fixup DESTDIR - bump pkgrevision

3 files changed, 22 insertions, 14 deletions

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 18afabad782..a0d9ca36d8a 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2008/06/12 02:14:22 joerg Exp $
+# $NetBSD: Makefile,v 1.123 2008/06/12 13:37:19 abs Exp $
 
 DISTNAME=	cpuflags-1.18
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/cpuflags/files/Makefile b/devel/cpuflags/files/Makefile
index 1ebbd1f20fc..abf909e2b6f 100644
--- a/devel/cpuflags/files/Makefile
+++ b/devel/cpuflags/files/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 2007/08/27 10:08:29 abs Exp $
+# $Id: Makefile,v 1.13 2008/06/12 13:37:19 abs Exp $
 
 VERSION=1.14
 
@@ -9,9 +9,12 @@ MANDIR?=${PREFIX}/man/man1
 SUBRDIR?=${PREFIX}/share/cpuflags
 SHAREMKDIR?=${PREFIX}/share/mk
 BINDIR?=${PREFIX}/bin
-BSD_INSTALL_DATA?=install
-BSD_INSTALL_MAN?=install
-BSD_INSTALL_SCRIPT?=install
+INSTALL_DATA?=install
+INSTALL_MAN?=install
+INSTALL_SCRIPT?=install
+INSTALL_PROGRAM_DIR?=mkdir -p
+INSTALL_MAN_DIR?=mkdir -p
+INSTALL_DATA_DIR?=mkdir -p
 SED?=sed
 
 all:
@@ -23,12 +26,15 @@ clean:
 	rm -rf *.out DIST
 
 install:
-	mkdir -p ${BINDIR} ${MANDIR} ${SHAREMKDIR} ${SUBRDIR}
-	${BSD_INSTALL_SCRIPT} cpuflags.sh.out	${BINDIR}/cpuflags
-	${BSD_INSTALL_MAN} cpuflags.1.out	${MANDIR}/cpuflags.1
-	${BSD_INSTALL_DATA} optimize_gcc.mk	${SHAREMKDIR}/optimize_gcc.mk
-	${BSD_INSTALL_DATA} cpuflags.mk.out	${SHAREMKDIR}/cpuflags.mk
-	${BSD_INSTALL_DATA} subr_*		${SUBRDIR}
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}/${BINDIR}
+	${INSTALL_MAN_DIR} ${DESTDIR}/${MANDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}/${SHAREMKDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}/${SUBRDIR}
+	${INSTALL_SCRIPT} cpuflags.sh.out	${DESTDIR}/${BINDIR}/cpuflags
+	${INSTALL_MAN} cpuflags.1.out	${DESTDIR}/${MANDIR}/cpuflags.1
+	${INSTALL_DATA} optimize_gcc.mk	${DESTDIR}/${SHAREMKDIR}/optimize_gcc.mk
+	${INSTALL_DATA} cpuflags.mk.out	${DESTDIR}/${SHAREMKDIR}/cpuflags.mk
+	${INSTALL_DATA} subr_*		${DESTDIR}/${SUBRDIR}
 
 dist:
 	mkdir -p DIST/cpuflags-${VERSION}
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index b171277677b..619f29addd5 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2008/06/12 02:14:42 joerg Exp $
+# $NetBSD: Makefile,v 1.67 2008/06/12 13:38:28 abs Exp $
 
 DISTNAME=	pkg_chk-1.94
+PKGREVISION=	1
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -41,7 +42,7 @@ do-extract:
 	cp ${FILESDIR}/pkg_chk.8 ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pkg_chk.sh ${PREFIX}/sbin/pkg_chk
-	${INSTALL_MAN} ${WRKSRC}/pkg_chk.8 ${PREFIX}/${PKGMANDIR}/man8/pkg_chk.8
+	${INSTALL_SCRIPT} ${WRKSRC}/pkg_chk.sh ${DESTDIR}/${PREFIX}/sbin/pkg_chk
+	${INSTALL_MAN} ${WRKSRC}/pkg_chk.8 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8/pkg_chk.8
 
 .include "../../mk/bsd.pkg.mk"