DESTDIR support

4 files changed, 28 insertions, 8 deletions

diff --git a/audio/cddbd/Makefile b/audio/cddbd/Makefile
index 25b8962d43f..341266b5e2a 100644
--- a/audio/cddbd/Makefile
+++ b/audio/cddbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/12/29 10:13:08 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/01 01:38:42 joerg Exp $
 #
 
 DISTNAME=	cddbd-1.3.1
@@ -14,15 +14,20 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freedb.org/en/download__server_software.4.html
 COMMENT=	Internet CD Database Server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FILE=	makefile
 
+INSTALLATION_DIRS+=	bin
+
 do-configure:
 	cd ${WRKSRC};							\
 	${SETENV} BASEDIR=${PREFIX:Q}/share ${SH} config.sh
 
 do-install:
 	cd ${WRKSRC};							\
-	${SETENV} INSTALL=${INSTALL:Q} BINDIR=${PREFIX:Q}/bin		\
+	${SETENV} INSTALL=${INSTALL:Q} DESTDIR=${DESTDIR} 		\
+	  BINDIR=${DESTDIR}${PREFIX}/bin	\
 	  BINPERM=${BINMODE:Q} BINOWNER=${BINOWN:Q}			\
 	  BINGROUP=${BINGRP:Q} ${SH} install.sh
 
diff --git a/audio/cddbd/distinfo b/audio/cddbd/distinfo
index cb29ea0217f..1fb72947cd0 100644
--- a/audio/cddbd/distinfo
+++ b/audio/cddbd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/08/30 14:12:38 joerg Exp $
+$NetBSD: distinfo,v 1.6 2010/02/01 01:38:42 joerg Exp $
 
 SHA1 (cddbd-1.3.1.tar.gz) = 2e8ab932750e54e6058edbcc6107835c9be7840c
 RMD160 (cddbd-1.3.1.tar.gz) = a2b666407db9d6415f430a9df8ef4a96fa24572c
@@ -6,7 +6,7 @@ Size (cddbd-1.3.1.tar.gz) = 93959 bytes
 SHA1 (cddbd-1.3.1.patch1.gz) = 08a96dac6c95cf6c289922215be6e6c99cd9f49e
 RMD160 (cddbd-1.3.1.patch1.gz) = 6e0343ded77336cec190682581ad8b9ee78f46d8
 Size (cddbd-1.3.1.patch1.gz) = 416 bytes
-SHA1 (patch-aa) = d7bd76f66e0a4d2cf08ced19b2c4ed684efa7064
+SHA1 (patch-aa) = 9ae4099537d81c792c6183837d25a7015edf5873
 SHA1 (patch-ab) = 6a84d5d1c9c811dc6d5faf8e806b065bc79e0959
 SHA1 (patch-ac) = 3701b82b47444eb8196069580e46f31d1d800160
 SHA1 (patch-ad) = afca1d372bf7e7bf4fc47b9100a914d6f16e431b
diff --git a/audio/cddbd/patches/patch-aa b/audio/cddbd/patches/patch-aa
index df7d1f35be1..4fa94d894dc 100644
--- a/audio/cddbd/patches/patch-aa
+++ b/audio/cddbd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
 
 --- install.sh.orig	1996-12-22 03:49:54.000000000 +0000
 +++ install.sh
@@ -78,6 +78,15 @@ $NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
  		return 0
  	else
  		$ECHO "\t$2 NOT installed"
+@@ -330,7 +328,7 @@ done
+ 
+ # Find other directories
+ 
+-BASEDIR=`cat .accessfile`
++BASEDIR=${DESTDIR}`cat .accessfile`
+ WORKDIR=${BASEDIR}
+ CDDBDIR=`dirname ${BASEDIR}`
+ 
 @@ -588,7 +586,7 @@ fi
  
  $ECHO "permissions:  default connect nopost noupdate noget" >> access
@@ -87,7 +96,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
  if getyn "Do you want to create the motd file now"
  then
  	if [ "$EDITOR" = "" ]
-@@ -624,7 +622,7 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
+@@ -624,10 +622,10 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
  $ECHO "\nInstalling cddbd files..."
  
  # Binaries
@@ -95,7 +104,11 @@ $NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
 +instfile cddbd ${BINDIR}/cddbd $BINPERM $BINOWNER $BINGROUP
  
  # Configuration files
- instfile access `cat .accessfile`/access $FPERM $OWNID $GRPID
+-instfile access `cat .accessfile`/access $FPERM $OWNID $GRPID
++instfile access ${BASEDIR}/access $FPERM $OWNID $GRPID
+ instfile sites $SITE $FPERM $OWNID $GRPID
+ 
+ if [ -f motd ]
 @@ -635,7 +633,7 @@ then
  	instfile motd $MOTD $FPERM $OWNID $GRPID
  fi
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 0ee5071e754..7ac8737da31 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:13 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/01 01:43:59 joerg Exp $
 #
 
 DISTNAME=	terminatorX-3.82
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://terminatorx.org/
 COMMENT=	Realtime audio synthesizer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
 DEPENDS+=	sox-[0-9]*:../../audio/sox
 DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools