diff options
Diffstat (limited to 'devel/pcre')
| -rw-r--r-- | devel/pcre/Makefile | 29 | ||||
| -rw-r--r-- | devel/pcre/distinfo | 7 | ||||
| -rw-r--r-- | devel/pcre/patches/patch-aa | 77 | ||||
| -rw-r--r-- | devel/pcre/pkg/DESCR | 2 | ||||
| -rw-r--r-- | devel/pcre/pkg/PLIST | 17 |
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 |