diff options
| -rw-r--r-- | devel/pcre/Makefile | 7 | ||||
| -rw-r--r-- | devel/pcre/PLIST | 3 | ||||
| -rw-r--r-- | devel/pcre/distinfo | 10 | ||||
| -rw-r--r-- | devel/pcre/patches/patch-aa | 6 | ||||
| -rw-r--r-- | devel/pcre/patches/patch-ab | 27 |
5 files changed, 26 insertions, 27 deletions
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 7cb9de9a100..1e449e6a1a6 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:39 jlam Exp $ -# FreeBSD Id: Makefile,v 1.1.1.1 1998/07/12 22:59:19 steve Exp $ +# $NetBSD: Makefile,v 1.19 2004/09/28 15:59:49 wiz Exp $ -DISTNAME= pcre-4.5 +DISTNAME= pcre-5.0 CATEGORIES= devel MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ ftp://pcre.sourceforge.net/pub/pcre/ @@ -17,6 +16,8 @@ USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes +PKG_CONFIG_OVERRIDE= libpcre.pc.in + TEST_TARGET= test .include "../../mk/bsd.pkg.mk" diff --git a/devel/pcre/PLIST b/devel/pcre/PLIST index 60c616abbf8..c5904cb9242 100644 --- a/devel/pcre/PLIST +++ b/devel/pcre/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:29 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/09/28 15:59:49 wiz Exp $ bin/pcre-config bin/pcregrep bin/pcretest @@ -6,6 +6,7 @@ include/pcre.h include/pcreposix.h lib/libpcre.la lib/libpcreposix.la +lib/pkgconfig/libpcre.pc man/man1/pcregrep.1 man/man1/pcretest.1 man/man3/pcre.3 diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index f8ee71af816..139c315e881 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2003/12/12 22:33:36 jmmv Exp $ +$NetBSD: distinfo,v 1.11 2004/09/28 15:59:49 wiz Exp $ -SHA1 (pcre-4.5.tar.bz2) = 750c42a7a5b85237ea8398bcffa7cba73c0813db -Size (pcre-4.5.tar.bz2) = 349536 bytes -SHA1 (patch-aa) = eff0e4fab9cac55a54af0ee448913a682d5e3733 -SHA1 (patch-ab) = 03bb38f5d07964a5ab16b1c80538ac77b3625640 +SHA1 (pcre-5.0.tar.bz2) = 320841e705a5ae86a2df9cfadb387f09a731b88f +Size (pcre-5.0.tar.bz2) = 465738 bytes +SHA1 (patch-aa) = c175ed919871534114fb02ca909be1e0ee12b522 +SHA1 (patch-ab) = 1bb79ce010f30fdd4ab3b579faa45fa06c01ce90 diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa index c3ad9d72ecc..57aa00366ab 100644 --- a/devel/pcre/patches/patch-aa +++ b/devel/pcre/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2003/12/12 22:33:36 jmmv Exp $ +$NetBSD: patch-aa,v 1.6 2004/09/28 15:59:49 wiz Exp $ ---- Makefile.in.orig 2003-12-10 17:45:44.000000000 +0100 +--- Makefile.in.orig 2004-09-13 16:20:00.000000000 +0200 +++ Makefile.in -@@ -77,12 +77,11 @@ NO_RECURSE = @NO_RECURSE@ +@@ -78,12 +78,11 @@ NO_RECURSE = @NO_RECURSE@ EBCDIC = @EBCDIC@ INSTALL = @INSTALL@ diff --git a/devel/pcre/patches/patch-ab b/devel/pcre/patches/patch-ab index d2e8c0bcd52..9a792c2654d 100644 --- a/devel/pcre/patches/patch-ab +++ b/devel/pcre/patches/patch-ab @@ -1,17 +1,14 @@ -$NetBSD: patch-ab,v 1.1 2002/12/30 18:08:02 cjep Exp $ +$NetBSD: patch-ab,v 1.2 2004/09/28 15:59:49 wiz Exp $ ---- pcre-config.in.orig Wed Jan 2 15:57:57 2002 +--- pcre-config.in.orig 2004-09-13 16:20:00.000000000 +0200 +++ pcre-config.in -@@ -45,10 +45,10 @@ while test $# -gt 0; do - echo $includes - ;; - --libs-posix) -- echo -L@libdir@ -lpcreposix -lpcre -+ echo -L@libdir@ -Wl,-R@libdir@ -lpcreposix -lpcre - ;; - --libs) -- echo -L@libdir@ -lpcre -+ echo -L@libdir@ -Wl,-R@libdir@ -lpcre - ;; - *) - echo "${usage}" 1>&2 +@@ -17,6 +17,9 @@ case `uname -s` in + *SunOS*) + libR=" -R@libdir@" + ;; ++ *BSD*) ++ libR=" -Wl,-R@libdir@" ++ ;; + esac + + while test $# -gt 0; do |