From a9a2d256ca780a42d9310ab628b9464ed494374a Mon Sep 17 00:00:00 2001
From: cheusov <cheusov@pkgsrc.org>
Date: Tue, 29 May 2012 18:19:28 +0000
Subject: 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
---
 misc/gnuls/Makefile | 16 ++++++++++------
 misc/gnuls/PLIST    | 12 +++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index ba0940ae979..936336020dd 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2011/11/01 16:16:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2012/05/29 18:19:28 cheusov Exp $
 #
 
 .include "../../sysutils/coreutils/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/coreutils/gnuls/}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 COMMENT=	GNU ls utility with color support
@@ -15,17 +16,20 @@ do-build:
 	${RUN} cd ${WRKSRC}/src && ${BUILD_MAKE_CMD} version.h
 	${RUN} cd ${WRKSRC}/src && ${BUILD_MAKE_CMD} dircolors ls
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin gnu/bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors \
-		${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}dircolors
+		${DESTDIR}${PREFIX}/bin/gdircolors
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ls \
-		${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}ls
+		${DESTDIR}${PREFIX}/bin/gls
 	${INSTALL_DATA} ${WRKSRC}/man/dircolors.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}dircolors.1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gdircolors.1
 	${INSTALL_DATA} ${WRKSRC}/man/ls.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}ls.1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gls.1
+	set -e; cd ${DESTDIR}${PREFIX}/gnu/bin; \
+	ln -s ../../bin/gls ls; \
+	ln -s ../../bin/gdircolors dircolors
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/misc/gnuls/PLIST b/misc/gnuls/PLIST
index d86d7d6e662..b0ad3ae5051 100644
--- a/misc/gnuls/PLIST
+++ b/misc/gnuls/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/11 23:00:52 jmmv Exp $
-bin/${GNU_PROGRAM_PREFIX}dircolors
-bin/${GNU_PROGRAM_PREFIX}ls
-man/man1/${GNU_PROGRAM_PREFIX}dircolors.1
-man/man1/${GNU_PROGRAM_PREFIX}ls.1
+@comment $NetBSD: PLIST,v 1.2 2012/05/29 18:19:28 cheusov Exp $
+gnu/bin/dircolors
+gnu/bin/ls
+bin/gdircolors
+bin/gls
+man/man1/gdircolors.1
+man/man1/gls.1
-- 
cgit v1.2.3