Make this work with buildlink3.

Correct framework directories.
Bump PKGREVISION.

3 files changed, 20 insertions, 13 deletions

diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile
index 4c5cf887da0..e030d317e82 100644
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/02 07:40:56 rh Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/10 23:57:23 rh Exp $
 #
 
 DISTNAME=		Addresses-0.4.5
+PKGREVISION=		1
 CATEGORIES=		misc gnustep
 MASTER_SITES=		http://giesler.biz/bjoern/downloads/
 
@@ -9,13 +10,12 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://giesler.biz/bjoern/en/sw_addr.html
 COMMENT=		Address book for GNUstep
 
-NO_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
-MAKEFILE=		GNUmakefile
+NO_CONFIGURE=		yes
 MAKE_ENV+=		Addresses_OBJCFLAGS=-I..
 
-.include "../../x11/gnustep-back/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/gnustep-base/buildlink3.mk"
+.include "../../x11/gnustep-back/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/Addresses/PLIST b/misc/Addresses/PLIST
index 4ec9d75a10f..037ac29fb2e 100644
--- a/misc/Addresses/PLIST
+++ b/misc/Addresses/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/02 07:40:57 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/10 23:57:23 rh 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
@@ -82,7 +82,6 @@ share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resource
 share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj/Localizable.strings
 share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/ISOCodeMapping.dict
 share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Info.plist
 share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Labels.dict
 share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Lock.tiff
 share/GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/A/Resources/Remove.tiff
@@ -118,7 +117,6 @@ share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/
 share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj/PropertiesAndLabels.strings
 share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj/PropertiesAndLabels.strings
 share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/Info.plist
 share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/ScriptingInfo.plist
 share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so
 share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/libAddresses.so.1.0.0
@@ -130,8 +128,6 @@ share/GNUstep/Local/Library/Libraries/libAddressView.so
 share/GNUstep/Local/Library/Libraries/libAddressView.so.1.0.0
 share/GNUstep/Local/Library/Libraries/libAddresses.so
 share/GNUstep/Local/Library/Libraries/libAddresses.so.1.0.0
-@dirrm share/GNUstep/Local/Library/Libraries
-@dirrm share/GNUstep/Local/Library/Headers
 @dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj
 @dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj
 @dirrm share/GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/A/Resources/English.lproj
diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk
index 06e648e4e1d..3a421dffbae 100644
--- a/misc/Addresses/buildlink3.mk
+++ b/misc/Addresses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/04/02 07:40:57 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/04/10 23:57:23 rh Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ADDRESSES_BUILDLINK3_MK:=	${ADDRESSES_BUILDLINK3_MK}+
@@ -13,6 +13,17 @@ BUILDLINK_PACKAGES+=	Addresses
 .if !empty(ADDRESSES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.Addresses+=	Addresses>=0.4.5
 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
+
 .endif	# ADDRESSES_BUILDLINK3_MK
 
 .include "../../x11/gnustep-back/buildlink3.mk"