[pkgsrc/trunk]: pkgsrc/devel/patch Remove GNU_PROGRAM_PREFIX variable (discus...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c14ec93c65f0
branches:  trunk
changeset: 604371:c14ec93c65f0
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 21:19:30 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

diffstat:

 devel/patch/Makefile |  21 ++++++---------------
 devel/patch/PLIST    |   8 ++++----
 2 files changed, 10 insertions(+), 19 deletions(-)

diffs (60 lines):

diff -r 0d1522ee9a3f -r c14ec93c65f0 devel/patch/Makefile
--- a/devel/patch/Makefile      Tue May 29 21:07:49 2012 +0000
+++ b/devel/patch/Makefile      Tue May 29 21:19:30 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2011/07/09 10:32:17 tron Exp $
+# $NetBSD: Makefile,v 1.33 2012/05/29 21:19:30 cheusov Exp $
 
 DISTNAME=      patch-2.5.9
+PKGREVISION=   1
 CATEGORIES=    devel
 # We keep an uncompressed tar archive of the sources on
 # ${MASTER_SITE_LOCAL} so that we won't need gzcat to extract the
@@ -23,21 +24,13 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.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
-
-PLIST_VARS+=           gpatch
-
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-PLIST.gpatch=          yes
-.endif
+CONFIGURE_ARGS+=       --program-prefix=g
 
 INSTALL_MAKE_FLAGS=    bindir=${DESTDIR}${PREFIX}/bin \
                        man1dir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+INSTALLATION_DIRS=     gnu/bin
+
 do-patch:
        ${MV} ${WRKSRC}/pch.c ${WRKSRC}/pch.c.orig
        ${AWK} '/#include <pch.h>/{print $$0 "\n#include <sys/param.h>";next;}\
@@ -47,9 +40,7 @@
                < ${WRKSRC}/pch.c.orig                                  \
                > ${WRKSRC}/pch.c
 
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
 post-install:
-       ${LN} -sf ${GNU_PROGRAM_PREFIX}patch ${DESTDIR}${PREFIX}/bin/gpatch
-.endif
+       ${LN} -sf ../../bin/gpatch ${DESTDIR}${PREFIX}/gnu/bin/patch
 
 .include "../../mk/bsd.pkg.mk"
diff -r 0d1522ee9a3f -r c14ec93c65f0 devel/patch/PLIST
--- a/devel/patch/PLIST Tue May 29 21:07:49 2012 +0000
+++ b/devel/patch/PLIST Tue May 29 21:19:30 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:00 jlam Exp $
-bin/${GNU_PROGRAM_PREFIX}patch
-${PLIST.gpatch}bin/gpatch
-man/man1/${GNU_PROGRAM_PREFIX}patch.1
+@comment $NetBSD: PLIST,v 1.6 2012/05/29 21:19:30 cheusov Exp $
+bin/gpatch
+gnu/bin/patch
+man/man1/gpatch.1