user-destdir support

4 files changed, 34 insertions, 18 deletions

diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 3e9471e8a79..07223afdb5f 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/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/07 16:38:39 joerg Exp $
 
 DISTNAME=	rosegarden-2.1pl4
 PKGNAME=	rosegarden-2.1.4
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.rosegardenmusic.com/
 COMMENT=	Notation editor & MIDI sequencer
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake makedepend
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
index 9a3261580f7..decda077ffd 100644
--- a/audio/rosegarden/distinfo
+++ b/audio/rosegarden/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:51 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/07/07 16:38:39 joerg Exp $
 
 SHA1 (rosegarden-2.1pl4.tar.gz) = 5a6e293eb38a7090ba6929fec23104ffef587533
 RMD160 (rosegarden-2.1pl4.tar.gz) = 94604241c8e4101520d8b79544a16839d98436e5
@@ -9,4 +9,4 @@ SHA1 (patch-ac) = 3f4f3ed849d037d3371b9ab786cb547d6e1c8daa
 SHA1 (patch-ad) = 22b2a1a060e8b2b3f7dda5d7c7189fc96b99c1a0
 SHA1 (patch-ae) = b6fb9815ee6918dbc5b28fd1fec6bca1d42cf028
 SHA1 (patch-af) = f3c99ccf142420255ae10f19bed37933ee24c744
-SHA1 (patch-ag) = f572f2ecee63bee1e62a9363c14bb468e4539937
+SHA1 (patch-ag) = 9f1185353c2663d7b250cfff45b2fdef8639e124
diff --git a/audio/rosegarden/patches/patch-ag b/audio/rosegarden/patches/patch-ag
index 91f04a45679..8c731305877 100644
--- a/audio/rosegarden/patches/patch-ag
+++ b/audio/rosegarden/patches/patch-ag
@@ -1,15 +1,31 @@
-$NetBSD: patch-ag,v 1.1 2002/03/19 12:21:08 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2009/07/07 16:38:39 joerg Exp $
 
---- do-install.orig	Tue Oct 21 18:20:43 1997
+--- do-install.orig	1997-10-21 23:20:43.000000000 +0200
 +++ do-install
-@@ -57,9 +57,10 @@
+@@ -23,12 +23,12 @@ echo
+ echo Thanks
+ echo
+ 
+-ROSELIBDIR=$LIBDIR/rosegarden
++ROSELIBDIR=${DESTDIR}$LIBDIR/rosegarden
+ 
+ ( set -x
+ 
+-$install -d $BINDIR
+-$install -s -c ./bin/rosegarden $BINDIR
++$install -d ${DESTDIR}$BINDIR
++$install -s -c ./bin/rosegarden ${DESTDIR}$BINDIR
+ 
+ $install -d $ROSELIBDIR/bin
+ $install -s -c ./bin/sequencer  $ROSELIBDIR/bin
+@@ -57,9 +57,10 @@ $install -d $ROSELIBDIR/rosepetal-filter
  $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
  $install -c ./petal/pattern.tcl $ROSELIBDIR/rosepetal-filters
  
 -test -d $HOME/.. || exit 0  # not set
 -test -f $HOME/Rosegarden && mv $HOME/Rosegarden $HOME/Rosegarden.SAVED
 -$install -c -m 644 Rosegarden $HOME
-+ADDIR=$LIBDIR/X11/app-defaults
++ADDIR=${DESTDIR}$LIBDIR/X11/app-defaults
 +test -d $ADDIR &&\
 + sed -e s:/usr/local/lib:$LIBDIR: -e s:/usr/local/bin:$BINDIR: Rosegarden.in >Rosegarden &&\
 + $install -c -m 644 Rosegarden $ADDIR
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index f55ce119dea..fb59b7ff863 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/01/24 17:43:58 reed Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/07 16:43:50 joerg Exp $
 #
 
 DISTNAME=		cvsweb-3.0.6
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.freebsd.org/projects/cvsweb.html
 COMMENT=		Web interface for browsing a CVS repository
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-File-Temp>=0.12:../../devel/p5-File-Temp
 DEPENDS+=		p5-IPC-Run>=0.74:../../devel/p5-IPC-Run
 DEPENDS+=		p5-MIME-Types>=1.12:../../mail/p5-MIME-Types
@@ -44,24 +46,21 @@ CVSWEB_DOCS=		ChangeLog INSTALL NEWS README TODO
 
 CONF_FILES=		${EGDIR}/cvsweb.conf ${PKG_SYSCONFDIR}/cvsweb.conf
 
+INSTALLATION_DIRS=	libexec/cgi-bin ${EGDIR}/icons ${EGDIR}/css ${DOCDIR}
+
 do-install:
-	${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/libexec/cgi-bin
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${DESTDIR}${PREFIX}/libexec/cgi-bin
 .for f in ${CVSWEB_CONF_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${EGDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EGDIR}/${f}
 .endfor
-	${INSTALL_DATA_DIR} ${EGDIR}/icons
 .for f in ${CVSWEB_ICONS}
-	${INSTALL_DATA} ${WRKSRC}/icons/${f} ${EGDIR}/icons/${f}
+	${INSTALL_DATA} ${WRKSRC}/icons/${f} ${DESTDIR}${EGDIR}/icons/${f}
 .endfor
-	${INSTALL_DATA_DIR} ${EGDIR}/css
 .for f in ${CVSWEB_CSS}
-	${INSTALL_DATA} ${WRKSRC}/css/${f} ${EGDIR}/css/${f}
+	${INSTALL_DATA} ${WRKSRC}/css/${f} ${DESTDIR}${EGDIR}/css/${f}
 .endfor
-	${INSTALL_DATA_DIR} ${DOCDIR}
 .for f in ${CVSWEB_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
 .endfor
 
 SUBST_CLASSES+=		prefix