[Gpg4win-commits] r60 - in trunk: . include m4 packages patches patches/pthreads-w32-2-7-0-release src

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Thu Nov 17 19:52:18 CET 2005


Author: werner
Date: 2005-11-17 19:52:17 +0100 (Thu, 17 Nov 2005)
New Revision: 60

Added:
   trunk/patches/pthreads-w32-2-7-0-release/
   trunk/patches/pthreads-w32-2-7-0-release/01-make.patch
   trunk/src/inst-crypt.nsi
   trunk/src/inst-eudoragpg.nsi
   trunk/src/inst-pthreads-w32.nsi
   trunk/src/inst-regex.nsi
   trunk/src/inst-sylpheed-claws.nsi
   trunk/src/loreley.mid
   trunk/src/uninst-crypt.nsi
   trunk/src/uninst-eudoragpg.nsi
   trunk/src/uninst-pthreads-w32.nsi
   trunk/src/uninst-regex.nsi
   trunk/src/uninst-sylpheed-claws.nsi
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/include/config.nsi.in
   trunk/m4/gpg4win.m4
   trunk/packages/download.sh
   trunk/src/Makefile.am
   trunk/src/gpg4win.mk.in
   trunk/src/inst-sections.nsi
Log:
Included Sylpheed.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/ChangeLog	2005-11-17 18:52:17 UTC (rev 60)
@@ -6,6 +6,31 @@
 	* src/inst-gpgme.nsi: Install libgpgme-glib-11.dll.
 	* src/uninst-gpgme.nsi: Uninstall libgpgme-glib-11.dll.
 
+2005-11-17  Werner Koch  <wk at g10code.com>
+
+	* src/Makefile.am (EXTRA_DIST): Add loreley.mid as original source
+	of the splash sound.
+
+	Add packages pthreads-w32 and regex.
+
+	* src/gpg4win.mk.in (MPKG_template): New.
+	(pkgmkflags, pkgmkarg): New.
+	(DEFLATE_macro): Use overwrite option for unzip.
+
+2005-11-16  Werner Koch  <wk at g10code.com>
+
+	* src/inst-crypt.nsi, src/uninst-crypt.nsi: New.
+	* m4/gpg4win.m4 (GPG4WIN_BPKG_GNUWIN32_LIB): New.
+
+	* src/uninst-sylpheed-claws.nsi, src/uninst-eudoragpg.nsi
+	* src/inst-eudoragpg.nsi, src/inst-sylpheed-claws.nsi: New.
+	* include/config.nsi.in: Add support for Sylpheed and EudorGPG.
+	* src/Makefile.am (gpg4win_spkgs): Add them.
+	(gpg4win_pkg_sylpheed_claws_configure): New. 
+
+	* src/inst-sections.nsi: Add them.
+	* configure.ac: Add them.
+
 2005-11-15  Werner Koch  <wk at g10code.com>
 
 	* src/Makefile.am (EXTRA_DIST): Add g4wihelp.nsi.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/Makefile.am	2005-11-17 18:52:17 UTC (rev 60)
@@ -26,4 +26,5 @@
 EXTRA_DIST = autogen.sh README.SVN \
 	patches/gnupg-1.4.2/01-po-subdirs.patch \
 	patches/gpgme-1.1.0/01-gpgme-def.patch \
-	patches/gpgme-1.1.0/02-libtool-dll.patch
+	patches/gpgme-1.1.0/02-libtool-dll.patch \
+        patches/pthreads-w32-2-7-0-release/01-make.patch

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/NEWS	2005-11-17 18:52:17 UTC (rev 60)
@@ -1,6 +1,8 @@
 Noteworthy changes in version 0.1.0
 ------------------------------------------------
 
+  * Inclded Sylpheed.
+
   * Some visual cleanups, more help texts.      
 
   * Reboot support for installing an already running GPGee 

Modified: trunk/README
===================================================================
--- trunk/README	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/README	2005-11-17 18:52:17 UTC (rev 60)
@@ -40,8 +40,7 @@
    build be the gpg4win) or gpg4win_spkgs (if foo should be build by
    gpg4win) in src/Makefile.am
 
-4. Add FOO to inst-sections.nsi and installer-finish.nsi.  The latter
-   is required for menu shortcuts.
+4. Add FOO to inst-sections.nsi.
 
 5. Add detection of packages to configure.ac.  Check out the available
    macros in m4/gpg4win.m4.  Depending on the way an upstream package

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/configure.ac	2005-11-17 18:52:17 UTC (rev 60)
@@ -85,6 +85,8 @@
 GPG4WIN_BPKG_GNU([gettext], [libiconv])
 
 GPG4WIN_BPKG_GNUWIN32([zlib])
+GPG4WIN_BPKG_GNUWIN32_LIB([crypt])
+GPG4WIN_BPKG_GNUWIN32_LIB([regex])
 GPG4WIN_BPKG_GNUWIN32([libpng], [pkgconfig])
 
 GPG4WIN_BPKG_GTK([pkgconfig])
@@ -99,9 +101,13 @@
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
 GPG4WIN_SPKG([gnupg])
+GPG4WIN_SPKG([pthreads-w32])
 GPG4WIN_SPKG([gpgol], [gpgme])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
 GPG4WIN_SPKG([winpt], [gpgme gnupg])
+GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng glib dnl
+                                gpgme pthreads-w32 crypt regex])
+GPG4WIN_SPKG([eudoragpg])
 GPG4WIN_SPKG([man_novice_de])
 GPG4WIN_SPKG([man_advanced_de])
 

Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/include/config.nsi.in	2005-11-17 18:52:17 UTC (rev 60)
@@ -77,12 +77,34 @@
 !define gpg4win_pkg_gpgee_version @gpg4win_pkg_gpgee_version@
 !define gpg4win_pkg_gpgee_src @gpg4win_pkg_gpgee_src@
 
+ at HAVE_PKG_SYLPHEED_CLAWS@
+!define gpg4win_pkg_sylpheed_claws @gpg4win_pkg_sylpheed_claws@
+!define gpg4win_pkg_sylpheed_claws_version @gpg4win_pkg_sylpheed_claws_version@
+
+ at HAVE_PKG_EUDORAGPG@
+!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
+!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
+
 @HAVE_PKG_ZLIB@
 !define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
 !define gpg4win_pkg_zlib_version @gpg4win_pkg_zlib_version@
 !define gpg4win_pkg_zlib_dev @gpg4win_pkg_zlib_dev@
 !define gpg4win_pkg_zlib_src @gpg4win_pkg_zlib_src@
 
+ at HAVE_PKG_CRYPT@
+!define gpg4win_pkg_crypt @gpg4win_pkg_crypt@
+!define gpg4win_pkg_crypt_version @gpg4win_pkg_crypt_version@
+!define gpg4win_pkg_crypt_src @gpg4win_pkg_crypt_src@
+
+ at HAVE_PKG_REGEX@
+!define gpg4win_pkg_regex @gpg4win_pkg_regex@
+!define gpg4win_pkg_regex_version @gpg4win_pkg_regex_version@
+!define gpg4win_pkg_regex_src @gpg4win_pkg_regex_src@
+
+ at HAVE_PKG_PTHREADS_W32@
+!define gpg4win_pkg_pthreads_w32 @gpg4win_pkg_pthreads_w32@
+!define gpg4win_pkg_pthreads_w32_version @gpg4win_pkg_pthreads_w32_version@
+
 @HAVE_PKG_LIBPNG@
 !define gpg4win_pkg_libpng @gpg4win_pkg_libpng@
 !define gpg4win_pkg_libpng_version @gpg4win_pkg_libpng_version@

Modified: trunk/m4/gpg4win.m4
===================================================================
--- trunk/m4/gpg4win.m4	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/m4/gpg4win.m4	2005-11-17 18:52:17 UTC (rev 60)
@@ -244,6 +244,7 @@
 ])
 
 
+
 # GPG4WIN_BPKG_GNUWIN32([PKG],[DEPENDS],[IF-FOUND],[IF-NOT-FOUND])
 # Set up the gnuwin32 package PKG.
 # It is provided in gpg4win_val.
@@ -304,7 +305,60 @@
           [$4])
 ])
 
+# GPG4WIN_BPKG_GNUWIN32_LIB([PKG],[DEPENDS],[IF-FOUND],[IF-NOT-FOUND])
+# Set up the gnuwin32 package PKG.  This is a static only library version.
+# It is provided in gpg4win_val.
+AC_DEFUN([GPG4WIN_BPKG_GNUWIN32_LIB],
+[
+  AC_REQUIRE([GPG4WIN_INIT])
+  _gpg4win_pkg=maybe
+  AC_ARG_ENABLE([pkg-$1],
+    AS_HELP_STRING([--enable-pkg-$1[=DIR]],
+                   [include package $1]),
+    _gpg4win_pkg=$enableval)
+  _gpg4win_bpkg=no
+  _gpg4win_version=
+  AS_IF([test x$_gpg4win_pkg != xno],
+        [GPG4WIN_FIND($1-lib, [$1-\(.*\)-lib],,
+         $_gpg4win_pkg,
+         _gpg4win_bpkg=$gpg4win_val
+	 _gpg4win_version=$gpg4win_version)])
 
+  # At this point, _gpg4win_bpkg is no, or the actual package source file.
+
+  # gpg4win_pkg_PKGNAME=FILENAME_OF_BINARY
+  gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]=$_gpg4win_bpkg
+  AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[-+],[__]))
+
+  # gpg4win_pkg_PKGNAME_version=VERSION
+  gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]_version=$_gpg4win_version
+  AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]_version)
+
+  AS_IF([test $_gpg4win_bpkg != no],
+    GPG4WIN_FIND($1-src, [$1-\(.*\)-src],,
+                 $_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val,
+       AC_MSG_ERROR(can not find sources for package $1))
+    # gpg4win_pkg_PKGNAME_src=FILENAME_OF_SOURCE
+    gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]_src=$_gpg4win_bpkg
+    AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]_src)
+
+    # FIXME: Add a version consistency check here.  All two packages
+    # must match!
+
+    GPG4WIN_DEFINE(HAVE_PKG_[]m4_translit([$1],[a-z+-],[A-Z__]))
+
+    _gpg4win_pkgs="$_gpg4win_pkgs $1"
+    # Record dependencies.  Also enter every package as node.
+    _gpg4win_deps="$_gpg4win_deps $1 $1"
+    AS_IF([test ! -z "$2"],
+          for _gpg4win_i in $2; do
+	    _gpg4win_deps="$_gpg4win_deps $_gpg4win_i $1"
+          done)
+          [$3],
+          [$4])
+])
+
+
 # GPG4WIN_BPKG_GTK([PKG],[DEPENDS],[IF-FOUND],[IF-NOT-FOUND])
 # Set up the Gtk binary package PKG.
 # It is provided in gpg4win_val.

Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/packages/download.sh	2005-11-17 18:52:17 UTC (rev 60)
@@ -37,9 +37,9 @@
 
 
 # http://gnuwin32.sourceforge.net/
+# Note:  Mesh, Duesseldorf does not work reliable anymore.
+server_gnuwin32=http://kent.dl.sourceforge.net/sourceforge/gnuwin32
 
-server_gnuwin32=http://mesh.dl.sourceforge.net/sourceforge/gnuwin32
-
 ${WGET} -c ${server_gnuwin32}/zlib-1.2.3-bin.zip
 ${WGET} -c ${server_gnuwin32}/zlib-1.2.3-lib.zip
 ${WGET} -c ${server_gnuwin32}/zlib-1.2.3-src.zip
@@ -48,7 +48,20 @@
 ${WGET} -c ${server_gnuwin32}/libpng-1.2.8-lib.zip
 ${WGET} -c ${server_gnuwin32}/libpng-1.2.8-src.zip
 
+${WGET} -c ${server_gnuwin32}/crypt-2.2.5-lib.zip
+${WGET} -c ${server_gnuwin32}/crypt-2.2.5-src.zip
 
+${WGET} -c ${server_gnuwin32}/regex-0.12-lib.zip
+${WGET} -c ${server_gnuwin32}/regex-0.12-src.zip
+
+
+# RedHat
+
+server_redhat=ftp://sources.redhat.com/pub/
+
+${WGET} -c ${server_redhat}/pthreads-win32/pthreads-w32-2-7-0-release.tar.gz
+
+
 # http://www.gimp.org/~tml/gimp/win32/downloads.html
 
 server_gtk=ftp://ftp.gtk.org/pub/gtk/v2.6
@@ -75,10 +88,10 @@
 
 # WinPT
 
-#server_winpt="http://wald.intevation.org/frs/download.php"
-server_winpt="ftp://ftp.g10code.com/g10code/scratch"
+server_winpt="http://wald.intevation.org/frs/download.php"
 
-${WGET} -c ${server_winpt}/winpt-0.11.0-cvs.tar.bz2
+${WGET} -c ${server_winpt}/47/winpt-0.11.0.tar.bz2
+${WGET} -c ${server_winpt}/48/winpt-0.11.0.tar.bz2.sig
 
 # GPGee
 # Note: This is a temporary location
@@ -108,7 +121,9 @@
 ${WGET} -c ${server_g10code}/gpgme-1.2.0-cvs.tar.bz2
 ${WGET} -c ${server_g10code}/gpa-0.7.1-cvs.tar.bz2
 ${WGET} -c ${server_g10code}/gpgol-0.9.4-cvs.tar.bz2
+${WGET} -c ${server_g10code}/sylpheed-claws-1.9.99cvs5-wk1.tar.bz2
 
 # Dummy manual pages
 ${WGET} -c ${server_g10code}/man_novice_de-0.0.0-cvs.tar.gz
 ${WGET} -c ${server_g10code}/man_advanced_de-0.0.0-cvs.tar.gz
+${WGET} -c ${server_g10code}/eudoragpg-0.0.0-cvs.tar.gz

Added: trunk/patches/pthreads-w32-2-7-0-release/01-make.patch
===================================================================
--- trunk/patches/pthreads-w32-2-7-0-release/01-make.patch	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/patches/pthreads-w32-2-7-0-release/01-make.patch	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,34 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2005-11-17  Werner Koch  <wk at g10code.com>
+
+	* GNUmakefile (install): Add new target.
+
+
+--- pthreads-w32-2-7-0-release.orig/GNUmakefile	2005-06-03 10:36:27.000000000 +0200
++++ pthreads-w32-2-7-0-release/GNUmakefile	2005-11-17 10:35:41.000000000 +0100
+@@ -541,6 +541,22 @@
+ 	$(RANLIB) $(GC_LIB)
+ 	echo touched > $(GC_STATIC_STAMP)
+ 
++
++install:
++	set -e; \
++        for i in include lib bin ; do \
++           mkdir -p "$(DESTDIR)$(prefix)/$$i" || true ; \
++        done; \
++        for i in pthread.h sched.h semaphore.h ; do \
++           cp "$$i" "$(DESTDIR)$(prefix)/include/$$i" ; \
++        done; \
++        for i in libpthread*.a pthread.def ; do \
++           cp "$$i" "$(DESTDIR)$(prefix)/lib/$$i" ; \
++        done; \
++        for i in pthread*.dll ; do \
++           cp "$$i" "$(DESTDIR)$(prefix)/bin/$$i" ; \
++        done
++
+ clean:
+ 	-$(RM) *~
+ 	-$(RM) *.i


Property changes on: trunk/patches/pthreads-w32-2-7-0-release/01-make.patch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/Makefile.am	2005-11-17 18:52:17 UTC (rev 60)
@@ -20,14 +20,14 @@
 
 EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
 	libiconv.def libintl.def  gpg4win-splash.bmp gpg4win-splash.wav \
-	exdll.h g4wihelp.c g4wihelp.nsi
+	exdll.h g4wihelp.c g4wihelp.nsi loreley.mid
 
 # Need to clean the dll because we bypassed automake.
 CLEANFILES = g4wihelp.dll 
 
 # Supported source packages.
-gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa winpt \
-		 man_novice_de man_advanced_de
+gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
+                 eudoragpg man_novice_de man_advanced_de
 
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
@@ -55,10 +55,31 @@
 gpg4win_pkg_winpt_configure = \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
+gpg4win_pkg_sylpheed_claws_configure = \
+  --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
+  --with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
+  --with-config-dir="Sylpheed-claws" \
+  --disable-libetpan --disable-aspell --disable-trayicon-plugin \
+  --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
+  --disable-jpilot --disable-startup-notification --disable-ipv6 \
+  --disable-mathml-viewer-plugin --disable-clamav-plugin \
+  --disable-spamassassin-plugin
 
+# Supported make-only source packages.
+gpg4win_mpkgs :=  pthreads-w32
+
+# Extra options for the make infocations for individual packages.
+# make_flags is used fur building make_args_inst is used for installing.
+gpg4win_pkg_pthreads_w32_make_args = \
+  prefix=$(idir) CROSS=$(host_alias)- clean GC
+
+gpg4win_pkg_pthreads_w32_make_args_inst = \
+  prefix=$$$${pkgidir} CROSS=$(host_alias)- 
+
+
 # Supported binary packages.
 gpg4win_bpkgs :=  libiconv gettext pkgconfig zlib glib libpng pango atk gtk+ \
-		  gpgee
+		  gpgee crypt regex
 
 # libiconv needs some special magic to generate a usable import
 # library.
@@ -96,7 +117,18 @@
 echo "libdir=\"$$$${pkgidir}/lib\"" >> lib/libz.la;)
 endef
 
+# To make shure that we link against the static versions we need
+# remove the import libs from crypt
+define gpg4win_pkg_crypt_post_install
+(cd $$$${pkgidir}/lib && rm libcrypt.dll.a libcrypt.lib)
+endef
 
+# To make shure that we link against the static versions we need
+# remove the import libs from regex
+define gpg4win_pkg_regex_post_install
+(cd $$$${pkgidir}/lib && rm libregex.dll.a libregex.lib)
+endef
+
 # We need to fix the prefix in the various packages using pkgconfig,
 # or we can't substitute it properly in our pkg-config wrapper.
 define gpg4win_pkg_glib_post_install

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/gpg4win.mk.in	2005-11-17 18:52:17 UTC (rev 60)
@@ -62,6 +62,8 @@
 	pkg_version_dev="$(1)-dev-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
 	pkgidir_dev="$(ipdir)/$$$${pkg_version_dev}";			\
 	pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_configure)";		\
+	pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_make_args)";          \
+	pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
 	export PKG_CONFIG="$(shell pwd)/$(top_srcdir)/src/pkg-config";	\
 	export PKG_CONFIG_PATH="${idir}/lib/pkgconfig";			\
 	export SYSROOT="${idir}"
@@ -75,7 +77,7 @@
 	  *.tar.bz2 | *.tbz2 | *.tbz)	\
 	    $(TAR) xjf "$(1)" ;;	\
 	  *.zip)			\
-	    $(UNZIP) "$(1)" ;;		\
+	    $(UNZIP) -o "$(1)" ;;		\
 	esac
 endef
 
@@ -122,13 +124,13 @@
 stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
 	($(call SETVARS,$(1));				\
 	  cd "$$$${pkgbdir}";				\
-	  $(MAKE) $(AM_MAKEFLAGS))
+	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
 	touch stamps/stamp-$(1)-03-make
 
 stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
 	($(call SETVARS,$(1));				\
 	  cd "$$$${pkgbdir}";				\
-	  $(MAKE) $(AM_MAKEFLAGS) install;		\
+	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
 	  $(call STRIP_macro,"$$$${pkgidir}"))
 	touch stamps/stamp-$(1)-04-install
 
@@ -143,6 +145,50 @@
 endef
 
 
+# Template for source packages using only make and no build
+# directory.
+
+define MPKG_template
+
+stamps/stamp-$(1)-00-unpack: stamps/stamp-directories 
+	(cd $(bdir);					\
+	 $(call SETVARS,$(1));				\
+	 $(call DEFLATE_macro,$$$${pkg}))
+	touch stamps/stamp-$(1)-00-unpack
+
+stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
+	(shopt -s nullglob;				\
+	 $(call SETVARS,$(1));				\
+	 for pfile in "$$$${pkgpdir}"/*.patch ; do	\
+	   (cd "$$$${pkgsdir}"; "$$$${pfile}")		\
+	 done)
+	touch stamps/stamp-$(1)-01-patch
+
+stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-01-patch
+	($(call SETVARS,$(1));				\
+	  cd "$$$${pkgsdir}";				\
+	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
+	touch stamps/stamp-$(1)-03-make
+
+stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
+	($(call SETVARS,$(1));				\
+	  cd "$$$${pkgsdir}";				\
+	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
+	  $(call STRIP_macro,"$$$${pkgidir}"))
+	touch stamps/stamp-$(1)-04-install
+
+stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
+	($(call SETVARS,$(1));				\
+	 cd $(ipdir);					\
+	 $(STOW) "$$$${pkg_version}")
+	touch stamps/stamp-$(1)-05-stow
+
+stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
+	touch stamps/stamp-final-$(1)
+endef
+
+
+
 # Template for binary packages.
 
 define BPKG_template
@@ -184,6 +230,9 @@
 # Insert the template for each source package.
 $(foreach spkg, $(gpg4win_spkgs), $(eval $(call SPKG_template,$(spkg))))
 
+# Insert the template for each make only source package.
+$(foreach mpkg, $(gpg4win_mpkgs), $(eval $(call MPKG_template,$(mpkg))))
+
 # Insert the template for each binary package.
 $(foreach bpkg, $(gpg4win_bpkgs), $(eval $(call BPKG_template,$(bpkg))))
 

Added: trunk/src/inst-crypt.nsi
===================================================================
--- trunk/src/inst-crypt.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/inst-crypt.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,37 @@
+# inst-crypt.nsi - Installer snippet.            -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/crypt-${gpg4win_pkg_crypt_version}
+
+!ifdef DEBUG
+Section "crypt" SEC_crypt
+!else
+Section "-crypt" SEC_crypt
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_crypt_src}"
+!else
+  # Nothing to install as we link statically.
+!endif
+SectionEnd

Added: trunk/src/inst-eudoragpg.nsi
===================================================================
--- trunk/src/inst-eudoragpg.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/inst-eudoragpg.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,45 @@
+# inst-eudoragpg.nsi - Installer snippet.       -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/eudoragpg-${gpg4win_pkg_eudoragpg_version}
+
+
+Section "EudoraGPG" SEC_eudoragpg
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_eudoragpg}"
+!else
+  #File ${prefix}/bin/eudoragpg.exe
+
+  SetOutPath "$INSTDIR\share\eudoragpg"
+  File "${prefix}/share/eudoragpg/eudoragpg.html"
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_eudoragpg ${LANG_ENGLISH} \
+   "EudoraGPG is a plugin for the Eudora mail program"
+LangString DESC_SEC_eudoragpg ${LANG_GERMAN} \
+   "EudoraGPG ist ein Plugin für das Eudora Mailprogramm"
+
+

Added: trunk/src/inst-pthreads-w32.nsi
===================================================================
--- trunk/src/inst-pthreads-w32.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/inst-pthreads-w32.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,37 @@
+# inst-pthreads-w32.nsi - Installer snippet.     -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/pthreads-w32-${gpg4win_pkg_pthreads_w32_version}
+
+!ifdef DEBUG
+Section "pthreads-w32" SEC_pthreads_w32
+!else
+Section "-pthreads-w32" SEC_pthreads_w32
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_pthreads_w32}"
+!else
+  File ${prefix}/bin/pthreadGC2.dll
+!endif
+SectionEnd

Added: trunk/src/inst-regex.nsi
===================================================================
--- trunk/src/inst-regex.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/inst-regex.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,37 @@
+# inst-regex.nsi - Installer snippet.            -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/regex-${gpg4win_pkg_regex_version}
+
+!ifdef DEBUG
+Section "regex" SEC_regex
+!else
+Section "-regex" SEC_regex
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_regex_src}"
+!else
+  # Nothing to install as we link statically.
+!endif
+SectionEnd

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/inst-sections.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -34,6 +34,15 @@
 !ifdef HAVE_PKG_ZLIB
 !include "inst-zlib.nsi"
 !endif
+!ifdef HAVE_PKG_CRYPT
+!include "inst-crypt.nsi"
+!endif
+!ifdef HAVE_PKG_REGEX
+!include "inst-regex.nsi"
+!endif
+!ifdef HAVE_PKG_PTHREADS_W32
+!include "inst-pthreads-w32.nsi"
+!endif
 !ifdef HAVE_PKG_GPGME
 !include "inst-gpgme.nsi"
 !endif
@@ -67,6 +76,12 @@
 !ifdef HAVE_PKG_GPGEE
 !include "inst-gpgee.nsi"
 !endif
+!ifdef HAVE_PKG_SYLPHEED_CLAWS
+!include "inst-sylpheed-claws.nsi"
+!endif
+!ifdef HAVE_PKG_EUDORAGPG
+!include "inst-eudoragpg.nsi"
+!endif
 !ifdef HAVE_PKG_MAN_NOVICE_DE
 !include "inst-man_novice_de.nsi"
 !endif
@@ -82,6 +97,12 @@
 !ifdef HAVE_PKG_MAN_NOVICE_DE
 !include "uninst-man_novice_de.nsi"
 !endif
+!ifdef HAVE_PKG_EUDORAGPG
+!include "uninst-eudoragpg.nsi"
+!endif
+!ifdef HAVE_PKG_SYLPHEED_CLAWS
+!include "uninst-sylpheed-claws.nsi"
+!endif
 !ifdef HAVE_PKG_GPGEE
 !include "uninst-gpgee.nsi"
 !endif
@@ -115,6 +136,15 @@
 !ifdef HAVE_PKG_GPGME
 !include "uninst-gpgme.nsi"
 !endif
+!ifdef HAVE_PKG_PTHREADS_W32
+!include "uninst-pthreads-w32.nsi"
+!endif
+!ifdef HAVE_PKG_REGEX
+!include "uninst-regex.nsi"
+!endif
+!ifdef HAVE_PKG_CRYPT
+!include "uninst-crypt.nsi"
+!endif
 !ifdef HAVE_PKG_ZLIB
 !include "uninst-zlib.nsi"
 !endif
@@ -150,6 +180,15 @@
 !ifdef HAVE_PKG_ZLIB
   !insertmacro UnselectSection ${SEC_zlib}
 !endif
+!ifdef HAVE_PKG_CRYPT
+  !insertmacro UnselectSection ${SEC_crypt}
+!endif
+!ifdef HAVE_PKG_REGEX
+  !insertmacro UnselectSection ${SEC_regex}
+!endif
+!ifdef HAVE_PKG_PTHREADS_W32
+  !insertmacro UnselectSection ${SEC_pthreads_w32}
+!endif
 !ifdef HAVE_PKG_LIBPNG
   !insertmacro UnselectSection ${SEC_libpng}
 !endif
@@ -205,6 +244,31 @@
   skip_gpa:
 !endif
 
+!ifdef HAVE_PKG_SYLPHEED_CLAWS
+  !insertmacro SectionFlagIsSet ${SEC_sylpheed} ${SF_SELECTED} have_sylpheed skip_sylpheed
+  have_sylpheed:
+  !insertmacro SelectSection ${SEC_zlib}
+  !insertmacro SelectSection ${SEC_gtk_}
+  !insertmacro SelectSection ${SEC_libpng}
+  !insertmacro SelectSection ${SEC_glib}
+  !insertmacro SelectSection ${SEC_gpgme}
+  !insertmacro SelectSection ${SEC_gnupg}
+  # fixme: Need more.
+  skip_sylpheed:
+!endif
+
+!ifdef HAVE_PKG_EUDORAGPG
+  !insertmacro SectionFlagIsSet ${SEC_eudoragpg} ${SF_SELECTED} have_eudoragpg skip_eudoragpg
+  have_eudoragpg:
+  !insertmacro SelectSection ${SEC_zlib}
+  !insertmacro SelectSection ${SEC_gtk_}
+  !insertmacro SelectSection ${SEC_libpng}
+  !insertmacro SelectSection ${SEC_glib}
+  !insertmacro SelectSection ${SEC_gpgme}
+  !insertmacro SelectSection ${SEC_gnupg}
+  skip_eudoragpg:
+!endif
+
 !ifdef HAVE_PKG_GTK_
   !insertmacro SectionFlagIsSet ${SEC_gtk_} \
 		${SF_SELECTED} have_gtk_ skip_gtk_
@@ -324,6 +388,12 @@
 !ifdef HAVE_PKG_GPGEE
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgee} $(DESC_SEC_gpgee)
 !endif
+!ifdef HAVE_PKG_SYLPHEED_CLAWS
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_sylpheed} $(DESC_SEC_sylpheed)
+!endif
+!ifdef HAVE_PKG_EUDORAGPG
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
+!endif
 !ifdef HAVE_PKG_MAN_NOVICE_DE
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_de} $(DESC_SEC_man_novice_de)
 !endif
@@ -351,7 +421,7 @@
     SectionGetFlags ${SEC_winpt} $R0 
     IntOp $R0 $R0 & ${SF_SELECTED} 
     IntCmp $R0 ${SF_SELECTED} 0 no_winpt_menu 
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WINPT.lnk" \
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WinPT.lnk" \
 	"$INSTDIR\winpt.exe" \
         "" "$INSTDIR\winpt.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_winpt)
    no_winpt_menu:
@@ -367,6 +437,26 @@
   no_gpa_menu:
 !endif
 
+!ifdef HAVE_PKG_SYLPHEED_CLAWS
+    SectionGetFlags ${SEC_sylpheed} $R0 
+    IntOp $R0 $R0 & ${SF_SELECTED} 
+    IntCmp $R0 ${SF_SELECTED} 0 no_sylpheed_menu 
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Sylpheed.lnk" \
+	"$INSTDIR\sylpheed-claws.exe" \
+        "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_sylpheed)
+  no_sylpheed_menu:
+!endif
+
+!ifdef HAVE_PKG_EUDORAGPG
+    SectionGetFlags ${SEC_eudoragpg} $R0 
+    IntOp $R0 $R0 & ${SF_SELECTED} 
+    IntCmp $R0 ${SF_SELECTED} 0 no_eudoragpg_menu 
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\EudoraGPG Plugin.lnk" \
+	"$INSTDIR\share\eudoragpg\eudoragpg.html" \
+        "" "" "" SW_SHOWNORMAL "" ""
+  no_eudoragpg_menu:
+!endif
+
 !ifdef HAVE_PKG_MAN_NOVICE_DE
     SectionGetFlags ${SEC_man_novice_de} $R0 
     IntOp $R0 $R0 & ${SF_SELECTED} 

Added: trunk/src/inst-sylpheed-claws.nsi
===================================================================
--- trunk/src/inst-sylpheed-claws.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/inst-sylpheed-claws.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,49 @@
+# inst-sylpheed.nsi - Installer snippet for Sylpheed. -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/sylpheed-claws-${gpg4win_pkg_sylpheed_claws_version}
+
+
+Section "Sylpheed" SEC_sylpheed
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_sylpheed_claws}"
+!else
+  File ${prefix}/bin/sylpheed-claws.exe
+  File ${prefix}/bin/pthreadGC2.dll
+
+  SetOutPath "$INSTDIR\share\sylpheed-claws"
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_sylpheed ${LANG_ENGLISH} \
+   "Sylpheed Mail-User-Agent"
+LangString DESC_SEC_sylpheed ${LANG_GERMAN} \
+   "Sylpheed ist ein vollständiges Mail- und News-Programm mit sehr guter \
+    Unterstützung for GnuPG.  Dies ist die Sylpheed-Claws Variante."
+
+LangString DESC_Menu_sylpheed ${LANG_ENGLISH} \
+   "Run the Sylpheed mailprogram."
+LangString DESC_Menu_sylpheed ${LANG_GERMAN} \
+   "Das Mailprogramm Sylpheed aufrufen."

Added: trunk/src/loreley.mid
===================================================================
(Binary files differ)


Property changes on: trunk/src/loreley.mid
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/uninst-crypt.nsi
===================================================================
--- trunk/src/uninst-crypt.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/uninst-crypt.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,35 @@
+# uninst-crypt.nsi - Installer snippet.        -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/crypt-${gpg4win_pkg_crypt_version}
+
+
+; Uninstaller section.
+Section "-un.crypt"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_crypt_src}"
+  Call un.SourceDelete
+!else
+  # Nothing to uninstall
+!endif
+SectionEnd

Added: trunk/src/uninst-eudoragpg.nsi
===================================================================
--- trunk/src/uninst-eudoragpg.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/uninst-eudoragpg.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,39 @@
+# uninst-eudoragpg.nsi - Installer snippet.     -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/eudoragpg-${gpg4win_pkg_eudoragpg_version}
+
+
+# Uninstaller section.
+Section "-un.eudoragpg"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_eudoragpg}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\eudoragpg.exe"
+
+  RMDir "$INSTDIR\share\eudoragpg"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-pthreads-w32.nsi
===================================================================
--- trunk/src/uninst-pthreads-w32.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/uninst-pthreads-w32.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,35 @@
+# uninst-pthreads-w32.nsi - Installer snippet.   -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/pthreads-w32-${gpg4win_pkg_pthreads_w32_version}
+
+
+; Uninstaller section.
+Section "-un.pthreads-w32"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_pthreads_w32}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\pthreadGC2.dll"
+!endif
+SectionEnd

Added: trunk/src/uninst-regex.nsi
===================================================================
--- trunk/src/uninst-regex.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/uninst-regex.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,35 @@
+# uninst-regex.nsi - Installer snippet.        -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/regex-${gpg4win_pkg_regex_version}
+
+
+; Uninstaller section.
+Section "-un.regex"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_regex_src}"
+  Call un.SourceDelete
+!else
+  # Nothing to uninstall
+!endif
+SectionEnd

Added: trunk/src/uninst-sylpheed-claws.nsi
===================================================================
--- trunk/src/uninst-sylpheed-claws.nsi	2005-11-17 18:16:24 UTC (rev 59)
+++ trunk/src/uninst-sylpheed-claws.nsi	2005-11-17 18:52:17 UTC (rev 60)
@@ -0,0 +1,39 @@
+# uninst-sylpheed.nsi - Installer snippet.        -*- coding: latin-1; -*-
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is part of GPG4Win.
+# 
+# GPG4Win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GPG4Win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/sylpheed-claws-${gpg4win_pkg_sylpheed_version}
+
+
+# Uninstaller section.
+Section "-un.sylpheed"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_sylpheed_claws}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\sylpheed-claws.exe"
+
+  RMDir "$INSTDIR\share\sylpheed-claws"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd



More information about the Gpg4win-commits mailing list