DESTDIR support

9 files changed, 44 insertions, 15 deletions

diff --git a/sysutils/checkpassword/Makefile b/sysutils/checkpassword/Makefile
index a098af5f5d4..ce144931eee 100644
--- a/sysutils/checkpassword/Makefile
+++ b/sysutils/checkpassword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/19 03:55:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/27 18:38:15 joerg Exp $
 #
 
 DISTNAME=		checkpassword-0.90
@@ -12,8 +12,12 @@ COMMENT=		Simple, uniform password-checking interface to all root applications
 DJB_RESTRICTED=		YES
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	bin
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/checkpassword ${DESTDIR}${PREFIX}/bin
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cpmtools/Makefile b/sysutils/cpmtools/Makefile
index d7b07428d75..441145a573e 100644
--- a/sysutils/cpmtools/Makefile
+++ b/sysutils/cpmtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/12/30 12:37:28 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/27 18:43:52 joerg Exp $
 #
 
 DISTNAME=		cpmtools-2.5
@@ -9,10 +9,13 @@ MAINTAINER=		dgriffi@cs.csubak.edu
 HOMEPAGE=		http://www.moria.de/~michael/cpmtools/
 COMMENT=		Similar to mtools, except for CP/M filesystems
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/cpmtools
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 INSTALLATION_DIRS+=	bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/sysutils/cpmtools/distinfo b/sysutils/cpmtools/distinfo
index bd5c0efa500..24d7a84a097 100644
--- a/sysutils/cpmtools/distinfo
+++ b/sysutils/cpmtools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2006/12/06 14:58:01 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/01/27 18:43:52 joerg Exp $
 
 SHA1 (cpmtools-2.5.tar.gz) = f563ed2fff83f6e9f7b7dfaf9c93c330d089542e
 RMD160 (cpmtools-2.5.tar.gz) = 36548809b9296023cd89e3b54aa26e51f9431763
@@ -6,3 +6,4 @@ Size (cpmtools-2.5.tar.gz) = 131166 bytes
 SHA1 (patch-aa) = 1bab34c82e5f56391cb4a0822f1afc68bc717132
 SHA1 (patch-ab) = beea1a1a0985506a8d5719d54ec95c2bcf1293de
 SHA1 (patch-ac) = e473ebcc2a9a89089d38340a91efffcbde6dbfac
+SHA1 (patch-ad) = 8d16645203eade5f8d850c936b902970529ca46d
diff --git a/sysutils/cpmtools/patches/patch-ad b/sysutils/cpmtools/patches/patch-ad
new file mode 100644
index 00000000000..43d69cd773c
--- /dev/null
+++ b/sysutils/cpmtools/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/01/27 18:43:52 joerg Exp $
+
+--- Makefile.in.orig	2010-01-27 18:41:45.000000000 +0000
++++ Makefile.in
+@@ -85,7 +85,7 @@ install:	all
+ 		$(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+ 		$(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+ 		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+-		$(INSTALL_DATA) diskdefs @datadir@/diskdefs
++		$(INSTALL_DATA) diskdefs ${DESTDIR}@datadir@/diskdefs
+ 		$(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
+ 		$(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
+ 		$(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1
diff --git a/sysutils/cpogm/Makefile b/sysutils/cpogm/Makefile
index a8ced6e03dd..28720260ccf 100644
--- a/sysutils/cpogm/Makefile
+++ b/sysutils/cpogm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/03/15 18:37:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/27 18:45:27 joerg Exp $
 #
 
 DISTNAME=		cpogm-1.0
@@ -8,11 +8,13 @@ MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 MAINTAINER=		kim@tac.nyc.ny.us
 COMMENT=		Copy owner, group and mode of a file
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		perl:run
 
 NO_CONFIGURE=		yes
 BUILD_TARGET=		all PREFIX=${PREFIX}
-INSTALL_TARGET=		install PREFIX=${PREFIX}
+INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX}
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cpogm/distinfo b/sysutils/cpogm/distinfo
index 9cb3df7648e..bd147a2db37 100644
--- a/sysutils/cpogm/distinfo
+++ b/sysutils/cpogm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.5 2010/01/27 18:45:27 joerg Exp $
 
 SHA1 (cpogm-1.0.tar.gz) = 676cc5d6220c29c9a7832500a86b133c474e395a
 RMD160 (cpogm-1.0.tar.gz) = 7c9622a794aead08a5b41bba397335aef3c6fed5
 Size (cpogm-1.0.tar.gz) = 981 bytes
-SHA1 (patch-aa) = 5de67b71c884e5dc0a02806e80bec5cd78765cd0
+SHA1 (patch-aa) = 143a8c00c99b9c0b56433bd5d67d622e83c87fff
diff --git a/sysutils/cpogm/patches/patch-aa b/sysutils/cpogm/patches/patch-aa
index dd7f68f9e16..b3a26d3e7d0 100644
--- a/sysutils/cpogm/patches/patch-aa
+++ b/sysutils/cpogm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/09/23 13:29:26 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/27 18:45:27 joerg Exp $
 
 --- Makefile.orig	Sun Sep 12 16:23:32 1999
 +++ Makefile	Tue Sep 23 10:04:24 2003
@@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.1 2003/09/23 13:29:26 wiz Exp $
  install: ${CMD}
 -	install -c -m 755 ${CMD} ${PREFIX}/${BIN}/${CMD}
 -	install -c -m 444 ${CMD}.man ${PREFIX}/man/man${MAN}/${CMD}.${MAN}
-+	${BSD_INSTALL_SCRIPT} ${CMD} ${PREFIX}/${BIN}/${CMD}
-+	${BSD_INSTALL_MAN} ${CMD}.man ${PREFIX}/man/man${MAN}/${CMD}.${MAN}
++	${BSD_INSTALL_SCRIPT} ${CMD} ${DESTDIR}${PREFIX}/${BIN}/${CMD}
++	${BSD_INSTALL_MAN} ${CMD}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man${MAN}/${CMD}.${MAN}
  
  clean:
  	rm -f ${CMD}
diff --git a/sysutils/dmsdos/Makefile b/sysutils/dmsdos/Makefile
index 783e280ed73..572f95a7ad4 100644
--- a/sysutils/dmsdos/Makefile
+++ b/sysutils/dmsdos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/08 21:18:44 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/27 18:46:39 joerg Exp $
 #
 
 DISTNAME=	dmsdos-0.9.2.3-pre2
@@ -11,12 +11,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cmp.felk.cvut.cz/~pisa/dmsdos/
 COMMENT=	Program to access DBLSPACE/DRVSPACE containers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/dmsdos-0.9.2.3-pre2/src
 
 F=	mcdmsdos.c dblspace_dec.c lib_interface.c dblspace_interface.c \
 	dblspace_chk.c dblspace_tables.c dstacker_alloc.c dblspace_alloc.c \
 	dblspace_compr.c dstacker_compr.c dstacker_dec.c dblspace_methsq.c
 
+INSTALLATION_DIRS=	bin
+
 post-extract:
 	find ${WRKDIR}/dmsdos-0.9.2.3-pre2 -type d -exec chmod +x {} \;
 
@@ -27,6 +31,6 @@ do-build:
 	cd ${WRKSRC} && ${CC} -D__DMSDOS_LIB__ ${F} -o mcdmsdos
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mcdmsdos ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mcdmsdos ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dptutil/Makefile b/sysutils/dptutil/Makefile
index 8c1b1a6a2c4..9298aaade8e 100644
--- a/sysutils/dptutil/Makefile
+++ b/sysutils/dptutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/11 16:46:36 ad Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/27 18:47:15 joerg Exp $
 
 DISTNAME=		raidmgt-3.31
 PKGNAME=		dptutil-3.31
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://opensource.adaptec.com/
 COMMENT=		DPT/Adaptec Storage Management software (dptutil)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # Should work for 32-bit PowerPC and SPARC, but untested.  64-bit platforms
 # may have problems.
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
@@ -27,7 +29,7 @@ post-patch:
 	${MV} ${WRKSRC}/dptutil/makefile.tmp ${WRKSRC}/dptutil/makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${PREFIX}/sbin/dpteng
-	${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${PREFIX}/sbin/dptutil
+	${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${DESTDIR}${PREFIX}/sbin/dpteng
+	${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${DESTDIR}${PREFIX}/sbin/dptutil
 
 .include "../../mk/bsd.pkg.mk"