PKG_DESTDIR_SUPPORT

6 files changed, 30 insertions, 24 deletions

diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index ced6ac7d256..d1e393f8052 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2009/12/17 19:58:36 abs Exp $
 #
 
 DISTNAME=	mp3asm-0.1.3-1
@@ -14,14 +14,16 @@ COMMENT=	MPEG 1/2/2.5 audio layer 1,2,3 frame level editor
 WRKSRC=		${WRKDIR}/mp3asm-0.1
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS+= share/doc/mp3asm
+PKG_DESTDIR_SUPPORT=user-destdir
+
 post-patch:
 	${SED} "s/getprogname/_getprogname/g" ${WRKSRC}/src/mp3asm.c		\
 		> ${WRKSRC}/src/mp3asm.c.done
 	${MV} ${WRKSRC}/src/mp3asm.c.done ${WRKSRC}/src/mp3asm.c
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mp3asm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mp3asm
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mp3asm
 
 .include "../../devel/sysexits/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 336a07c88b8..9d7ac514d04 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/17 20:00:48 abs Exp $
 
 DISTNAME=	mpegaudio
 PKGNAME=	mpegaudio-3.9
@@ -9,8 +9,11 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	MPEG/audio Layer 1 and Layer 2 encoder/decoder package
 
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+=  bin ${PKGMANDIR}/man1
+
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpegaudio/distinfo b/audio/mpegaudio/distinfo
index 52a5126fe4b..de4b052ad4d 100644
--- a/audio/mpegaudio/distinfo
+++ b/audio/mpegaudio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2006/06/09 15:08:08 minskim Exp $
+$NetBSD: distinfo,v 1.4 2009/12/17 20:00:48 abs Exp $
 
 SHA1 (mpegaudio.tar.Z) = 75a801c4aff290b4e0c7cdb2b07991c630955fbf
 RMD160 (mpegaudio.tar.Z) = 3e40fa6629e0bb88046ac882bbfcc263925f7006
 Size (mpegaudio.tar.Z) = 144707 bytes
-SHA1 (patch-aa) = 7b61fd9effe57086d2d2f669fd5b5235a8854e03
-SHA1 (patch-ab) = 67758b144d384aea66509e508e79112a052b8369
+SHA1 (patch-aa) = ce73eab14c962f143997b73e19a00e3d3e585ec7
+SHA1 (patch-ab) = c901c8b0b0af5232ed4759970b320988bcfe1266
 SHA1 (patch-ac) = 389d7973e317362d5927be96ab3222f011410b40
 SHA1 (patch-ad) = f81fb4c7557d9fe96d9164c0df4367389df6b2e4
 SHA1 (patch-ae) = 65bc956b1cc3a97ca3569c3943760d41b63f10e8
diff --git a/audio/mpegaudio/patches/patch-aa b/audio/mpegaudio/patches/patch-aa
index 042c62eb71d..919545ac6e5 100644
--- a/audio/mpegaudio/patches/patch-aa
+++ b/audio/mpegaudio/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2009/12/17 20:00:48 abs Exp $
 
---- Makefile.orig	Wed Jan  5 02:47:50 1994
+--- Makefile.orig	1994-01-05 01:47:50.000000000 +0000
 +++ Makefile
 @@ -1,10 +1,21 @@
  ALL : musicin musicout
@@ -23,8 +23,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
 +	rm -f *.core *.o musicin musicout
 +
 +install:
-+	${BSD_INSTALL_PROGRAM} musicin ${PREFIX}/bin/mpeg_musicin
-+	${BSD_INSTALL_PROGRAM} musicout ${PREFIX}/bin/mpeg_musicout
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib/mpegaudio/tables
-+	${BSD_INSTALL_DATA} tables/* ${PREFIX}/lib/mpegaudio/tables/
++	${BSD_INSTALL_PROGRAM} musicin ${DESTDIR}${PREFIX}/bin/mpeg_musicin
++	${BSD_INSTALL_PROGRAM} musicout ${DESTDIR}${PREFIX}/bin/mpeg_musicout
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/mpegaudio/tables
++	${BSD_INSTALL_DATA} tables/* ${DESTDIR}${PREFIX}/lib/mpegaudio/tables/
 +	
diff --git a/audio/mpegaudio/patches/patch-ab b/audio/mpegaudio/patches/patch-ab
index 353648b2b64..71336b425ae 100644
--- a/audio/mpegaudio/patches/patch-ab
+++ b/audio/mpegaudio/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/12 00:54:04 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/17 20:00:48 abs Exp $
 
---- common.h.orig	Wed Jan  5 02:42:00 1994
+--- common.h.orig	1994-01-05 01:42:00.000000000 +0000
 +++ common.h
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ common.h
  #endif
  
  #ifdef  UNIX
diff --git a/audio/mserv-devel/Makefile b/audio/mserv-devel/Makefile
index 59e7be5f482..56a74c5b1a5 100644
--- a/audio/mserv-devel/Makefile
+++ b/audio/mserv-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/10 11:32:40 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/17 19:58:19 abs Exp $
 #
 
 DISTNAME=	mserv-0.39a
@@ -19,20 +19,21 @@ REPLACE_PERL=		support/mservedit webclient/main.cgi \
 			webclient/margin.cgi webclient/mserv.cgi
 USE_TOOLS+=		perl:run pkg-config
 
+INSTALLATION_DIRS+= share/doc/mserv share/mserv/webclient
+PKG_DESTDIR_SUPPORT= user-destdir
+
 post-configure:
 	${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mserv
+	${INSTALL_SCRIPT} ${WRKSRC}/support/mservedit ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} \
 		${WRKSRC}/INSTALL \
 		${WRKSRC}/LICENSE \
-		${PREFIX}/share/doc/mserv
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mserv/webclient
+		${DESTDIR}${PREFIX}/share/doc/mserv
 	${INSTALL_DATA} \
 		${WRKSRC}/webclient/* \
-		${PREFIX}/share/mserv/webclient
+		${DESTDIR}${PREFIX}/share/mserv/webclient
 
 .include "../../audio/libshout/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"