Install resource files inside share/GNUstep/Library.

Allow unprivileged USE_DESTDIR installs.
Bump PKGREVISION.

2 files changed, 78 insertions, 3 deletions

diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index dcfdedae1aa..54adb9384a6 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/04/13 12:42:38 rh Exp $
+# $NetBSD: Makefile,v 1.30 2009/04/19 01:00:48 rh Exp $
 #
 
 DISTNAME=	GNUMail-1.2.0pre3
+PKGREVISION=	1
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
 
@@ -11,7 +12,7 @@ COMMENT=	GNUstep clone of NeXT's Mail.app application
 
 LICENSE=	gnu-lgpl-v2
 
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	objc
 
@@ -20,6 +21,12 @@ NO_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	no
 MAKE_FILE=	GNUmakefile
 
+FIX_GNUSTEP_INSTALLATION_DIR= yes
+.for _dir_ in Account Advanced Clock Colors Compose Face Filtering	\
+	Fonts Import MIME PGP Receiving Sending Viewing
+SUBST_FILES.gnustep_installation_dir+=	Bundles/${_dir_}/GNUmakefile
+.endfor
+
 .include "../../mail/Pantomime/buildlink3.mk"
 .include "../../misc/Addresses/buildlink3.mk"
 .include "../../x11/gnustep-back/buildlink3.mk"
diff --git a/mail/GNUMail/PLIST b/mail/GNUMail/PLIST
index 00babe67253..f406969d136 100644
--- a/mail/GNUMail/PLIST
+++ b/mail/GNUMail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/04/13 12:42:38 rh Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/04/19 01:00:48 rh Exp $
 bin/GNUMail
 include/GNUMail
 lib/GNUstep/Applications/GNUMail.app/GNUMail
@@ -174,6 +174,74 @@ lib/GNUstep/Frameworks/GNUMail.framework/Versions/Current
 lib/GNUstep/Frameworks/GNUMail.framework/libGNUMail.so
 lib/libGNUMail.so
 lib/libGNUMail.so.1.2.0
+share/GNUstep/Library/GNUMail/Account.prefs/Account
+share/GNUstep/Library/GNUMail/Account.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Account.prefs/Resources/account.tiff
+share/GNUstep/Library/GNUMail/Account.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Advanced.prefs/Advanced
+share/GNUstep/Library/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Advanced.prefs/Resources/advanced.tiff
+share/GNUstep/Library/GNUMail/Advanced.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Colors.prefs/Colors
+share/GNUstep/Library/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Colors.prefs/Resources/colors.tiff
+share/GNUstep/Library/GNUMail/Colors.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Compose.prefs/Compose
+share/GNUstep/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
+share/GNUstep/Library/GNUMail/Compose.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Filtering.prefs/Filtering
+share/GNUstep/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
+share/GNUstep/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Filtering.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Fonts.prefs/Fonts
+share/GNUstep/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
+share/GNUstep/Library/GNUMail/Fonts.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Import.bundle/Import
+share/GNUstep/Library/GNUMail/Import.bundle/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Import.bundle/stamp.make
+share/GNUstep/Library/GNUMail/MIME.prefs/MIME
+share/GNUstep/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/MIME.prefs/Resources/mime.tiff
+share/GNUstep/Library/GNUMail/MIME.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Receiving.prefs/Receiving
+share/GNUstep/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
+share/GNUstep/Library/GNUMail/Receiving.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
+share/GNUstep/Library/GNUMail/Sending.prefs/Sending
+share/GNUstep/Library/GNUMail/Sending.prefs/stamp.make
+share/GNUstep/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
+share/GNUstep/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
+share/GNUstep/Library/GNUMail/Viewing.prefs/Viewing
+share/GNUstep/Library/GNUMail/Viewing.prefs/stamp.make
+@dirrm share/GNUstep/Library/GNUMail/Viewing.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Viewing.prefs
+@dirrm share/GNUstep/Library/GNUMail/Sending.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Sending.prefs
+@dirrm share/GNUstep/Library/GNUMail/Receiving.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Receiving.prefs
+@dirrm share/GNUstep/Library/GNUMail/MIME.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/MIME.prefs
+@dirrm share/GNUstep/Library/GNUMail/Import.bundle/Resources
+@dirrm share/GNUstep/Library/GNUMail/Import.bundle
+@dirrm share/GNUstep/Library/GNUMail/Fonts.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Fonts.prefs
+@dirrm share/GNUstep/Library/GNUMail/Filtering.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Filtering.prefs
+@dirrm share/GNUstep/Library/GNUMail/Compose.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Compose.prefs
+@dirrm share/GNUstep/Library/GNUMail/Colors.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Colors.prefs
+@dirrm share/GNUstep/Library/GNUMail/Advanced.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Advanced.prefs
+@dirrm share/GNUstep/Library/GNUMail/Account.prefs/Resources
+@dirrm share/GNUstep/Library/GNUMail/Account.prefs
+@dirrm share/GNUstep/Library/GNUMail
+@comment in devel/gnustep-make: @dirrm share/GNUstep/Library
+@comment in devel/gnustep-make: @dirrm share/GNUstep
 @dirrm lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Resources
 @exec ${MKDIR} %D/lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Headers
 @dirrm lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Headers