[pkgsrc/trunk]: pkgsrc/editors/ed Remove GNU_PROGRAM_PREFIX variable (discuss...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa4d2065db95
branches:  trunk
changeset: 604377:aa4d2065db95
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Tue May 29 21:51:15 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:

 editors/ed/Makefile |  20 +++++++++++---------
 editors/ed/PLIST    |  14 ++++++++------
 2 files changed, 19 insertions(+), 15 deletions(-)

diffs (61 lines):

diff -r 2c6e46e65227 -r aa4d2065db95 editors/ed/Makefile
--- a/editors/ed/Makefile       Tue May 29 21:45:04 2012 +0000
+++ b/editors/ed/Makefile       Tue May 29 21:51:15 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/01/27 18:20:43 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2012/05/29 21:51:15 cheusov Exp $
 
 DISTNAME=              ed-1.1
+PKGREVISION=           1
 CATEGORIES=            editors
 MASTER_SITES=          ${MASTER_SITE_GNU:=ed/}
 EXTRACT_SUFX=          .tar.bz2
@@ -8,21 +9,22 @@
 MAINTAINER=            reed%reedmedia.net@localhost
 HOMEPAGE=              http://www.gnu.org/software/ed/ed.html
 COMMENT=               GNU version of line-oriented text editor
+LICENSE=               gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 
-.include "../../mk/bsd.prefs.mk"
-
-INFO_FILES=            # PLIST
+INFO_FILES=            yes
 
-.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
+CONFIGURE_ARGS+=       --program-prefix=g
 
 INSTALL_TARGET=                install install-man
 
+INSTALLATION_DIRS=     gnu/bin
+
+post-install:
+       ln -s ../../bin/ged  ${DESTDIR}${PREFIX}/gnu/bin/ed
+       ln -s ../../bin/gred ${DESTDIR}${PREFIX}/gnu/bin/red
+
 .include "../../mk/bsd.pkg.mk"
diff -r 2c6e46e65227 -r aa4d2065db95 editors/ed/PLIST
--- a/editors/ed/PLIST  Tue May 29 21:45:04 2012 +0000
+++ b/editors/ed/PLIST  Tue May 29 21:51:15 2012 +0000
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/20 18:15:38 jlam Exp $
-bin/${GNU_PROGRAM_PREFIX}ed
-bin/${GNU_PROGRAM_PREFIX}red
-info/${GNU_PROGRAM_PREFIX}ed.info
-man/man1/${GNU_PROGRAM_PREFIX}ed.1
-man/man1/${GNU_PROGRAM_PREFIX}red.1
+@comment $NetBSD: PLIST,v 1.4 2012/05/29 21:51:15 cheusov Exp $
+bin/ged
+bin/gred
+gnu/bin/ed
+gnu/bin/red
+info/ged.info
+man/man1/ged.1
+man/man1/gred.1