[pkgsrc/trunk]: pkgsrc/misc/gnuls Fix conflicts during the merge (add files n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9184da499193
branches:  trunk
changeset: 468262:9184da499193
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Feb 11 23:06:42 2004 +0000

description:
Fix conflicts during the merge (add files not imported properly).
Hope this is the right way to go...

diffstat:

 misc/gnuls/Makefile         |  37 +++++++++++++++++++++++++++++++++++++
 misc/gnuls/patches/patch-aa |  13 +++++++++++++
 2 files changed, 50 insertions(+), 0 deletions(-)

diffs (58 lines):

diff -r 1a2912081de2 -r 9184da499193 misc/gnuls/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/gnuls/Makefile       Wed Feb 11 23:06:42 2004 +0000
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.7 2004/02/11 23:06:42 jmmv Exp $
+#
+
+DISTNAME=      coreutils-5.0
+PKGNAME=       ${DISTNAME:S/coreutils/gnuls/}
+CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GNU:=coreutils/}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    tech-pkg%NetBSD.org@localhost
+HOMEPAGE=      http://www.gnu.org/software/coreutils/
+COMMENT=       GNU ls utility with color support
+
+CONFLICTS=     coreutils-[0-9]* linuxls-[0-9]*
+
+GNU_CONFIGURE=         YES
+USE_BUILDLINK2=                YES
+USE_PERL5=             build
+
+PLIST_SUBST+=          GNU_PROGRAM_PREFIX="${GNU_PROGRAM_PREFIX}"
+BUILD_DEFS+=           GNU_PROGRAM_PREFIX
+
+INSTALL_DIRS=          bin man/man1
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors \
+               ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}dircolors
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/ls \
+               ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}ls
+       ${INSTALL_DATA} ${WRKSRC}/man/dircolors.1 \
+               ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}dircolors.1
+       ${INSTALL_DATA} ${WRKSRC}/man/ls.1 \
+               ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}ls.1
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 1a2912081de2 -r 9184da499193 misc/gnuls/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/gnuls/patches/patch-aa       Wed Feb 11 23:06:42 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2004/02/11 23:06:42 jmmv Exp $
+
+--- Makefile.in.orig   2003-04-02 16:28:41.000000000 +0200
++++ Makefile.in
+@@ -149,7 +149,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = lib src doc man m4 po tests
++SUBDIRS = lib src
+ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
+   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
+   announce-gen \