details: https://anonhg.NetBSD.org/pkgsrc/rev/e4516cad4d9a
branches: trunk
changeset: 604373:e4516cad4d9a
user: cheusov <cheusov%pkgsrc.org@localhost>
date: Tue May 29 21:37:03 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
Fix for some pkglint warnings
diffstat:
devel/gmake/Makefile | 24 +++++++-----------------
devel/gmake/PLIST | 8 ++++----
devel/gmake/options.mk | 6 +++---
3 files changed, 14 insertions(+), 24 deletions(-)
diffs (81 lines):
diff -r 5e0e4e067993 -r e4516cad4d9a devel/gmake/Makefile
--- a/devel/gmake/Makefile Tue May 29 21:22:19 2012 +0000
+++ b/devel/gmake/Makefile Tue May 29 21:37:03 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2011/11/26 23:11:37 hans Exp $
+# $NetBSD: Makefile,v 1.81 2012/05/29 21:37:03 cheusov Exp $
DISTNAME= make-3.82
PKGNAME= g${DISTNAME}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
EXTRACT_SUFX= .tar.bz2
@@ -26,17 +26,9 @@
.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
+CONFIGURE_ARGS+= --program-prefix=g
-PLIST_VARS+= gmake
-
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-PLIST.gmake= yes
-.endif
+INSTALLATION_DIRS+= gnu/bin
PLIST_SRC= ${PKGDIR}/PLIST
@@ -48,10 +40,8 @@
.endif
post-install:
- ${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
- ${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
-.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
- ${LN} -sf ${GNU_PROGRAM_PREFIX}make ${DESTDIR}${PREFIX}/bin/gmake
-.endif
+ ${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/gmake
+ ${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/gmake
+ ${LN} -sf ../../bin/gmake ${DESTDIR}${PREFIX}/gnu/bin/make
.include "../../mk/bsd.pkg.mk"
diff -r 5e0e4e067993 -r e4516cad4d9a devel/gmake/PLIST
--- a/devel/gmake/PLIST Tue May 29 21:22:19 2012 +0000
+++ b/devel/gmake/PLIST Tue May 29 21:37:03 2012 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:42:59 jlam Exp $
-bin/${GNU_PROGRAM_PREFIX}make
-${PLIST.gmake}bin/gmake
+@comment $NetBSD: PLIST,v 1.10 2012/05/29 21:37:03 cheusov Exp $
+bin/gmake
+gnu/bin/make
info/make.info
-man/man1/${GNU_PROGRAM_PREFIX}make.1
+man/man1/gmake.1
diff -r 5e0e4e067993 -r e4516cad4d9a devel/gmake/options.mk
--- a/devel/gmake/options.mk Tue May 29 21:22:19 2012 +0000
+++ b/devel/gmake/options.mk Tue May 29 21:37:03 2012 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2011/11/26 19:01:15 hans Exp $
+# $NetBSD: options.mk,v 1.2 2012/05/29 21:37:03 cheusov Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gmake
PKG_SUPPORTED_OPTIONS= nls
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=
.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= nls
.endif
-PKG_OPTIONS_LEGACY_VARS= GMAKE_LOCALE
+PKG_OPTIONS_LEGACY_VARS+= GMAKE_LOCALE
.include "../../mk/bsd.options.mk"