[pkgsrc/trunk]: pkgsrc/audio/cddb-bundle Make this play nice with the new gnu...

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b9eb11c55cb
branches:  trunk
changeset: 557629:5b9eb11c55cb
user:      rh <rh%pkgsrc.org@localhost>
date:      Sun Apr 19 08:19:37 2009 +0000

description:
Make this play nice with the new gnustep directory hierarchy.  While at it,
add full DESTDIR support.  Bump PKGREVISION.

diffstat:

 audio/cddb-bundle/Makefile      |  13 +++++++++----
 audio/cddb-bundle/PLIST         |  20 ++++++++++----------
 audio/cddb-bundle/buildlink3.mk |   3 +--
 3 files changed, 20 insertions(+), 16 deletions(-)

diffs (81 lines):

diff -r f27fbb72a93d -r 5b9eb11c55cb audio/cddb-bundle/Makefile
--- a/audio/cddb-bundle/Makefile        Sun Apr 19 08:15:50 2009 +0000
+++ b/audio/cddb-bundle/Makefile        Sun Apr 19 08:19:37 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/07/15 16:38:36 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/04/19 08:19:37 rh Exp $
 #
 
 DISTNAME=      cddb.bundle-0.2
 PKGNAME=       ${DISTNAME:S/./-/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio gnustep
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
@@ -11,17 +11,22 @@
 HOMEPAGE=      http://gsburn.sourceforge.net/
 COMMENT=       CDDB client bundle
 
+LICENSE=       gnu-gpl-v2
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                ${WRKDIR}/cddb.bundle
 NO_CONFIGURE=  yes
 USE_LANGUAGES= objc
-MAKE_ENV+=     ADDITIONAL_CPPFLAGS="-Wno-import" \
-               GNUSTEP_INSTALLATION_DIR=${PREFIX}/share/GNUstep/Local/
+MAKE_ENV+=     ADDITIONAL_CPPFLAGS="-Wno-import"
 MAKE_FILE=     GNUmakefile
 
 INSTALL_MAKE_FLAGS=    INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
                        INSTALL_DATA=${INSTALL_DATA:Q}
 
+FIX_GNUSTEP_INSTALLATION_DIR= yes
+SUBST_FILES.gnustep_installation_dir+= Cddb/GNUmakefile
+
 .include "../../devel/gnustep-base/buildlink3.mk"
+.include "../../x11/gnustep-gui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f27fbb72a93d -r 5b9eb11c55cb audio/cddb-bundle/PLIST
--- a/audio/cddb-bundle/PLIST   Sun Apr 19 08:15:50 2009 +0000
+++ b/audio/cddb-bundle/PLIST   Sun Apr 19 08:19:37 2009 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $
-share/GNUstep/Local/Library/Bundles/Cddb.bundle/Cddb
-share/GNUstep/Local/Library/Bundles/Cddb.bundle/Resources/Info-gnustep.plist
-share/GNUstep/Local/Library/Bundles/Cddb.bundle/stamp.make
-share/GNUstep/Local/Library/Headers/Cddb/Cddb.h
-@dirrm share/GNUstep/Local/Library/Headers/Cddb
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Headers
-@dirrm share/GNUstep/Local/Library/Bundles/Cddb.bundle/Resources
-@dirrm share/GNUstep/Local/Library/Bundles/Cddb.bundle
-@comment in devel/gnustep-make: @dirrm share/GNUstep/Local/Library/Bundles
+@comment $NetBSD: PLIST,v 1.2 2009/04/19 08:19:37 rh Exp $
+include/Cddb/Cddb.h
+lib/GNUstep/Bundles/Cddb.bundle/Cddb
+lib/GNUstep/Bundles/Cddb.bundle/Resources/Info-gnustep.plist
+lib/GNUstep/Bundles/Cddb.bundle/stamp.make
+@dirrm lib/GNUstep/Bundles/Cddb.bundle/Resources
+@dirrm lib/GNUstep/Bundles/Cddb.bundle
+@comment in x11/gnustep-base: @dirrm lib/GNUstep/Bundles
+@comment in devel/gnustep-base: @dirrm lib/GNUstep
+@dirrm include/Cddb
diff -r f27fbb72a93d -r 5b9eb11c55cb audio/cddb-bundle/buildlink3.mk
--- a/audio/cddb-bundle/buildlink3.mk   Sun Apr 19 08:15:50 2009 +0000
+++ b/audio/cddb-bundle/buildlink3.mk   Sun Apr 19 08:19:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/04/19 08:19:37 rh Exp $
 
 BUILDLINK_TREE+=       cddb-bundle
 
@@ -9,7 +9,6 @@
 BUILDLINK_ABI_DEPENDS.cddb-bundle?=    cddb-bundle>=0.2nb1
 BUILDLINK_PKGSRCDIR.cddb-bundle?=      ../../audio/cddb-bundle
 
-.include "../../devel/gnustep-make/buildlink3.mk"
 .endif # CDDB_BUNDLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -cddb-bundle