diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,6 +1,6 @@ PORTNAME= cpio PORTVERSION= 2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= GNU PKGNAMEPREFIX= g @@ -29,4 +29,8 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gcpio ${STAGEDIR}${PREFIX}/gnubin/cpio + .include diff --git a/archivers/gcpio/pkg-descr b/archivers/gcpio/pkg-descr --- a/archivers/gcpio/pkg-descr +++ b/archivers/gcpio/pkg-descr @@ -12,6 +12,7 @@ Note that this port will install these utilities with a 'g' prefix, e.g. gcpio, but the texinfo documentation will refer to them without -the 'g' prefix. +the 'g' prefix. Prepend '/usr/local/gnubin' to your 'PATH' to use +them without the 'g' prefix. WWW: http://www.gnu.org/software/cpio/ diff --git a/archivers/gcpio/pkg-plist b/archivers/gcpio/pkg-plist --- a/archivers/gcpio/pkg-plist +++ b/archivers/gcpio/pkg-plist @@ -1,4 +1,5 @@ bin/gcpio +gnubin/cpio man/man1/gcpio.1.gz %%NLS%%share/locale/da/LC_MESSAGES/cpio.mo %%NLS%%share/locale/de/LC_MESSAGES/cpio.mo diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -2,6 +2,7 @@ PORTNAME= tar PORTVERSION= 1.34 +PORTREVISION= 1 CATEGORIES= archivers sysutils MASTER_SITES= GNU PKGNAMEPREFIX= g @@ -38,4 +39,8 @@ STATIC_VARS= STATIC_ARGS=build STATIC_VARS_OFF= STATIC_ARGS=lib +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gtar ${STAGEDIR}${PREFIX}/gnubin/tar + .include diff --git a/archivers/gtar/pkg-descr b/archivers/gtar/pkg-descr --- a/archivers/gtar/pkg-descr +++ b/archivers/gtar/pkg-descr @@ -9,6 +9,7 @@ Note that this port will install these utilities with a 'g' prefix, e.g. gtar, but the man pages and info documentation will refer to -them without the 'g' prefix. +them without the 'g' prefix. Prepend '/usr/local/gnubin' to your +'PATH' to use them without the 'g' prefix. WWW: http://www.gnu.org/software/tar/ diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist --- a/archivers/gtar/pkg-plist +++ b/archivers/gtar/pkg-plist @@ -1,4 +1,5 @@ bin/gtar +gnubin/tar libexec/grmt man/man1/gtar.1.gz man/man8/grmt.8.gz diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile --- a/archivers/sharutils/Makefile +++ b/archivers/sharutils/Makefile @@ -2,7 +2,7 @@ PORTNAME= sharutils PORTVERSION= 4.15.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= GNU @@ -57,4 +57,9 @@ ${WRKSRC}/doc/${man} .endfor +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gshar ${STAGEDIR}${PREFIX}/gnubin/shar + @${LN} -sf ../bin/gunshar ${STAGEDIR}${PREFIX}/gnubin/unshar + .include diff --git a/archivers/sharutils/pkg-plist b/archivers/sharutils/pkg-plist --- a/archivers/sharutils/pkg-plist +++ b/archivers/sharutils/pkg-plist @@ -1,5 +1,7 @@ bin/gshar bin/gunshar +gnubin/shar +gnubin/unshar man/man1/gshar.1.gz man/man1/gunshar.1.gz %%NLS%%share/locale/bg/LC_MESSAGES/sharutils.mo diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -2,7 +2,7 @@ PORTNAME= gindent DISTVERSION= 2.2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU/indent DISTNAME= indent-${DISTVERSION} @@ -32,4 +32,8 @@ @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gindent ${STAGEDIR}${PREFIX}/gnubin/indent + .include diff --git a/devel/gindent/pkg-plist b/devel/gindent/pkg-plist --- a/devel/gindent/pkg-plist +++ b/devel/gindent/pkg-plist @@ -1,4 +1,5 @@ bin/gindent +gnubin/indent man/man1/gindent.1.gz %%PORTDOCS%%%%DOCSDIR%%/indent.html %%NLS%%share/locale/bg/LC_MESSAGES/indent.mo diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmake PORTVERSION= 4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= GNU/make DISTNAME= make-${PORTVERSION} @@ -31,4 +31,8 @@ INFO= make +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gmake ${STAGEDIR}${PREFIX}/gnubin/make + .include diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist --- a/devel/gmake/pkg-plist +++ b/devel/gmake/pkg-plist @@ -1,4 +1,5 @@ bin/gmake +gnubin/make include/gnumake.h %%NLS%%share/locale/be/LC_MESSAGES/make.mo %%NLS%%share/locale/bg/LC_MESSAGES/make.mo diff --git a/devel/m4/Makefile b/devel/m4/Makefile --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -2,7 +2,7 @@ PORTNAME= m4 PORTVERSION= 1.4.18 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNU @@ -32,6 +32,10 @@ @${REINPLACE_CMD} -e '/^* M4: / s|M4|G&|' ${WRKSRC}/doc/m4.texi @${REINPLACE_CMD} -e '/^install-exec-am: / s| .*||' ${WRKSRC}/lib/Makefile.in +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gm4 ${STAGEDIR}${PREFIX}/gnubin/m4 + post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${STAGEDIR}${EXAMPLESDIR}/ diff --git a/devel/m4/pkg-plist b/devel/m4/pkg-plist --- a/devel/m4/pkg-plist +++ b/devel/m4/pkg-plist @@ -1,4 +1,5 @@ bin/gm4 +gnubin/m4 man/man1/gm4.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/capitalize.m4 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/capitalize2.m4 diff --git a/devel/patch/Makefile b/devel/patch/Makefile --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -2,7 +2,7 @@ PORTNAME= patch PORTVERSION= 2.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU DEBIAN_POOL:dp DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -26,10 +26,14 @@ TEST_TARGET= check -PLIST_FILES= bin/gpatch man/man1/gpatch.1.gz +PLIST_FILES= bin/gpatch gnubin/patch man/man1/gpatch.1.gz post-patch: @${REINPLACE_CMD} -e '/^LOG_COMPILER =/,+1s|$$(SHELL)|bash|' \ ${WRKSRC}/tests/Makefile.in +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gpatch ${STAGEDIR}${PREFIX}/gnubin/patch + .include diff --git a/math/units/Makefile b/math/units/Makefile --- a/math/units/Makefile +++ b/math/units/Makefile @@ -2,7 +2,7 @@ PORTNAME= units PORTVERSION= 2.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= GNU @@ -26,4 +26,8 @@ 's|$$(INSTALL_PROGRAM) units_cur|${INSTALL_SCRIPT} units_cur|' \ ${WRKSRC}/Makefile.in +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gunits ${STAGEDIR}${PREFIX}/gnubin/units + .include diff --git a/math/units/pkg-plist b/math/units/pkg-plist --- a/math/units/pkg-plist +++ b/math/units/pkg-plist @@ -1,4 +1,5 @@ bin/gunits +gnubin/units %%DATADIR%%/currency.units %%DATADIR%%/definitions.units %%DATADIR%%/locale_map.txt diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile --- a/misc/findutils/Makefile +++ b/misc/findutils/Makefile @@ -2,6 +2,7 @@ PORTNAME= findutils PORTVERSION= 4.8.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= GNU @@ -28,4 +29,10 @@ LOCALSTATEDIR?= /var/db +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin +.for cmd in find updatedb locate xargs + @${LN} -sf ../bin/g${cmd} ${STAGEDIR}${PREFIX}/gnubin/${cmd} +.endfor + .include diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist --- a/misc/findutils/pkg-plist +++ b/misc/findutils/pkg-plist @@ -2,6 +2,10 @@ bin/glocate bin/gupdatedb bin/gxargs +gnubin/find +gnubin/locate +gnubin/updatedb +gnubin/xargs libexec/gfrcode man/man1/gfind.1.gz man/man1/glocate.1.gz diff --git a/misc/gwhich/Makefile b/misc/gwhich/Makefile --- a/misc/gwhich/Makefile +++ b/misc/gwhich/Makefile @@ -2,7 +2,7 @@ PORTNAME= gwhich PORTVERSION= 2.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= GNU/which DISTNAME= which-${PORTVERSION} @@ -15,12 +15,14 @@ INFO= which PORTEXAMPLES= EXAMPLES -PLIST_FILES= bin/gwhich man/man1/gwhich.1.gz +PLIST_FILES= bin/gwhich gnubin/which man/man1/gwhich.1.gz OPTIONS_DEFINE= EXAMPLES post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gwhich ${STAGEDIR}${PREFIX}/gnubin/which .include diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= coreutils PORTVERSION= 8.32 +PORTREVISION= 1 CATEGORIES= sysutils textproc MASTER_SITES= GNU @@ -31,6 +32,8 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +.include "${.CURDIR}/Makefile.COMMANDS" + CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib @@ -41,5 +44,9 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \ ${STAGEDIR}${PREFIX}/libexec/coreutils/libstdbuf.so + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin +.for cmd in ${COMMANDS} + @${LN} -sf ../bin/g${cmd:S/stat/nustat/} ${STAGEDIR}${PREFIX}/gnubin/${cmd} +.endfor .include diff --git a/sysutils/coreutils/pkg-descr b/sysutils/coreutils/pkg-descr --- a/sysutils/coreutils/pkg-descr +++ b/sysutils/coreutils/pkg-descr @@ -15,7 +15,8 @@ Note that this port will install these utilities with a `g' prefix, for example gdate, gexpr, and gtest, but the texinfo documentation -will refer to them without the `g' prefix. +will refer to them without the `g' prefix. Prepend '/usr/local/gnubin' to +your 'PATH' to use them without prefixing 'g'. GNU su does not support a wheel group. This port installs it without the suid bit, unless you define WITH_SUID while building. diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist --- a/sysutils/coreutils/pkg-plist +++ b/sysutils/coreutils/pkg-plist @@ -104,6 +104,112 @@ bin/gwho bin/gwhoami bin/gyes +gnubin/[ +gnubin/b2sum +gnubin/base32 +gnubin/base64 +gnubin/basename +gnubin/basenc +gnubin/cat +gnubin/chcon +gnubin/chgrp +gnubin/chmod +gnubin/chown +gnubin/chroot +gnubin/cksum +gnubin/comm +gnubin/cp +gnubin/csplit +gnubin/cut +gnubin/date +gnubin/dd +gnubin/df +gnubin/dir +gnubin/dircolors +gnubin/dirname +gnubin/du +gnubin/echo +gnubin/env +gnubin/expand +gnubin/expr +gnubin/factor +gnubin/false +gnubin/fmt +gnubin/fold +gnubin/groups +gnubin/head +gnubin/hostid +gnubin/id +gnubin/install +gnubin/join +gnubin/kill +gnubin/link +gnubin/ln +gnubin/logname +gnubin/ls +gnubin/md5sum +gnubin/mkdir +gnubin/mkfifo +gnubin/mknod +gnubin/mktemp +gnubin/mv +gnubin/nice +gnubin/nl +gnubin/nohup +gnubin/nproc +gnubin/numfmt +gnubin/od +gnubin/paste +gnubin/pathchk +gnubin/pinky +gnubin/pr +gnubin/printenv +gnubin/printf +gnubin/ptx +gnubin/pwd +gnubin/readlink +gnubin/realpath +gnubin/rm +gnubin/rmdir +gnubin/runcon +gnubin/seq +gnubin/sha1sum +gnubin/sha224sum +gnubin/sha256sum +gnubin/sha384sum +gnubin/sha512sum +gnubin/shred +gnubin/shuf +gnubin/sleep +gnubin/sort +gnubin/split +gnubin/stat +gnubin/stdbuf +gnubin/stty +gnubin/sum +gnubin/sync +gnubin/tac +gnubin/tail +gnubin/tee +gnubin/test +gnubin/timeout +gnubin/touch +gnubin/tr +gnubin/true +gnubin/truncate +gnubin/tsort +gnubin/tty +gnubin/uname +gnubin/unexpand +gnubin/uniq +gnubin/unlink +gnubin/uptime +gnubin/users +gnubin/vdir +gnubin/wc +gnubin/who +gnubin/whoami +gnubin/yes libexec/coreutils/libstdbuf.so man/man1/gb2sum.1.gz man/man1/gbase32.1.gz diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile --- a/textproc/diffutils/Makefile +++ b/textproc/diffutils/Makefile @@ -2,6 +2,7 @@ PORTNAME= diffutils PORTVERSION= 3.7 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= GNU @@ -27,4 +28,10 @@ @${REINPLACE_CMD} -e '/^mkdir/s:@mkdir_p@:${MKDIR}:' \ ${WRKSRC}/po/Makefile.in.in +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin +.for cmd in cmp diff diff3 sdiff + @${LN} -sf ../bin/g${cmd} ${STAGEDIR}${PREFIX}/gnubin/${cmd} +.endif + .include diff --git a/textproc/diffutils/pkg-descr b/textproc/diffutils/pkg-descr --- a/textproc/diffutils/pkg-descr +++ b/textproc/diffutils/pkg-descr @@ -6,6 +6,7 @@ Note that this port will install these utilities with a 'g' prefix, for example gdiff, gdiff3, gcmp, but the texinfo documentation -will refer to these utilities without the 'g' prefix. +will refer to these utilities without the 'g' prefix. Prepend +'/usr/local/gnubin' to your 'PATH' to use them without the 'g' prefix. WWW: http://www.gnu.org/software/diffutils/diffutils.html diff --git a/textproc/diffutils/pkg-plist b/textproc/diffutils/pkg-plist --- a/textproc/diffutils/pkg-plist +++ b/textproc/diffutils/pkg-plist @@ -2,6 +2,10 @@ bin/gdiff bin/gdiff3 bin/gsdiff +gnubin/cmp +gnubin/diff +gnubin/diff3 +gnubin/sdiff man/man1/gcmp.1.gz man/man1/gdiff.1.gz man/man1/gdiff3.1.gz diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -2,6 +2,7 @@ PORTNAME= sed PORTVERSION= 4.8 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= GNU PKGNAMEPREFIX= g @@ -36,6 +37,10 @@ @${REINPLACE_CMD} 's,^\* sed:,* GNU sed:,' \ ${WRKSRC}/doc/config.texi +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/gnubin + @${LN} -sf ../bin/gsed ${STAGEDIR}${PREFIX}/gnubin/sed + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} diff --git a/textproc/gsed/pkg-plist b/textproc/gsed/pkg-plist --- a/textproc/gsed/pkg-plist +++ b/textproc/gsed/pkg-plist @@ -1,4 +1,5 @@ bin/gsed +gnubin/sed man/man1/gsed.1.gz %%NLS%%share/locale/af/LC_MESSAGES/sed.mo %%NLS%%share/locale/ast/LC_MESSAGES/sed.mo