[Gpg4win-commits] r575 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Oct 29 22:41:09 CET 2007
Author: marcus
Date: 2007-10-29 22:41:09 +0100 (Mon, 29 Oct 2007)
New Revision: 575
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/gpg4win.mk.in
Log:
2007-10-26 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Add libetpan.
* configure.ac: Add libetpan package.
* include/config.nsi.in: Add support for libetpan.
* src/Makefile.am (EXTRA_DIST): Add inst-libetpan.nsi and
uninst-libetpan.nsi.
(gpg4win_spkgs): Add libetpan.
(gpg4win_pkg_libetpan_configure): New variable.
* src/uninst-libetpan.nsi, src/inst-libetpan.nsi: New files.
* src/gpg4win.mk.in: Invoke configure with relative path to make
it easier on some packages (in particular libetpan).
(SETVRS): Add install bin directory to PATH.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-29 19:58:17 UTC (rev 574)
+++ trunk/ChangeLog 2007-10-29 21:41:09 UTC (rev 575)
@@ -1,3 +1,17 @@
+2007-10-26 Marcus Brinkmann <marcus at g10code.de>
+
+ * packages/packages.current: Add libetpan.
+ * configure.ac: Add libetpan package.
+ * include/config.nsi.in: Add support for libetpan.
+ * src/Makefile.am (EXTRA_DIST): Add inst-libetpan.nsi and
+ uninst-libetpan.nsi.
+ (gpg4win_spkgs): Add libetpan.
+ (gpg4win_pkg_libetpan_configure): New variable.
+ * src/uninst-libetpan.nsi, src/inst-libetpan.nsi: New files.
+ * src/gpg4win.mk.in: Invoke configure with relative path to make
+ it easier on some packages (in particular libetpan).
+ (SETVRS): Add install bin directory to PATH.
+
2007-10-29 Werner Koch <wk at g10code.com>
* packages/packages.current: Update to libgpg-error 1.6.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-10-29 19:58:17 UTC (rev 574)
+++ trunk/configure.ac 2007-10-29 21:41:09 UTC (rev 575)
@@ -204,8 +204,9 @@
GPG4WIN_SPKG([winpt], [gpgme gnupg])
GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
gpgme pthreads-w32 crypt regex])
+GPG4WIN_SPKG([libetpan], [pthreads-w32])
GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
- gpgme pthreads-w32 crypt regex])
+ gpgme pthreads-w32 crypt regex libetpan])
# The Eudora license (the one for the EMS API) is still not acceptable.
#GPG4WIN_SPKG([eudoragpg])
GPG4WIN_IPKG([man_novice_de])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-10-29 19:58:17 UTC (rev 574)
+++ trunk/include/config.nsi.in 2007-10-29 21:41:09 UTC (rev 575)
@@ -115,6 +115,10 @@
!define gpg4win_pkg_sylpheed_claws @gpg4win_pkg_sylpheed_claws@
!define gpg4win_pkg_sylpheed_claws_version @gpg4win_pkg_sylpheed_claws_version@
+ at HAVE_PKG_LIBETPAN@
+!define gpg4win_pkg_libetpan @gpg4win_pkg_libetpan@
+!define gpg4win_pkg_libetpan_version @gpg4win_pkg_libetpan_version@
+
@HAVE_PKG_CLAWS_MAIL@
!define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
!define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-10-29 19:58:17 UTC (rev 574)
+++ trunk/packages/packages.current 2007-10-29 21:41:09 UTC (rev 575)
@@ -65,6 +65,15 @@
chk b9faae10efae552f23c213891a3ed8187cb7d017
#
+# libetpan for claws
+#
+
+server ftp://ftp.g10code.com/g10code/scratch
+
+file libetpan-0.52-dev-20071029.tar.gz
+chk bf01a5754831f833745ee8812463a327b4be060b
+
+#
# Claws
#
# (Kept on our own mirror due to Sourceforge peculiarities.)
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-10-29 19:58:17 UTC (rev 574)
+++ trunk/src/Makefile.am 2007-10-29 21:41:09 UTC (rev 575)
@@ -26,6 +26,7 @@
inst-gpg4win.nsi uninst-gpg4win.nsi \
inst-atk.nsi uninst-atk.nsi \
inst-cairo.nsi uninst-cairo.nsi \
+ inst-libetpan.nsi uninst-libetpan.nsi \
inst-claws-mail.nsi uninst-claws-mail.nsi \
inst-crypt.nsi uninst-crypt.nsi \
inst-dirmngr.nsi uninst-dirmngr.nsi \
@@ -73,7 +74,7 @@
# Supported source packages.
gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
- gpa winpt sylpheed-claws \
+ gpa winpt sylpheed-claws libetpan \
claws-mail gnupg2 pinentry libassuan libksba \
libgcrypt dirmngr w32pth
@@ -197,7 +198,11 @@
--disable-mathml-viewer-plugin --disable-clamav-plugin \
--disable-spamassassin-plugin
-gpg4win_pkg_claws_mail_configure = --silent \
+# The CFLAGS are needed to find pthread-w32.
+gpg4win_pkg_libetpan_configure = \
+ CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
+
+gpg4win_pkg_claws_mail_configure = \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
--with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
--with-config-dir="Claws-mail" --disable-pthread \
Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in 2007-10-29 19:58:17 UTC (rev 574)
+++ trunk/src/gpg4win.mk.in 2007-10-29 21:41:09 UTC (rev 575)
@@ -68,6 +68,7 @@
pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
export PKG_CONFIG="$(tsdir)/src/pkg-config"; \
export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig"; \
+ export PATH="$(idir)/bin:$${PATH}"; \
export SYSROOT="$(idir)"; \
export CONFIG_SITE="$(tsdir)/src/config.site"
endef
@@ -125,7 +126,7 @@
($(call SETVARS,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
- eval "$$$${pkgsdir}/configure" \
+ eval "../$$$${pkg_version}/configure" \
--prefix="$$$${pkgidir}" \
--host=$(host_cpu)-$(host_os) \
--build=$(build_cpu)-$(build_os) \
More information about the Gpg4win-commits
mailing list