- Avoid installation of Clock and PGP in GNUSTEP_USER_DIR

Problem noted by: ryngold@softhome.net

4 files changed, 74 insertions, 0 deletions

diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index a09d8dc5b6bd..b251e03045f7 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnumail
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.collaboration-world.com/gnumail.data/releases/Stable/ \
 		ftp://ftp.gnustep.org/pub/gnustep/usr-apps/
diff --git a/mail/gnumail/files/patch-Bundles-Clock-GNUmakefile b/mail/gnumail/files/patch-Bundles-Clock-GNUmakefile
new file mode 100644
index 000000000000..037b8fd27c66
--- /dev/null
+++ b/mail/gnumail/files/patch-Bundles-Clock-GNUmakefile
@@ -0,0 +1,11 @@
+--- Bundles/Clock/GNUmakefile.orig	Sun Feb 17 21:44:50 2002
++++ Bundles/Clock/GNUmakefile	Mon Jan 20 05:44:09 2003
+@@ -3,7 +3,7 @@
+ BUNDLE_NAME = Clock
+ BUNDLE_EXTENSION = .bundle
+ 
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/GNUMail
++BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GNUMail
+ 
+ Clock_RESOURCE_FILES = *.tiff
+ 
diff --git a/mail/gnumail/files/patch-Bundles-PGP-GNUmakefile b/mail/gnumail/files/patch-Bundles-PGP-GNUmakefile
new file mode 100644
index 000000000000..dc819feb8dbb
--- /dev/null
+++ b/mail/gnumail/files/patch-Bundles-PGP-GNUmakefile
@@ -0,0 +1,11 @@
+--- Bundles/PGP/GNUmakefile.orig	Thu Aug 29 01:20:04 2002
++++ Bundles/PGP/GNUmakefile	Mon Jan 20 05:43:35 2003
+@@ -3,7 +3,7 @@
+ BUNDLE_NAME = PGP
+ BUNDLE_EXTENSION = .bundle
+ 
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/GNUMail
++BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GNUMail
+ 
+ PGP_RESOURCE_FILES = *.tiff
+ 
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index 60924436d72d..f3462cc033a9 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -82,6 +82,52 @@ Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/library_paths.
 Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so
 Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1
 Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGNUMail.so.1.0.0
+Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Clock
+Local/Library/GNUMail/Clock.bundle/Resources/Info-gnustep.plist
+Local/Library/GNUMail/Clock.bundle/Resources/Date-0.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-1.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-2.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-3.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-4.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-5.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-6.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-7.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-8.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Date-9.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-0.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-1.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-10.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-11.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-12.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-2.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-3.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-4.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-5.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-6.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-7.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-8.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/LED-9.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Mask.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-1.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-10.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-11.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-12.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-2.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-3.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-4.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-5.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-6.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-7.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-8.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Month-9.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-0.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-1.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-2.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-3.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-4.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-5.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday-6.tiff
+Local/Library/GNUMail/Clock.bundle/Resources/Weekday.tiff
 Local/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
 Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Compose
@@ -154,6 +200,11 @@ Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/Viewing
 @dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Compose.prefs/Resources
 @dirrm Local/Library/GNUMail/Compose.prefs
+@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm Local/Library/GNUMail/Clock.bundle/%%GNU_ARCH%%
+@dirrm Local/Library/GNUMail/Clock.bundle/Resources
+@dirrm Local/Library/GNUMail/Clock.bundle
 @dirrm Local/Library/GNUMail
 @dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
 @dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%