Remove GNU_PROGRAM_PREFIX as discussed in pkgsrc-users@

5 files changed, 21 insertions, 33 deletions

diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 47bfc5a1122..53edb5c1a3a 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/04/07 17:32:40 dholland Exp $
+# $NetBSD: Makefile,v 1.34 2012/05/30 11:58:52 cheusov Exp $
 #
 
 DISTNAME=	ArX-2.2.4
@@ -17,7 +17,6 @@ DEPENDS+=	patch-[0-9]*:../../devel/patch
 DEPENDS+=	diffutils-[0-9]*:../../devel/diffutils
 DEPENDS+=	gtar-base-[0-9]*:../../archivers/gtar-base
 
-BUILD_DEFS+=	GNU_PROGRAM_PREFIX
 EVAL_PREFIX+=	PREFIX.diffutils=diffutils
 EVAL_PREFIX+=	PREFIX.gtar-base=gtar-base
 
@@ -25,9 +24,9 @@ USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	ARXDIFF=${PREFIX.diffutils}/bin/${GNU_PROGRAM_PREFIX}diff
-CONFIGURE_ARGS+=	ARXPATCH=${PREFIX.diffutils}/bin/${GNU_PROGRAM_PREFIX}patch
-CONFIGURE_ARGS+=	ARXTAR=${PREFIX.gtar-base}/bin/${GNU_PROGRAM_PREFIX}tar
+CONFIGURE_ARGS+=	ARXDIFF=${PREFIX.diffutils}/bin/gdiff
+CONFIGURE_ARGS+=	ARXPATCH=${PREFIX.diffutils}/bin/gpatch
+CONFIGURE_ARGS+=	ARXTAR=${PREFIX.gtar-base}/bin/gtar
 CONFIGURE_ARGS+=	ARXPKGCONFIG=${PKG_CONFIG:Q}
 # XXX Python is needed for build only; this is handled by devel/scons
 CONFIGURE_ARGS+=	ARXPYTHON=${TRUE:Q}
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 4354dcdc83a..221a75a7df1 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/12/11 01:41:53 asau Exp $
+# $NetBSD: Makefile,v 1.29 2012/05/30 11:57:27 cheusov Exp $
 #
 
 DISTNAME=		rcs-5.7
@@ -18,7 +18,7 @@ MAKE_JOBS_SAFE=		no
 DEPENDS+=		diffutils>=2.7:../../devel/diffutils
 CONFIGURE_ARGS+=	--with-diffutils
 # the native diff/diff3 is not sufficient for rcs
-TOOLS_PLATFORM.diff=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
+TOOLS_PLATFORM.diff=	${LOCALBASE}/bin/gdiff
 .endif
 
 GNU_CONFIGURE=		yes
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 959c594224e..fb30d2ca5e1 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2011/11/26 04:39:51 sbd Exp $
+# $NetBSD: Makefile,v 1.39 2012/05/30 11:55:54 cheusov Exp $
 #
 
 DISTNAME=	tla-1.3.5
@@ -33,10 +33,10 @@ OVERRIDE_DIRDEPTH=	3
 CONFIGURE_DIRS=		src/=build
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--with-gnu-diff=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff
-CONFIGURE_ARGS+=	--with-gnu-diff3=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff3
-CONFIGURE_ARGS+=	--with-gnu-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
-CONFIGURE_ARGS+=	--with-gnu-tar=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
+CONFIGURE_ARGS+=	--with-gnu-diff=${PREFIX}/bin/gdiff
+CONFIGURE_ARGS+=	--with-gnu-diff3=${PREFIX}/bin/gdiff3
+CONFIGURE_ARGS+=	--with-gnu-patch=${PREFIX}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-tar=${PREFIX}/bin/gtar
 
 DOCDIR=			${PREFIX}/share/doc/tla
 
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index fa2826f0dd9..2992ae47b68 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.208 2012/05/14 02:22:03 obache Exp $
+# $NetBSD: mk.conf,v 1.209 2012/05/30 12:02:29 cheusov Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -943,11 +943,6 @@ GAMEOWN?=	${GAMES_USER}
 # Possible:	any user name
 # Default:	GAMES_USER
 
-GNU_PROGRAM_PREFIX?=	g
-# This is the prefix to add for GNU programs, like gls or gnutouch.
-# Possible: g, gnu, empty, ...
-# Default: g
-
 #GRUB_NETWORK_CARDS=
 # Compile netboot support for the listed network interface cards into GRUB.
 # Use e.g. "rtl8139" for RealTek 8139 support or "eepro100 epic100" for
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 2189652b6b1..924166fcc24 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.248 2012/04/13 02:25:06 sbd Exp $
+# $NetBSD: replace.mk,v 1.249 2012/05/30 12:02:28 cheusov Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -359,7 +359,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.find=
 TOOLS_DEPENDS.find?=		findutils>=4.1:../../sysutils/findutils
 TOOLS_CREATE+=			find
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.find=findutils
-TOOLS_PATH.find=		${TOOLS_PREFIX.find}/bin/${GNU_PROGRAM_PREFIX}find
+TOOLS_PATH.find=		${TOOLS_PREFIX.find}/bin/gfind
 .  endif
 .endif
 
@@ -397,7 +397,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gawk=
 TOOLS_DEPENDS.gawk?=		gawk>=3.1.1:../../lang/gawk
 TOOLS_CREATE+=			gawk
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gawk=gawk
-TOOLS_PATH.gawk=		${TOOLS_PREFIX.gawk}/bin/${GNU_PROGRAM_PREFIX}awk
+TOOLS_PATH.gawk=		${TOOLS_PREFIX.gawk}/bin/gawk
 .  endif
 TOOLS_ALIASES.gawk=		awk
 .endif
@@ -447,7 +447,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gsed=
 TOOLS_DEPENDS.gsed?=		gsed>=3.0.2:../../textproc/gsed
 TOOLS_CREATE+=			gsed
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gsed=gsed
-TOOLS_PATH.gsed=		${TOOLS_PREFIX.gsed}/bin/${GNU_PROGRAM_PREFIX}sed
+TOOLS_PATH.gsed=		${TOOLS_PREFIX.gsed}/bin/gsed
 .  endif
 TOOLS_ALIASES.gsed=		sed
 .endif
@@ -459,13 +459,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gtar=
 TOOLS_DEPENDS.gtar?=		gtar-base>=1.13.25:../../archivers/gtar-base
 TOOLS_CREATE+=			gtar
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gtar=gtar-base
-.    if defined(GTAR_PROGRAM_PREFIX)
-TOOLS_PATH.gtar=		${TOOLS_PREFIX.gtar}/bin/${GTAR_PROGRAM_PREFIX}tar
-.    elif defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} != ""
-TOOLS_PATH.gtar=		${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
-.    else
 TOOLS_PATH.gtar=		${TOOLS_PREFIX.gtar}/bin/gtar
-.    endif
 .  endif
 .endif
 
@@ -838,7 +832,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.xargs=
 TOOLS_DEPENDS.xargs?=		findutils>=4.1:../../sysutils/findutils
 TOOLS_CREATE+=			xargs
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xargs=findutils
-TOOLS_PATH.xargs=		${TOOLS_PREFIX.xargs}/bin/${GNU_PROGRAM_PREFIX}xargs
+TOOLS_PATH.xargs=		${TOOLS_PREFIX.xargs}/bin/gxargs
 TOOLS_ARGS.xargs=		-r	# don't run command if stdin is empty
 .  endif
 .endif
@@ -926,7 +920,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 TOOLS_DEPENDS.${_t_}?=	coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=		${_t_}
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=coreutils
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
+TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
 .    endif
 .  endif
 .endfor
@@ -941,7 +935,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.[=
 TOOLS_DEPENDS.[?=	coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=		[
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.[=coreutils
-TOOLS_PATH.[=		${TOOLS_PREFIX.[}/bin/${GNU_PROGRAM_PREFIX}[
+TOOLS_PATH.[=		${TOOLS_PREFIX.[}/bin/g[
 .  endif
 .endif
 
@@ -960,7 +954,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 TOOLS_DEPENDS.${_t_}?=	grep>=2.5.1:../../textproc/grep
 TOOLS_CREATE+=		${_t_}
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=grep
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
+TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
 .    endif
 .  endif
 .endfor
@@ -1029,7 +1023,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 TOOLS_DEPENDS.${_t_}?=	diffutils>=2.8.1:../../devel/diffutils
 TOOLS_CREATE+=		${_t_}
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=diffutils
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
+TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
 .    endif
 .  endif
 .endfor