DESTDIR support

5 files changed, 30 insertions, 19 deletions

diff --git a/math/mtl/Makefile b/math/mtl/Makefile
index fe35f33ca60..c3035397e64 100644
--- a/math/mtl/Makefile
+++ b/math/mtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/10 10:33:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/04 14:51:44 joerg Exp $
 
 DISTNAME=		mtl-2.1.2-21
 PKGNAME=		mtl-2.1.2.21
@@ -9,18 +9,22 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.osl.iu.edu/research/mtl/
 COMMENT=		Matrix Template Library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 NO_BUILD=		yes
 
 CONFLICTS+=		mtl-2.1.2-[0-9]*
 USE_LANGUAGES=		c c++
 
+INSTALLATION_DIRS+=	share/doc/mtl share/examples/mtl
+
+INSTALL_MAKE_FLAGS+=	includedir=${DESTDIR}${PREFIX}/include/mtl
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mtl
 	${INSTALL_DATA} ${WRKSRC}/contrib/examples/*.cc	\
-		${PREFIX}/share/examples/mtl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtl
+	    ${DESTDIR}${PREFIX}/share/examples/mtl
 	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL LICENSE README	\
-		${PREFIX}/share/doc/mtl
+	    ${DESTDIR}${PREFIX}/share/doc/mtl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index 91f8e603ec4..95e3cca5da5 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/06/30 00:07:20 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2010/02/04 14:56:21 joerg Exp $
 
 DISTNAME=		udunits-1.12.1
 PKGREVISION=		3
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.unidata.ucar.edu/software/udunits/
 COMMENT=		Library and program for manipulating units of physical quantities
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 USE_TOOLS+=		perl
@@ -25,6 +26,11 @@ PERL5_PACKLIST=		auto/UDUNITS/.packlist
 EGDIR=			${PREFIX}/share/examples/udunits
 CONF_FILES=		${EGDIR}/udunits.dat ${PKG_SYSCONFDIR}/udunits.dat
 
+INSTALL_MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \
+			BINDIR=${DESTDIR}${PREFIX}/bin \
+			INCDIR=${DESTDIR}${PREFIX}/include \
+			LIBDIR=${DESTDIR}${PREFIX}/lib
+
 post-install:
 	${RM} -rf ${WRKSRC}/perl/blib/lib
 
diff --git a/math/udunits/distinfo b/math/udunits/distinfo
index 2931755fb9b..59cf5090ad8 100644
--- a/math/udunits/distinfo
+++ b/math/udunits/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2008/09/02 03:11:08 obache Exp $
+$NetBSD: distinfo,v 1.13 2010/02/04 14:56:21 joerg Exp $
 
 SHA1 (udunits-1.12.1.tar.Z) = ee37ca61eb1dcf34165b7573cc1645824bd6968d
 RMD160 (udunits-1.12.1.tar.Z) = fb2f0442673ca47d302782c84ce37b8da1e16535
 Size (udunits-1.12.1.tar.Z) = 365873 bytes
-SHA1 (patch-aa) = 0998141196898a7bc168fe45c5019586645167f2
+SHA1 (patch-aa) = 6d98bef47df79538f3ef1fe99c405f854f2e2bda
 SHA1 (patch-ab) = 9a98e048499d38f8dedba6fb1a169e178dbd77ba
 SHA1 (patch-ac) = ebcfb1b47b828f12ba11364fda7a2f0b335c6fb5
 SHA1 (patch-ad) = d48978bd66d9ef691cd9c70b057a7e5d8a802fb6
diff --git a/math/udunits/patches/patch-aa b/math/udunits/patches/patch-aa
index afb64bb9175..f2ceff14128 100644
--- a/math/udunits/patches/patch-aa
+++ b/math/udunits/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/12/24 17:21:04 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/04 14:56:21 joerg Exp $
 
 --- port/master.mk.in.orig	Wed Nov 25 17:26:56 1998
 +++ port/master.mk.in
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2002/12/24 17:21:04 jmmv Exp $
  # `etc/' files:
  ############################################################################
 -ETCDIR	= $(prefix)/etc
-+ETCDIR	= @datadir@/examples/udunits
++ETCDIR	= ${DESTDIR}@datadir@/examples/udunits
  ETCFILE	= dummy-etcfile		# to silence GNU make(1)
  
  installed_etcfiles:
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 171754d8ec6..4aa2197325b 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/06/30 00:07:20 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/04 15:01:20 joerg Exp $
 
 DISTNAME=	yorick-1.6.02
 PKGREVISION=	2
@@ -10,12 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://yorick.sourceforge.net/
 COMMENT=	Numerical algebra system (similar to Matlab)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=		${WRKDIR}/yorick-1.6
 BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
 INSTALL_DIRS=	${WRKSRC}
-INSTALLATION_DIRS=	${PKGINFODIR} ${PKGMANDIR}/man1 share/doc share/emacs/site-lisp
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc share/emacs/site-lisp
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 USE_TOOLS+=	gmake makeinfo
 INFO_FILES=	# PLIST
@@ -27,16 +29,15 @@ post-patch:
 	done
 
 post-install:
-	cd ${PREFIX}/bin; for f in yorick gist; do			\
-		${LN} -sf ../lib/yorick/1.6/bin/$$f $$f;		\
-	done
+	${LN} -sf ../lib/yorick/1.6/bin/yorick ${DESTDIR}${PREFIX}/bin/yorick
+	${LN} -sf ../lib/yorick/1.6/bin/gist ${DESTDIR}${PREFIX}/bin/gist
 	cd ${WRKSRC}/doc; for f in yorick.info yorick.info-[0-9]*; do	\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};		\
 	done
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/${PKGMANDIR}/man1
-	cd ${PREFIX}/share/doc && ${LN} -sf ../yorick/1.6/doc yorick
-	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${LN} -sf ../yorick/1.6/doc ${DESTDIR}${PREFIX}/share/doc/yorick
+	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${DESTDIR}${PREFIX}/share/emacs/site-lisp
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"