[csw-devel] SF.net SVN: gar:[18661] csw/mgar/pkg/pcre/trunk

[dmichelsen at users.sourceforge.net]

Revision: 18661
          http://gar.svn.sourceforge.net/gar/?rev=18661&view=rev
Author:   dmichelsen
Date:     2012-07-06 20:57:52 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
pcre/trunk: Update to 8.31

Modified Paths:
--------------
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/pcre/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch

Modified: csw/mgar/pkg/pcre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pcre/trunk/Makefile	2012-07-06 14:41:41 UTC (rev 18660)
+++ csw/mgar/pkg/pcre/trunk/Makefile	2012-07-06 20:57:52 UTC (rev 18661)
@@ -1,5 +1,5 @@
 NAME = pcre
-VERSION = 8.30
+VERSION = 8.31
 CATEGORIES = lib
 GARTYPE = v2
 
@@ -15,10 +15,6 @@
 DISTFILES  = $(DISTNAME).tar.bz2
 PATCHFILES = 0001-Allow-norunpath-for-libtool.patch
 
-# Use patch until this is fixed:
-#   http://bugs.exim.org/show_bug.cgi?id=1206
-PATCHFILES += 0002-Remove-bashism.patch
-
 VENDOR_URL = http://www.pcre.org
 
 PACKAGES = CSWpcre
@@ -59,12 +55,12 @@
 PACKAGES += CSWlibpcrecpp0
 SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0
 PKGFILES_CSWlibpcrecpp0 += $(call pkgfiles_lib,libpcrecpp.so.0)
-RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre1
 
 PACKAGES += CSWlibpcreposix0
 SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0
 PKGFILES_CSWlibpcreposix0 += $(call pkgfiles_lib,libpcreposix.so.0)
-RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre1
 
 REINPLACE_USRLOCAL += doc/pcre-config.1
 REINPLACE_USRLOCAL += doc/pcresample.3
@@ -94,6 +90,6 @@
 
 test-custom:
 	@echo " ==> Running make $(TEST_TARGET) in $*"
-	cd $(WORKSRC) && /usr/bin/ulimit -s 16384 && /usr/bin/env -i $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET)
+	cd $(WORKSRC) && /usr/bin/ulimit -s 32768 && /usr/bin/env -i $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET)
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/pcre/trunk/checksums
===================================================================
--- csw/mgar/pkg/pcre/trunk/checksums	2012-07-06 14:41:41 UTC (rev 18660)
+++ csw/mgar/pkg/pcre/trunk/checksums	2012-07-06 20:57:52 UTC (rev 18661)
@@ -1 +1 @@
-98e8928cccc945d04279581e778fbdff  pcre-8.30.tar.bz2
+1c9a276af932b5599157f96e945391f0  pcre-8.31.tar.bz2

Deleted: csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch
===================================================================
--- csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch	2012-07-06 14:41:41 UTC (rev 18660)
+++ csw/mgar/pkg/pcre/trunk/files/0002-Remove-bashism.patch	2012-07-06 20:57:52 UTC (rev 18661)
@@ -1,25 +0,0 @@
-From 3fea8bd4c59e4efa53cc9cf842c8836dacdcba89 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 4 Feb 2012 23:19:53 +0100
-Subject: [PATCH] Remove bashism
-
----
- RunTest |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/RunTest b/RunTest
-index aae292e..0d542f9 100755
---- a/RunTest
-+++ b/RunTest
-@@ -135,7 +135,7 @@ $sim ./pcretest -C pcre8 >/dev/null
- support8=$?
- $sim ./pcretest -C pcre16 >/dev/null
- support16=$?
--if [ $(( $support8 + $support16 )) -eq 2 ] ; then
-+if [ `expr $support8 + $support16` -eq 2 ] ; then
-   test8=
-   test16=-16
-   if [ "$arg8" = yes -a "$arg16" != yes ] ; then
--- 
-1.7.8.3
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.