Sat Feb 7 21:10:48 2009 UTC ()
DESTDIR support. Needs pkg-config.


(joerg)
diff -r1.21 -r1.22 pkgsrc/audio/xmp/Makefile
diff -r1.10 -r1.11 pkgsrc/audio/xmp/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/xmp/patches/patch-ac

cvs diff -r1.21 -r1.22 pkgsrc/audio/xmp/Makefile (expand / switch to context diff)
--- pkgsrc/audio/xmp/Makefile 2009/01/09 20:43:53 1.21
+++ pkgsrc/audio/xmp/Makefile 2009/02/07 21:10:47 1.22
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/01/09 20:43:53 shattered Exp $
+# $NetBSD: Makefile,v 1.22 2009/02/07 21:10:47 joerg Exp $
 
 DISTNAME=	xmp-2.5.1
 CATEGORIES=	audio
@@ -8,18 +8,24 @@
 HOMEPAGE=	http://xmp.sourceforge.net/
 COMMENT=	Player for many different Amiga and PC module formats
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-alsa \
 		--disable-oss \
 		--disable-xmms \
 		--sysconfdir=${PKG_SYSCONFDIR}
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
 EGDIR=		${PREFIX}/share/examples/xmp
 CONF_FILES=	${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
 CONF_FILES+=	${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
+
+INSTALL_MAKE_FLAGS+=	INSTALL=${INSTALL}
+
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
@@ -27,8 +33,5 @@
 # No native support for these OS's, so use esound for audio output
 .include "../../audio/esound/buildlink3.mk"
 .endif
-
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.10 -r1.11 pkgsrc/audio/xmp/distinfo (expand / switch to context diff)
--- pkgsrc/audio/xmp/distinfo 2009/01/09 20:43:53 1.10
+++ pkgsrc/audio/xmp/distinfo 2009/02/07 21:10:48 1.11
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2009/01/09 20:43:53 shattered Exp $
+$NetBSD: distinfo,v 1.11 2009/02/07 21:10:48 joerg Exp $
 
 SHA1 (xmp-2.5.1.tar.gz) = 20ce22f453e49adb590b3cbd3ae3e812eb7de4ee
 RMD160 (xmp-2.5.1.tar.gz) = 5fcd7f62b34424e5848806244485d5960a068cc8
 Size (xmp-2.5.1.tar.gz) = 772595 bytes
-SHA1 (patch-ac) = e6db4ff056954cf25030160cf12c30e45b24fda1
+SHA1 (patch-ac) = 5831f36e9b13c9e658c7e204b3fdb33f08e560d0
 SHA1 (patch-ag) = 813d3c73334cb025b2900d398fb8be8ec2b42d22
 SHA1 (patch-ah) = 0807af0d328f578cacf121d12370cd59841d9924
 SHA1 (patch-al) = d909468c772325acf3d5e16daeaf7e62a36c7582

cvs diff -r1.4 -r1.5 pkgsrc/audio/xmp/patches/Attic/patch-ac (expand / switch to context diff)
--- pkgsrc/audio/xmp/patches/Attic/patch-ac 2009/01/09 20:43:53 1.4
+++ pkgsrc/audio/xmp/patches/Attic/patch-ac 2009/02/07 21:10:48 1.5
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2009/01/09 20:43:53 shattered Exp $
+$NetBSD: patch-ac,v 1.5 2009/02/07 21:10:48 joerg Exp $
 
 --- etc/Makefile.orig	2007-10-23 11:28:30.000000000 +0000
 +++ etc/Makefile
@@ -9,6 +9,6 @@
 -	@echo Installing xmp.conf and xmp-modules.conf in $(SYSCONFDIR)...
 -	@[ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
 -	$(INSTALL) -m644 xmp.conf xmp-modules.conf $(DESTDIR)$(SYSCONFDIR)/
-+	@echo Installing xmp.conf and xmp-modules.conf in $(datarootdir)/examples/xmp...
-+	$(INSTALL) -m644 xmp.conf xmp-modules.conf $(datarootdir)/examples/xmp
++	@echo Installing xmp.conf and xmp-modules.conf in ${DESTDIR}$(datarootdir)/examples/xmp...
++	$(INSTALL) -m644 xmp.conf xmp-modules.conf ${DESTDIR}$(datarootdir)/examples/xmp