[csw-devel] SF.net SVN: gar:[5289] csw/mgar/pkg/findutils/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Wed Jun 17 01:43:40 CEST 2009
Revision: 5289
http://gar.svn.sourceforge.net/gar/?rev=5289&view=rev
Author: skayser
Date: 2009-06-16 23:43:40 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
findutils: non-maintainer commit, GAR-ized build description incl. version bump
Modified Paths:
--------------
csw/mgar/pkg/findutils/trunk/Makefile
csw/mgar/pkg/findutils/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/findutils/trunk/files/CSWfindutils.postinstall
Removed Paths:
-------------
csw/mgar/pkg/findutils/trunk/files/locatedb.patch
csw/mgar/pkg/findutils/trunk/files/prototypes.patch
Property Changed:
----------------
csw/mgar/pkg/findutils/trunk/
Property changes on: csw/mgar/pkg/findutils/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/findutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/findutils/trunk/Makefile 2009-06-16 22:31:33 UTC (rev 5288)
+++ csw/mgar/pkg/findutils/trunk/Makefile 2009-06-16 23:43:40 UTC (rev 5289)
@@ -1,8 +1,10 @@
+# Todo
+# * Non-maintainer upload, needs to be checked by Chris
GARNAME = findutils
-GARVERSION = 4.2.23
+GARVERSION = 4.4.2
CATEGORIES = utils
-DESCRIPTION = Find utilities
+DESCRIPTION = A set of utilities for searching a filesystem
define BLURB
The findutils package consists of three programs. `find' is a program which
searches a directory tree to find a file or group of files. It walks the
@@ -14,26 +16,40 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += CSWfindutils.postinstall
+REQUIRED_PKGS = CSWggettextrt CSWiconv
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-# Fix up prototypes
-PATCHFILES = prototypes.patch
+EXTRA_MERGE_EXCLUDE_FILES = /opt/csw/lib/charset.alias
+EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/share/info/dir
-# Don't generate the locatedb on install
-PATCHFILES += locatedb.patch
-
-CONFIGURE_ARGS = --prefix=/opt/csw
+CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --program-prefix=g
-CONFIGURE_ARGS += --mandir=/opt/csw/share/man
-CONFIGURE_ARGS += --infodir=/opt/csw/share/info
+CONFIGURE_ARGS += --localstatedir=/var/opt/csw
+EXTRA_CFLAGS = -fast -xnolibmopt
+
+# Test target requires GNU diff
TEST_TARGET = check
+TEST_ARGS = "PATH=/opt/csw/gnu:$$PATH"
-# Test requires DejaGNU to be installed
-TEST_SCRIPTS =
+# Few of the tests fail, not yet further investigated
+SKIPTEST = 1
include gar/category.mk
+# ./configure determines to add a second -R/opt/csw/lib (libtool?), strip it
+#
+# configure:37145: checking how to link with libiconv
+# configure:37147: result: /opt/csw/lib/libiconv.so -R/opt/csw/lib
+# ...
+# configure:37775: checking how to link with libintl
+# configure:37777: result: /opt/csw/lib/libintl.so -R/opt/csw/lib
+#
+post-configure-modulated:
+ @perl -pi -e 's|-R/opt/csw/lib||' $(WORKSRC)/*/Makefile
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/findutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/findutils/trunk/checksums 2009-06-16 22:31:33 UTC (rev 5288)
+++ csw/mgar/pkg/findutils/trunk/checksums 2009-06-16 23:43:40 UTC (rev 5289)
@@ -1,3 +1,2 @@
-ecaff8b060e8d69c10eb2391a8032e26 download/findutils-4.2.23.tar.gz
-e29f6b6b1746a7c8974779c4634732c8 download/prototypes.patch
-8efdfde2dc0b28cf42556f60450aac81 download/locatedb.patch
+06573955b3b3ad2ab85031083bd5eb02 download/CSWfindutils.postinstall
+351cc4adb07d54877fa15f75fb77d39f download/findutils-4.4.2.tar.gz
Added: csw/mgar/pkg/findutils/trunk/files/CSWfindutils.postinstall
===================================================================
--- csw/mgar/pkg/findutils/trunk/files/CSWfindutils.postinstall (rev 0)
+++ csw/mgar/pkg/findutils/trunk/files/CSWfindutils.postinstall 2009-06-16 23:43:40 UTC (rev 5289)
@@ -0,0 +1,59 @@
+#!/bin/sh
+PATH=/usr/bin
+export PATH
+
+GUPDATEDB=/opt/csw/bin/gupdatedb
+CRONTAB=/var/spool/cron/crontabs/root
+OLDGLOCATEDIR=/opt/csw/var
+NEWGLOCATEDIR=/var/opt/csw
+OLDGLOCATEDB=${OLDGLOCATEDIR}/locatedb
+NEWGLOCATEDB=${NEWGLOCATEDIR}/locatedb
+
+if [ -z "${PKG_INSTALL_ROOT}" -o "${PKG_INSTALL_ROOT}" = "/" ]
+then
+ RCRONTAB=${CRONTAB}
+ RNEWGLOCATEDIR=${NEWGLOCATEDIR}
+ ROLDGLOCATEDB=${OLDGLOCATEDB}
+ RNEWGLOCATEDB=${NEWGLOCATEDB}
+else
+ RCRONTAB=${PKG_INSTALL_ROOT}${CRONTAB}
+ RNEWGLOCATEDIR=${PKG_INSTALL_ROOT}${NEWGLOCATEDIR}
+ ROLDGLOCATEDB=${PKG_INSTALL_ROOT}${OLDGLOCATEDB}
+ RNEWGLOCATEDB=${PKG_INSTALL_ROOT}${NEWGLOCATEDB}
+fi
+
+if /usr/bin/grep "${GUPDATEDB}" ${RCRONTAB} > /dev/null 2>&1; then
+ echo "${RCRONTAB} UNCHANGED because a job for ${GUPDATEDB} already exists"
+else
+ echo '43 3 * * * [ -x '${GUPDATEDB}' ] && '${GUPDATEDB}' --prunepaths="/dev /devices /proc /tmp /var/tmp" 1>/dev/null 2>&1 # Added by CSWfindutils' >> ${RCRONTAB}
+ echo "ADDED ${GUPDATEDB} to ${RCRONTAB}"
+fi
+
+if [ -f ${ROLDGLOCATEDB} ]
+then
+ if [ -f ${RNEWGLOCATEDB} ]
+ then
+ cat <<_EOF
+
+******************************************************************************
+ WARNING!
+
+Found TWO locatedb files during postinstall. We don't know what to do for the
+best. Please inspect:
+
+ ${OLDGLOCATEDB}
+ ${NEWGLOCATEDB}
+
+and ensure that the desired database is installed as:
+
+ ${NEWGLOCATEDB}
+
+******************************************************************************
+
+_EOF
+ else
+ mkdir -p ${RNEWGLOCATEDIR} && mv ${ROLDGLOCATEDB} ${RNEWGLOCATEDB}
+ echo "MOVED existing database to ${NEWGLOCATEDB}"
+ fi
+fi
+
Property changes on: csw/mgar/pkg/findutils/trunk/files/CSWfindutils.postinstall
___________________________________________________________________
Added: svn:executable
+ *
Deleted: csw/mgar/pkg/findutils/trunk/files/locatedb.patch
===================================================================
--- csw/mgar/pkg/findutils/trunk/files/locatedb.patch 2009-06-16 22:31:33 UTC (rev 5288)
+++ csw/mgar/pkg/findutils/trunk/files/locatedb.patch 2009-06-16 23:43:40 UTC (rev 5289)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/Makefile.in findutils-4.1/Makefile.in
---- findutils-4.1.orig/Makefile.in 1994-11-05 06:45:56.000000000 -0800
-+++ findutils-4.1/Makefile.in 2003-07-29 07:31:56.444240000 -0700
-@@ -50,7 +50,7 @@
- DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
-
- DIST_OTHER = COPYING ChangeLog TODO install-sh config.h.in stamp-h.in
--SUBDIRS = lib find xargs locate doc testsuite
-+SUBDIRS = lib find xargs doc testsuite
- CONFIG_HEADER = config.h
-
- all:: ${ALL}
Deleted: csw/mgar/pkg/findutils/trunk/files/prototypes.patch
===================================================================
--- csw/mgar/pkg/findutils/trunk/files/prototypes.patch 2009-06-16 22:31:33 UTC (rev 5288)
+++ csw/mgar/pkg/findutils/trunk/files/prototypes.patch 2009-06-16 23:43:40 UTC (rev 5289)
@@ -1,90 +0,0 @@
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/find/defs.h findutils-4.1/find/defs.h
---- findutils-4.1.orig/find/defs.h 1994-11-02 12:59:15.000000000 -0800
-+++ findutils-4.1/find/defs.h 2003-07-29 07:35:25.256788000 -0700
-@@ -301,7 +301,7 @@
- boolean mark_stat P_((struct predicate *tree));
-
- /* util.c */
--char *basename P_((char *fname));
-+/* char *basename P_((char *fname)); */
- struct predicate *get_new_pred P_((void));
- struct predicate *get_new_pred_chk_op P_((void));
- struct predicate *insert_primary P_((boolean (*pred_func )()));
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/find/fstype.c findutils-4.1/find/fstype.c
---- findutils-4.1.orig/find/fstype.c 1994-11-03 08:33:48.000000000 -0800
-+++ findutils-4.1/find/fstype.c 2003-07-29 07:34:31.040670000 -0700
-@@ -30,8 +30,9 @@
- extern int errno;
- #endif
-
--char *strdup ();
--char *strstr ();
-+/* char *strdup ();
-+ * char *strstr ();
-+ */
-
- static char *filesystem_type_uncached P_((char *path, char *relpath, struct stat *statp));
- static int xatoi P_((char *cp));
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/find/parser.c findutils-4.1/find/parser.c
---- findutils-4.1.orig/find/parser.c 1994-11-02 12:59:19.000000000 -0800
-+++ findutils-4.1/find/parser.c 2003-07-29 07:34:49.741746000 -0700
-@@ -52,7 +52,7 @@
- #define lstat stat
- #endif
-
--char *strstr ();
-+/* char *strstr (); */
- int lstat ();
- int stat ();
- #ifndef atol /* for Linux */
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/find/util.c findutils-4.1/find/util.c
---- findutils-4.1.orig/find/util.c 1994-10-19 21:49:47.000000000 -0700
-+++ findutils-4.1/find/util.c 2003-07-29 07:35:46.432706000 -0700
-@@ -26,7 +26,7 @@
-
- char *
- basename (fname)
-- char *fname;
-+ const char *fname;
- {
- char *p;
-
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/lib/nextelem.c findutils-4.1/lib/nextelem.c
---- findutils-4.1.orig/lib/nextelem.c 1994-09-27 06:02:45.000000000 -0700
-+++ findutils-4.1/lib/nextelem.c 2003-07-29 07:33:44.560192000 -0700
-@@ -32,7 +32,7 @@
- #endif
- #endif
-
--char *strdup ();
-+/* char *strdup (); */
- void free ();
-
- /* Return the next element of a colon-separated path.
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/lib/savedir.c findutils-4.1/lib/savedir.c
---- findutils-4.1.orig/lib/savedir.c 1994-10-07 10:21:34.000000000 -0700
-+++ findutils-4.1/lib/savedir.c 2003-07-29 07:33:59.848256000 -0700
-@@ -62,7 +62,7 @@
- #define NULL 0
- #endif
-
--char *stpcpy ();
-+/* char *stpcpy (); */
-
- /* Return a freshly allocated string containing the filenames
- in directory DIR, separated by '\0' characters;
-diff --speed-large-files --minimal -Nru findutils-4.1.orig/xargs/xargs.c findutils-4.1/xargs/xargs.c
---- findutils-4.1.orig/xargs/xargs.c 1994-10-07 10:21:39.000000000 -0700
-+++ findutils-4.1/xargs/xargs.c 2003-07-29 07:36:06.386407000 -0700
-@@ -60,8 +60,9 @@
- #define memcpy(dest, source, count) (bcopy((source), (dest), (count)))
- #endif
-
--char *strstr ();
--char *strdup ();
-+/* char *strstr ();
-+ * char *strdup ();
-+ */
-
- #ifndef _POSIX_SOURCE
- #include <sys/param.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list