summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/pcre/Makefile8
-rw-r--r--devel/pcre/PLIST10
-rw-r--r--devel/pcre/buildlink3.mk4
-rw-r--r--devel/pcre/distinfo9
-rw-r--r--devel/pcre/patches/patch-aa18
5 files changed, 20 insertions, 29 deletions
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 2050b0cb5ef..bc455a4a44d 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2005/08/31 08:48:45 snj Exp $
-DISTNAME= pcre-5.0
-PKGREVISION= 1
+DISTNAME= pcre-6.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
ftp://pcre.sourceforge.net/pub/pcre/
@@ -13,7 +12,10 @@ COMMENT= Perl Compatible Regular Expressions library
PKG_INSTALLATION_TYPES= overwrite pkgviews
+BUILD_TARGET= all libpcrecpp.la pcrecpp_unittest \
+ pcre_scanner_unittest pcre_stringpiece_unittest
GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
PKG_CONFIG_OVERRIDE= libpcre.pc.in
diff --git a/devel/pcre/PLIST b/devel/pcre/PLIST
index c5904cb9242..ed799480eb9 100644
--- a/devel/pcre/PLIST
+++ b/devel/pcre/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/28 15:59:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5.6.1 2005/08/31 08:48:45 snj Exp $
bin/pcre-config
bin/pcregrep
bin/pcretest
include/pcre.h
+include/pcre_scanner.h
+include/pcre_stringpiece.h
+include/pcrecpp.h
include/pcreposix.h
lib/libpcre.la
+lib/libpcrecpp.la
lib/libpcreposix.la
lib/pkgconfig/libpcre.pc
man/man1/pcregrep.1
@@ -14,6 +18,7 @@ man/man3/pcre_compile.3
man/man3/pcre_config.3
man/man3/pcre_copy_named_substring.3
man/man3/pcre_copy_substring.3
+man/man3/pcre_dfa_exec.3
man/man3/pcre_exec.3
man/man3/pcre_free_substring.3
man/man3/pcre_free_substring_list.3
@@ -24,12 +29,15 @@ man/man3/pcre_get_substring.3
man/man3/pcre_get_substring_list.3
man/man3/pcre_info.3
man/man3/pcre_maketables.3
+man/man3/pcre_refcount.3
man/man3/pcre_study.3
man/man3/pcre_version.3
man/man3/pcreapi.3
man/man3/pcrebuild.3
man/man3/pcrecallout.3
man/man3/pcrecompat.3
+man/man3/pcrecpp.3
+man/man3/pcrematching.3
man/man3/pcrepattern.3
man/man3/pcreperform.3
man/man3/pcreposix.3
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 2b4ff556b74..6de30224661 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6.6.1 2005/08/31 08:48:45 snj Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= pcre
.if !empty(PCRE_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.pcre+= pcre>=3.4nb1
-BUILDLINK_RECOMMENDED.pcre+= pcre>=5.0nb1
+BUILDLINK_RECOMMENDED.pcre+= pcre>=6.2
BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre
.endif # PCRE_BUILDLINK3_MK
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index 19cd22a6c3a..b38430cfe94 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 22:24:30 agc Exp $
+$NetBSD: distinfo,v 1.12.4.1 2005/08/31 08:48:45 snj Exp $
-SHA1 (pcre-5.0.tar.bz2) = 320841e705a5ae86a2df9cfadb387f09a731b88f
-RMD160 (pcre-5.0.tar.bz2) = bf0b384a6cbb6af3be34cde4e2725b33c17e424f
-Size (pcre-5.0.tar.bz2) = 465738 bytes
-SHA1 (patch-aa) = c175ed919871534114fb02ca909be1e0ee12b522
+SHA1 (pcre-6.2.tar.bz2) = 191fbde6614473f907da7d1ef92e17df97fde3eb
+RMD160 (pcre-6.2.tar.bz2) = b56d841d42444372f7d80a74f9271c4f58d1cd82
+Size (pcre-6.2.tar.bz2) = 561447 bytes
SHA1 (patch-ab) = 1bb79ce010f30fdd4ab3b579faa45fa06c01ce90
diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa
deleted file mode 100644
index 57aa00366ab..00000000000
--- a/devel/pcre/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/09/28 15:59:49 wiz Exp $
-
---- Makefile.in.orig 2004-09-13 16:20:00.000000000 +0200
-+++ Makefile.in
-@@ -78,12 +78,11 @@ NO_RECURSE = @NO_RECURSE@
- EBCDIC = @EBCDIC@
-
- INSTALL = @INSTALL@
--INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DATA = ${BSD_INSTALL_DATA}
-
- # LIBTOOL enables the building of shared and static libraries. It is set up
- # to do one or the other or both by ./configure.
-
--LIBTOOL = @LIBTOOL@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
- @ON_WINDOWS@LINK = $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L.libs
- @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)