 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.50 2012/12/06 11:40:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2012/12/31 00:27:36 sbd Exp $
 DISTNAME=	binutils-2.22
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://directory.fsf.org/project/binutils/
 COMMENT=	GNU binary utilities
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 EXTRACT_SUFX=	.tar.bz2
 CONFLICTS=	avr-binutils<2.13.2.1nb1
 @@ -21,27 +21,27 @@ REPLACE_LOCALEDIR_PATTERNS+=	Make-in
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lib-path='/lib:/usr/lib'
 CONFIGURE_ARGS+=	--program-prefix=g
 BINUTILS_PREFIX=	${PREFIX}/${MACHINE_GNU_PLATFORM}
 PLIST_SRC=	${PKGDIR}/PLIST.common
 PLIST_SRC+=	${WRKDIR}/PLIST_DYNAMIC
 INFO_FILES=	yes
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 # gprof (XXX: and others?) cannot be built on all platforms
+#
 PLIST_VARS+=	gprof ld
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "IRIX"
 PLIST.gprof=	yes
 EXTRA_FILES+=	gprof
 .endif
 .if ${OPSYS} != "SunOS"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.36 2012/12/06 11:40:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2012/12/31 00:27:36 sbd Exp $
 DISTNAME=	patch-2.5.9
 PKGREVISION=	2
 CATEGORIES=	devel
 # We keep an uncompressed tar archive of the sources on
 # ${MASTER_SITE_LOCAL} so that we won't need gzcat to extract the
 # sources, which could potentially cause a circular dependency on
 # archivers/gzip-base.
+#
 #MASTER_SITES=   ${MASTER_SITE_GNU:=patch/}
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar
 @@ -18,27 +18,27 @@ COMMENT=	Patch files using diff output
 LICENSE=	gnu-gpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
 .include "../../mk/bsd.prefs.mk"
 CONFIGURE_ARGS+=	--program-prefix=g
 INSTALL_MAKE_FLAGS=	bindir=${DESTDIR}${PREFIX}/bin \
 			man1dir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 do-patch:
 	${MV} ${WRKSRC}/pch.c ${WRKSRC}/pch.c.orig
 	${AWK} '/#include <pch.h>/{print $$0 "\n#include <sys/param.h>";next;}\
 		/^#if HAVE_SETMODE_DOS/					\
 		{gsub(/^#if HAVE_SETMODE_DOS/,"#if defined(HAVE_SETMODE_DOS) \\&\\& !(defined(BSD) \\&\\& BSD >= 199306) \\&\\& !defined(__INTERIX)");print $$0; next; } \
 		{print $$0;}'						\
 		< ${WRKSRC}/pch.c.orig 					\
 		> ${WRKSRC}/pch.c
 SYMLINKS	= bin/gpatch ${PKGGNUDIR}bin/patch \
 		man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1
 post-install:

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.52 2012/12/06 11:42:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2012/12/31 00:27:36 sbd Exp $
 DISTNAME=	gawk-4.0.1
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gawk/gawk.html
 COMMENT=	GNU awk
 LICENSE=	gnu-gpl-v3
 CONFLICTS=	ja-gawk-[0-9]*
 @@ -25,23 +25,23 @@ INFO_FILES=		yes
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 LDFLAGS.IRIX+=		-lgen
 CPPFLAGS.OSF1+=		-D_OSF_SOURCE
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64)
 CFLAGS+=	-Dvm_region=vm_region_64
 .endif
-INSTALLATION_DIRS+=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS+=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 post-install:
 	${LN} -s ${PREFIX}/bin/gawk ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/awk
 	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/gawk.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/awk.1
 BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.10.36
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,36 +1,36 @@
-# $NetBSD: Makefile,v 1.33 2012/12/18 12:08:25 tron Exp $
+# $NetBSD: Makefile,v 1.34 2012/12/31 00:27:37 sbd Exp $
 DISTNAME=	grep-2.14
 PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/grep/grep.html
 COMMENT=	GNU grep
 LICENSE=	gnu-gpl-v3 # or later
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		makeinfo msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-perl-regexp
 CONFIGURE_ARGS+=	--program-prefix=g
 CONFIGURE_ENV+=		MKDIR_P=${INSTALL_DATA_DIR:Q}
 INFO_FILES=		yes
 TEXINFO_REQD=		4.0
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 .include "../../mk/bsd.prefs.mk"
 post-install:
 .for g n in  bin/ggrep ${PKGGNUDIR}bin/grep bin/gegrep ${PKGGNUDIR}bin/egrep \
              bin/gfgrep ${PKGGNUDIR}bin/fgrep   \
              man/man1/ggrep.1 ${PKGGNUDIR}${PKGMANDIR}/man1/grep.1 \
              man/man1/ggrep.1 ${PKGGNUDIR}${PKGMANDIR}/man1/egrep.1 \
              man/man1/ggrep.1 ${PKGGNUDIR}${PKGMANDIR}/man1/fgrep.1
 	${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor
 .include "../../devel/gettext-lib/buildlink3.mk"

 @@ -1,35 +1,35 @@
-# $NetBSD: Makefile,v 1.42 2012/12/06 11:43:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2012/12/31 00:27:37 sbd Exp $
+#
 DISTNAME=	sed-4.2.1
 PKGNAME=	g${DISTNAME}
 PKGREVISION=	4
 CATEGORIES=	textproc editors
 MASTER_SITES=	${MASTER_SITE_GNU:=sed/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/sed/sed.html
 COMMENT=	GNU implementation of sed, the POSIX stream editor
 LICENSE=	gnu-gpl-v3 AND gnu-fdl-v1.3
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 INFO_FILES=		YES
 TEST_TARGET=		check
-INSTALLATION_DIRS=	gnu/bin gnu/man/man1
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 # at least Solaris-2.9 has issues with grep/egrep
 USE_TOOLS+=		grep makeinfo
 CONFIGURE_ARGS+=	--program-prefix=g
 .include "../../mk/bsd.prefs.mk"
 post-install:
 .for g n in bin/gsed ${PKGGNUDIR}bin/sed ${PKGMANDIR}/man1/gsed.1 ${PKGGNUDIR}${PKGMANDIR}/man1/sed.1
 	${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor