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

1 files changed, 7 insertions, 17 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 6cd3d780804..5ba1a078ca6 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -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 @@ TEST_TARGET=		check
 
 .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+=		gmake
+CONFIGURE_ARGS+=	--program-prefix=g
 
-.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 @@ CONFIGURE_ARGS+=	ac_cv_func_strndup=no
 .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"