user-destdir support

10 files changed, 47 insertions, 38 deletions

diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index c688823412a..c1bc0ea906b 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/08 14:03:26 joerg Exp $
 
 DISTNAME=	tosha-0.05
 PKGREVISION=	1
@@ -10,6 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Read CD digital audio data through the SCSI bus
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 
diff --git a/audio/tosha/distinfo b/audio/tosha/distinfo
index facb153f901..88a55e3100b 100644
--- a/audio/tosha/distinfo
+++ b/audio/tosha/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2007/10/19 13:33:24 rillig Exp $
+$NetBSD: distinfo,v 1.8 2009/07/08 14:03:26 joerg Exp $
 
 SHA1 (tosha-0.05.tar.gz) = b567f452843b544b082c88403d74ad1ca07f6820
 RMD160 (tosha-0.05.tar.gz) = 21ed9253b020efba1035febe86080a2bd8cc04da
 Size (tosha-0.05.tar.gz) = 17859 bytes
-SHA1 (patch-aa) = 10e3bff1ce1859e0389f39e4042960c0a61ca2b7
+SHA1 (patch-aa) = eeefefb53525f903be12a8844b33a7b553a26552
 SHA1 (patch-ab) = 9b4b43d6cb0fe2871cfd0e7e76ffdbd19123573a
 SHA1 (patch-ac) = 26feb1151d4fb02c5831762447c7bb264517f4d6
 SHA1 (patch-af) = 4a1debd7dec8eaa6e2cae2dc33c8ec1aecbfc736
diff --git a/audio/tosha/patches/patch-aa b/audio/tosha/patches/patch-aa
index 4f61fed67bd..f584afdcd45 100644
--- a/audio/tosha/patches/patch-aa
+++ b/audio/tosha/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2006/06/24 08:37:40 rillig Exp $
+$NetBSD: patch-aa,v 1.11 2009/07/08 14:03:26 joerg Exp $
 
 --- Makefile.orig	1997-05-21 01:57:17.000000000 +0200
 +++ Makefile	2006-06-24 10:36:24.000000000 +0200
@@ -41,8 +41,8 @@ $NetBSD: patch-aa,v 1.10 2006/06/24 08:37:40 rillig Exp $
 -	gzip -f -9 $(MANDIR)/man$(SECTION)/tosha.1 \
 -		$(MANDIR)/man$(SECTION)/pcmplay.1 \
 -		$(MANDIR)/man$(SECTION)/pcmfade.1
-+	${BSD_INSTALL_PROGRAM} tosha pcmplay pcmfade $(BINDIR)
-+	${BSD_INSTALL_MAN} tosha.1 pcmplay.1 pcmfade.1 $(MANDIR)/man$(SECTION)
++	${BSD_INSTALL_PROGRAM} tosha pcmplay pcmfade ${DESTDIR}$(BINDIR)
++	${BSD_INSTALL_MAN} tosha.1 pcmplay.1 pcmfade.1 ${DESTDIR}$(MANDIR)/man$(SECTION)
  
  clean:
  	rm -f *.o *~ *core tosha pcmplay pcmfade
diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile
index 939ccba4ffc..590a360ad55 100644
--- a/audio/tunapie/Makefile
+++ b/audio/tunapie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/09 22:56:21 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/08 14:04:06 joerg Exp $
 #
 
 DISTNAME=	tunapie-2.1.6
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tunapie.sourceforge.net/
 COMMENT=	Directory browser for Internet radio and TV streams
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
@@ -21,14 +23,14 @@ INSTALLATION_DIRS=	bin share/tunapie ${PKGMANDIR}/man1
 
 do-install:
 	${PYTHONBIN} ${WRKSRC}/src/compile
-	${INSTALL_SCRIPT} ${WRKSRC}/src/*.py* ${PREFIX}/share/tunapie/
-	${INSTALL_DATA} ${WRKSRC}/src/*.xpm ${PREFIX}/share/tunapie/
-	${INSTALL_DATA} ${WRKSRC}/src/*.png ${PREFIX}/share/tunapie/
-	${INSTALL_MAN} ${WRKSRC}/tunapie.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/src/*.py* ${DESTDIR}${PREFIX}/share/tunapie/
+	${INSTALL_DATA} ${WRKSRC}/src/*.xpm ${DESTDIR}${PREFIX}/share/tunapie/
+	${INSTALL_DATA} ${WRKSRC}/src/*.png ${DESTDIR}${PREFIX}/share/tunapie/
+	${INSTALL_MAN} ${WRKSRC}/tunapie.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${ECHO} "#!/bin/sh" > ${WRKSRC}/tunapie.sh
 	${ECHO} "${PYTHONBIN} ${PREFIX}/share/tunapie/Tunapie.py" >> \
 		${WRKSRC}/tunapie.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/tunapie.sh ${PREFIX}/bin/tunapie
+	${INSTALL_SCRIPT} ${WRKSRC}/tunapie.sh ${DESTDIR}${PREFIX}/bin/tunapie
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 33d1ceb9256..b47f7db34ec 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/08 14:06:22 joerg Exp $
 #
 
 DISTNAME=	xanalyser-1.24
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://arvin.schnell-web.net/xanalyser/
 COMMENT=	Frequency spectrum analyser for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 2621118a92d..35fa47f7172 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/08 14:06:51 joerg Exp $
 #
 
 DISTNAME=	xhippo-3.3
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/xhippo/xhippo.html
 COMMENT=	Generic playlist manager for UNIX
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -18,19 +20,20 @@ CONFIGURE_ENV+=	--with-gnome=no
 CONF_FILES=	${PREFIX}/share/doc/xhippo/xhippo.config.example \
 		${PKG_SYSCONFDIR}/xhippo.config
 
+INSTALLATION_DIRS=	share/doc/xhippo
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xhippo
 	${INSTALL_DATA} ${WRKSRC}/xhippo.config \
-		${PREFIX}/share/doc/xhippo/xhippo.config.example
+		${DESTDIR}${PREFIX}/share/doc/xhippo/xhippo.config.example
 	${INSTALL_DATA} ${WRKSRC}/xhippo.gtkrc \
-		${PREFIX}/share/doc/xhippo/xhippo.gtkrc
-	${INSTALL_DATA} ${WRKSRC}/BUGS ${PREFIX}/share/doc/xhippo
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xhippo
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xhippo
-	${INSTALL_DATA} ${WRKSRC}/README.fvwm2 ${PREFIX}/share/doc/xhippo
-	${INSTALL_DATA} ${WRKSRC}/doc/xhippo.ps.gz ${PREFIX}/share/doc/xhippo
-	${INSTALL_DATA} ${WRKSRC}/doc/xhippo.txt.gz ${PREFIX}/share/doc/xhippo
-	${INSTALL_DATA} ${WRKSRC}/doc/xhippo.sgml ${PREFIX}/share/doc/xhippo
+		${DESTDIR}${PREFIX}/share/doc/xhippo/xhippo.gtkrc
+	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/xhippo
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/share/doc/xhippo
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xhippo
+	${INSTALL_DATA} ${WRKSRC}/README.fvwm2 ${DESTDIR}${PREFIX}/share/doc/xhippo
+	${INSTALL_DATA} ${WRKSRC}/doc/xhippo.ps.gz ${DESTDIR}${PREFIX}/share/doc/xhippo
+	${INSTALL_DATA} ${WRKSRC}/doc/xhippo.txt.gz ${DESTDIR}${PREFIX}/share/doc/xhippo
+	${INSTALL_DATA} ${WRKSRC}/doc/xhippo.sgml ${DESTDIR}${PREFIX}/share/doc/xhippo
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index dad23af8ce9..959539636cc 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/11/10 17:21:33 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/08 14:08:56 joerg Exp $
 
 DISTNAME=		xmix-2.1
 PKGREVISION=		3
@@ -11,6 +11,8 @@ PATCHFILES=		xmix-2.1.mixers.patch
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Mixer for X Window System
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NOT_FOR_PLATFORM=	Interix-*-*
 
 WRKSRC=			${WRKDIR}/xmix
@@ -21,7 +23,7 @@ pre-configure:
 	${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man
 
 pre-install:
-	${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults
+	${INSTALL_DATA} ${WRKSRC}/XMix ${DESTDIR}${PREFIX}/lib/X11/app-defaults
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile
index 01b0aa7de3a..b00d428db5c 100644
--- a/devel/libscsi/Makefile
+++ b/devel/libscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/05/20 20:42:04 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/08 14:02:49 joerg Exp $
 #
 
 DISTNAME=	libscsi-1.6
@@ -12,12 +12,9 @@ COMMENT=	FreeBSD SCSI user library
 NOT_FOR_PLATFORM=	Interix-*-*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_ENV+=	LIBDIR=${PREFIX:Q}/lib MANDIR=${PREFIX:Q}/man NOPIC=1 NOPROFILE=1
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP}
-MAKE_ENV+=	MANOWN=${MANOWN} MANGRP=${MANGRP}
-
-MANCOMPRESSED_IF_MANZ=	yes
+USE_BSD_MAKEFILE=	yes
 
 INSTALLATION_DIRS=	include lib ${PKGMANDIR}/cat3 ${PKGMANDIR}/man3
 
diff --git a/devel/libscsi/distinfo b/devel/libscsi/distinfo
index fc44c53e965..dc72c3db6f8 100644
--- a/devel/libscsi/distinfo
+++ b/devel/libscsi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2007/09/12 21:05:29 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/07/08 14:02:49 joerg Exp $
 
 SHA1 (libscsi-1.6.tar.gz) = 8d6d47d2baa5e272e09ac5ee1330dd37461e922f
 RMD160 (libscsi-1.6.tar.gz) = 586e0b73777a6be41f075c2b6f4fb73c81d7fa03
 Size (libscsi-1.6.tar.gz) = 11896 bytes
 SHA1 (patch-aa) = d34b6769997c3fe29b99d0465710bd3c5d9bcda8
-SHA1 (patch-ab) = 8b6894ca7084605d67a3b01dba06bab51e6c0bfa
+SHA1 (patch-ab) = 6f8f913a0348666b973dfb50509c77c1a0056cc9
 SHA1 (patch-ac) = 26234441505ad213642692f5b705e166c48eba47
 SHA1 (patch-ad) = 7772f992e3df11b0461db33c91ff570f90ea82db
diff --git a/devel/libscsi/patches/patch-ab b/devel/libscsi/patches/patch-ab
index 1f3c95c59a6..04e24cb97e0 100644
--- a/devel/libscsi/patches/patch-ab
+++ b/devel/libscsi/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.6 2004/05/30 18:05:54 minskim Exp $
+$NetBSD: patch-ab,v 1.7 2009/07/08 14:02:49 joerg Exp $
 
 --- Makefile.orig	Wed Feb 18 15:43:00 1998
 +++ Makefile	Thu Dec 20 12:22:50 2001
-@@ -4,7 +4,11 @@
+@@ -4,7 +4,13 @@
  #CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys
  SRCS=	scsi.c
  
 -MAN3=	scsi.3
 +NOLINT=	1
++NOPIC=		1
++NOPROFILE=	1
 +
 +MANINSTALL= maninstall catinstall 
 +
@@ -15,14 +17,14 @@ $NetBSD: patch-ab,v 1.6 2004/05/30 18:05:54 minskim Exp $
  
  MLINKS+=scsi.3 scsireq_buff_decode.3 scsi.3 scsireq_build.3 \
  	scsi.3 scsireq_decode.3 scsi.3 scsireq_encode.3 \
-@@ -14,8 +18,8 @@
+@@ -14,8 +20,8 @@
  	scsi.3 scsi_debug_output.3
  
  beforeinstall:
 -	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/scsi.h \
 -	    ${DESTDIR}/usr/include
 +	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/scsi.h \
-+	    ${PREFIX}/include
++	    ${DESTDIR}${PREFIX}/include
  
  
  .include <bsd.lib.mk>