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 unified 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,34 +1,37 @@ @@ -1,34 +1,37 @@
1# $NetBSD: Makefile,v 1.21 2009/01/09 20:43:53 shattered Exp $ 1# $NetBSD: Makefile,v 1.22 2009/02/07 21:10:47 joerg Exp $
2 2
3DISTNAME= xmp-2.5.1 3DISTNAME= xmp-2.5.1
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
6 6
7MAINTAINER= rxg@NetBSD.org 7MAINTAINER= rxg@NetBSD.org
8HOMEPAGE= http://xmp.sourceforge.net/ 8HOMEPAGE= http://xmp.sourceforge.net/
9COMMENT= Player for many different Amiga and PC module formats 9COMMENT= Player for many different Amiga and PC module formats
10 10
 11PKG_DESTDIR_SUPPORT= user-destdir
 12
11GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
12CONFIGURE_ARGS+=--disable-alsa \ 14CONFIGURE_ARGS+=--disable-alsa \
13 --disable-oss \ 15 --disable-oss \
14 --disable-xmms \ 16 --disable-xmms \
15 --sysconfdir=${PKG_SYSCONFDIR} 17 --sysconfdir=${PKG_SYSCONFDIR}
16 18
17USE_TOOLS+= gmake 19USE_TOOLS+= gmake pkg-config
18 20
19EGDIR= ${PREFIX}/share/examples/xmp 21EGDIR= ${PREFIX}/share/examples/xmp
20CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf 22CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
21CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf 23CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
22 24
 25INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR}
 26
 27INSTALL_MAKE_FLAGS+= INSTALL=${INSTALL}
 28
23.include "options.mk" 29.include "options.mk"
24.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
25 31
26.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" 32.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
27# No native support for these OS's, so use esound for audio output 33# No native support for these OS's, so use esound for audio output
28.include "../../audio/esound/buildlink3.mk" 34.include "../../audio/esound/buildlink3.mk"
29.endif 35.endif
30 36
31pre-install: 
32 ${INSTALL_DATA_DIR} ${EGDIR} 
33 
34.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/audio/xmp/distinfo (expand / switch to unified 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,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.10 2009/01/09 20:43:53 shattered Exp $ 1$NetBSD: distinfo,v 1.11 2009/02/07 21:10:48 joerg Exp $
2 2
3SHA1 (xmp-2.5.1.tar.gz) = 20ce22f453e49adb590b3cbd3ae3e812eb7de4ee 3SHA1 (xmp-2.5.1.tar.gz) = 20ce22f453e49adb590b3cbd3ae3e812eb7de4ee
4RMD160 (xmp-2.5.1.tar.gz) = 5fcd7f62b34424e5848806244485d5960a068cc8 4RMD160 (xmp-2.5.1.tar.gz) = 5fcd7f62b34424e5848806244485d5960a068cc8
5Size (xmp-2.5.1.tar.gz) = 772595 bytes 5Size (xmp-2.5.1.tar.gz) = 772595 bytes
6SHA1 (patch-ac) = e6db4ff056954cf25030160cf12c30e45b24fda1 6SHA1 (patch-ac) = 5831f36e9b13c9e658c7e204b3fdb33f08e560d0
7SHA1 (patch-ag) = 813d3c73334cb025b2900d398fb8be8ec2b42d22 7SHA1 (patch-ag) = 813d3c73334cb025b2900d398fb8be8ec2b42d22
8SHA1 (patch-ah) = 0807af0d328f578cacf121d12370cd59841d9924 8SHA1 (patch-ah) = 0807af0d328f578cacf121d12370cd59841d9924
9SHA1 (patch-al) = d909468c772325acf3d5e16daeaf7e62a36c7582 9SHA1 (patch-al) = d909468c772325acf3d5e16daeaf7e62a36c7582
10SHA1 (patch-am) = d22d3310225f070327ec891046bd5113b6352251 10SHA1 (patch-am) = d22d3310225f070327ec891046bd5113b6352251
cvs diff -r1.4 -r1.5 pkgsrc/audio/xmp/patches/Attic/patch-ac (expand / switch to unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.4 2009/01/09 20:43:53 shattered Exp $ 1$NetBSD: patch-ac,v 1.5 2009/02/07 21:10:48 joerg Exp $
2 2
3--- etc/Makefile.orig 2007-10-23 11:28:30.000000000 +0000 3--- etc/Makefile.orig 2007-10-23 11:28:30.000000000 +0000
4+++ etc/Makefile 4+++ etc/Makefile
5@@ -14,7 +14,6 @@ subdist:: all 5@@ -14,7 +14,6 @@ subdist:: all
6 include $(TOPDIR)/Makefile.rules 6 include $(TOPDIR)/Makefile.rules
7  7
8 install:: 8 install::
9- @echo Installing xmp.conf and xmp-modules.conf in $(SYSCONFDIR)... 9- @echo Installing xmp.conf and xmp-modules.conf in $(SYSCONFDIR)...
10- @[ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR) 10- @[ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
11- $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DESTDIR)$(SYSCONFDIR)/ 11- $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DESTDIR)$(SYSCONFDIR)/
12+ @echo Installing xmp.conf and xmp-modules.conf in $(datarootdir)/examples/xmp... 12+ @echo Installing xmp.conf and xmp-modules.conf in ${DESTDIR}$(datarootdir)/examples/xmp...
13+ $(INSTALL) -m644 xmp.conf xmp-modules.conf $(datarootdir)/examples/xmp 13+ $(INSTALL) -m644 xmp.conf xmp-modules.conf ${DESTDIR}$(datarootdir)/examples/xmp
14  14