Update pcre to version 3.4

Version 3.4 22-Aug-00
---------------------

1. Fixed typo in pcre.h: unsigned const char * changed to const unsigned char *.

2. Diagnose condition (?(0) as an error instead of crashing on matching.


Version 3.3 01-Aug-00
---------------------

1. If an octal character was given, but the value was greater than \377, it
was not getting masked to the least significant bits, as documented. This could
lead to crashes in some systems.

2. Perl 5.6 (if not earlier versions) accepts classes like [a-\d] and treats
the hyphen as a literal. PCRE used to give an error; it now behaves like Perl.

3. Added the functions pcre_free_substring() and pcre_free_substring_list().
These just pass their arguments on to (pcre_free)(), but they are provided
because some uses of PCRE bind it to non-C systems that can call its functions,
but cannot call free() or pcre_free() directly.

4. Add "make test" as a synonym for "make check". Corrected some comments in
the Makefile.

5. Add $(DESTDIR)/ in front of all the paths in the "install" target in the
Makefile.

6. Changed the name of pgrep to pcregrep, because Solaris has introduced a
command called pgrep for grepping around the active processes.

7. Added the beginnings of support for UTF-8 character strings.

8. Arranged for the Makefile to pass over the settings of CC, CFLAGS, and
RANLIB to ./ltconfig so that they are used by libtool. I think these are all
the relevant ones. (AR is not passed because ./ltconfig does its own figuring
out for the ar command.)

Version 3.2 12-May-00
---------------------

This is purely a bug fixing release.

1. If the pattern /((Z)+|A)*/ was matched agained ZABCDEFG it matched Z instead
of ZA. This was just one example of several cases that could provoke this bug,
which was introduced by change 9 of version 2.00. The code for breaking
infinite loops after an iteration that matches an empty string was't working
correctly.

2. The pcretest program was not imitating Perl correctly for the pattern /a*/g
when matched against abbab (for example). After matching an empty string, it
wasn't forcing anchoring when setting PCRE_NOTEMPTY for the next attempt; this
caused it to match further down the string than it should.

3. The code contained an inclusion of sys/types.h. It isn't clear why this
was there because it doesn't seem to be needed, and it causes trouble on some
systems, as it is not a Standard C header. It has been removed.

4. Made 4 silly changes to the source to avoid stupid compiler warnings that
were reported on the Macintosh. The changes were from

  while ((c = *(++ptr)) != 0 && c != '\n');
to
  while ((c = *(++ptr)) != 0 && c != '\n') ;

Totally extraordinary, but if that's what it takes...

5. PCRE is being used in one environment where neither memmove() nor bcopy() is
available. Added HAVE_BCOPY and an autoconf test for it; if neither
HAVE_MEMMOVE nor HAVE_BCOPY is set, use a built-in emulation function which
assumes the way PCRE uses memmove() (always moving upwards).

6. PCRE is being used in one environment where strchr() is not available. There
was only one use in pcre.c, and writing it out to avoid strchr() probably gives
faster code anyway.


Version 3.1 09-Feb-00
---------------------
The only change in this release is the fixing of some bugs in Makefile.in for
the "install" target:

(1) It was failing to install pcreposix.h.

(2) It was overwriting the pcre.3 man page with the pcreposix.3 man page.


Version 3.0 01-Feb-00
---------------------

1. Add support for the /+ modifier to perltest (to output $` like it does in
pcretest).

2. Add support for the /g modifier to perltest.

3. Fix pcretest so that it behaves even more like Perl for /g when the pattern
matches null strings.

4. Fix perltest so that it doesn't do unwanted things when fed an empty
pattern. Perl treats empty patterns specially - it reuses the most recent
pattern, which is not what we want. Replace // by /(?#)/ in order to avoid this
effect.

5. The POSIX interface was broken in that it was just handing over the POSIX
captured string vector to pcre_exec(), but (since release 2.00) PCRE has
required a bigger vector, with some working space on the end. This means that
the POSIX wrapper now has to get and free some memory, and copy the results.

6. Added some simple autoconf support, placing the test data and the
documentation in separate directories, re-organizing some of the
information files, and making it build pcre-config (a GNU standard). Also added
libtool support for building PCRE as a shared library, which is now the
default.

7. Got rid of the leading zero in the definition of PCRE_MINOR because 08 and
09 are not valid octal constants. Single digits will be used for minor values
less than 10.

8. Defined REG_EXTENDED and REG_NOSUB as zero in the POSIX header, so that
existing programs that set these in the POSIX interface can use PCRE without
modification.

9. Added a new function, pcre_fullinfo() with an extensible interface. It can
return all that pcre_info() returns, plus additional data. The pcre_info()
function is retained for compatibility, but is considered to be obsolete.

10. Added experimental recursion feature (?R) to handle one common case that
Perl 5.6 will be able to do with (?p{...}).

11. Added support for POSIX character classes like [:alpha:], which Perl is
adopting.

5 files changed, 104 insertions, 28 deletions

diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index b5d29c3d153..bcfa8a41f80 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,28 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/14 12:55:30 zuntum Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/07/12 22:59:19 steve Exp $
 
-DISTNAME=       pcre-2.08
-CATEGORIES=     devel
-MASTER_SITES=   ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/
+DISTNAME=	pcre-3.4
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcre/}			\
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/	\
+		ftp://pcre.sourceforge.net/pub/pcre/
 
 MAINTAINER=	proff@netbsd.org
+HOMEPAGE=	http://www.pcre.org/
 COMMENT=	Perl Compatible Regular Expressions library
 
-do-configure:
-	${SED} -e '/^CC/s/.*/CC=${CC}/' \
-	       -e '/^CFLAGS/s/.*/CFLAGS=${CFLAGS}/' \
-	       -e '/^RANLIB/s/.*/RANLIB=${RANLIB}/' \
-	    ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.new
-	${MV} ${WRKSRC}/Makefile.new ${WRKSRC}/Makefile
+GNU_CONFIGURE=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pgrep ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libpcre.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libpcreposix.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/pcreposix.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/pcre.h ${PREFIX}/include
-	${INSTALL_MAN} ${WRKSRC}/pcre.3 ${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKSRC}/pcreposix.3 ${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKSRC}/pgrep.1 ${PREFIX}/man/man1
+USE_LIBTOOL=	yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index ef373130f26..b72101a0477 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/04/21 00:44:41 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/05/14 12:55:30 zuntum Exp $
 
-SHA1 (pcre-2.08.tar.gz) = 957f5aa2c7e9d12100d4344030fcd6836727d89d
-Size (pcre-2.08.tar.gz) = 180799 bytes
+SHA1 (pcre-3.4.tar.gz) = faa4ffdcd7c42cb512f6ae3428ed0c20e8f84c9b
+Size (pcre-3.4.tar.gz) = 296708 bytes
+SHA1 (patch-aa) = b473bb6d87f81ec4fab5bbb33e315ed41ce5114b
diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa
new file mode 100644
index 00000000000..287b6f2c022
--- /dev/null
+++ b/devel/pcre/patches/patch-aa
@@ -0,0 +1,77 @@
+$NetBSD: patch-aa,v 1.1 2001/05/14 12:55:30 zuntum Exp $
+
+--- Makefile.in.orig	Tue Aug 22 11:05:43 2000
++++ Makefile.in
+@@ -43,7 +43,6 @@
+ # is set to "a" instead of "la", which causes the shared libraries not to be
+ # installed.
+ 
+-LIBTOOL = @LIBTOOL@
+ LIBSUFFIX = @LIBSUFFIX@
+ 
+ # These are the version numbers for the shared libraries
+@@ -56,9 +55,10 @@
+ # A copy of install-sh is in this distribution and is used by default.      #
+ #---------------------------------------------------------------------------#
+ 
+-INSTALL = ./install-sh -c
+-INSTALL_DATA = ${INSTALL} -m 644
+-
++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
++INSTALL_MAN = ${BSD_INSTALL_MAN}
+ 
+ #---------------------------------------------------------------------------#
+ # For almost all systems, the command to create a library is "ar cq", but   #
+@@ -78,7 +78,7 @@
+ OBJ = maketables.o get.o study.o pcre.o
+ LOBJ = maketables.lo get.lo study.lo pcre.lo
+ 
+-all:            libtool libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) pcretest pcregrep
++all:            libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) pcretest pcregrep
+ 
+ libtool:        config.guess config.sub ltconfig ltmain.sh
+ 		@if test "$(LIBTOOL)" = "./libtool"; then \
+@@ -112,7 +112,7 @@
+ 		@echo '--- Building shared library: libpcre'
+ 		@echo ' '
+ 		-rm -f libpcre.la
+-		./libtool $(CC) -version-info '$(PCRELIBVERSION)' -o libpcre.la -rpath $(LIBDIR) $(LOBJ)
++		$(LIBTOOL) $(CC) -version-info '$(PCRELIBVERSION)' -o libpcre.la -rpath $(LIBDIR) $(LOBJ)
+ 
+ libpcreposix.a: pcreposix.o
+ 		@echo ' '
+@@ -127,7 +127,7 @@
+ 		@echo '--- Building shared library: libpcreposix'
+ 		@echo ' '
+ 		-rm -f libpcreposix.la
+-		./libtool $(CC) -version-info '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la -rpath $(LIBDIR) pcreposix.lo
++		$(LIBTOOL) $(CC) -version-info '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la -rpath $(LIBDIR) pcreposix.lo
+ 
+ pcre.o:         chartables.c pcre.c pcre.h internal.h config.h Makefile
+ 		$(LIBTOOL) $(CC) -c $(CFLAGS) $(UTF8) pcre.c
+@@ -163,9 +163,9 @@
+ 		$(LIBTOOL) $(INSTALL_DATA) libpcreposix.$(LIBSUFFIX) $(DESTDIR)/$(LIBDIR)/libpcreposix.$(LIBSUFFIX)
+ 		$(INSTALL_DATA) pcre.h $(DESTDIR)/$(INCDIR)/pcre.h
+ 		$(INSTALL_DATA) pcreposix.h $(DESTDIR)/$(INCDIR)/pcreposix.h
+-		$(INSTALL_DATA) doc/pcre.3 $(DESTDIR)/$(MANDIR)/man3/pcre.3
+-		$(INSTALL_DATA) doc/pcreposix.3 $(DESTDIR)/$(MANDIR)/man3/pcreposix.3
+-		$(INSTALL_DATA) doc/pcregrep.1 $(DESTDIR)/$(MANDIR)/man1/pcregrep.1
++		$(INSTALL_MAN) doc/pcre.3 $(DESTDIR)/$(MANDIR)/man3/pcre.3
++		$(INSTALL_MAN) doc/pcreposix.3 $(DESTDIR)/$(MANDIR)/man3/pcreposix.3
++		$(INSTALL_MAN) doc/pcregrep.1 $(DESTDIR)/$(MANDIR)/man1/pcregrep.1
+ 		@if test "$(LIBTOOL)" = "./libtool"; then \
+ 		  echo ' '; \
+ 		  echo '--- Rebuilding pcregrep to use installed shared library ---'; \
+@@ -175,8 +175,8 @@
+ 		  echo $(CC) $(CFLAGS) -o pcretest pcretest.o -L$(DESTDIR)/$(LIBDIR) -lpcre -lpcreposix; \
+ 		  $(CC) $(CFLAGS) -o pcretest pcretest.o -L$(DESTDIR)/$(LIBDIR) -lpcre -lpcreposix; \
+ 		fi
+-		$(INSTALL)	pcregrep $(DESTDIR)/$(BINDIR)/pcregrep
+-		$(INSTALL)	pcre-config $(DESTDIR)/$(BINDIR)/pcre-config
++		$(INSTALL_PROGRAM)	.libs/pcregrep $(DESTDIR)/$(BINDIR)/pcregrep
++		$(INSTALL_SCRIPT)	pcre-config $(DESTDIR)/$(BINDIR)/pcre-config
+ 
+ # 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/pkg/DESCR b/devel/pcre/pkg/DESCR
index 59e819f1516..26ee2001e3f 100644
--- a/devel/pcre/pkg/DESCR
+++ b/devel/pcre/pkg/DESCR
@@ -2,5 +2,3 @@ PCRE is a Perl compatible library of regular expressions.  They
 are based on a completely seperate code-base from Henry Spencers
 originals.  It has been designed to make efficient use of memory
 for compiled regex's.
-
-Original Author:  Phil Hazel <ph10@cam.ac.uk>
diff --git a/devel/pcre/pkg/PLIST b/devel/pcre/pkg/PLIST
index a5862433271..e8d363f2a2d 100644
--- a/devel/pcre/pkg/PLIST
+++ b/devel/pcre/pkg/PLIST
@@ -1,9 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 1999/09/19 00:55:37 ad Exp $
-bin/pgrep
+@comment $NetBSD: PLIST,v 1.4 2001/05/14 12:55:30 zuntum Exp $
+bin/pcre-config
+bin/pcregrep
 include/pcre.h
 include/pcreposix.h
 lib/libpcre.a
+lib/libpcre.la
+lib/libpcre.so
+lib/libpcre.so.0
+lib/libpcre.so.0.1
 lib/libpcreposix.a
-man/man3/pcreposix.3
+lib/libpcreposix.la
+lib/libpcreposix.so
+lib/libpcreposix.so.0
+lib/libpcreposix.so.0.0
+man/man1/pcregrep.1
 man/man3/pcre.3
-man/man1/pgrep.1
+man/man3/pcreposix.3