DESTDIR support

7 files changed, 29 insertions, 15 deletions

diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 4bb122d3536..7ad4d8a4099 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:50 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/29 17:44:37 joerg Exp $
 
 DISTNAME=	argtable-1.2
 CATEGORIES=	devel
@@ -8,14 +8,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ibiblio.org/pub/Linux/devel/argtable.html
 COMMENT=	Library for parsing command line arguments of a C/C++ program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 
 USE_LANGUAGES=	c c++
 
 INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3 share/doc/argtable
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/man/man3/*.3 ${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_DATA} ${WRKSRC}/COPYING.LIB ${PREFIX}/share/doc/argtable
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/src/argtable.h ${DESTDIR}${PREFIX}/include
+	${INSTALL_LIB} ${WRKSRC}/src/libargtable.a ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/man/man3/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_DATA} ${WRKSRC}/COPYING.LIB ${DESTDIR}${PREFIX}/share/doc/argtable
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index 74ec048c4d4..c56a62e7822 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/07/14 17:26:35 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2010/01/29 17:46:17 joerg Exp $
 
 DISTNAME=		bcc
 PKGREVISION=		1
@@ -8,6 +8,8 @@ CATEGORIES=		devel lang
 MAINTAINER=		tsarna@NetBSD.org
 COMMENT=		Bruce Evans' C compiler (with as and ld); can do 16-bit code
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		bin86-[0-9]*
 CONFLICTS+=		dev86-[0-9]*
 
diff --git a/devel/bin86/Makefile b/devel/bin86/Makefile
index 29da48f60df..1c225eee91f 100644
--- a/devel/bin86/Makefile
+++ b/devel/bin86/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/08 00:39:23 reed Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/29 17:51:31 joerg Exp $
 
 DISTNAME=		bin86-0.16.17
 PKGREVISION=		1
@@ -10,6 +10,8 @@ MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://www.debath.co.uk/
 COMMENT=		Simple assembler and linker for x86 machine code
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		bcc-[0-9]*
 CONFLICTS+=		dev86-[0-9]*
 
@@ -21,6 +23,6 @@ do-build:
 	cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX:Q}
 
 do-install:
-	cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX:Q} PKGMANDIR=${PKGMANDIR:Q} install
+	cd ${WRKSRC} && ${GMAKE} PREFIX=${DESTDIR}${PREFIX} PKGMANDIR=${PKGMANDIR} install
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile
index b74cfc4961f..fb12eda1ac6 100644
--- a/devel/cqual/Makefile
+++ b/devel/cqual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/06 01:44:47 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/29 17:53:56 joerg Exp $
 #
 
 DISTNAME=		cqual-0.991
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cs.umd.edu/~jfoster/cqual/
 COMMENT=		Tool for adding type qualifiers to C
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl:run bison m4
@@ -29,8 +31,8 @@ pre-build:
 .endif
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC:Q}/doc/user-guide.pdf ${PREFIX:Q}/share/doc/cqual/
-	${INSTALL_DATA} ${WRKSRC:Q}/examples/* ${PREFIX:Q}/share/examples/cqual/
+	${INSTALL_DATA} ${WRKSRC:Q}/doc/user-guide.pdf ${DESTDIR}${PREFIX}/share/doc/cqual/
+	${INSTALL_DATA} ${WRKSRC:Q}/examples/* ${DESTDIR}${PREFIX}/share/examples/cqual/
 
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cut/Makefile b/devel/cut/Makefile
index 5dfb5463b06..13912014c99 100644
--- a/devel/cut/Makefile
+++ b/devel/cut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/01/21 11:08:33 ichiro Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/29 17:53:16 joerg Exp $
 #
 
 DISTNAME=	cut-2.4
@@ -11,6 +11,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.falvotech.com/content/cut/
 COMMENT=	C Unit Tester
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS+=	bin
+
 WRKSRC=	${WRKDIR}/repo
 
 #BUILD_TARGET=	bin/cutgen
diff --git a/devel/cut/distinfo b/devel/cut/distinfo
index fdd8a1ce6b6..edc04d12941 100644
--- a/devel/cut/distinfo
+++ b/devel/cut/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2008/01/21 11:08:33 ichiro Exp $
+$NetBSD: distinfo,v 1.2 2010/01/29 17:53:16 joerg Exp $
 
 SHA1 (cut-2.4.tar.gz) = 453c608367bd15b61a43f0a841e86453a34441ac
 RMD160 (cut-2.4.tar.gz) = 3d6d56f4613264a21f8bd87d71a831b16514f070
 Size (cut-2.4.tar.gz) = 120644 bytes
-SHA1 (patch-aa) = 88616d584ccd1a1a98f77e0c388453b0f4c4cea5
+SHA1 (patch-aa) = e441165ec65741bb6ea4299b66ac3d2905a9c072
 SHA1 (patch-ab) = c5ce03e2eeed63a0c5fe14f7ffb69c821885f688
diff --git a/devel/cut/patches/patch-aa b/devel/cut/patches/patch-aa
index 9c40a3c4182..0e0a3477c13 100644
--- a/devel/cut/patches/patch-aa
+++ b/devel/cut/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2008/01/21 11:08:33 ichiro Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 17:53:16 joerg Exp $
 
 --- Makefile.orig	2006-04-26 02:54:39.000000000 +0900
 +++ Makefile	2008-01-19 19:40:19.000000000 +0900
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2008/01/21 11:08:33 ichiro Exp $
  .SUFFIXES:
  
 -INSTALLPATH := /usr/local
-+INSTALLPATH = $(LOCALBASE)
++INSTALLPATH = ${DESTDIR}${PREFIX}
  INCDIR := $(INSTALLPATH)/include/cut-2
  BINDIR := $(INSTALLPATH)/bin