Use fhs filesystem layout to make Addresses more hier(7) compliant.

Bump PKGREVISION.

5 files changed, 170 insertions, 149 deletions

diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile
index b5375c5489f..41e8d120c11 100644
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/07/15 17:20:03 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/04/13 12:37:22 rh Exp $
 #
 
 DISTNAME=		Addresses-0.4.6
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		misc gnustep
 MASTER_SITES=		http://giesler.biz/bjoern/downloads/
 
@@ -10,11 +10,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://giesler.biz/bjoern/en/sw_addr.html
 COMMENT=		Address book for GNUstep
 
+LICENSE=		gnu-lgpl-v2
+
 USE_LANGUAGES=		objc
 
 NO_CONFIGURE=		yes
-MAKE_ENV+=		Addresses_OBJCFLAGS=-I.. \
-			GNUSTEP_INSTALLATION_DIR=${PREFIX}/share/GNUstep/Local/
+MAKE_JOBS_SAFE=		no
+MAKE_ENV+=		Addresses_OBJCFLAGS=-I..
 MAKE_FILE=		GNUmakefile
 
 .include "../../devel/gnustep-base/buildlink3.mk"
diff --git a/misc/Addresses/PLIST b/misc/Addresses/PLIST
index 51bb8c755f7..f204782662e 100644
--- a/misc/Addresses/PLIST
+++ b/misc/Addresses/PLIST
@@ -1,134 +1,141 @@
-@comment $NetBSD: PLIST,v 1.7 2008/07/15 17:20:03 joerg Exp $
-share/GNUstep/Local/Applications/AddressManager.app/AddressManager
-share/GNUstep/Local/Applications/AddressManager.app/Resources/AddressManager.desktop
-share/GNUstep/Local/Applications/AddressManager.app/Resources/AddressManager.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/AddressManagerInfo.plist
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/Add.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.classes
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/objects.gorm
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/ISOCountryCodes.dict
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/Localizable.strings
-share/GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/Add.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.classes
-share/GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/objects.gorm
-share/GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/ISOCountryCodes.dict
-share/GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/Localizable.strings
-share/GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/Add.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.classes
-share/GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/objects.gorm
-share/GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/ISOCountryCodes.dict
-share/GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/Localizable.strings
-share/GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/Add.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/data.classes
-share/GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/objects.gorm
-share/GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/ISOCountryCodes.dict
-share/GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/Localizable.strings
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Info-gnustep.plist
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/Add.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/data.classes
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/objects.gorm
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/ISOCountryCodes.dict
-share/GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/Localizable.strings
-share/GNUstep/Local/Applications/AddressManager.app/Resources/VCFFile.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/VCFImage.tiff
-share/GNUstep/Local/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
-share/GNUstep/Local/Applications/AddressManager.app/library_paths.openapp
-share/GNUstep/Local/Applications/AddressManager.app/stamp.make
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/AddressView
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Headers
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Resources
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/AddressView
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Headers/ADImageView.h
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Headers/ADPersonPropertyView.h
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Headers/ADPersonView.h
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Headers/ADSinglePropertyView.h
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Headers/AddressView.h
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Add.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/AddressLayouts.dict
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Change.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Dutch.lproj/Localizable.strings
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/English.lproj/Localizable.strings
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/French.lproj/Localizable.strings
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/German.lproj/Localizable.strings
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/ISOCodeMapping.dict
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Labels.dict
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Lock.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Remove.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/ScriptingInfo.plist
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Share.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Spanish.lproj/Localizable.strings
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/UnknownImage.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/VCFImage.tiff
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/libAddressView.so
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/libAddressView.so.0.0.1
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/Current
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/libAddressView.so
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Addresses
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Headers
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Resources
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Addresses
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADAddressBook.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADConverter.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADEnvelopeAddressBook.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADGlobals.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADGroup.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADImageLoading.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADLocalAddressBook.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADMultiValue.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADPListConverter.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADPerson.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADPlugin.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADPublicAddressBook.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADRecord.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADSearchElement.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADTypedefs.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/ADVCFConverter.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/AddressBook.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers/Addresses.h
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/Dutch.lproj/PropertiesAndLabels.strings
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/English.lproj/PropertiesAndLabels.strings
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/French.lproj/PropertiesAndLabels.strings
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/German.lproj/PropertiesAndLabels.strings
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/ScriptingInfo.plist
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/Spanish.lproj/PropertiesAndLabels.strings
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/libAddresses.so
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/libAddresses.so.0.0.1
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/Current
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/libAddresses.so
-share/GNUstep/Local/Library/Headers/AddressBook
-share/GNUstep/Local/Library/Headers/AddressView
-share/GNUstep/Local/Library/Headers/Addresses
-share/GNUstep/Local/Library/Libraries/libAddressView.so
-share/GNUstep/Local/Library/Libraries/libAddressView.so.0.0.1
-share/GNUstep/Local/Library/Libraries/libAddresses.so
-share/GNUstep/Local/Library/Libraries/libAddresses.so.0.0.1
-share/GNUstep/Local/Tools/AddressManager
-@dirrm share/GNUstep/Local/Tools
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Libraries
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Headers
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/Spanish.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/German.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/French.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/English.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources/Dutch.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Resources
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0/Headers
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/0
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions
-@dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Spanish.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/German.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/French.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/English.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources/Dutch.lproj
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Resources
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0/Headers
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/0
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions
-@dirrm share/GNUstep/Local/Library/Frameworks/AddressView.framework
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Frameworks
-@dirrm share/GNUstep/Local/Applications/AddressManager.app
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Applications
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local
+@comment $NetBSD: PLIST,v 1.8 2009/04/13 12:37:23 rh Exp $
+bin/AddressManager
+include/AddressBook
+include/AddressView
+include/Addresses
+lib/GNUstep/Applications/AddressManager.app/AddressManager
+lib/GNUstep/Applications/AddressManager.app/Resources/AddressManager.desktop
+lib/GNUstep/Applications/AddressManager.app/Resources/AddressManager.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/AddressManagerInfo.plist
+lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/Add.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.classes
+lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/objects.gorm
+lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj/ISOCountryCodes.dict
+lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj/Localizable.strings
+lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/Add.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.classes
+lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/objects.gorm
+lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj/ISOCountryCodes.dict
+lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/Add.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.classes
+lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/objects.gorm
+lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj/ISOCountryCodes.dict
+lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj/Localizable.strings
+lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/Add.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/data.classes
+lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/objects.gorm
+lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj/ISOCountryCodes.dict
+lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Applications/AddressManager.app/Resources/Info-gnustep.plist
+lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/Add.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/data.classes
+lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/objects.gorm
+lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj/ISOCountryCodes.dict
+lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/Applications/AddressManager.app/Resources/VCFFile.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/VCFImage.tiff
+lib/GNUstep/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
+lib/GNUstep/Applications/AddressManager.app/library_paths.openapp
+lib/GNUstep/Applications/AddressManager.app/stamp.make
+lib/GNUstep/Frameworks/AddressView.framework/AddressView
+lib/GNUstep/Frameworks/AddressView.framework/Headers
+lib/GNUstep/Frameworks/AddressView.framework/Resources
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/AddressView
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Headers/ADImageView.h
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Headers/ADPersonPropertyView.h
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Headers/ADPersonView.h
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Headers/ADSinglePropertyView.h
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Headers/AddressView.h
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Add.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/AddressLayouts.dict
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Change.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Dutch.lproj/Localizable.strings
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/French.lproj/Localizable.strings
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/ISOCodeMapping.dict
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Info-gnustep.plist
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Labels.dict
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Lock.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Remove.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/ScriptingInfo.plist
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Share.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/UnknownImage.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/VCFImage.tiff
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/libAddressView.so
+lib/GNUstep/Frameworks/AddressView.framework/Versions/0/libAddressView.so.0.0.1
+lib/GNUstep/Frameworks/AddressView.framework/Versions/Current
+lib/GNUstep/Frameworks/AddressView.framework/libAddressView.so
+lib/GNUstep/Frameworks/Addresses.framework/Addresses
+lib/GNUstep/Frameworks/Addresses.framework/Headers
+lib/GNUstep/Frameworks/Addresses.framework/Resources
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Addresses
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADAddressBook.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADConverter.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADEnvelopeAddressBook.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADGlobals.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADGroup.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADImageLoading.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADLocalAddressBook.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADMultiValue.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADPListConverter.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADPerson.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADPlugin.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADPublicAddressBook.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADRecord.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADSearchElement.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADTypedefs.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/ADVCFConverter.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/AddressBook.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers/Addresses.h
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/Dutch.lproj/PropertiesAndLabels.strings
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/English.lproj/PropertiesAndLabels.strings
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/French.lproj/PropertiesAndLabels.strings
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/German.lproj/PropertiesAndLabels.strings
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/Info-gnustep.plist
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/ScriptingInfo.plist
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/Spanish.lproj/PropertiesAndLabels.strings
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/libAddresses.so
+lib/GNUstep/Frameworks/Addresses.framework/Versions/0/libAddresses.so.0.0.1
+lib/GNUstep/Frameworks/Addresses.framework/Versions/Current
+lib/GNUstep/Frameworks/Addresses.framework/libAddresses.so
+lib/libAddressView.so
+lib/libAddressView.so.0.0.1
+lib/libAddresses.so
+lib/libAddresses.so.0.0.1
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/Spanish.lproj
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/German.lproj
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/French.lproj
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/English.lproj
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources/Dutch.lproj
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Resources
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0/Headers
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions/0
+@dirrm lib/GNUstep/Frameworks/Addresses.framework/Versions
+@dirrm lib/GNUstep/Frameworks/Addresses.framework
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Spanish.lproj
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/German.lproj
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/French.lproj
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/English.lproj
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources/Dutch.lproj
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Resources
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0/Headers
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions/0
+@dirrm lib/GNUstep/Frameworks/AddressView.framework/Versions
+@dirrm lib/GNUstep/Frameworks/AddressView.framework
+@comment in x11/gnustep-base: @dirrm lib/GNUstep/Frameworks
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/Spanish.lproj
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/German.lproj
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/French.lproj
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/English.lproj
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources/Dutch.lproj
+@dirrm lib/GNUstep/Applications/AddressManager.app/Resources
+@dirrm lib/GNUstep/Applications/AddressManager.app
+@comment in x11/gnustep-gui: @dirrm lib/GNUstep/Applications
diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk
index 8c55a772c3e..6cf9be026c8 100644
--- a/misc/Addresses/buildlink3.mk
+++ b/misc/Addresses/buildlink3.mk
@@ -1,23 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/04/13 12:37:23 rh Exp $
 
 BUILDLINK_TREE+=	Addresses
 
 .if !defined(ADDRESSES_BUILDLINK3_MK)
 ADDRESSES_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.Addresses+=	Addresses>=0.4.5
-BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.6nb6
+BUILDLINK_API_DEPENDS.Addresses+=	Addresses>=0.4.6nb7
+BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.6nb7
 BUILDLINK_PKGSRCDIR.Addresses?=	../../misc/Addresses
 
 .include "../../devel/gnustep-make/gnustep.mk"
 
-_BL_Addresses_H1= Local/Library/Frameworks/AddressBook.framewok/Versions/A/Headers
-_BL_Addresses_H2= Local/Library/Frameworks/AddressView.framewok/Versions/A/Headers
-BUILDLINK_INCDIRS.Addresses+=	${GNUSTEP_ROOT}/${_BL_Addresses_H1}
-BUILDLINK_INCDIRS.Addresses+=	${GNUSTEP_ROOT}/${_BL_Addresses_H2}
-BUILDLINK_FILES.Addresses+=	${GNUSTEP_SUBDIR}/Local/Library/Headers/AddressBook/*.h
-BUILDLINK_FILES.Addresses+=	${GNUSTEP_SUBDIR}/Local/Library/Headers/AddressView/*.h
-BUILDLINK_FILES.Addresses+=	${GNUSTEP_SUBDIR}/Local/Library/Headers/Addresses/*.h
+BUILDLINK_INCDIRS.Addresses+=	lib/GNUstep/Frameworks/Addresses.framework/Headers
+BUILDLINK_INCDIRS.Addresses+=	lib/GNUstep/Frameworks/AddresView.framework/Headers
+BUILDLINK_FILES.Addresses+= 	include/AddressBook/*.h
+BUILDLINK_FILES.Addresses+= 	include/Addresses/*.h
+BUILDLINK_FILES.Addresses+= 	include/AddressView/*.h
 
 .include "../../x11/gnustep-back/buildlink3.mk"
 .endif # ADDRESSES_BUILDLINK3_MK
diff --git a/misc/Addresses/distinfo b/misc/Addresses/distinfo
index 2e185c3a7f9..ce4b37ff308 100644
--- a/misc/Addresses/distinfo
+++ b/misc/Addresses/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/07/15 17:20:03 joerg Exp $
+$NetBSD: distinfo,v 1.5 2009/04/13 12:37:23 rh Exp $
 
 SHA1 (Addresses-0.4.6.tar.gz) = 8495fd4d5f358cb51b5ddd0e204d86d40a7d5563
 RMD160 (Addresses-0.4.6.tar.gz) = 3bbeefb3fe2e47fdfd541f85df7b28a82aa4edae
 Size (Addresses-0.4.6.tar.gz) = 444463 bytes
 SHA1 (patch-aa) = 78d0a9d0f70cd7897f4bbd7d14711d0060baa5cb
+SHA1 (patch-ab) = 3babdba3010401715fb0bd48ddd535ac6ecf8faf
diff --git a/misc/Addresses/patches/patch-ab b/misc/Addresses/patches/patch-ab
new file mode 100644
index 00000000000..fa39dc1aea7
--- /dev/null
+++ b/misc/Addresses/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/04/13 12:37:23 rh Exp $
+
+--- Frameworks/Addresses/GNUmakefile.orig	2004-07-30 01:36:21.000000000 +1000
++++ Frameworks/Addresses/GNUmakefile
+@@ -49,6 +49,6 @@ include $(GNUSTEP_MAKEFILES)/framework.m
+ -include GNUmakefile.postamble
+ 
+ after-Addresses-install::
+-	ln -sf $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/Addresses \
+-	       $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/AddressBook
++	ln -sf ${GNUSTEP_ROOT}/include/Addresses \
++	       ${GNUSTEP_ROOT}/include/AddressBook
+