Sun Apr 19 08:19:37 2009 UTC ()
Make this play nice with the new gnustep directory hierarchy.  While at it,
add full DESTDIR support.  Bump PKGREVISION.


(rh)
diff -r1.10 -r1.11 pkgsrc/audio/cddb-bundle/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/audio/cddb-bundle/PLIST
diff -r1.7 -r1.8 pkgsrc/audio/cddb-bundle/buildlink3.mk
cvs diff -r1.10 -r1.11 pkgsrc/audio/cddb-bundle/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cddb-bundle/Makefile 2008/07/15 16:38:36 1.10
+++ pkgsrc/audio/cddb-bundle/Makefile 2009/04/19 08:19:37 1.11
@@ -1,27 +1,32 @@ @@ -1,27 +1,32 @@
1# $NetBSD: Makefile,v 1.10 2008/07/15 16:38:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.11 2009/04/19 08:19:37 rh Exp $
2# 2#
3 3
4DISTNAME= cddb.bundle-0.2 4DISTNAME= cddb.bundle-0.2
5PKGNAME= ${DISTNAME:S/./-/} 5PKGNAME= ${DISTNAME:S/./-/}
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= audio gnustep 7CATEGORIES= audio gnustep
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://gsburn.sourceforge.net/ 11HOMEPAGE= http://gsburn.sourceforge.net/
12COMMENT= CDDB client bundle 12COMMENT= CDDB client bundle
13 13
 14LICENSE= gnu-gpl-v2
 15
14PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
15 17
16WRKSRC= ${WRKDIR}/cddb.bundle 18WRKSRC= ${WRKDIR}/cddb.bundle
17NO_CONFIGURE= yes 19NO_CONFIGURE= yes
18USE_LANGUAGES= objc 20USE_LANGUAGES= objc
19MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import" \ 21MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import"
20 GNUSTEP_INSTALLATION_DIR=${PREFIX}/share/GNUstep/Local/ 
21MAKE_FILE= GNUmakefile 22MAKE_FILE= GNUmakefile
22 23
23INSTALL_MAKE_FLAGS= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \ 24INSTALL_MAKE_FLAGS= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
24 INSTALL_DATA=${INSTALL_DATA:Q} 25 INSTALL_DATA=${INSTALL_DATA:Q}
25 26
 27FIX_GNUSTEP_INSTALLATION_DIR= yes
 28SUBST_FILES.gnustep_installation_dir+= Cddb/GNUmakefile
 29
26.include "../../devel/gnustep-base/buildlink3.mk" 30.include "../../devel/gnustep-base/buildlink3.mk"
 31.include "../../x11/gnustep-gui/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/cddb-bundle/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/cddb-bundle/PLIST 2005/05/16 09:40:59 1.1.1.1
+++ pkgsrc/audio/cddb-bundle/PLIST 2009/04/19 08:19:37 1.2
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/04/19 08:19:37 rh Exp $
2share/GNUstep/Local/Library/Bundles/Cddb.bundle/Cddb 2include/Cddb/Cddb.h
3share/GNUstep/Local/Library/Bundles/Cddb.bundle/Resources/Info-gnustep.plist 3lib/GNUstep/Bundles/Cddb.bundle/Cddb
4share/GNUstep/Local/Library/Bundles/Cddb.bundle/stamp.make 4lib/GNUstep/Bundles/Cddb.bundle/Resources/Info-gnustep.plist
5share/GNUstep/Local/Library/Headers/Cddb/Cddb.h 5lib/GNUstep/Bundles/Cddb.bundle/stamp.make
6@dirrm share/GNUstep/Local/Library/Headers/Cddb 6@dirrm lib/GNUstep/Bundles/Cddb.bundle/Resources
7@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Headers 7@dirrm lib/GNUstep/Bundles/Cddb.bundle
8@dirrm share/GNUstep/Local/Library/Bundles/Cddb.bundle/Resources 8@comment in x11/gnustep-base: @dirrm lib/GNUstep/Bundles
9@dirrm share/GNUstep/Local/Library/Bundles/Cddb.bundle 9@comment in devel/gnustep-base: @dirrm lib/GNUstep
10@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Bundles 10@dirrm include/Cddb
cvs diff -r1.7 -r1.8 pkgsrc/audio/cddb-bundle/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/audio/cddb-bundle/buildlink3.mk 2009/03/20 19:23:52 1.7
+++ pkgsrc/audio/cddb-bundle/buildlink3.mk 2009/04/19 08:19:37 1.8
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:52 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2009/04/19 08:19:37 rh Exp $
2 2
3BUILDLINK_TREE+= cddb-bundle 3BUILDLINK_TREE+= cddb-bundle
4 4
5.if !defined(CDDB_BUNDLE_BUILDLINK3_MK) 5.if !defined(CDDB_BUNDLE_BUILDLINK3_MK)
6CDDB_BUNDLE_BUILDLINK3_MK:= 6CDDB_BUNDLE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.cddb-bundle+= cddb-bundle>=0.2 8BUILDLINK_API_DEPENDS.cddb-bundle+= cddb-bundle>=0.2
9BUILDLINK_ABI_DEPENDS.cddb-bundle?= cddb-bundle>=0.2nb1 9BUILDLINK_ABI_DEPENDS.cddb-bundle?= cddb-bundle>=0.2nb1
10BUILDLINK_PKGSRCDIR.cddb-bundle?= ../../audio/cddb-bundle 10BUILDLINK_PKGSRCDIR.cddb-bundle?= ../../audio/cddb-bundle
11 11
12.include "../../devel/gnustep-make/buildlink3.mk" 
13.endif # CDDB_BUNDLE_BUILDLINK3_MK 12.endif # CDDB_BUNDLE_BUILDLINK3_MK
14 13
15BUILDLINK_TREE+= -cddb-bundle 14BUILDLINK_TREE+= -cddb-bundle