From ea78f651baabe0931b0262be962c579e2c55dd00 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 20 May 2011 07:56:25 +0000
Subject: [PATCH] pcre 7.6

---
 pcre/build.sh    | 72 +++++++++++-------------------------------------
 pcre/meta/pkgdef | 39 +++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/pcre/build.sh b/pcre/build.sh
index fcb8b91..c8a8f99 100755
--- a/pcre/build.sh
+++ b/pcre/build.sh
@@ -3,12 +3,13 @@
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=pcre
-version=4.5
+version=7.6
 pkgver=1
 source[0]=$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
@@ -17,11 +18,10 @@ source[0]=$topdir-$version.tar.bz2
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
+# Global settings
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+configure_args="$configure_args --enable-utf8"
 
 reg prep
 prep()
@@ -32,22 +32,20 @@ prep()
 reg build
 build()
 {
-    configure_args='--prefix=$prefix --enable-utf8'
     generic_build
-    setdir source
-    $MAKE_PROG runtest
-    # Workaround libtool problems...
-    setdir source
-    ${SED} -e "s# libpcre.la# -L$srcdir/$topsrcdir/.libs libpcre.la#g" libpcreposix.la > libpcreposix.la.new
-    ${MV} libpcreposix.la.new libpcreposix.la
+}
+
+reg check
+check()
+{
+    generic_check
 }
 
 reg install
 install()
 {
     generic_install DESTDIR
-    doc NEWS AUTHORS ChangeLog LICENCE
-    ${RM} -f ${stagedir}${prefix}/${_libdir}/*.la
+    setdir ${stagedir}${prefix}/${_docdir}/pcre
 }
 
 reg pack
@@ -65,42 +63,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/pcre/meta/pkgdef b/pcre/meta/pkgdef
index 8e389b1..ddf49ef 100644
--- a/pcre/meta/pkgdef
+++ b/pcre/meta/pkgdef
@@ -1,10 +1,41 @@
 [pcre]
-pkgname="$pkgprefix""$topdir"
-name="PCRE - Perl Compatible Regular Expressions"
-pkgcat="library"
+pkgname="${pkgprefix}${topdir}"
+name="pcre - Perl Compatible Regular Expressions"
+pkgcat="system"
 pkgvendor="http://www.pcre.org"
 pkgdesc="A set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5"
 pkgver="$pkgver"
 files(-,root,bin)
-*
+$_bindir/pcregrep
+$_bindir/pcretest
+$_libdir/*.so.*
+$_mandir/man1/pcregrep.1*
+$_mandir/man1/pcretest.1*
+$_docdir/pcre/pcre.txt
+$_docdir/pcre/pcregrep.txt
+$_docdir/pcre/pcretest.txt
+$_docdir/pcre/AUTHORS
+$_docdir/pcre/ChangeLog
+$_docdir/pcre/NEWS
+$_docdir/pcre/COPYING
+$_docdir/pcre/LICENCE
+$_docdir/pcre/README
+
+[pcre-devel]
+pkgname="${pkgprefix}${topdir}d"
+name="pcre-devel - Development support for pcre"
+pkgcat="system"
+pkgvendor="http://www.pcre.org"
+pkgdesc="A set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5"
+pkgver="$pkgver"
+files(-,root,bin)
+$_bindir/pcre-config
+$_includedir
+$_libdir/*.so
+$_libdir/*.a
+$_libdir/pkgconfig
+$_mandir/man1/pcre-config.1*
+$_mandir/man3
+$_docdir/pcre/pcre-config.txt
+$_docdir/pcre/html