Use GNU_PROGRAM_PREFIX. Based on a patch by Jeremy C. Reed.

2 files changed, 63 insertions, 56 deletions

diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index 7f2ef51684a..eb941766ceb 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.11 2002/07/24 19:45:28 jlam Exp $
-# FreeBSD Id: ports/textproc/textutils/Makefile,v 1.7 1999/09/18 17:46:30 steve Exp
+# $NetBSD: Makefile,v 1.12 2002/12/22 17:27:28 wiz Exp $
+#
 
 DISTNAME=	textutils-2.0
 CATEGORIES=	textproc
@@ -12,7 +12,14 @@ COMMENT=	GNU text utilities
 USE_PERL5=	build
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--program-prefix=g
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GNU_PROGRAM_PREFIX)
+CONFIGURE_ARGS=	--program-prefix=${GNU_PROGRAM_PREFIX}
+.endif
+PLIST_SUBST+=	GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+BUILD_DEFS+=	GNU_PROGRAM_PREFIX
 
 post-install:
 	${INSTALL_INFO} ${PREFIX}/info/textutils.info ${PREFIX}/info/dir
diff --git a/textproc/textutils/PLIST b/textproc/textutils/PLIST
index 1be8ef7733e..af570988982 100644
--- a/textproc/textutils/PLIST
+++ b/textproc/textutils/PLIST
@@ -1,60 +1,60 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $
-bin/gcat
-bin/gcksum
-bin/gcomm
-bin/gcsplit
-bin/gcut
-bin/gexpand
-bin/gfmt
-bin/gfold
-bin/ghead
-bin/gjoin
-bin/gmd5sum
-bin/gnl
-bin/god
-bin/gpaste
-bin/gpr
-bin/gptx
-bin/gsort
-bin/gsplit
-bin/gsum
-bin/gtac
-bin/gtail
-bin/gtr
-bin/gtsort
-bin/gunexpand
-bin/guniq
-bin/gwc
+@comment $NetBSD: PLIST,v 1.3 2002/12/22 17:27:29 wiz Exp $
+bin/${GNU_PROGRAM_PREFIX}cat
+bin/${GNU_PROGRAM_PREFIX}cksum
+bin/${GNU_PROGRAM_PREFIX}comm
+bin/${GNU_PROGRAM_PREFIX}csplit
+bin/${GNU_PROGRAM_PREFIX}cut
+bin/${GNU_PROGRAM_PREFIX}expand
+bin/${GNU_PROGRAM_PREFIX}fmt
+bin/${GNU_PROGRAM_PREFIX}fold
+bin/${GNU_PROGRAM_PREFIX}head
+bin/${GNU_PROGRAM_PREFIX}join
+bin/${GNU_PROGRAM_PREFIX}md5sum
+bin/${GNU_PROGRAM_PREFIX}nl
+bin/${GNU_PROGRAM_PREFIX}od
+bin/${GNU_PROGRAM_PREFIX}paste
+bin/${GNU_PROGRAM_PREFIX}pr
+bin/${GNU_PROGRAM_PREFIX}ptx
+bin/${GNU_PROGRAM_PREFIX}sort
+bin/${GNU_PROGRAM_PREFIX}split
+bin/${GNU_PROGRAM_PREFIX}sum
+bin/${GNU_PROGRAM_PREFIX}tac
+bin/${GNU_PROGRAM_PREFIX}tail
+bin/${GNU_PROGRAM_PREFIX}tr
+bin/${GNU_PROGRAM_PREFIX}tsort
+bin/${GNU_PROGRAM_PREFIX}unexpand
+bin/${GNU_PROGRAM_PREFIX}uniq
+bin/${GNU_PROGRAM_PREFIX}wc
 @unexec ${INSTALL_INFO} --delete %D/info/textutils.info %D/info/dir
 info/textutils.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec ${INSTALL_INFO} %D/info/textutils.info %D/info/dir
-man/man1/gcat.1
-man/man1/gcksum.1
-man/man1/gcomm.1
-man/man1/gcsplit.1
-man/man1/gcut.1
-man/man1/gexpand.1
-man/man1/gfmt.1
-man/man1/gfold.1
-man/man1/ghead.1
-man/man1/gjoin.1
-man/man1/gmd5sum.1
-man/man1/gnl.1
-man/man1/god.1
-man/man1/gpaste.1
-man/man1/gpr.1
-man/man1/gptx.1
-man/man1/gsort.1
-man/man1/gsplit.1
-man/man1/gsum.1
-man/man1/gtac.1
-man/man1/gtail.1
-man/man1/gtr.1
-man/man1/gtsort.1
-man/man1/gunexpand.1
-man/man1/guniq.1
-man/man1/gwc.1
+man/man1/${GNU_PROGRAM_PREFIX}cat.1
+man/man1/${GNU_PROGRAM_PREFIX}cksum.1
+man/man1/${GNU_PROGRAM_PREFIX}comm.1
+man/man1/${GNU_PROGRAM_PREFIX}csplit.1
+man/man1/${GNU_PROGRAM_PREFIX}cut.1
+man/man1/${GNU_PROGRAM_PREFIX}expand.1
+man/man1/${GNU_PROGRAM_PREFIX}fmt.1
+man/man1/${GNU_PROGRAM_PREFIX}fold.1
+man/man1/${GNU_PROGRAM_PREFIX}head.1
+man/man1/${GNU_PROGRAM_PREFIX}join.1
+man/man1/${GNU_PROGRAM_PREFIX}md5sum.1
+man/man1/${GNU_PROGRAM_PREFIX}nl.1
+man/man1/${GNU_PROGRAM_PREFIX}od.1
+man/man1/${GNU_PROGRAM_PREFIX}paste.1
+man/man1/${GNU_PROGRAM_PREFIX}pr.1
+man/man1/${GNU_PROGRAM_PREFIX}ptx.1
+man/man1/${GNU_PROGRAM_PREFIX}sort.1
+man/man1/${GNU_PROGRAM_PREFIX}split.1
+man/man1/${GNU_PROGRAM_PREFIX}sum.1
+man/man1/${GNU_PROGRAM_PREFIX}tac.1
+man/man1/${GNU_PROGRAM_PREFIX}tail.1
+man/man1/${GNU_PROGRAM_PREFIX}tr.1
+man/man1/${GNU_PROGRAM_PREFIX}tsort.1
+man/man1/${GNU_PROGRAM_PREFIX}unexpand.1
+man/man1/${GNU_PROGRAM_PREFIX}uniq.1
+man/man1/${GNU_PROGRAM_PREFIX}wc.1
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/textutils.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/textutils.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/textutils.mo