[pkgsrc/trunk]: pkgsrc Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsr...

[cheusov <cheusov%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dff4c74a78d
branches:  trunk
changeset: 604380:0dff4c74a78d
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 22:02:31 2012 +0000

description:
Remove GNU_PROGRAM_PREFIX variable (discussed in pkgsrc-users@).
All utilities are installed with a prefix 'g'. Symlinks with original
names are created in ${PREFIX}/gnu/bin.

++pkgrevision

Add LICENSE

diffstat:

 sysutils/findutils/Makefile |  19 +++++++++++--------
 sysutils/findutils/PLIST    |  30 +++++++++++++++++-------------
 textproc/grep/Makefile      |  20 +++++++++++---------
 textproc/grep/PLIST         |  17 ++++++++++-------
 4 files changed, 49 insertions(+), 37 deletions(-)

diffs (153 lines):

diff -r 011a5e7e97ea -r 0dff4c74a78d sysutils/findutils/Makefile
--- a/sysutils/findutils/Makefile       Tue May 29 21:53:55 2012 +0000
+++ b/sysutils/findutils/Makefile       Tue May 29 22:02:31 2012 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.28 2011/04/22 13:44:41 obache Exp $
+# $NetBSD: Makefile,v 1.29 2012/05/29 22:02:31 cheusov Exp $
 
 DISTNAME=      findutils-4.2.33
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNU:=findutils/}
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/findutils/findutils.html
 COMMENT=       The GNU find, xargs and locate utilities
+LICENSE=       gnu-gpl-v3
 
 GNU_CONFIGURE=         YES
 INFO_FILES=            YES
@@ -16,13 +17,15 @@
 
 LDFLAGS.IRIX+=         -lgen
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=       --program-prefix=g
+
+INSTALLATION_DIRS=     gnu/bin
 
-.if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX:Q}
-.endif
-PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+=           GNU_PROGRAM_PREFIX
+post-install:
+       ln -s ../../bin/gfind     ${DESTDIR}${PREFIX}/gnu/bin/find
+       ln -s ../../bin/glocate   ${DESTDIR}${PREFIX}/gnu/bin/locate
+       ln -s ../../bin/gupdatedb ${DESTDIR}${PREFIX}/gnu/bin/updatedb
+       ln -s ../../bin/gxargs    ${DESTDIR}${PREFIX}/gnu/bin/xargs
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 011a5e7e97ea -r 0dff4c74a78d sysutils/findutils/PLIST
--- a/sysutils/findutils/PLIST  Tue May 29 21:53:55 2012 +0000
+++ b/sysutils/findutils/PLIST  Tue May 29 22:02:31 2012 +0000
@@ -1,17 +1,21 @@
-@comment $NetBSD: PLIST,v 1.9 2008/03/08 11:15:03 tnn Exp $
-bin/${GNU_PROGRAM_PREFIX}find
-bin/${GNU_PROGRAM_PREFIX}locate
-bin/${GNU_PROGRAM_PREFIX}updatedb
-bin/${GNU_PROGRAM_PREFIX}xargs
+@comment $NetBSD: PLIST,v 1.10 2012/05/29 22:02:31 cheusov Exp $
+bin/gfind
+bin/glocate
+bin/gupdatedb
+bin/gxargs
+gnu/bin/find
+gnu/bin/locate
+gnu/bin/updatedb
+gnu/bin/xargs
 info/find.info
-libexec/${GNU_PROGRAM_PREFIX}bigram
-libexec/${GNU_PROGRAM_PREFIX}code
-libexec/${GNU_PROGRAM_PREFIX}frcode
-man/man1/${GNU_PROGRAM_PREFIX}find.1
-man/man1/${GNU_PROGRAM_PREFIX}locate.1
-man/man1/${GNU_PROGRAM_PREFIX}updatedb.1
-man/man1/${GNU_PROGRAM_PREFIX}xargs.1
-man/man5/${GNU_PROGRAM_PREFIX}locatedb.5
+libexec/gbigram
+libexec/gcode
+libexec/gfrcode
+man/man1/gfind.1
+man/man1/glocate.1
+man/man1/gupdatedb.1
+man/man1/gxargs.1
+man/man5/glocatedb.5
 share/locale/be/LC_MESSAGES/findutils.mo
 share/locale/bg/LC_MESSAGES/findutils.mo
 share/locale/ca/LC_MESSAGES/findutils.mo
diff -r 011a5e7e97ea -r 0dff4c74a78d textproc/grep/Makefile
--- a/textproc/grep/Makefile    Tue May 29 21:53:55 2012 +0000
+++ b/textproc/grep/Makefile    Tue May 29 22:02:31 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2011/04/22 13:44:49 obache Exp $
+# $NetBSD: Makefile,v 1.26 2012/05/29 22:10:24 cheusov Exp $
 #
 
 DISTNAME=      grep-2.5.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,6 +10,7 @@
 MAINTAINER=    bouyer%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/grep/grep.html
 COMMENT=       GNU grep
+LICENSE=       gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -17,17 +18,18 @@
 CONFIGURE_ARGS+=       --disable-perl-regexp
 USE_PKGLOCALEDIR=      YES
 USE_TOOLS+=            makeinfo msgfmt
-INFO_FILES=            # PLIST
+INFO_FILES=            yes
 TEXINFO_REQD=          4.0
 CONFIGURE_ENV+=                MKDIR_P=${INSTALL_DATA_DIR:Q}
 
-.include "../../mk/bsd.prefs.mk"
+INSTALLATION_DIRS=     gnu/bin
+
+CONFIGURE_ARGS+=       --program-prefix=g
 
-.if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX:Q}
-.endif
-PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+=           GNU_PROGRAM_PREFIX
+post-install:
+.for p in grep egrep fgrep
+       ln -s ../../bin/g${p} ${DESTDIR}${PREFIX}/gnu/bin/${p}
+.endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 011a5e7e97ea -r 0dff4c74a78d textproc/grep/PLIST
--- a/textproc/grep/PLIST       Tue May 29 21:53:55 2012 +0000
+++ b/textproc/grep/PLIST       Tue May 29 22:02:31 2012 +0000
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2008/03/08 12:16:43 tnn Exp $
-bin/${GNU_PROGRAM_PREFIX}egrep
-bin/${GNU_PROGRAM_PREFIX}fgrep
-bin/${GNU_PROGRAM_PREFIX}grep
+@comment $NetBSD: PLIST,v 1.8 2012/05/29 22:10:24 cheusov Exp $
+bin/gegrep
+bin/gfgrep
+bin/ggrep
+gnu/bin/egrep
+gnu/bin/fgrep
+gnu/bin/grep
 info/grep.info
-man/man1/${GNU_PROGRAM_PREFIX}egrep.1
-man/man1/${GNU_PROGRAM_PREFIX}fgrep.1
-man/man1/${GNU_PROGRAM_PREFIX}grep.1
+man/man1/gegrep.1
+man/man1/gfgrep.1
+man/man1/ggrep.1
 share/locale/af/LC_MESSAGES/grep.mo
 share/locale/be/LC_MESSAGES/grep.mo
 share/locale/bg/LC_MESSAGES/grep.mo