Make all GNUstep ports install into the System domain so that the Local domain is available for stuff built from source.

Some ports were already installing in the System domain, for these just remove the Makefile lines explicitly specifying the install domain.

The rest are installed in the Local domain, remove any overrides, update their pkg-plists and any explicit paths in the Makefiles and then bump port revision.

Approved by:	bapt (mentor)
Differential Revision:	https://reviews.freebsd.org/D2977

7 files changed, 380 insertions, 382 deletions

diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
index fc9b1170434e..54dcdfe77082 100644
--- a/mail/addresses-goodies/Makefile
+++ b/mail/addresses-goodies/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	addresses
 PORTVERSION=	0.4.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnustep
 MASTER_SITES=	SAVANNAH/gap
 PKGNAMESUFFIX=	-goodies${PKGNAMESUFFIX2}
diff --git a/mail/addresses-goodies/pkg-plist b/mail/addresses-goodies/pkg-plist
index 45086d88df56..15356db399a7 100644
--- a/mail/addresses-goodies/pkg-plist
+++ b/mail/addresses-goodies/pkg-plist
@@ -1,3 +1,3 @@
-GNUstep/Local/Tools/adgnumailconverter
-GNUstep/Local/Tools/adserver
-GNUstep/Local/Tools/adtool
+GNUstep/System/Tools/adgnumailconverter
+GNUstep/System/Tools/adserver
+GNUstep/System/Tools/adtool
diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index 836a8cfc7147..2b774e7de476 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	addresses
 PORTVERSION=	0.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	Addresses-${PORTVERSION}
diff --git a/mail/addresses/pkg-plist b/mail/addresses/pkg-plist
index 8d27e4532f01..e187b0a5ec7c 100644
--- a/mail/addresses/pkg-plist
+++ b/mail/addresses/pkg-plist
@@ -1,112 +1,112 @@
-GNUstep/Local/Applications/AddressManager.app/AddressManager
-GNUstep/Local/Applications/AddressManager.app/Resources/AddressManager.desktop
-GNUstep/Local/Applications/AddressManager.app/Resources/AddressManager.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/AddressManagerInfo.plist
-GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/Add.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.classes
-GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/objects.gorm
-GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/ISOCountryCodes.dict
-GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/Localizable.strings
-GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/Add.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.classes
-GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/objects.gorm
-GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/ISOCountryCodes.dict
-GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/Add.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.classes
-GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/objects.gorm
-GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/ISOCountryCodes.dict
-GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/Localizable.strings
-GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/Add.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/data.classes
-GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/objects.gorm
-GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/ISOCountryCodes.dict
-GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Applications/AddressManager.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/Add.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/data.classes
-GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/objects.gorm
-GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/ISOCountryCodes.dict
-GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/Localizable.strings
-GNUstep/Local/Applications/AddressManager.app/Resources/VCFFile.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/VCFImage.tiff
-GNUstep/Local/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
-GNUstep/Local/Applications/AddressManager.app/stamp.make
-GNUstep/Local/Library/Frameworks/AddressView.framework/AddressView
-GNUstep/Local/Library/Frameworks/AddressView.framework/Headers
-GNUstep/Local/Library/Frameworks/AddressView.framework/Resources
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/AddressView
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADImageView.h
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonPropertyView.h
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonView.h
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADSinglePropertyView.h
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/AddressView.h
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Add.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/AddressLayouts.dict
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Change.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ISOCodeMapping.dict
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Labels.dict
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Lock.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Remove.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Share.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/UnknownImage.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/VCFImage.tiff
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%LIBVERSION%%
-GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/AddressView.framework/libAddressView.so
-GNUstep/Local/Library/Frameworks/Addresses.framework/Addresses
-GNUstep/Local/Library/Frameworks/Addresses.framework/Headers
-GNUstep/Local/Library/Frameworks/Addresses.framework/Resources
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Addresses
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADAddressBook.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADConverter.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADEnvelopeAddressBook.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGlobals.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGroup.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADImageLoading.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADLocalAddressBook.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADMultiValue.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPListConverter.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPerson.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPlugin.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPublicAddressBook.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADRecord.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADSearchElement.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADTypedefs.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADVCFConverter.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/AddressBook.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/Addresses.h
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/PropertiesAndLabels.strings
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/PropertiesAndLabels.strings
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/PropertiesAndLabels.strings
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/PropertiesAndLabels.strings
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/PropertiesAndLabels.strings
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%LIBVERSION%%
-GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/Addresses.framework/libAddresses.so
-GNUstep/Local/Library/Headers/AddressView
-GNUstep/Local/Library/Headers/Addresses
-GNUstep/Local/Library/Libraries/libAddressView.so
-GNUstep/Local/Library/Libraries/libAddressView.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libAddressView.so.%%LIBVERSION%%
-GNUstep/Local/Library/Libraries/libAddresses.so
-GNUstep/Local/Library/Libraries/libAddresses.so.%%MAJORLIBVERSION%%
-GNUstep/Local/Library/Libraries/libAddresses.so.%%LIBVERSION%%
-GNUstep/Local/Tools/AddressManager
-GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.info
-GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.info
-GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.info
-GNUstep/Local/Library/Headers/AddressBook/AddressBook.h
+GNUstep/System/Applications/AddressManager.app/AddressManager
+GNUstep/System/Applications/AddressManager.app/Resources/AddressManager.desktop
+GNUstep/System/Applications/AddressManager.app/Resources/AddressManager.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/AddressManagerInfo.plist
+GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/Add.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.classes
+GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/objects.gorm
+GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/ISOCountryCodes.dict
+GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/Localizable.strings
+GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/Add.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.classes
+GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/objects.gorm
+GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/ISOCountryCodes.dict
+GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/Add.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.classes
+GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/objects.gorm
+GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/ISOCountryCodes.dict
+GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/Localizable.strings
+GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/Add.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/data.classes
+GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/objects.gorm
+GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/ISOCountryCodes.dict
+GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/Localizable.strings
+GNUstep/System/Applications/AddressManager.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/Add.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/data.classes
+GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/objects.gorm
+GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/ISOCountryCodes.dict
+GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Applications/AddressManager.app/Resources/VCFFile.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/VCFImage.tiff
+GNUstep/System/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
+GNUstep/System/Applications/AddressManager.app/stamp.make
+GNUstep/System/Library/Frameworks/AddressView.framework/AddressView
+GNUstep/System/Library/Frameworks/AddressView.framework/Headers
+GNUstep/System/Library/Frameworks/AddressView.framework/Resources
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/AddressView
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADImageView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonPropertyView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADSinglePropertyView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/AddressView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Add.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/AddressLayouts.dict
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Change.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ISOCodeMapping.dict
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Labels.dict
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Lock.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Remove.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Share.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/UnknownImage.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/VCFImage.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/Current
+GNUstep/System/Library/Frameworks/AddressView.framework/libAddressView.so
+GNUstep/System/Library/Frameworks/Addresses.framework/Addresses
+GNUstep/System/Library/Frameworks/Addresses.framework/Headers
+GNUstep/System/Library/Frameworks/Addresses.framework/Resources
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Addresses
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADConverter.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADEnvelopeAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGlobals.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGroup.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADImageLoading.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADLocalAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADMultiValue.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPListConverter.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPerson.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPlugin.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPublicAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADRecord.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADSearchElement.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADTypedefs.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADVCFConverter.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/AddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/Addresses.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/Current
+GNUstep/System/Library/Frameworks/Addresses.framework/libAddresses.so
+GNUstep/System/Library/Headers/AddressView
+GNUstep/System/Library/Headers/Addresses
+GNUstep/System/Library/Libraries/libAddressView.so
+GNUstep/System/Library/Libraries/libAddressView.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libAddressView.so.%%LIBVERSION%%
+GNUstep/System/Library/Libraries/libAddresses.so
+GNUstep/System/Library/Libraries/libAddresses.so.%%MAJORLIBVERSION%%
+GNUstep/System/Library/Libraries/libAddresses.so.%%LIBVERSION%%
+GNUstep/System/Tools/AddressManager
+GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.info
+GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.info
+GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.info
+GNUstep/System/Library/Headers/AddressBook/AddressBook.h
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 5278e12e7c34..b6cf3612029b 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnumail
 PORTVERSION=	1.2.2
+PORTREVISION=	2
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://download.gna.org/gnustep-nonfsf/
 DISTNAME=	GNUMail-${PORTVERSION}
@@ -17,8 +18,6 @@ CPE_VENDOR=	gnu
 USE_GNUSTEP=	back build
 LIB_DEPENDS=	libPantomime.so:${PORTSDIR}/mail/pantomime \
 		libAddresses.so:${PORTSDIR}/mail/addresses
-USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
-
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
+USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 .include <bsd.port.mk>
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index a3f41c559950..fbec8d8cabe5 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -1,261 +1,261 @@
-@dir GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
-GNUstep/Local/Applications/GNUMail.app/GNUMail
-GNUstep/Local/Applications/GNUMail.app/Resources/AddressBook_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/AddressManager_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/Address_bcc.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/Address_cc.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/Address_to.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/Arabic.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Czech.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/GNUMail.scriptTerminology
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/InfoPlist.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib/objects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib/classes.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib/info.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib/keyedobjects.nib
-GNUstep/Local/Applications/GNUMail.app/Resources/French.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail.desktop
-GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail_128.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail_Full.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/GNUMail_big.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Arabic.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Czech.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/French.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Russian.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Spanish.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Swedish.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Turkish.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Russian.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/ScriptingInfo.plist
-GNUstep/Local/Applications/GNUMail.app/Resources/Spanish.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Swedish.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Turkish.lproj/Localizable.strings
-GNUstep/Local/Applications/GNUMail.app/Resources/Welcome
-GNUstep/Local/Applications/GNUMail.app/Resources/add.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/add_bcc_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/add_bcc_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/add_cc_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/add_cc_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/addresses_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/addresses_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-1.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-2.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-3.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-4.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-5.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-6.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-7.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/anim-logo-8.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/answered-flag.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/attach_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/attach_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/common_Unknown.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/create_12.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/create_16.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/create_20.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/create_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/create_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/delete_20.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/delete_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/delete_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/down_15.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/drafts_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/drafts_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/drag_mail.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/drag_mails.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/duplicate.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/edit.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/find_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/find_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/flagged-flag.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/folder_12.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/folder_16.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/folder_20.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/forward_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/forward_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/hand.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/headers_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/headers_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/mailbox_add_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/mailbox_rename_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/mailboxes_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/mailboxes_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/pgp-mail-small.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/pgp-mail.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/print_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/print_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/raw_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/raw_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/recent-flag.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/remove_bcc_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/remove_bcc_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/remove_cc_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/remove_cc_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/reply_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/reply_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/restart_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_12.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_16.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_20.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/retrieve_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/send_12.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/send_16.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/send_20.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/send_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/send_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/show_all_headers_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/show_all_headers_48.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/sort_down.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/sort_left.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/sort_right.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/sort_up.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/stop_32.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/trash_12.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/trash_16.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/trash_20.tiff
-GNUstep/Local/Applications/GNUMail.app/Resources/up_15.tiff
-GNUstep/Local/Applications/GNUMail.app/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Account
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Resources/account.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Advanced
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources/advanced.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Colors
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources/colors.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Compose
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Emoticon
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face1.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face10.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face11.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face13.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face14.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face15.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face19.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face2.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face3.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face4.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face5.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face6.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face8.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face9.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/Face
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/Resources/stamp.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Filtering.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Fonts
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources/fonts.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/Import
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/MIME
-GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/mime.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/PGP
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/clear_20.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/clear_48.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_20.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_48.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_80.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/pgp-mail.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed+encrypted_80.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_20.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_48.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_80.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/unsigned_20.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/unsigned_48.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Sending
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/stamp.make
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/3-pane_96x96.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/drawer_96x96.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/floating_96x96.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/viewing.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/widescreen_96x96.tiff
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Viewing
-GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/stamp.make
-GNUstep/Local/Library/Frameworks/GNUMail.framework/GNUMail
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Headers
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Resources
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/GNUMail
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%MAJORVERSION%%
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%VERSION%%
-GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/GNUMail.framework/libGNUMail.so
-GNUstep/Local/Library/Headers/GNUMail
-GNUstep/Local/Library/Libraries/libGNUMail.so
-GNUstep/Local/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
-GNUstep/Local/Library/Libraries/libGNUMail.so.%%VERSION%%
-GNUstep/Local/Tools/GNUMail
+@dir GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
+GNUstep/System/Applications/GNUMail.app/GNUMail
+GNUstep/System/Applications/GNUMail.app/Resources/AddressBook_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/AddressManager_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/Address_bcc.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/Address_cc.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/Address_to.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/Arabic.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Czech.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/GNUMail.scriptTerminology
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/InfoPlist.strings
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib/objects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib/classes.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib/info.nib
+GNUstep/System/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/GNUMail.app/Resources/French.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/GNUMail.desktop
+GNUstep/System/Applications/GNUMail.app/Resources/GNUMail.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/GNUMail_128.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/GNUMail_Full.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/GNUMail_big.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/German.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/Arabic.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/Czech.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/English.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/French.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/German.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/Russian.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/Swedish.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Resources/Turkish.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Russian.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/ScriptingInfo.plist
+GNUstep/System/Applications/GNUMail.app/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Swedish.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Turkish.lproj/Localizable.strings
+GNUstep/System/Applications/GNUMail.app/Resources/Welcome
+GNUstep/System/Applications/GNUMail.app/Resources/add.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/add_bcc_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/add_bcc_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/add_cc_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/add_cc_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/addresses_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/addresses_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-1.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-2.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-3.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-4.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-5.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-6.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-7.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/anim-logo-8.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/answered-flag.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/attach_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/attach_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/common_Unknown.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/create_12.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/create_16.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/create_20.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/create_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/create_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/delete_20.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/delete_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/delete_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/down_15.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/drafts_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/drafts_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/drag_mail.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/drag_mails.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/duplicate.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/edit.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/find_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/find_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/flagged-flag.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/folder_12.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/folder_16.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/folder_20.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/forward_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/forward_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/hand.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/headers_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/headers_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/mailbox_add_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/mailbox_rename_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/mailboxes_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/mailboxes_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/pgp-mail-small.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/pgp-mail.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/print_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/print_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/raw_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/raw_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/recent-flag.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/remove_bcc_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/remove_bcc_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/remove_cc_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/remove_cc_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/reply_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/reply_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/restart_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/retrieve_12.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/retrieve_16.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/retrieve_20.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/retrieve_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/retrieve_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/send_12.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/send_16.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/send_20.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/send_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/send_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/show_all_headers_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/show_all_headers_48.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/sort_down.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/sort_left.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/sort_right.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/sort_up.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/stop_32.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/trash_12.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/trash_16.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/trash_20.tiff
+GNUstep/System/Applications/GNUMail.app/Resources/up_15.tiff
+GNUstep/System/Applications/GNUMail.app/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Account.prefs/Account
+GNUstep/System/Library/ApplicationSupport/GNUMail/Account.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Account.prefs/Resources/account.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Account.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Advanced.prefs/Advanced
+GNUstep/System/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources/advanced.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Advanced.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Colors.prefs/Colors
+GNUstep/System/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources/colors.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Colors.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Compose.prefs/Compose
+GNUstep/System/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Compose.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Emoticon
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face1.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face10.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face11.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face13.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face14.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face15.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face19.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face2.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face3.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face4.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face5.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face6.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face8.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face9.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Face.bundle/Face
+GNUstep/System/Library/ApplicationSupport/GNUMail/Face.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Face.bundle/Resources/stamp.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Face.bundle/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
+GNUstep/System/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Filtering.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Filtering.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Fonts.prefs/Fonts
+GNUstep/System/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources/fonts.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Fonts.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Import.bundle/Import
+GNUstep/System/Library/ApplicationSupport/GNUMail/Import.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Import.bundle/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/MIME.prefs/MIME
+GNUstep/System/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/mime.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/MIME.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/PGP
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/clear_20.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/clear_48.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_20.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_48.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_80.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/pgp-mail.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed+encrypted_80.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_20.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_48.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_80.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/unsigned_20.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/unsigned_48.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
+GNUstep/System/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Receiving.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Sending.prefs/Sending
+GNUstep/System/Library/ApplicationSupport/GNUMail/Sending.prefs/stamp.make
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/3-pane_96x96.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/drawer_96x96.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/floating_96x96.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/viewing.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources/widescreen_96x96.tiff
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Viewing
+GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/stamp.make
+GNUstep/System/Library/Frameworks/GNUMail.framework/GNUMail
+GNUstep/System/Library/Frameworks/GNUMail.framework/Headers
+GNUstep/System/Library/Frameworks/GNUMail.framework/Resources
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/GNUMail
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%MAJORVERSION%%
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%VERSION%%
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/Current
+GNUstep/System/Library/Frameworks/GNUMail.framework/libGNUMail.so
+GNUstep/System/Library/Headers/GNUMail
+GNUstep/System/Library/Libraries/libGNUMail.so
+GNUstep/System/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
+GNUstep/System/Library/Libraries/libGNUMail.so.%%VERSION%%
+GNUstep/System/Tools/GNUMail
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index c9c842985b71..9ba7616e24a8 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -15,7 +15,6 @@ LICENSE=	LGPL21
 # The use of libiconv shouldn't be necessary, but a build dependency installs
 # it and we end up picking up the header.
 MAKE_ARGS+=	LIBRARIES_DEPEND_UPON='${ICONV_LIB} -lssl'
-MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 USES=		gnustep iconv
 USE_OPENSSL=	yes
 USE_GNUSTEP=	back build