Add PKGGNUDIR support.

6 files changed, 21 insertions, 19 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 9232fe2302a..4b648892890 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/11/21 07:46:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2012/12/06 11:40:57 jperkin Exp $
 
 DISTNAME=	binutils-2.22
 PKGREVISION=	1
@@ -84,11 +84,11 @@ post-install:
 .for f in ${SYMLINK_FILES}
 	set -e; \
 	if [ -f ${DESTDIR}${PREFIX}/bin/g${f:Q} ]; then \
-	    ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}; \
+	    ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}; \
 	fi
 	if [ -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1 ]; then \
 	    ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 \
-	              ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1; \
+	              ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1; \
 	fi
 .endfor
 
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 16746b5e521..888331b6e53 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/31 11:16:53 asau Exp $
+# $NetBSD: Makefile,v 1.30 2012/12/06 11:40:58 jperkin Exp $
 #
 
 DISTNAME=		diffutils-3.2
@@ -28,8 +28,8 @@ AUTO_MKDIRS=		yes
 
 post-install:
 .for f in cmp diff diff3 sdiff
-	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 
 CONFIGURE_ARGS+=	--program-prefix=g
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index ee7f14c5186..a3b4ec2689f 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2012/10/31 11:17:00 asau Exp $
+# $NetBSD: Makefile,v 1.52 2012/12/06 11:40:58 jperkin Exp $
 #
 
 DISTNAME=	indent-2.2.9
@@ -22,10 +22,12 @@ MAKE_JOBS_SAFE=		no
 
 AUTO_MKDIRS=		yes
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
-	${LN} -sf ${PREFIX}/bin/gindent ${DESTDIR}${PREFIX}/gnu/bin/indent
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gindent.1 ${DESTDIR}${PREFIX}/gnu/man/man1/indent.1
-	${LN} -sf ${PREFIX}/bin/gtexinfo2man ${DESTDIR}${PREFIX}/gnu/bin/texinfo2man
+	${LN} -sf ${PREFIX}/bin/gindent ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/indent
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gindent.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/indent.1
+	${LN} -sf ${PREFIX}/bin/gtexinfo2man ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/texinfo2man
 
 CONFIGURE_ARGS+=	--program-prefix=g
 
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 1814303a2d4..56b1dbe86e6 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2012/10/31 11:17:01 asau Exp $
+# $NetBSD: Makefile,v 1.84 2012/12/06 11:40:59 jperkin Exp $
 
 DISTNAME=	make-3.82
 PKGNAME=	g${DISTNAME}
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	ac_cv_func_strndup=no
 post-install:
 	${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/gmake
 	${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/gmake
-	${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/gnu/bin/make
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/gnu/man/man1/make.1
+	${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}/bin/make
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index cb3f1929ca1..18e75871843 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2012/10/31 11:17:27 asau Exp $
+# $NetBSD: Makefile,v 1.70 2012/12/06 11:40:59 jperkin Exp $
 
 DISTNAME=	m4-1.4.16
 PKGREVISION=	3
@@ -29,7 +29,7 @@ AUTO_MKDIRS=		yes
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4
-	${LN} -sf ${PREFIX}/bin/gm4 ${DESTDIR}${PREFIX}/gnu/bin/m4
-	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gm4.1 ${DESTDIR}${PREFIX}/gnu/man/man1/m4.1
+	${LN} -sf ${PREFIX}/bin/gm4 ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/m4
+	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gm4.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/m4.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 01009475236..7093f233381 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2012/10/31 11:19:22 asau Exp $
+# $NetBSD: Makefile,v 1.36 2012/12/06 11:40:59 jperkin Exp $
 
 DISTNAME=	patch-2.5.9
 PKGREVISION=	2
@@ -39,8 +39,8 @@ do-patch:
 		< ${WRKSRC}/pch.c.orig 					\
 		> ${WRKSRC}/pch.c
 
-SYMLINKS	= bin/gpatch gnu/bin/patch \
-		man/man1/gpatch.1 gnu/man/man1/patch.1
+SYMLINKS	= bin/gpatch ${PKGGNUDIR}bin/patch \
+		man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1
 post-install:
 .for o n in ${SYMLINKS}
 	${LN} -sf ${PREFIX}/${o} ${DESTDIR}${PREFIX}/${n}