Updated to version 3.7. Changes since 3.4:

Version 3.7 29-Oct-01
---------------------

1. In updating pcretest to check change 1 of version 3.6, I screwed up.
This caused pcretest, when used on the test data, to segfault. Unfortunately,
this didn't happen under Solaris 8, where I normally test things.

Version 3.6 23-Oct-01
---------------------

1. Crashed with /(sens|respons)e and \1ibility/ and "sense and sensibility" if
offsets passed as NULL with zero offset count.

2. The config.guess and config.sub files had not been updated when I moved to
the latest autoconf.

Version 3.5 15-Aug-01
---------------------

1. Added some missing #if !defined NOPOSIX conditionals in pcretest.c that
had been forgotten.

2. By using declared but undefined structures, we can avoid using "void"
definitions in pcre.h while keeping the internal definitions of the structures
private.

3. The distribution is now built using autoconf 2.50 and libtool 1.4. From a
user point of view, this means that both static and shared libraries are built
by default, but this can be individually controlled. More of the work of
handling this static/shared cases is now inside libtool instead of PCRE's make
file.

4. The pcretest utility is now installed along with pcregrep because it is
useful for users (to test regexs) and by doing this, it automatically gets
relinked by libtool. The documentation has been turned into a man page, so
there are now .1, .txt, and .html versions in /doc.

5. Upgrades to pcregrep:
   (i)   Added long-form option names like gnu grep.
   (ii)  Added --help to list all options with an explanatory phrase.
   (iii) Added -r, --recursive to recurse into sub-directories.
   (iv)  Added -f, --file to read patterns from a file.

6. pcre_exec() was referring to its "code" argument before testing that
argument for NULL (and giving an error if it was NULL).

7. Upgraded Makefile.in to allow for compiling in a different directory from
the source directory.

8. Tiny buglet in pcretest: when pcre_fullinfo() was called to retrieve the
options bits, the pointer it was passed was to an int instead of to an unsigned
long int. This mattered only on 64-bit systems.

9. Fixed typo (3.4/1) in pcre.h again. Sigh. I had changed pcre.h (which is
generated) instead of pcre.in, which it its source. Also made the same change
in several of the .c files.

10. A new release of gcc defines printf() as a macro, which broke pcretest
because it had an ifdef in the middle of a string argument for printf(). Fixed
by using separate calls to printf().

11. Added --enable-newline-is-cr and --enable-newline-is-lf to the configure
script, to force use of CR or LF instead of \n in the source. On non-Unix
systems, the value can be set in config.h.

12. The limit of 200 on non-capturing parentheses is a _nesting_ limit, not an
absolute limit. Changed the text of the error message to make this clear, and
likewise updated the man page.

13. The limit of 99 on the number of capturing subpatterns has been removed.
The new limit is 65535, which I hope will not be a "real" limit.

4 files changed, 24 insertions, 76 deletions

diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 0202777e7f5..6d35a097270 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2001/06/27 03:41:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/30 10:20:01 martti Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/07/12 22:59:19 steve Exp $
 
-DISTNAME=	pcre-3.4
+DISTNAME=	pcre-3.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcre/}			\
 		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/	\
 		ftp://pcre.sourceforge.net/pub/pcre/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	proff@netbsd.org
 HOMEPAGE=	http://www.pcre.org/
diff --git a/devel/pcre/PLIST b/devel/pcre/PLIST
index d6de1787ec9..92c0510189a 100644
--- a/devel/pcre/PLIST
+++ b/devel/pcre/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:25:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/30 10:20:02 martti Exp $
 bin/pcre-config
 bin/pcregrep
+bin/pcretest
 include/pcre.h
 include/pcreposix.h
 lib/libpcre.a
@@ -14,5 +15,6 @@ lib/libpcreposix.so
 lib/libpcreposix.so.0
 lib/libpcreposix.so.0.0
 man/man1/pcregrep.1
+man/man1/pcretest.1
 man/man3/pcre.3
 man/man3/pcreposix.3
diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo
index b72101a0477..973270982d1 100644
--- a/devel/pcre/distinfo
+++ b/devel/pcre/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/05/14 12:55:30 zuntum Exp $
+$NetBSD: distinfo,v 1.5 2001/11/30 10:20:02 martti Exp $
 
-SHA1 (pcre-3.4.tar.gz) = faa4ffdcd7c42cb512f6ae3428ed0c20e8f84c9b
-Size (pcre-3.4.tar.gz) = 296708 bytes
-SHA1 (patch-aa) = b473bb6d87f81ec4fab5bbb33e315ed41ce5114b
+SHA1 (pcre-3.7.tar.bz2) = e7bf67470969589e7abc8bd36abae88d06d01410
+Size (pcre-3.7.tar.bz2) = 261693 bytes
+SHA1 (patch-aa) = 81599c2dcc68225e45f4080d14f039543b9e76fb
diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa
index 287b6f2c022..7e810fcf444 100644
--- a/devel/pcre/patches/patch-aa
+++ b/devel/pcre/patches/patch-aa
@@ -1,77 +1,22 @@
-$NetBSD: patch-aa,v 1.1 2001/05/14 12:55:30 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2001/11/30 10:20:02 martti 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
--
+--- Makefile.in.orig	Mon Oct 29 16:51:17 2001
++++ Makefile.in	Sat Nov 24 10:47:36 2001
+@@ -62,13 +62,14 @@
+ UTF8   = @UTF8@
+ NEWLINE = @NEWLINE@
+ 
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
 +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
+ # LIBTOOL enables the building of shared and static libraries. It is set up
+ # to do one or the other or both by ./configure.
  
--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
+-LIBTOOL = @LIBTOOL@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. $(NEWLINE)
+ LINK = $(LIBTOOL) --mode=link $(CC)
  
- # 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,