summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrh <rh>2009-04-19 08:19:37 +0000
committerrh <rh>2009-04-19 08:19:37 +0000
commit6f8b8b6874824cc632e40b205536413fa5a7fbe3 (patch)
tree83d09834a32914970a77e5ceadb5ec81fee61962
parent690c4fefe27398fa5ab81bda66d1c8a035d5dc98 (diff)
downloadpkgsrc-6f8b8b6874824cc632e40b205536413fa5a7fbe3.tar.gz
Make this play nice with the new gnustep directory hierarchy. While at it,
add full DESTDIR support. Bump PKGREVISION.
-rw-r--r--audio/cddb-bundle/Makefile13
-rw-r--r--audio/cddb-bundle/PLIST20
-rw-r--r--audio/cddb-bundle/buildlink3.mk3
3 files changed, 20 insertions, 16 deletions
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index f496ee0938c..6ecb138b73e 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org
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 --git a/audio/cddb-bundle/PLIST b/audio/cddb-bundle/PLIST
index e16a6e4c990..e6d9f5d359d 100644
--- a/audio/cddb-bundle/PLIST
+++ b/audio/cddb-bundle/PLIST
@@ -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 --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
index 9ea643348b2..3f707c2248a 100644
--- a/audio/cddb-bundle/buildlink3.mk
+++ b/audio/cddb-bundle/buildlink3.mk
@@ -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_API_DEPENDS.cddb-bundle+= cddb-bundle>=0.2
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