[csw-devel] SF.net SVN: gar:[9361] csw/mgar/pkg/grep/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Mar 25 13:41:25 CET 2010
Revision: 9361
http://gar.svn.sourceforge.net/gar/?rev=9361&view=rev
Author: dmichelsen
Date: 2010-03-25 12:41:24 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
grep: Update to 2.6 and provide own links to /opt/csw/gnu
Modified Paths:
--------------
csw/mgar/pkg/grep/trunk/Makefile
csw/mgar/pkg/grep/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/grep/trunk/files/gar-base.diff
csw/mgar/pkg/grep/trunk/files/install.diff
Property Changed:
----------------
csw/mgar/pkg/grep/trunk/
Property changes on: csw/mgar/pkg/grep/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/grep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/grep/trunk/Makefile 2010-03-25 10:57:21 UTC (rev 9360)
+++ csw/mgar/pkg/grep/trunk/Makefile 2010-03-25 12:41:24 UTC (rev 9361)
@@ -1,5 +1,5 @@
GARNAME = grep
-GARVERSION = 2.5
+GARVERSION = 2.6
CATEGORIES = utils
DESCRIPTION = GNU grep
@@ -15,22 +15,28 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTNAME = grep-2.6.7-64540
+DISTFILES = $(DISTNAME).tar.xz
# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-# Patch makefile to honor DESTDIR
-PATCHFILES = install.diff
+DEP_PKGS_CSWgrep = CSWggettextrt CSWpcrert
-CONFIGURE_ARGS = $(DIRPATHS)
+# As suggested in
+# <http://savannah.gnu.org/bugs/?24813>
+EXTRA_CFLAGS = -features=extensions
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --program-prefix=g
+
TEST_TARGET = check
-# Spencer bre test #16 fails
-TEST_SCRIPTS =
+EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
include gar/category.mk
-pre-test:
- @( cd $(WORKSRC)/tests ; chmod 555 *.sh *.awk )
+post-install-modulated:
+ ginstall -d $(DESTDIR)$(prefix)/gnu
+ $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/grep/trunk/checksums
===================================================================
--- csw/mgar/pkg/grep/trunk/checksums 2010-03-25 10:57:21 UTC (rev 9360)
+++ csw/mgar/pkg/grep/trunk/checksums 2010-03-25 12:41:24 UTC (rev 9361)
@@ -1,2 +1 @@
-5e7bd36e089b637ab3795354ec25dcae download/grep-2.5.tar.bz2
-50d12d2a275ff85cc7a6f85f131b5674 download/install.diff
+34ebed3991555c9e0cd484153aad9098 grep-2.6.7-64540.tar.xz
Deleted: csw/mgar/pkg/grep/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/grep/trunk/files/gar-base.diff 2010-03-25 10:57:21 UTC (rev 9360)
+++ csw/mgar/pkg/grep/trunk/files/gar-base.diff 2010-03-25 12:41:24 UTC (rev 9361)
@@ -1,40 +0,0 @@
-diff --speed-large-files --minimal -Nru grep-2.5.orig/po/Makefile.in.in grep-2.5/po/Makefile.in.in
---- grep-2.5.orig/po/Makefile.in.in 1998-11-06 10:19:18.000000000 -0800
-+++ grep-2.5/po/Makefile.in.in 2003-07-28 19:38:17.292352000 -0700
-@@ -111,16 +111,16 @@
- install-data-no: all
- install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(datadir); \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
-- *.gmo) destdir=$(gnulocaledir);; \
-- *) destdir=$(localedir);; \
-+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-+ *) destdir=$(DESTDIR)$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
-@@ -153,12 +153,12 @@
- done
- if test "$(PACKAGE)" = "gettext"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(gettextsrcdir); \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-- $(gettextsrcdir)/Makefile.in.in; \
-+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
Deleted: csw/mgar/pkg/grep/trunk/files/install.diff
===================================================================
--- csw/mgar/pkg/grep/trunk/files/install.diff 2010-03-25 10:57:21 UTC (rev 9360)
+++ csw/mgar/pkg/grep/trunk/files/install.diff 2010-03-25 12:41:24 UTC (rev 9361)
@@ -1,40 +0,0 @@
-diff --speed-large-files --minimal -Nru grep-2.5.orig/po/Makefile.in.in grep-2.5/po/Makefile.in.in
---- grep-2.5.orig/po/Makefile.in.in 1998-11-06 10:19:18.000000000 -0800
-+++ grep-2.5/po/Makefile.in.in 2003-07-28 19:38:17.292352000 -0700
-@@ -111,16 +111,16 @@
- install-data-no: all
- install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(datadir); \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
-- *.gmo) destdir=$(gnulocaledir);; \
-- *) destdir=$(localedir);; \
-+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-+ *) destdir=$(DESTDIR)$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
-@@ -153,12 +153,12 @@
- done
- if test "$(PACKAGE)" = "gettext"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(gettextsrcdir); \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-- $(gettextsrcdir)/Makefile.in.in; \
-+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
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