2008-09-27 Colin Leroy <colin@colino.net>
authorColin Leroy <colin@colino.net>
Sat, 27 Sep 2008 10:43:11 +0000 (10:43 +0000)
committerColin Leroy <colin@colino.net>
Sat, 27 Sep 2008 10:43:11 +0000 (10:43 +0000)
* configure.ac,
src/Makefile.am,
include/config.nsi.in,
src/gpg4win.nsi,
src/inst-sections.nsi,
packages/packages.current: Add Curl, Claws plugins Gtkhtml,
Vcalendar and Notification.
* src/inst-curl.nsi, src/uninst-curl.nsi,
src/inst-gtkhtml2_viewer.nsi, src/uninst-gtkhtml2_viewer.nsi,
src/inst-vcalendar.nsi, src/uninst-vcalendar.nsi,
src/inst-notifiation_plugin.nsi, src/uninst-notification_plugin.nsi:
New files for these new packages

15 files changed:
ChangeLog
configure.ac
include/config.nsi.in
packages/packages.current
src/Makefile.am
src/gpg4win.nsi
src/inst-curl.nsi [new file with mode: 0644]
src/inst-gtkhtml2_viewer.nsi [new file with mode: 0644]
src/inst-notification_plugin.nsi [new file with mode: 0644]
src/inst-sections.nsi
src/inst-vcalendar.nsi [new file with mode: 0644]
src/uninst-curl.nsi [new file with mode: 0644]
src/uninst-gtkhtml2_viewer.nsi [new file with mode: 0644]
src/uninst-notification_plugin.nsi [new file with mode: 0644]
src/uninst-vcalendar.nsi [new file with mode: 0644]

index feb966b..029776c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,24 @@
+2008-09-27  Colin Leroy  <colin@colino.net>
+
+       * configure.ac,
+       src/Makefile.am,
+       include/config.nsi.in,
+       src/gpg4win.nsi,
+       src/inst-sections.nsi,
+       packages/packages.current: Add Curl, Claws plugins Gtkhtml,
+       Vcalendar and Notification.
+       * src/inst-curl.nsi, src/uninst-curl.nsi,
+       src/inst-gtkhtml2_viewer.nsi, src/uninst-gtkhtml2_viewer.nsi,
+       src/inst-vcalendar.nsi, src/uninst-vcalendar.nsi,
+       src/inst-notifiation_plugin.nsi, src/uninst-notification_plugin.nsi:
+       New files for these new packages
+
 2008-09-25  Colin Leroy  <colin@colino.net>
 
        * src/Makefile.am (gpg4win_pkg_claws_mail_configure): Add
-       --disable-dbus. No more patches!
+       --disable-dbus.  No more patches!
        * packages/packages.current: Update claws and change claws
-       and libetpan's sources
+       and libetpan's sources.
 
 2008-09-22  Marcus Brinkmann  <marcus@g10code.com>
 
index 3c09ff6..288486c 100644 (file)
@@ -209,9 +209,12 @@ GPG4WIN_SPKG([libtasn1])
 GPG4WIN_SPKG([opencdk], [libgpg-error libgcrypt])
 GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 opencdk])
 GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
+GPG4WIN_SPKG([curl], [zlib gnutls kdesupport])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
                             gpgme pthreads-w32 crypt regex libetpan gnutls])
-
+GPG4WIN_SPKG([notification_plugin], [claws-mail])
+GPG4WIN_SPKG([gtkhtml2_viewer], [curl claws-mail])
+GPG4WIN_SPKG([vcalendar], [curl claws-mail])
 GPG4WIN_IPKG([compendium_de])
 GPG4WIN_IPKG([man_novice_en])
 #GPG4WIN_IPKG([man_advanced_en])
index 2c1fb4d..aa61fef 100644 (file)
 !define gpg4win_pkg_gnutls @gpg4win_pkg_gnutls@
 !define gpg4win_pkg_gnutls_version @gpg4win_pkg_gnutls_version@
 
+@HAVE_PKG_CURL@
+!define gpg4win_pkg_curl @gpg4win_pkg_curl@
+!define gpg4win_pkg_curl_version @gpg4win_pkg_curl_version@
+
+
 @HAVE_PKG_LIBETPAN@
 !define gpg4win_pkg_libetpan @gpg4win_pkg_libetpan@
 !define gpg4win_pkg_libetpan_version @gpg4win_pkg_libetpan_version@
 !define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
 !define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
 
+@HAVE_PKG_NOTIFICATION_PLUGIN@
+!define gpg4win_pkg_notification_plugin @gpg4win_pkg_notification_plugin@
+!define gpg4win_pkg_notification_plugin_version @gpg4win_pkg_notification_plugin_version@
+
+@HAVE_PKG_GTKHTML2_VIEWER@
+!define gpg4win_pkg_gtkhtml2_viewer @gpg4win_pkg_gtkhtml2_viewer@
+!define gpg4win_pkg_gtkhtml2_viewer_version @gpg4win_pkg_gtkhtml2_viewer_version@
+
+@HAVE_PKG_VCALENDAR@
+!define gpg4win_pkg_vcalendar @gpg4win_pkg_vcalendar@
+!define gpg4win_pkg_vcalendar_version @gpg4win_pkg_vcalendar_version@
+
 #@HAVE_PKG_EUDORAGPG@
 #!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
 #!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
index 5a3e9f7..bff9cce 100644 (file)
@@ -97,13 +97,36 @@ file libetpan-0.56.tar.gz
 chk  b75a493f6f6a82bd19acb41e459f76dc6c27e2c8
 
 #
+# curl for Claws plugins
+#
+
+server http://curl.haxx.se/download
+file  curl-7.19.0.tar.bz2
+chk   fffb34be2e3c66e58a5d3daaf8aa38cae33b284f
+
+#
 # Claws
 #
 # (Kept on our own mirror due to Sourceforge peculiarities.)
 server http://www.claws-mail.org/win32
 
-file  claws-mail-3.5.0cvs131.tar.bz2
-chk   1c3956988a861dbb371dfe942c1ad93a31a042bc
+file  claws-mail-3.5.0cvs132.tar.bz2
+chk   d9507ecf51ab7738fc121890be606a5bd3543459
+
+#
+# Claws plugins
+#
+server http://www.claws-mail.org/win32
+file  notification_plugin-0.17cvs6.tar.gz
+chk   c3ca1de4e6e6d2a611397b7910b3fbf0a09fd7bf
+
+server http://www.claws-mail.org/win32
+file  gtkhtml2_viewer-0.19cvs11.tar.gz
+chk   5d104416873512e175c54a3c0a914116ec2acd14
+
+server http://www.claws-mail.org/win32
+file  vcalendar-2.0cvs15.tar.gz
+chk   690fbff01f97899fcc5a95b076919f80cbc5d075
 
 #
 # Pthreads for Windows.
index 7554a74..f940754 100644 (file)
@@ -29,8 +29,12 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         inst-libtasn1.nsi         uninst-libtasn1.nsi        \
         inst-opencdk.nsi          uninst-opencdk.nsi         \
         inst-gnutls.nsi                   uninst-gnutls.nsi          \
+        inst-curl.nsi             uninst-curl.nsi            \
         inst-libetpan.nsi         uninst-libetpan.nsi        \
         inst-claws-mail.nsi       uninst-claws-mail.nsi      \
+        inst-notification_plugin.nsi      uninst-notification_plugin.nsi      \
+        inst-gtkhtml2_viewer.nsi   uninst-gtkhtml2_viewer.nsi      \
+        inst-vcalendar.nsi        uninst-vcalendar.nsi      \
         inst-crypt.nsi            uninst-crypt.nsi           \
         inst-dirmngr.nsi          uninst-dirmngr.nsi         \
         inst-eudoragpg.nsi        uninst-eudoragpg.nsi       \
@@ -80,9 +84,10 @@ CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
 
 # Supported source packages.
 gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex \
-               gpa winpt libgsasl libtasn1 opencdk gnutls \
-                libetpan claws-mail gnupg2 pinentry \
-               libassuan libksba libgcrypt adns dirmngr w32pth scute
+               gpa winpt libgsasl libtasn1 opencdk gnutls curl \
+                libetpan claws-mail notification_plugin gtkhtml2_viewer \
+               vcalendar gnupg2 pinentry libassuan libksba libgcrypt \
+               adns dirmngr w32pth scute
 
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
@@ -194,6 +199,9 @@ gpg4win_pkg_winpt_configure = --silent \
 gpg4win_pkg_gnutls_configure = \
   --disable-cxx
 
+gpg4win_pkg_curl_configure = \
+  --with-gnutls --without-ca-bundle
+
 # The CFLAGS are needed to find pthread-w32.
 gpg4win_pkg_libetpan_configure = --with-gnutls \
   CPPFLAGS=\"-I$(idir)/include\" LIBS=\"-L$(idir)/lib\"
@@ -211,6 +219,16 @@ gpg4win_pkg_claws_mail_configure = \
   --disable-spamassassin-plugin --disable-bogofilter-plugin \
   --disable-valgrind --disable-networkmanager-support
 
+gpg4win_pkg_notification_plugin_configure = \
+  --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
+  --disable-libnotify --disable-lcdproc
+
+gpg4win_pkg_gtkhtml2_viewer_configure = \
+  --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
+
+gpg4win_pkg_vcalendar_configure = \
+  --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) LIBS=\"-L$(idir)/bin\"
+
 gpg4win_pkg_scute_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-libassuan-prefix=$(idir)
 
index a3dc90c..1630f8a 100644 (file)
@@ -35,9 +35,6 @@
 !ifdef HAVE_PKG_KDELIBS
 !undef HAVE_PKG_KDELIBS
 !endif
-!ifdef HAVE_PKG_KDESUPPORT
-!undef HAVE_PKG_KDESUPPORT
-!endif
 !ifdef HAVE_PKG_OXYGEN_ICONS
 !undef HAVE_PKG_OXYGEN_ICONS
 !endif
diff --git a/src/inst-curl.nsi b/src/inst-curl.nsi
new file mode 100644 (file)
index 0000000..546c965
--- /dev/null
@@ -0,0 +1,38 @@
+# inst-curl.nsi - Installer snippet for curl.        -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 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}/curl-${gpg4win_pkg_curl_version}
+
+!ifdef DEBUG
+Section "curl" SEC_curl
+!else
+Section "-curl" SEC_curl
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File ${gpg4win_pkg_curl}
+!else
+
+  File ${prefix}/bin/libcurl-4.dll
+
+!endif
+SectionEnd
diff --git a/src/inst-gtkhtml2_viewer.nsi b/src/inst-gtkhtml2_viewer.nsi
new file mode 100644 (file)
index 0000000..febb0b9
--- /dev/null
@@ -0,0 +1,39 @@
+# inst-gtkhtml2_viewer.nsi - Installer snippet for gtkhtml2_viewer.        -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 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}/gtkhtml2_viewer-${gpg4win_pkg_gtkhtml2_viewer_version}
+
+!ifdef DEBUG
+Section "gtkhtml2_viewer" SEC_gtkhtml2_viewer
+!else
+Section "-gtkhtml2_viewer" SEC_gtkhtml2_viewer
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File ${gpg4win_pkg_gtkhtml2_viewer}
+!else
+
+  SetOutPath "$INSTDIR\lib\claws-mail\plugins"
+  File ${prefix}/lib/claws-mail/plugins/gtkhtml2_viewer.dll
+
+!endif
+SectionEnd
diff --git a/src/inst-notification_plugin.nsi b/src/inst-notification_plugin.nsi
new file mode 100644 (file)
index 0000000..4987bda
--- /dev/null
@@ -0,0 +1,39 @@
+# inst-notification_plugin.nsi - Installer snippet for notification_plugin.        -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 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}/notification_plugin-${gpg4win_pkg_notification_plugin_version}
+
+!ifdef DEBUG
+Section "notification_plugin" SEC_notification_plugin
+!else
+Section "-notification_plugin" SEC_notification_plugin
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File ${gpg4win_pkg_notification_plugin}
+!else
+
+  SetOutPath "$INSTDIR\lib\claws-mail\plugins"
+  File ${prefix}/lib/claws-mail/plugins/notification_plugin.dll
+
+!endif
+SectionEnd
index 35063ba..992cc43 100644 (file)
 !ifdef HAVE_PKG_GNUTLS
 !include "inst-gnutls.nsi"
 !endif
+!ifdef HAVE_PKG_CURL
+!include "inst-curl.nsi"
+!endif
 !ifdef HAVE_PKG_PINENTRY
 !include "inst-pinentry.nsi"
 !endif
 !ifdef HAVE_PKG_CLAWS_MAIL
 !include "inst-claws-mail.nsi"
 !endif
+!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
+!include "inst-notification_plugin.nsi"
+!endif
+!ifdef HAVE_PKG_GTKHTML2_VIEWER
+!include "inst-gtkhtml2_viewer.nsi"
+!endif
+!ifdef HAVE_PKG_VCALENDAR
+!include "inst-vcalendar.nsi"
+!endif
 #!ifdef HAVE_PKG_EUDORAGPG
 #!include "inst-eudoragpg.nsi"
 #!endif
 !ifdef HAVE_PKG_CLAWS_MAIL
 !include "uninst-claws-mail.nsi"
 !endif
+!ifdef HAVE_PKG_NOTIFICATION_PLUGIN
+!include "uninst-notification_plugin.nsi"
+!endif
+!ifdef HAVE_PKG_GTKHTML2_VIEWER
+!include "uninst-gtkhtml2_viewer.nsi"
+!endif
+!ifdef HAVE_PKG_VCALENDAR
+!include "uninst-vcalendar.nsi"
+!endif
 !ifdef HAVE_PKG_SCUTE
 !include "uninst-scute.nsi"
 !endif
 !ifdef HAVE_PKG_GNUTLS
 !include "uninst-gnutls.nsi"
 !endif
+!ifdef HAVE_PKG_CURL
+!include "uninst-curl.nsi"
+!endif
 !ifdef HAVE_PKG_GTK_
 !include "uninst-gtk+.nsi"
 !endif
@@ -560,6 +584,9 @@ Function CalcDepends
 !ifdef HAVE_PKG_GNUTLS
   !insertmacro UnselectSection ${SEC_gnutls}
 !endif
+!ifdef HAVE_PKG_CURL
+  !insertmacro UnselectSection ${SEC_curl}
+!endif
 !ifdef HAVE_PKG_LIBGPG_ERROR
   !insertmacro UnselectSection ${SEC_libgpg_error}
 !endif
@@ -692,6 +719,8 @@ Function CalcDepends
   !insertmacro SelectSection ${SEC_regex}
   !insertmacro SelectSection ${SEC_libetpan}
   !insertmacro SelectSection ${SEC_gnutls}
+  !insertmacro SelectSection ${SEC_curl}
+  !insertmacro SelectSection ${SEC_kdesupport}
   skip_claws_mail:
 !endif
 
@@ -706,6 +735,14 @@ Function CalcDepends
   skip_gnutls:
 !endif
 
+!ifdef HAVE_PKG_CURL
+  !insertmacro SectionFlagIsSet ${SEC_curl} ${SF_SELECTED} have_curl skip_curl
+  have_curl:
+  !insertmacro SelectSection ${SEC_zlib}
+  !insertmacro SelectSection ${SEC_gnutls}
+  skip_curl:
+!endif
+
 !ifdef HAVE_PKG_OPENCDK
   !insertmacro SectionFlagIsSet ${SEC_opencdk} ${SF_SELECTED} have_opencdk skip_opencdk
   have_opencdk:
diff --git a/src/inst-vcalendar.nsi b/src/inst-vcalendar.nsi
new file mode 100644 (file)
index 0000000..9baf49c
--- /dev/null
@@ -0,0 +1,39 @@
+# inst-vcalendar.nsi - Installer snippet for vcalendar.        -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 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}/vcalendar-${gpg4win_pkg_vcalendar_version}
+
+!ifdef DEBUG
+Section "vcalendar" SEC_vcalendar
+!else
+Section "-vcalendar" SEC_vcalendar
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File ${gpg4win_pkg_vcalendar}
+!else
+
+  SetOutPath "$INSTDIR\lib\claws-mail\plugins"
+  File ${prefix}/lib/claws-mail/plugins/vcalendar.dll
+
+!endif
+SectionEnd
diff --git a/src/uninst-curl.nsi b/src/uninst-curl.nsi
new file mode 100644 (file)
index 0000000..1c6581c
--- /dev/null
@@ -0,0 +1,37 @@
+# uninst-curl.nsi - Installer snippet for curl.-*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 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}/curl-${gpg4win_pkg_curl_version}
+
+
+; Uninstaller section.
+Section "-un.curl"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_curl}"
+  Call un.SourceDelete
+!else
+
+  Delete "$INSTDIR\libcurl-4.dll"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd
diff --git a/src/uninst-gtkhtml2_viewer.nsi b/src/uninst-gtkhtml2_viewer.nsi
new file mode 100644 (file)
index 0000000..f1c637f
--- /dev/null
@@ -0,0 +1,39 @@
+# uninst-gtkhtml2_viewer.nsi - Installer snippet for gtkhtml2_viewer.-*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 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}/gtkhtml2_viewer-${gpg4win_pkg_gtkhtml2_viewer_version}
+
+
+; Uninstaller section.
+Section "-un.gtkhtml2_viewer"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gtkhtml2_viewer}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\lib\claws-mail\plugins\gtkhtml2_viewer.dll"
+  RMDir "$INSTDIR\lib\claws-mail\plugins"
+  RMDir "$INSTDIR\lib\claws-mail"
+  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd
diff --git a/src/uninst-notification_plugin.nsi b/src/uninst-notification_plugin.nsi
new file mode 100644 (file)
index 0000000..0f287f5
--- /dev/null
@@ -0,0 +1,39 @@
+# uninst-notification_plugin.nsi - Installer snippet for notification_plugin.-*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 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}/notification_plugin-${gpg4win_pkg_notification_plugin_version}
+
+
+; Uninstaller section.
+Section "-un.notification_plugin"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_notification_plugin}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\lib\claws-mail\plugins\notification_plugin.dll"
+  RMDir "$INSTDIR\lib\claws-mail\plugins"
+  RMDir "$INSTDIR\lib\claws-mail"
+  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd
diff --git a/src/uninst-vcalendar.nsi b/src/uninst-vcalendar.nsi
new file mode 100644 (file)
index 0000000..83c0e79
--- /dev/null
@@ -0,0 +1,39 @@
+# uninst-vcalendar.nsi - Installer snippet for vcalendar.-*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007 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}/vcalendar-${gpg4win_pkg_vcalendar_version}
+
+
+; Uninstaller section.
+Section "-un.vcalendar"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_vcalendar}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\lib\claws-mail\plugins\vcalendar.dll"
+  RMDir "$INSTDIR\lib\claws-mail\plugins"
+  RMDir "$INSTDIR\lib\claws-mail"
+  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR"
+
+!endif
+SectionEnd