From 4316f1bb08f881b05a2afcf57700164d722aa536 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 25 Dec 2002 17:51:23 +0000 Subject: Honor GNU_PROGRAM_PREFIX. Patch by Jeremy C. Reed. --- sysutils/fileutils/Makefile | 11 +++-- sysutils/fileutils/PLIST | 102 ++++++++++++++++++++++---------------------- sysutils/findutils/Makefile | 11 ++++- sysutils/findutils/PLIST | 36 ++++++++-------- 4 files changed, 86 insertions(+), 74 deletions(-) (limited to 'sysutils') diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile index 93afb5d7337..354ccbab9db 100644 --- a/sysutils/fileutils/Makefile +++ b/sysutils/fileutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2002/12/06 17:58:07 grant Exp $ +# $NetBSD: Makefile,v 1.26 2002/12/25 17:51:23 wiz Exp $ DISTNAME= fileutils-4.1.11 CATEGORIES= sysutils @@ -12,11 +12,16 @@ COMMENT= GNU file management utilities GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_BUILDLINK2= YES -CONFIGURE_ARGS+= --program-prefix=g \ - --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv} +CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv} .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 + .if ${OPSYS} == SunOS CONFIGURE_SCRIPT= ${SH} ./configure .endif diff --git a/sysutils/fileutils/PLIST b/sysutils/fileutils/PLIST index 0c62fb5a277..02f5756ca69 100644 --- a/sysutils/fileutils/PLIST +++ b/sysutils/fileutils/PLIST @@ -1,57 +1,57 @@ -@comment $NetBSD: PLIST,v 1.5 2002/10/26 15:43:51 grant Exp $ -bin/gchgrp -bin/gchmod -bin/gchown -bin/gcp -bin/gdd -bin/gdf -bin/gdir -bin/gdircolors -bin/gdu -bin/ginstall -bin/glink -bin/gln -bin/gls -bin/gmkdir -bin/gmkfifo -bin/gmknod -bin/gmv -bin/grm -bin/grmdir -bin/gshred -bin/gstat -bin/gsync -bin/gtouch -bin/gunlink -bin/gvdir +@comment $NetBSD: PLIST,v 1.6 2002/12/25 17:51:23 wiz Exp $ +bin/${GNU_PROGRAM_PREFIX}chgrp +bin/${GNU_PROGRAM_PREFIX}chmod +bin/${GNU_PROGRAM_PREFIX}chown +bin/${GNU_PROGRAM_PREFIX}cp +bin/${GNU_PROGRAM_PREFIX}dd +bin/${GNU_PROGRAM_PREFIX}df +bin/${GNU_PROGRAM_PREFIX}dir +bin/${GNU_PROGRAM_PREFIX}dircolors +bin/${GNU_PROGRAM_PREFIX}du +bin/${GNU_PROGRAM_PREFIX}install +bin/${GNU_PROGRAM_PREFIX}link +bin/${GNU_PROGRAM_PREFIX}ln +bin/${GNU_PROGRAM_PREFIX}ls +bin/${GNU_PROGRAM_PREFIX}mkdir +bin/${GNU_PROGRAM_PREFIX}mkfifo +bin/${GNU_PROGRAM_PREFIX}mknod +bin/${GNU_PROGRAM_PREFIX}mv +bin/${GNU_PROGRAM_PREFIX}rm +bin/${GNU_PROGRAM_PREFIX}rmdir +bin/${GNU_PROGRAM_PREFIX}shred +bin/${GNU_PROGRAM_PREFIX}stat +bin/${GNU_PROGRAM_PREFIX}sync +bin/${GNU_PROGRAM_PREFIX}touch +bin/${GNU_PROGRAM_PREFIX}unlink +bin/${GNU_PROGRAM_PREFIX}vdir @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/coreutils.info info/coreutils.info @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/coreutils.info -man/man1/gchgrp.1 -man/man1/gchmod.1 -man/man1/gchown.1 -man/man1/gcp.1 -man/man1/gdd.1 -man/man1/gdf.1 -man/man1/gdir.1 -man/man1/gdircolors.1 -man/man1/gdu.1 -man/man1/ginstall.1 -man/man1/glink.1 -man/man1/gln.1 -man/man1/gls.1 -man/man1/gmkdir.1 -man/man1/gmkfifo.1 -man/man1/gmknod.1 -man/man1/gmv.1 -man/man1/grm.1 -man/man1/grmdir.1 -man/man1/gshred.1 -man/man1/gstat.1 -man/man1/gsync.1 -man/man1/gtouch.1 -man/man1/gunlink.1 -man/man1/gvdir.1 +man/man1/${GNU_PROGRAM_PREFIX}chgrp.1 +man/man1/${GNU_PROGRAM_PREFIX}chmod.1 +man/man1/${GNU_PROGRAM_PREFIX}chown.1 +man/man1/${GNU_PROGRAM_PREFIX}cp.1 +man/man1/${GNU_PROGRAM_PREFIX}dd.1 +man/man1/${GNU_PROGRAM_PREFIX}df.1 +man/man1/${GNU_PROGRAM_PREFIX}dir.1 +man/man1/${GNU_PROGRAM_PREFIX}dircolors.1 +man/man1/${GNU_PROGRAM_PREFIX}du.1 +man/man1/${GNU_PROGRAM_PREFIX}install.1 +man/man1/${GNU_PROGRAM_PREFIX}link.1 +man/man1/${GNU_PROGRAM_PREFIX}ln.1 +man/man1/${GNU_PROGRAM_PREFIX}ls.1 +man/man1/${GNU_PROGRAM_PREFIX}mkdir.1 +man/man1/${GNU_PROGRAM_PREFIX}mkfifo.1 +man/man1/${GNU_PROGRAM_PREFIX}mknod.1 +man/man1/${GNU_PROGRAM_PREFIX}mv.1 +man/man1/${GNU_PROGRAM_PREFIX}rm.1 +man/man1/${GNU_PROGRAM_PREFIX}rmdir.1 +man/man1/${GNU_PROGRAM_PREFIX}shred.1 +man/man1/${GNU_PROGRAM_PREFIX}stat.1 +man/man1/${GNU_PROGRAM_PREFIX}sync.1 +man/man1/${GNU_PROGRAM_PREFIX}touch.1 +man/man1/${GNU_PROGRAM_PREFIX}unlink.1 +man/man1/${GNU_PROGRAM_PREFIX}vdir.1 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/fileutils.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/fileutils.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/fileutils.mo diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile index 96e21895da4..dec19ec7285 100644 --- a/sysutils/findutils/Makefile +++ b/sysutils/findutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/11/29 08:05:31 tron Exp $ +# $NetBSD: Makefile,v 1.7 2002/12/25 17:56:46 wiz Exp $ DISTNAME= findutils-4.1 PKGREVISION= 2 @@ -11,10 +11,17 @@ COMMENT= The GNU find, xargs and locate utilities USE_BUILDLINK2= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --program-prefix=g INFO_FILES= find.info +.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 + .include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST index 668b8899dd1..6d5c69fcdd0 100644 --- a/sysutils/findutils/PLIST +++ b/sysutils/findutils/PLIST @@ -1,23 +1,23 @@ -@comment $NetBSD: PLIST,v 1.3 2002/10/22 11:35:40 wiz Exp $ -bin/gfind -bin/gxargs -bin/glocate -bin/gupdatedb -libexec/gfrcode -libexec/gcode -libexec/gbigram +@comment $NetBSD: PLIST,v 1.4 2002/12/25 17:56:46 wiz Exp $ +bin/${GNU_PROGRAM_PREFIX}find +bin/${GNU_PROGRAM_PREFIX}xargs +bin/${GNU_PROGRAM_PREFIX}locate +bin/${GNU_PROGRAM_PREFIX}updatedb +libexec/${GNU_PROGRAM_PREFIX}frcode +libexec/${GNU_PROGRAM_PREFIX}code +libexec/${GNU_PROGRAM_PREFIX}bigram @unexec ${INSTALL_INFO} --delete %D/info/find.info %D/info/dir info/find.info info/find.info-1 info/find.info-2 @exec ${INSTALL_INFO} %D/info/find.info %D/info/dir -man/cat1/gfind.0 -man/cat1/gxargs.0 -man/cat1/glocate.0 -man/cat1/gupdatedb.0 -man/cat5/glocatedb.0 -man/man1/gfind.1 -man/man1/gxargs.1 -man/man1/glocate.1 -man/man1/gupdatedb.1 -man/man5/glocatedb.5 +man/cat1/${GNU_PROGRAM_PREFIX}find.0 +man/cat1/${GNU_PROGRAM_PREFIX}xargs.0 +man/cat1/${GNU_PROGRAM_PREFIX}locate.0 +man/cat1/${GNU_PROGRAM_PREFIX}updatedb.0 +man/cat5/${GNU_PROGRAM_PREFIX}locatedb.0 +man/man1/${GNU_PROGRAM_PREFIX}find.1 +man/man1/${GNU_PROGRAM_PREFIX}xargs.1 +man/man1/${GNU_PROGRAM_PREFIX}locate.1 +man/man1/${GNU_PROGRAM_PREFIX}updatedb.1 +man/man5/${GNU_PROGRAM_PREFIX}locatedb.5 -- cgit v1.2.3