Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@)

10 files changed, 25 insertions, 46 deletions

diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index 38b29fc8795..5d6695b058f 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2012/03/09 10:20:15 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2012/05/29 22:58:53 cheusov Exp $
 
 DISTNAME=		pax-20080110
+PKGREVISION=		1
 CATEGORIES=		archivers
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -22,19 +23,6 @@ USE_FEATURES=		nbcompat
 
 .if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
 CONFIGURE_ARGS+=	--program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
-
-.else
-
-# pax installs "tar" and "cpio"
-.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) && \
-    (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
-CONFLICTS+=		gcpio-[0-9]*
-.endif
-.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) && \
-    (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX))
-CONFLICTS+=		gtar-base-[0-9]*
-.endif
-
 .endif
 
 PLIST_SUBST+=		NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index a39e844e0e0..8ade87c5e5c 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2011/12/06 00:19:22 sbd Exp $
+# $NetBSD: Makefile,v 1.35 2012/05/29 22:58:53 cheusov Exp $
 #
 
 DISTNAME=	geneweb-5.01
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \
@@ -31,11 +31,8 @@ RCD_SCRIPTS=	geneweb
 
 .include "../../mk/bsd.prefs.mk"
 
-# sysutils/coreutils a 'gwc' program, so conflict with it if
-# ${GNU_PROGRAM_PREFIX} == "g"
-.if ${GNU_PROGRAM_PREFIX} == "g"
+# sysutils/coreutils installs a 'gwc' program, so conflict with it
 CONFLICTS+=	coreutils-[0-9]*
-.endif
 
 # Stripped OCAML binaries don't seem to work any more.
 # Installing unstripped binaries until this is fixed.
diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile
index 1844d8ba0eb..eb847e48274 100644
--- a/devel/cogito/Makefile
+++ b/devel/cogito/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/06/19 19:34:52 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2012/05/29 22:58:53 cheusov Exp $
 #
 
 DISTNAME=		cogito-0.18.2
@@ -40,7 +40,7 @@ REPLACE_PERL+=		cg-Xfollowrenames
 .if ${OPSYS} == "SunOS"
 
 DEPENDS+=	findutils>=4.1:../../sysutils/findutils
-TOOLS_PLATFORM.xargs=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}xargs
+TOOLS_PLATFORM.xargs=	${LOCALBASE}/bin/gxargs
 
 .endif
 
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index 4c16c799aaa..fee501e8829 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/22 09:32:24 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2012/05/29 22:58:53 cheusov Exp $
 #
 
 DISTNAME=	quilt-0.48
@@ -15,14 +15,13 @@ DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
 DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
 DEPENDS+=	patch>=2.4:../../devel/patch
 
-BUILD_DEFS+=	GNU_PROGRAM_PREFIX
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	bash:run gettext-tools gmake msgfmt perl:run
 
-CONFIGURE_ARGS+=	--with-cp=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}cp
-CONFIGURE_ARGS+=	--with-date=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}date
-CONFIGURE_ARGS+=	--with-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
-CONFIGURE_ARGS+=	--with-sed=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}sed
+CONFIGURE_ARGS+=	--with-cp=${PREFIX}/bin/gcp
+CONFIGURE_ARGS+=	--with-date=${PREFIX}/bin/gdate
+CONFIGURE_ARGS+=	--with-patch=${PREFIX}/bin/gpatch
+CONFIGURE_ARGS+=	--with-sed=${PREFIX}/bin/gsed
 CONFIGURE_ARGS+=	--with-sendmail=/usr/sbin/sendmail
 CONFIGURE_ARGS+=	--without-rpmbuild
 CONFIGURE_ARGS+=	--without-getopt
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index cf5d1ab7fd8..686f4f13d4c 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2009/09/16 02:25:34 reed Exp $
+# $NetBSD: Makefile.common,v 1.44 2012/05/29 22:58:52 cheusov Exp $
 
 # used by audio/xfce4-mixer/Makefile
 # used by devel/xfce4-dev-tools/Makefile
@@ -53,5 +53,5 @@ XFCE4_EGBASE=		${PREFIX}/share/examples/xfce4
 ## # Use the latest GNU tar when the native tar is buggy
 ## .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*)
 ## BUILD_DEPENDS+=		gtar-base-[0-9]*:../../archivers/gtar-base
-## GTAR=			${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
+## GTAR=			${PREFIX}/bin/gtar
 ## .endif
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 932b6318a71..56986d467c1 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2012/04/06 12:55:23 marino Exp $
+# $NetBSD: Makefile,v 1.86 2012/05/29 22:58:52 cheusov Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 PKGREVISION=	18
@@ -23,7 +23,7 @@ SUBST_CLASSES+=		tarexe
 SUBST_STAGE.tarexe=	pre-configure
 SUBST_MESSAGE.tarexe=	Use GNU tar in ark
 SUBST_FILES.tarexe=	ark/ark.kcfg
-SUBST_SED.tarexe=	-e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar</default>:'
+SUBST_SED.tarexe=	-e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/gtar</default>:'
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 028917e92c0..8bf61e53b52 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/03/22 11:58:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.8 2012/05/29 22:58:52 cheusov Exp $
 #
 
 PKGNAME=		rabbitmq-${RMQ_VERSION}
@@ -23,7 +23,7 @@ DEPENDS+=		${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
 .include "version.mk"
 .include "../../lang/python/pyversion.mk"
 
-BUILD_DEFS+=		VARBASE GNU_PROGRAM_PREFIX
+BUILD_DEFS+=		VARBASE
 
 .include		"../../mk/bsd.prefs.mk"
 
@@ -63,7 +63,7 @@ SUBST_SED.paths+=	-e 's|/var/lib|${VARBASE}/db|g'
 SUBST_SED.paths+=	-e 's|/var/log|${VARBASE}/log|g'
 SUBST_SED.paths+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.paths+=	-e 's|erl|${PREFIX}/bin/erl|g'
-SUBST_SED.paths+=	-e 's|readlink|${PREFIX}/bin/${GNU_PROGRAM_PREFIX}readlink|g'
+SUBST_SED.paths+=	-e 's|readlink|${PREFIX}/bin/greadlink|g'
 
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmqctl
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-env
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index e96dbde25e2..2f6c65fc896 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2011/08/23 21:47:18 abs Exp $
+# $NetBSD: Makefile,v 1.76 2012/05/29 22:58:52 cheusov Exp $
 #
 
 DISTNAME=	pkgdiff-1.3
@@ -28,7 +28,7 @@ BUILD_DEFS+=	MANINSTALL
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1"
 DEPENDS+=	diffutils-[0-9]*:../../devel/diffutils
-DIFF?=		${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff
+DIFF?=		${PREFIX}/bin/gdiff
 .else
 DIFF?=		diff
 .endif
diff --git a/sysutils/9base/Makefile b/sysutils/9base/Makefile
index 777203c516a..2926889a1a6 100644
--- a/sysutils/9base/Makefile
+++ b/sysutils/9base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/10/27 09:58:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2012/05/29 22:58:52 cheusov Exp $
 #
 
 DISTNAME=	9base-6
+PKGREVISION=	1
 PKGNAME=	9base-20100604
 CATEGORIES=	sysutils shells
 MASTER_SITES=	http://dl.suckless.org/tools/
@@ -34,12 +35,6 @@ LDFLAGS+= -static
 BUILDLINK_TRANSFORM+=	rm:-static
 .endif
 
-.if ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+=		coreutils-[0-9]*
-CONFLICTS+=		grep-[0-9]*
-CONFLICTS+=		gsed-[0-9]*
-.endif
-
 MAKE_FLAGS+=	PREFIX=${PREFIX} \
 		MANPREFIX=${PREFIX}/${PKGMANDIR}
 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 40ce4813e0c..ce9fd748505 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2012/03/10 10:56:12 obache Exp $
+# $NetBSD: Makefile,v 1.231 2012/05/29 22:58:52 cheusov Exp $
 
 DISTNAME=	gtk+-2.24.10
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--disable-visibility
 # which do not have it.
 .if ${OPSYS} == "SunOS"
 BUILD_DEPENDS+=		grep-[0-9]*:../../textproc/grep
-TOOLS_PATH.grep=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
+TOOLS_PATH.grep=	${LOCALBASE}/bin/ggrep
 .endif
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""