Add DESTDIR support.

10 files changed, 30 insertions, 16 deletions

diff --git a/cad/adms/Makefile b/cad/adms/Makefile
index 4e07a6e1004..a40c991a809 100644
--- a/cad/adms/Makefile
+++ b/cad/adms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/05/12 11:33:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:15 joerg Exp $
 #
 
 DISTNAME=	adms-2.2.5
@@ -10,6 +10,7 @@ HOMEPAGE=	http://mot-adms.sourceforge.net/
 COMMENT=	Compact device model code generator for SPICE
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 AUTOMAKE_OVERRIDE=	NO
 GNU_CONFIGURE=		YES
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile
index 4cc2161c654..5e252053a1e 100644
--- a/cad/covered-current/Makefile
+++ b/cad/covered-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/11/17 12:04:11 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:15 joerg Exp $
 #
 
 DISTNAME=	covered-${SNAPDATE}
@@ -11,6 +11,7 @@ HOMEPAGE=	http://covered.sourceforge.net/
 COMMENT=	Verilog code coverage analyzer (development snapshot)
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	verilog{,-current}-[0-9]*:../../cad/verilog
 
diff --git a/cad/covered/Makefile b/cad/covered/Makefile
index 165ad7c8672..d10dc3f9ae0 100644
--- a/cad/covered/Makefile
+++ b/cad/covered/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/11/17 12:04:11 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:15 joerg Exp $
 #
 
 DISTNAME=	covered-0.4.7
@@ -10,6 +10,7 @@ HOMEPAGE=	http://covered.sourceforge.net/
 COMMENT=	Verilog code coverage analyzer (stable release version)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	verilog{,-current}-[0-9]*:../../cad/verilog
 
diff --git a/cad/gattrib/Makefile b/cad/gattrib/Makefile
index 267495469a4..007d200a46c 100644
--- a/cad/gattrib/Makefile
+++ b/cad/gattrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/02/01 02:34:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/12 02:14:15 joerg Exp $
 
 DISTNAME=		geda-gattrib-${PKGVERSION}
 PKGNAME=		gattrib-${PKGVERSION}
@@ -8,6 +8,8 @@ MAINTAINER=		wulf@NetBSD.org
 HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Attribute editor for gEDA
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../cad/geda/Makefile.common"
 
 USE_TOOLS+=             bash intltool msgfmt pkg-config
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index ebe040a05c4..6f55a5f39dc 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/02/02 04:50:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.43 2008/06/12 02:14:16 joerg Exp $
 #
 
 DISTNAME=	pcb-20080202
@@ -10,6 +10,7 @@ HOMEPAGE=	http://pcb.sourceforge.net/
 COMMENT=	Printed circuit board layout system
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	gettext-tools>=0.14.6:../../devel/gettext-tools
 
@@ -64,7 +65,8 @@ CONFIGURE_ARGS+=	--with-exporters=${EXPORTERS:Q}
 # remove some stuff that is either broken or unmaintained
 # and would require another runtime depends
 post-install:
-	${RM} ${PREFIX}/share/pcb/tools/PCB2HPGL ${PREFIX}/share/pcb/tools/tgo2pcb.tcl
+	${RM} ${DESTDIR}${PREFIX}/share/pcb/tools/PCB2HPGL
+	${RM} ${DESTDIR}${PREFIX}/share/pcb/tools/tgo2pcb.tcl
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/cad/py-MyHDL/Makefile b/cad/py-MyHDL/Makefile
index c2899e59557..a9584a2dd83 100644
--- a/cad/py-MyHDL/Makefile
+++ b/cad/py-MyHDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/04/25 20:39:06 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:16 joerg Exp $
 #
 
 DISTNAME=	myhdl-0.5.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jandecaluwe.com/Tools/MyHDL/Overview.html
 COMMENT=	Hardware description in Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_ACCEPTED=	25 24
 
diff --git a/cad/py-simpy/Makefile b/cad/py-simpy/Makefile
index 967167fc368..46ae7d959af 100644
--- a/cad/py-simpy/Makefile
+++ b/cad/py-simpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/04/25 20:39:06 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:16 joerg Exp $
 #
 
 DISTNAME=		SimPy-1.8
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://simpy.sourceforge.net/
 COMMENT=		Discrete event simulation framework
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 616962e1704..3eb6d8c3960 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/05/26 18:09:57 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.49 2008/06/12 02:14:16 joerg Exp $
 #
 
 DISTNAME=	ViPEC-3.2.0
@@ -10,19 +10,22 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://vipec.sourceforge.net/
 COMMENT=	Network analyser for electrical networks
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 UNLIMIT_RESOURCES+=	datasize
 
+INSTALLATION_DIRS=	bin
 CONFLICTS+=		vipec-[0-9]*
 
 post-patch:
 	${SED} 's;@prefix@;${PREFIX};g' < ${FILESDIR}/vipec.sh.in > ${WRKDIR}/vipec.sh
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/vipec.sh ${PREFIX}/bin/vipec
-	${INSTALL_DATA} ${WRKSRC}/vipec.cfg ${PREFIX}/vipec
-	${RM} -fr ${PREFIX}/vipec/*/CVS  ${PREFIX}/vipec/help/models/CVS
+	${INSTALL_SCRIPT} ${WRKDIR}/vipec.sh ${DESTDIR}${PREFIX}/bin/vipec
+	${INSTALL_DATA} ${WRKSRC}/vipec.cfg ${DESTDIR}${PREFIX}/vipec
+	${RM} -fr ${DESTDIR}${PREFIX}/vipec/*/CVS  ${DESTDIR}${PREFIX}/vipec/help/models/CVS
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo
index 5f21ace20b9..5de5e33bb41 100644
--- a/cad/vipec/distinfo
+++ b/cad/vipec/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2006/05/31 10:25:24 joerg Exp $
+$NetBSD: distinfo,v 1.11 2008/06/12 02:14:16 joerg Exp $
 
 SHA1 (ViPEC-3.2.0.tar.gz) = 022bdd49effb22a64bf3da25ec1e48a072228ddf
 RMD160 (ViPEC-3.2.0.tar.gz) = b2452324b78e29bf7a33c7e5cf83116bf9a0550c
 Size (ViPEC-3.2.0.tar.gz) = 191819 bytes
-SHA1 (patch-aa) = 55ddfbddc0c7206961ed16a3ea242c1e0d285ec6
+SHA1 (patch-aa) = f5578ad15c6c6a9c47cc1064daf1b15de10c02c6
 SHA1 (patch-ab) = 6158ee0b5f767065828be8582cdcc574d729a132
 SHA1 (patch-ac) = 4a8dcc7bc73e56b5cf79e0b9f9e205b03c9c2263
 SHA1 (patch-ad) = 2fba5db87866b6dbdc3f75409cc5430f04363325
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 6323603eea9..db5ccffbc58 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2005/02/11 04:09:20 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.13 2008/06/12 02:14:16 joerg Exp $
 
 --- Makefile.orig	2003-10-03 01:39:34.000000000 +0000
 +++ Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.12 2005/02/11 04:09:20 dmcmahill Exp $
  SOURCEPATH = `pwd`
  VERSION = 3.2.0
 -INSTALLDIR = $(PREFIX)/opt/vipec
-+INSTALLDIR = $(PREFIX)/vipec
++INSTALLDIR = ${DESTDIR}$(PREFIX)/vipec
  ICONFILE = vipec.gif
  
  export VERSION