Reach over from misc/gnuls to sysutils/coreutils for common logic and

patches. Updates gnuls to 6.11 and makes it track coreutils.

5 files changed, 6 insertions, 146 deletions

diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 84de493659f..39ac001055c 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,38 +1,21 @@
-# $NetBSD: Makefile,v 1.19 2008/03/04 19:21:11 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/15 20:01:03 tnn Exp $
 #
 
-DISTNAME=	coreutils-6.9
+.include "../../sysutils/coreutils/Makefile.common"
+
 PKGNAME=	${DISTNAME:S/coreutils/gnuls/}
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU:=coreutils/}
-EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/coreutils/
 COMMENT=	GNU ls utility with color support
 
 CONFLICTS=	coreutils-[0-9]* linuxls-[0-9]*
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=		YES
-
-PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+=		GNU_PROGRAM_PREFIX
+do-build:
+	${RUN} cd ${WRKSRC}/lib && ${BUILD_MAKE_CMD} all
+	${RUN} cd ${WRKSRC}/src && ${BUILD_MAKE_CMD} dircolors ls
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+=		ac_list_mounted_fs=found
-.endif
-
-.if ${OPSYS} != "Linux"
-CONFIGURE_ENV+=		gt_cv_func_gnugettext3_libintl=yes
-.endif
-CONFIGURE_ENV+=		MKDIR_P=${MKDIR:Q}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors \
 		${DESTDIR}${PREFIX}/bin/${GNU_PROGRAM_PREFIX}dircolors
diff --git a/misc/gnuls/distinfo b/misc/gnuls/distinfo
deleted file mode 100644
index 4c9af51ba8e..00000000000
--- a/misc/gnuls/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2007/07/20 12:41:29 tnn Exp $
-
-SHA1 (coreutils-6.9.tar.bz2) = 10310a78c4e1d9f742f3815ac28e9bf1086a5885
-RMD160 (coreutils-6.9.tar.bz2) = c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7
-Size (coreutils-6.9.tar.bz2) = 5384378 bytes
-SHA1 (patch-aa) = f1c25c1ca167fbd83680d4ea1dc45771f6800fdb
-SHA1 (patch-ab) = ec3f8be38adbf9bdd14d7ec8c64440b09c66a718
-SHA1 (patch-ac) = 676fd4eaeedf8f94ac6d1894fd16491ce8412cb0
diff --git a/misc/gnuls/patches/patch-aa b/misc/gnuls/patches/patch-aa
deleted file mode 100644
index 1fd500441aa..00000000000
--- a/misc/gnuls/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2007/07/20 12:41:29 tnn Exp $
-
---- Makefile.in.orig	2007-03-22 22:20:26.000000000 +0100
-+++ Makefile.in
-@@ -520,7 +520,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib src doc man po tests
-+SUBDIRS = lib src
- EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
-   .gitignore \
-   .hgignore \
diff --git a/misc/gnuls/patches/patch-ab b/misc/gnuls/patches/patch-ab
deleted file mode 100644
index 0350777b63f..00000000000
--- a/misc/gnuls/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/07/20 12:41:29 tnn Exp $
-
---- src/Makefile.in.orig	2007-03-22 22:23:20.000000000 +0100
-+++ src/Makefile.in
-@@ -36,7 +36,8 @@ host_triplet = @host@
- EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
- 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
- 	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
--bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
-+bin_PROGRAMS = dircolors$(EXEEXT) ls$(EXEEXT)
-+no_bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
- 	cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
- 	ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
- 	vdir$(EXEEXT) ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) \
-@@ -1126,7 +1127,8 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
- # otherwise we may get into trouble with distinct strings that the
- # current locale considers to be equal.
- ASSORT = LC_ALL=C sort
--all_programs = \
-+all_programs = $(bin_PROGRAMS)
-+no_all_programs = \
-     $(bin_PROGRAMS) \
-     $(bin_SCRIPTS) \
-   $(EXTRA_PROGRAMS)
diff --git a/misc/gnuls/patches/patch-ac b/misc/gnuls/patches/patch-ac
deleted file mode 100644
index c1e49a694a1..00000000000
--- a/misc/gnuls/patches/patch-ac
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/07/20 12:41:29 tnn Exp $
-
---- lib/mountlist.c.orig	2007-01-26 23:16:55.000000000 +0100
-+++ lib/mountlist.c
-@@ -174,6 +174,11 @@
- 
- #if MOUNTED_GETMNTINFO
- 
-+# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)
-+# define statfs				statvfs
-+# define HAVE_F_FSTYPENAME_IN_STATFS  1
-+# endif
-+
- # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
- static char *
- fstype_to_string (short int t)
-@@ -296,6 +301,10 @@ fstype_to_string (int t)
- }
- #endif /* MOUNTED_VMOUNT */
- 
-+#ifdef __INTERIX
-+# include <dirent.h>
-+# include <sys/statvfs.h>
-+#endif
- 
- #if defined MOUNTED_GETMNTENT1 || defined MOUNTED_GETMNTENT2
- 
-@@ -859,6 +868,50 @@ read_file_system_list (bool need_fs_type
-   }
- #endif /* MOUNTED_VMOUNT. */
- 
-+#ifdef __INTERIX		/* Interix. */
-+  {
-+    DIR *devfs = opendir ("/dev/fs");
-+    struct dirent *de;
-+    struct statvfs svfs;
-+    char fsname[] = "/dev/fs/#"; /* writable */
-+
-+    if (devfs == NULL)
-+      return NULL;
-+
-+    while ((de = readdir (devfs)) != NULL)
-+      {
-+	if (strlen (de->d_name) != 1)
-+	  {
-+	    /* "Drive letters" should all be exactly one character long. */
-+	    continue;
-+	  }
-+
-+	fsname[8] = de->d_name[0];
-+
-+	if (statvfs (fsname, &svfs) != 0)
-+	  {
-+	    /* Could be an offline network fs or empty removable; don't fail. */
-+	    continue;
-+	  }
-+
-+	me = xmalloc (sizeof *me);
-+
-+	me->me_devname = xstrdup (svfs.f_mntfromname);
-+	me->me_mountdir = xstrdup (svfs.f_mntonname);
-+	me->me_type = xstrdup (svfs.f_fstypename);
-+	me->me_dev = (dev_t)svfs.f_fsid;
-+	me->me_dummy = (svfs.f_type == ST_FSTYPE_OFS ? 1 : 0);
-+	me->me_remote = ((svfs.f_type == ST_FSTYPE_SAMBA
-+			  || svfs.f_type == ST_FSTYPE_NFS) ? 1 : 0);
-+	me->me_type_malloced = 1;
-+
-+	/* Add to the linked list. */
-+	*mtail = me;
-+	mtail = &me->me_next;
-+      }
-+  }
-+#endif
-+
-   *mtail = NULL;
-   return mount_list;
-