Add DESTDIR support.

2 files changed, 42 insertions, 40 deletions

diff --git a/parallel/p5-Parallel-Pvm/Makefile b/parallel/p5-Parallel-Pvm/Makefile
index d49d8b6a309..5429c8e4662 100644
--- a/parallel/p5-Parallel-Pvm/Makefile
+++ b/parallel/p5-Parallel-Pvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 21:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:42 joerg Exp $
 #
 
 DISTNAME=	Parallel-Pvm-1.3.0
@@ -13,6 +13,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.csm.ornl.gov/pvm/pvm_home.html
 COMMENT=	Perl module for PVM (Parallel Virtual Machine)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PVM_ROOT?=		${LOCALBASE}/pvm3
 CONFIGURE_ENV+=		PVM_ROOT=${PVM_ROOT:Q} PVM_ARCH=${PVM_ARCH:Q}
 MAKE_ENV+=		PVM_ROOT=${PVM_ROOT:Q} PVM_ARCH=${PVM_ARCH:Q}
@@ -20,6 +22,8 @@ PERL5_PACKLIST=		auto/Parallel/Pvm/.packlist
 MESSAGE_SUBST+=		PVM_ROOT=${PVM_ROOT}
 EXAMPLES_DIR=		${PREFIX}/share/examples/p5-Parallel-Pvm
 
+INSTALLATION_DIRS=	${EXAMPLES_DIR}
+
 post-build:
 .for f in hello.pl hello_other.pl
 	${SED} -e 's;@exampledir@;${EXAMPLES_DIR};g' -e 's;@perl@;${PERL5};g' \
@@ -27,9 +31,8 @@ post-build:
 .endfor
 
 post-install:
-	${INSTALL_SCRIPT_DIR} ${EXAMPLES_DIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/hello.pl ${EXAMPLES_DIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/hello_other.pl ${EXAMPLES_DIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/hello.pl ${DESTDIR}${EXAMPLES_DIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/hello_other.pl ${DESTDIR}${EXAMPLES_DIR}
 
 .include "../../lang/perl5/module.mk"
 .include "../../parallel/pvm3/buildlink3.mk"
diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index 62f3add0107..e57b0bea4cd 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2008/02/09 23:49:27 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2008/06/12 02:14:42 joerg Exp $
 
 DISTNAME=	pvm3.4.5
 PKGNAME=	pvm-3.4.5
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.csm.ornl.gov/pvm/pvm_home.html
 COMMENT=	Parallel Virtual Machine libraries and environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	m4
 
 .include "../../mk/bsd.prefs.mk"
@@ -59,57 +61,54 @@ pre-install:
 	${RM} -f ${WRKSRC}/lib/pvmgetarch.orig
 	${RM} -f ${WRKSRC}/man/man1/pvm_intro.1.orig
 
+INSTALLATION_DIRS=	${PVM_DIR}/bin/${PVM_ARCH} ${PVM_DIR}/conf \
+			${PVM_DIR}/examples ${PVM_DIR}/gexamples \
+			${PVM_DIR}/include ${PVM_DIR}/lib/${PVM_ARCH} \
+			${PKGMANDIR}/man1 ${PKGMANDIR}/man3
+
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PVM_DIR}/lib/${PVM_ARCH}
 .for __tmp__ in libgpvm3.la libpvm3.la libpvmtrc.la libfpvm3.la
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH}
+		${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${DESTDIR}${PVM_DIR}/lib/${PVM_ARCH}
 .endfor
 .for __tmp__ in pvm pvmgs
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH}/
+		${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${DESTDIR}${PVM_DIR}/lib/${PVM_ARCH}/
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/${PVM_ARCH}/pvmd3		\
-		${PVM_DIR}/lib/${PVM_ARCH}
-	${LIBTOOL} --mode=finish ${PVM_DIR}/lib/${PVM_ARCH}
+		${DESTDIR}${PVM_DIR}/lib/${PVM_ARCH}
+	${LIBTOOL} --mode=finish ${DESTDIR}${PVM_DIR}/lib/${PVM_ARCH}
 	for f in `${LS} -1 ${WRKSRC}/lib`; do				\
 		if [ -f ${WRKSRC}/lib/$$f ]; then			\
-			${INSTALL_SCRIPT} ${WRKSRC}/lib/$$f ${PVM_DIR}/lib; \
+			${INSTALL_SCRIPT} ${WRKSRC}/lib/$$f ${DESTDIR}${PVM_DIR}/lib; \
 		fi;							\
 	done
 
-	${INSTALL_PROGRAM_DIR} ${PVM_DIR}/bin/${PVM_ARCH}
 	for f in ${WRKSRC}/bin/${PVM_ARCH}/* ; do \
 	${ECHO} "Installing $$f" ; \
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} $$f \
-		${PVM_DIR}/bin/${PVM_ARCH}/ ; done
-
-	${INSTALL_DATA_DIR} ${PVM_DIR}/conf
-	${INSTALL_DATA} ${WRKSRC}/conf/${PVM_ARCH}.def ${PVM_DIR}/conf
-	${INSTALL_DATA} ${WRKSRC}/conf/${PVM_ARCH}.m4 ${PVM_DIR}/conf
-
-	${INSTALL_DATA_DIR} ${PVM_DIR}/examples
-	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${PVM_DIR}/examples
-	${INSTALL_DATA} ${WRKSRC}/examples/*.f ${PVM_DIR}/examples
-	${INSTALL_DATA} ${WRKSRC}/examples/Readme ${PVM_DIR}/examples
-	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.aimk ${PVM_DIR}/examples
-
-	${INSTALL_DATA_DIR} ${PVM_DIR}/gexamples
-	${INSTALL_DATA} ${WRKSRC}/gexamples/*.c ${PVM_DIR}/gexamples
-	${INSTALL_DATA} ${WRKSRC}/gexamples/*.f ${PVM_DIR}/gexamples
-	${INSTALL_DATA} ${WRKSRC}/gexamples/Readme ${PVM_DIR}/gexamples
-	${INSTALL_DATA} ${WRKSRC}/gexamples/Makefile.aimk ${PVM_DIR}/gexamples
-	${INSTALL_DATA} ${WRKSRC}/gexamples/Makefile ${PVM_DIR}/gexamples
-
-	${INSTALL_DATA_DIR} ${PVM_DIR}/include
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PVM_DIR}/include
-
-	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
-	${RM} ${PREFIX}/${PKGMANDIR}/man1/PVM.1
-	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/pvm_intro.1 ${PREFIX}/${PKGMANDIR}/man1/PVM.1
+		${DESTDIR}${PVM_DIR}/bin/${PVM_ARCH}/ ; done
+
+	${INSTALL_DATA} ${WRKSRC}/conf/${PVM_ARCH}.def ${DESTDIR}${PVM_DIR}/conf
+	${INSTALL_DATA} ${WRKSRC}/conf/${PVM_ARCH}.m4 ${DESTDIR}${PVM_DIR}/conf
+
+	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${DESTDIR}${PVM_DIR}/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/*.f ${DESTDIR}${PVM_DIR}/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/Readme ${DESTDIR}${PVM_DIR}/examples
+	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.aimk ${DESTDIR}${PVM_DIR}/examples
+
+	${INSTALL_DATA} ${WRKSRC}/gexamples/*.c ${DESTDIR}${PVM_DIR}/gexamples
+	${INSTALL_DATA} ${WRKSRC}/gexamples/*.f ${DESTDIR}${PVM_DIR}/gexamples
+	${INSTALL_DATA} ${WRKSRC}/gexamples/Readme ${DESTDIR}${PVM_DIR}/gexamples
+	${INSTALL_DATA} ${WRKSRC}/gexamples/Makefile.aimk ${DESTDIR}${PVM_DIR}/gexamples
+	${INSTALL_DATA} ${WRKSRC}/gexamples/Makefile ${DESTDIR}${PVM_DIR}/gexamples
+
+	${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PVM_DIR}/include
+
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man3/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/PVM.1
+	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/pvm_intro.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/PVM.1
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"