Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

5 files changed, 26 insertions, 17 deletions

diff --git a/mbone/common-mml/Makefile b/mbone/common-mml/Makefile
index d745953f4e4..df7fbc00f97 100644
--- a/mbone/common-mml/Makefile
+++ b/mbone/common-mml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/30 15:41:02 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/04 18:15:08 jlam Exp $
 #
 
 DISTNAME=	common-1.2.16
@@ -11,6 +11,8 @@ MAINTAINER=	psham@cs.nmsu.edu
 HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/common/
 COMMENT=	Common multimedia library required by mbone tools
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/common
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -22,8 +24,8 @@ DOCDIR=		${PREFIX}/share/doc/common-mml
 
 do-install:
 	${LIBTOOL} --mode=install \
-		${INSTALL_LIB} ${WRKSRC}/src/*.la ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/src/*.h ${INCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCDIR}
+		${INSTALL_LIB} ${WRKSRC}/src/*.la ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/src/*.h ${DESTDIR}${INCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/mdd/Makefile b/mbone/mdd/Makefile
index 2d8f3529e00..aa1677cb826 100644
--- a/mbone/mdd/Makefile
+++ b/mbone/mdd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:00 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 18:15:08 jlam Exp $
 #
 
 DISTNAME=	mdd-20050318
@@ -9,10 +9,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	manu@NetBSD.org
 COMMENT=	Multicast file distribution tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mdd ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/mdd.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/mdd ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/mdd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/mdp/Makefile b/mbone/mdp/Makefile
index 31868577017..214adb3699f 100644
--- a/mbone/mdp/Makefile
+++ b/mbone/mdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/12/01 13:56:42 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/04 18:15:08 jlam Exp $
 #
 
 # XXX: Shouldn't this package be simply called mdp, without the "src-"?
@@ -13,6 +13,8 @@ MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://cs.itd.nrl.navy.mil/work/mdp/
 COMMENT=	Multicast file transfer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/mdp
 BUILD_DIRS=	unix
 USE_LANGUAGES=	c++
@@ -29,6 +31,6 @@ do-configure:
 	cd ${WRKSRC}/unix && rm -f Makefile && ln -s Makefile.netbsd Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unix/mdp ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unix/mdp ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 19504be5e31..8d3797d83e8 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/01/08 17:33:42 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/03/04 18:15:08 jlam Exp $
 #
 
 DISTNAME=	rat-3.0.28
@@ -10,7 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
 COMMENT=	Robust Audio Tool - multicast audioconferencing
 
-NO_MTREE=	yes
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CRYPTO=		yes
 USE_TOOLS+=	gmake
 USE_X11BASE=	yes
@@ -29,10 +30,11 @@ do-build:
 	cd ${WRKSRC} && USER=${USER} PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh ./Build rat
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/rat ${PREFIX}/bin/rat
-	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/rat.1 ${PREFIX}/${PKGMANDIR}/man1/rat.1
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/rat ${DESTDIR}${PREFIX}/bin/rat
+	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/rat.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rat.1
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 010358d241e..dea1fbd7f15 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/09/07 22:12:14 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2008/03/04 18:15:08 jlam Exp $
 #
 
 DISTNAME=	sdr-3.0
@@ -10,6 +10,8 @@ MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
 COMMENT=	MBone Session Directory
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/sdr/${SYSDIR}
 CRYPTO=		yes
 USE_TOOLS+=	gmake
@@ -51,7 +53,7 @@ post-configure:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sdr ${PREFIX}/bin/sdr
+	${INSTALL_PROGRAM} ${WRKSRC}/sdr ${DESTDIR}${PREFIX}/bin/sdr
 
 .include "../../mbone/common-mml/buildlink3.mk"
 .include "../../x11/tk83/buildlink3.mk"