Update to 6.1.

CXX patches flamed by:	#bsd-unix
Approved by:		krion (maintainer)
Special thanks to:	fjoe@, vsevolod@, Umka

6 files changed, 59 insertions, 18 deletions

diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 0cc99f6..a54655f 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pcre
-PORTVERSION=	5.0
+PORTVERSION=	6.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -37,14 +37,15 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		pcregrep.1 pcretest.1
 MAN3=		pcre.3 pcre_compile.3 pcre_config.3 \
-		pcre_copy_named_substring.3 pcre_copy_substring.3 pcre_exec.3 \
-		pcre_free_substring.3 pcre_free_substring_list.3 pcre_fullinfo.3 \
-		pcre_get_named_substring.3 pcre_get_stringnumber.3 pcre_get_substring.3 \
-		pcre_get_substring_list.3 pcre_info.3 pcre_maketables.3 \
-		pcre_study.3 pcre_version.3 pcreapi.3 \
-		pcrebuild.3 pcrecallout.3 pcrecompat.3 \
-		pcrepattern.3 pcreperform.3 pcreposix.3 \
-		pcresample.3
+		pcre_copy_named_substring.3 pcre_copy_substring.3 \
+		pcre_dfa_exec.3 pcre_exec.3 pcre_free_substring.3 \
+		pcre_free_substring_list.3 pcre_fullinfo.3 \
+		pcre_get_named_substring.3 pcre_get_stringnumber.3 \
+		pcre_get_substring.3 pcre_get_substring_list.3 pcre_info.3 \
+		pcre_maketables.3 pcre_refcount.3 pcre_study.3 pcre_version.3 \
+		pcreapi.3 pcrebuild.3 pcrecallout.3 pcrecompat.3 \
+		pcrecpp.3 pcrematching.3 pcrepattern.3 \
+		pcreperform.3 pcreposix.3 pcresample.3
 
 post-install:
 	@${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/pcregrep ${DESTDIR}${PREFIX}/bin/pcretest
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index a83ad5c..25d7945 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,2 +1,2 @@
-MD5 (pcre-5.0.tar.bz2) = 813850808894d99fb5b1c41ec6335d4f
-SIZE (pcre-5.0.tar.bz2) = 465738
+MD5 (pcre-6.1.tar.bz2) = 069a8c34df7ec4bd0dad8f26c64c9dd3
+SIZE (pcre-6.1.tar.bz2) = 555109
diff --git a/devel/pcre/files/patch-Makefile.in b/devel/pcre/files/patch-Makefile.in
index ba7e095..fbed966 100644
--- a/devel/pcre/files/patch-Makefile.in
+++ b/devel/pcre/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Sun Sep 26 01:33:12 2004
-+++ Makefile.in	Sun Sep 26 01:35:05 2004
-@@ -259,8 +259,8 @@
+--- Makefile.in.orig	Wed Jul 27 14:02:36 2005
++++ Makefile.in	Wed Jul 27 14:04:08 2005
+@@ -483,8 +483,8 @@
  		$(LIBTOOL) --mode=install $(INSTALL) pcregrep@EXEEXT@ $(DESTDIR)$(BINDIR)/pcregrep@EXEEXT@
  		$(LIBTOOL) --mode=install $(INSTALL) pcretest@EXEEXT@ $(DESTDIR)$(BINDIR)/pcretest@EXEEXT@
  		$(INSTALL) pcre-config $(DESTDIR)$(BINDIR)/pcre-config
 -		$(mkinstalldirs) $(DESTDIR)$(LIBDIR)/pkgconfig
--		$(INSTALL) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
+-		$(INSTALL_DATA) libpcre.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libpcre.pc
 +		$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/pkgconfig
-+		$(INSTALL) libpcre.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/libpcre.pc
++		$(INSTALL_DATA) libpcre.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/libpcre.pc
+ 
+ # The uninstall target removes all the files that were installed.
  
- # We deliberately omit dftables and chartables.c from 'make clean'; once made
- # chartables.c shouldn't change, and if people have edited the tables by hand,
diff --git a/devel/pcre/files/patch-configure b/devel/pcre/files/patch-configure
new file mode 100644
index 0000000..bd113f7
--- /dev/null
+++ b/devel/pcre/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	Wed Jul 27 15:51:37 2005
++++ configure	Wed Jul 27 15:51:55 2005
+@@ -19569,9 +19569,9 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-if test -n "$ac_cv_prog_ac_ct_CXX" -a "$pcre_has_cpp_headers" = 1; then
+-  MAYBE_CPP_TARGETS='$(CPP_TARGETS)'
+-fi
++##if test -n "$ac_cv_prog_ac_ct_CXX" -a "$pcre_has_cpp_headers" = 1; then
++MAYBE_CPP_TARGETS='$(CPP_TARGETS)'
++##fi
+ 
+ 
+ 
diff --git a/devel/pcre/files/patch-pcrecpp.cc b/devel/pcre/files/patch-pcrecpp.cc
new file mode 100644
index 0000000..176e32c
--- /dev/null
+++ b/devel/pcre/files/patch-pcrecpp.cc
@@ -0,0 +1,19 @@
+--- pcrecpp.cc.orig	Wed Jun 22 12:40:52 2005
++++ pcrecpp.cc	Wed Jul 27 17:14:34 2005
+@@ -36,6 +36,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <string>
++#include <algorithm>
+ #include "config.h"
+ // We need this to compile the proper dll on windows/msys.  This is copied
+ // from pcre_internal.h.  It would probably be better just to include that.
+@@ -378,7 +379,7 @@
+   int matches = TryMatch(text, 0, UNANCHORED, vec, kVecSize);
+   if (matches == 0)
+     return false;
+-  out->clear();
++  out->erase();
+   return Rewrite(out, rewrite, text, vec, matches);
+ }
+ 
diff --git a/devel/pcre/pkg-plist b/devel/pcre/pkg-plist
index 7098f9e..94f9a31 100644
--- a/devel/pcre/pkg-plist
+++ b/devel/pcre/pkg-plist
@@ -3,9 +3,15 @@ bin/pcregrep
 bin/pcretest
 include/pcre.h
 include/pcreposix.h
+include/pcre_scanner.h
+include/pcre_stringpiece.h
+include/pcrecpp.h
 lib/libpcre.a
 lib/libpcre.so
 lib/libpcre.so.0
+lib/libpcrecpp.a
+lib/libpcrecpp.so
+lib/libpcrecpp.so.0
 lib/libpcreposix.a
 lib/libpcreposix.so
 lib/libpcreposix.so.0