pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Reach over from misc/gnuls to sysutils/coreutils for c...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e3eecd17a7c5
branches: trunk
changeset: 542419:e3eecd17a7c5
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu May 15 20:01:03 2008 +0000
description:
Reach over from misc/gnuls to sysutils/coreutils for common logic and
patches. Updates gnuls to 6.11 and makes it track coreutils.
diffstat:
misc/gnuls/Makefile | 29 ++-----------
misc/gnuls/distinfo | 8 ---
misc/gnuls/patches/patch-aa | 13 ------
misc/gnuls/patches/patch-ab | 24 -----------
misc/gnuls/patches/patch-ac | 78 --------------------------------------
sysutils/coreutils/Makefile | 60 +++++-----------------------
sysutils/coreutils/Makefile.common | 53 +++++++++++++++++++++++++
7 files changed, 71 insertions(+), 194 deletions(-)
diffs (truncated from 330 to 300 lines):
diff -r df9be32f2180 -r e3eecd17a7c5 misc/gnuls/Makefile
--- a/misc/gnuls/Makefile Thu May 15 19:47:07 2008 +0000
+++ b/misc/gnuls/Makefile Thu May 15 20:01:03 2008 +0000
@@ -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@localhost
-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 -r df9be32f2180 -r e3eecd17a7c5 misc/gnuls/distinfo
--- a/misc/gnuls/distinfo Thu May 15 19:47:07 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r df9be32f2180 -r e3eecd17a7c5 misc/gnuls/patches/patch-aa
--- a/misc/gnuls/patches/patch-aa Thu May 15 19:47:07 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r df9be32f2180 -r e3eecd17a7c5 misc/gnuls/patches/patch-ab
--- a/misc/gnuls/patches/patch-ab Thu May 15 19:47:07 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r df9be32f2180 -r e3eecd17a7c5 misc/gnuls/patches/patch-ac
--- a/misc/gnuls/patches/patch-ac Thu May 15 19:47:07 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
-
diff -r df9be32f2180 -r e3eecd17a7c5 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile Thu May 15 19:47:07 2008 +0000
+++ b/sysutils/coreutils/Makefile Thu May 15 20:01:03 2008 +0000
@@ -1,50 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2008/05/13 09:22:46 tron Exp $
-
-DISTNAME= coreutils-6.11
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
+# $NetBSD: Makefile,v 1.47 2008/05/15 20:01:03 tnn Exp $
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.gnu.org/software/coreutils/
-COMMENT= GNU basic file, shell and text manipulation utilities
-
-PKG_DESTDIR_SUPPORT= user-destdir
-NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-*
+.include "../../sysutils/coreutils/Makefile.common"
CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
-GNU_CONFIGURE= YES
-USE_TOOLS+= msgfmt msgmerge perl xgettext
-USE_PKGLOCALEDIR= YES
-
-INFO_FILES= YES
-
-TEST_TARGET= check
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+= ac_list_mounted_fs=found
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
-CONFIGURE_ENV+= ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes
-.endif
-
-# Exclude programs from PLIST which aren't built on a platform.
-PLIST_VARS+= hostid
-.if ${OPSYS} != "Interix"
-PLIST.hostid= yes
-.endif
-
-# XXX - this hack is bound to cause fallout on some platform at some point.
-# How can we determine the API version of the builtin gettext?
-.if ${OPSYS} != "Linux"
-CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes
-.endif
-CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q}
-
-CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
# if GNU_PROGRAM_PREFIX == 'g'
# devel/id-utils installs a 'gid' program, so conflict with it
# databases/geneweb a 'gwc' program, so conflict with it
@@ -56,19 +15,24 @@
.endif
# print/teTeX-bin installed a 'readlink' program, so
# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin)
-.if ${GNU_PROGRAM_PREFIX} == ""
+.if empty(GNU_PROGRAM_PREFIX)
CONFLICTS+= teTeX-bin<3
CONFLICTS+= mktemp-[0-9]*
.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
-BUILD_DEFS+= GNU_PROGRAM_PREFIX
+INFO_FILES= yes
+
+# Exclude programs from PLIST which aren't built on a platform.
+PLIST_VARS+= hostid
+.if ${OPSYS} != "Interix"
+PLIST.hostid= yes
+.endif
#CONFIGURE_ARGS+= --enable-install-program=su
#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
# ${OPSYS} == "OpenBSD"
-#MAKE_FLAGS+= setuid_root_mode=a=rx
-#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu
+#MAKE_FLAGS+= setuid_root_mode=a=rx
+#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu
#MESSAGE_SUBST+= OPSYS=${OPSYS:Q}
#.endif
diff -r df9be32f2180 -r e3eecd17a7c5 sysutils/coreutils/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/coreutils/Makefile.common Thu May 15 20:01:03 2008 +0000
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile.common,v 1.1 2008/05/15 20:01:03 tnn Exp $
+# used by sysutils/coreutils/Makefile
+# used by misc/gnuls/Makefile
+
+DISTNAME= coreutils-6.11
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.gnu.org/software/coreutils/
+COMMENT= GNU basic file, shell and text manipulation utilities
+
+PKG_DESTDIR_SUPPORT= user-destdir
+NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-*
+
+PATCHDIR= ${.CURDIR}/../../sysutils/coreutils/patches
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/coreutils/distinfo
+
+GNU_CONFIGURE= YES
+USE_TOOLS+= msgfmt msgmerge perl xgettext
+USE_PKGLOCALEDIR= YES
+
+TEST_TARGET= check
Home |
Main Index |
Thread Index |
Old Index