2 files changed, 92 insertions, 83 deletions

diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index dd12c7631f84..c1c0f14b3aea 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -24,5 +24,9 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Addresses-${PORTVERSION}
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=LOCAL
+MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
+ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/AddressView/AddressView.framework/Versions/Current
+ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/Addresses/Addresses.framework/Versions/Current
 
 .include <bsd.port.mk>
diff --git a/mail/addresses/pkg-plist b/mail/addresses/pkg-plist
index e0e7a9ade656..10952a66a20e 100644
--- a/mail/addresses/pkg-plist
+++ b/mail/addresses/pkg-plist
@@ -33,105 +33,110 @@ Local/Applications/AddressManager.app/Resources/VCFImage.tiff
 Local/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
 Local/Applications/AddressManager.app/library_paths.openapp
 Local/Applications/AddressManager.app/stamp.make
+Local/Library/Frameworks/AddressView.framework/AddressView
 Local/Library/Frameworks/AddressView.framework/Headers
 Local/Library/Frameworks/AddressView.framework/Resources
-Local/Library/Frameworks/AddressView.framework/Versions/A/AddressView
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADImageView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADPersonPropertyView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADPersonView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/ADSinglePropertyView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Headers/AddressView.h
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Add.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/AddressLayouts.dict
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Change.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Dutch.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/English.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/French.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/ISOCodeMapping.dict
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Labels.dict
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Lock.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Remove.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Share.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Spanish.lproj/Localizable.strings
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/UnknownImage.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/VCFImage.tiff
-Local/Library/Frameworks/AddressView.framework/Versions/A/libAddressView.so
-Local/Library/Frameworks/AddressView.framework/Versions/A/libAddressView.so.0
-Local/Library/Frameworks/AddressView.framework/Versions/A/libAddressView.so.0.0.1
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/AddressView
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADImageView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonPropertyView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADSinglePropertyView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/AddressView.h
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Add.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/AddressLayouts.dict
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Change.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ISOCodeMapping.dict
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Labels.dict
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Lock.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Remove.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Share.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/Localizable.strings
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/UnknownImage.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/VCFImage.tiff
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%LIBVERSION%%
 Local/Library/Frameworks/AddressView.framework/Versions/Current
+Local/Library/Frameworks/AddressView.framework/libAddressView.so
+Local/Library/Frameworks/Addresses.framework/Addresses
 Local/Library/Frameworks/Addresses.framework/Headers
 Local/Library/Frameworks/Addresses.framework/Resources
-Local/Library/Frameworks/Addresses.framework/Versions/A/Addresses
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADConverter.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADEnvelopeAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADGlobals.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADGroup.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADImageLoading.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADLocalAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADMultiValue.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPListConverter.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPerson.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPlugin.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADPublicAddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADRecord.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADSearchElement.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADTypedefs.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/ADVCFConverter.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/AddressBook.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Headers/Addresses.h
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Dutch.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/English.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Spanish.lproj/PropertiesAndLabels.strings
-Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so
-Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so.0
-Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so.0.0.1
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Addresses
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADConverter.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADEnvelopeAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGlobals.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGroup.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADImageLoading.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADLocalAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADMultiValue.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPListConverter.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPerson.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPlugin.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPublicAddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADRecord.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADSearchElement.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADTypedefs.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADVCFConverter.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/AddressBook.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/Addresses.h
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/PropertiesAndLabels.strings
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%LIBVERSION%%
 Local/Library/Frameworks/Addresses.framework/Versions/Current
+Local/Library/Frameworks/Addresses.framework/libAddresses.so
 Local/Library/Headers/AddressBook
 Local/Library/Headers/AddressView
 Local/Library/Headers/Addresses
 Local/Library/Libraries/libAddressView.so
-Local/Library/Libraries/libAddressView.so.0
-Local/Library/Libraries/libAddressView.so.0.0.1
+Local/Library/Libraries/libAddressView.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libAddressView.so.%%LIBVERSION%%
 Local/Library/Libraries/libAddresses.so
-Local/Library/Libraries/libAddresses.so.0
-Local/Library/Libraries/libAddresses.so.0.0.1
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Dutch.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/English.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Spanish.lproj
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/Addresses.framework/Versions/A
+Local/Library/Libraries/libAddresses.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libAddresses.so.%%LIBVERSION%%
+Local/Tools/AddressManager
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/Addresses.framework/Versions
 @dirrm Local/Library/Frameworks/Addresses.framework
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Dutch.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/English.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/French.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Spanish.lproj
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/AddressView.framework/Versions/A
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/AddressView.framework/Versions
 @dirrm Local/Library/Frameworks/AddressView.framework
-@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj
-@dirrm Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/English.lproj
-@dirrm Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/French.lproj
-@dirrm Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm
-@dirrm Local/Applications/AddressManager.app/Resources/German.lproj
 @dirrm Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm
 @dirrm Local/Applications/AddressManager.app/Resources/Spanish.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/German.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/French.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/English.lproj
+@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm
+@dirrm Local/Applications/AddressManager.app/Resources/Dutch.lproj
 @dirrm Local/Applications/AddressManager.app/Resources
 @dirrm Local/Applications/AddressManager.app