[csw-devel] SF.net SVN: gar:[21123] csw/mgar/pkg/file/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21123
          http://gar.svn.sourceforge.net/gar/?rev=21123&view=rev
Author:   dmichelsen
Date:     2013-05-16 17:12:05 +0000 (Thu, 16 May 2013)
Log Message:
-----------
file/trunk: Update to 5.14 and enable pcre due to problems with stack size on recursive implementation of Solaris stock regexec

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

Added Paths:
-----------
    csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2013-05-16 16:34:44 UTC (rev 21122)
+++ csw/mgar/pkg/file/trunk/Makefile	2013-05-16 17:12:05 UTC (rev 21123)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = file
-VERSION = 5.12
+VERSION = 5.14
 GARTYPE = v2
 
 define BLURB
@@ -15,8 +15,10 @@
 MASTER_SITES = ftp://ftp.astron.com/pub/file/
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
+# PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
 
+PATCHFILES += 0001-Use-PCRE.patch
+
 VENDOR_URL = http://www.darwinsys.com/file/
 
 PACKAGES += CSWgfile
@@ -46,6 +48,7 @@
 PKGFILES_CSWlibmagic1 += $(call pkgfiles_lib,libmagic.so.1)
 RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data
+RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibpcreposix0
 CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data
 OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic
 
@@ -67,6 +70,8 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 
+EXTRA_LINKER_FLAGS += -lpcreposix -lpcre
+
 BUILD64_LIBS_ONLY = 1
 
 PYCOMPILE = 1

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2013-05-16 16:34:44 UTC (rev 21122)
+++ csw/mgar/pkg/file/trunk/checksums	2013-05-16 17:12:05 UTC (rev 21123)
@@ -1 +1 @@
-1d7d85cb9354f79e5e351deef36be6ba  file-5.12.tar.gz
+c26625f1d6773ad4bc5a87c0e315632c  file-5.14.tar.gz

Added: csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch	                        (rev 0)
+++ csw/mgar/pkg/file/trunk/files/0001-Use-PCRE.patch	2013-05-16 17:12:05 UTC (rev 21123)
@@ -0,0 +1,25 @@
+From d54a5b9bf5d91b42e4c3fd01229a5123e22a6019 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 16 May 2013 14:58:54 +0200
+Subject: [PATCH] Use PCRE
+
+---
+ src/file.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/file.h b/src/file.h
+index 2b64399..364a067 100644
+--- a/src/file.h
++++ b/src/file.h
+@@ -61,7 +61,7 @@
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+-#include <regex.h>
++#include <pcreposix.h>
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+-- 
+1.8.1.4
+

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