Date: Thu, 9 Mar 2000 22:47:56 +0000 (GMT) From: dom@happygiraffe.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17294: Update for devel/pcre Message-ID: <20000309224756.69AD52162@myrddin.demon.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 17294 >Category: ports >Synopsis: Update to devel/pcre >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 9 16:10:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Dominic Mitchell >Release: FreeBSD 4.0-CURRENT i386 >Organization: None. >Environment: FreeBSD myrddin.demon.co.uk 4.0-CURRENT FreeBSD 4.0-CURRENT #2: Thu Feb 24 09:31:58 GMT 2000 root@myrddin.demon.co.uk:/usr/src/sys/compile/MYRDDIN i386 >Description: This updates the pcre port to v3.1. This includes shared libs using that bane of every porters life, libtool. Unfortunately, the libtool support in this library is decidely non-standard, so it still installs .la files. If anybody could correct this for me, I'd appreciate it. >How-To-Repeat: n/a >Fix: Here's the diffs against the existing devel/pcre port. diff -urN /usr/ports/devel/pcre/Makefile pcre/Makefile --- /usr/ports/devel/pcre/Makefile Tue Sep 28 03:40:41 1999 +++ pcre/Makefile Thu Mar 9 21:57:24 2000 @@ -1,35 +1,21 @@ # New ports collection makefile for: pcre -# Version required: 2.08 +# Version required: 3.1 # Date created: 08 July 1998 # Whom: dom # # $FreeBSD: ports/devel/pcre/Makefile,v 1.4 1999/09/28 02:40:41 steve Exp $ # -DISTNAME= pcre-2.08 +DISTNAME= pcre-3.1 CATEGORIES= devel MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/ MAINTAINER= dom@myrddin.demon.co.uk +# Implies GNU_CONFIGURE. +USE_LIBTOOL= yes + MAN3= pcre.3 pcreposix.3 MAN1= pgrep.1 - -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 - -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}/pcre.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/pcreposix.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 .include <bsd.port.mk> diff -urN /usr/ports/devel/pcre/files/md5 pcre/files/md5 --- /usr/ports/devel/pcre/files/md5 Wed Nov 10 21:14:42 1999 +++ pcre/files/md5 Thu Mar 9 21:57:24 2000 @@ -1 +1 @@ -MD5 (pcre-2.08.tar.gz) = c0a0e7605eb1ed1787a0641f4d775e56 +MD5 (pcre-3.1.tar.gz) = e24369e30177e2580dac9fe655dd8ad8 diff -urN /usr/ports/devel/pcre/patches/patch-aa pcre/patches/patch-aa --- /usr/ports/devel/pcre/patches/patch-aa Thu Jan 1 01:00:00 1970 +++ pcre/patches/patch-aa Thu Mar 9 22:32:23 2000 @@ -0,0 +1,44 @@ +--- Makefile.in.orig Wed Feb 9 10:44:58 2000 ++++ Makefile.in Thu Mar 9 22:32:11 2000 +@@ -42,7 +42,7 @@ + # is set to "la" instead of "a", which causes the shared libraries to be + # installed. + +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = $(LOCALBASE)/bin/libtool + LIBSUFFIX = @LIBSUFFIX@ + + # These are the version numbers for the shared libraries +@@ -76,13 +76,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 pgrep +- +-libtool: config.guess config.sub ltconfig ltmain.sh +- @if test "$(LIBTOOL)" = "libtool"; then \ +- echo '--- Building libtool ---'; \ +- ./ltconfig ./ltmain.sh; \ +- echo '--- Built libtool ---'; fi ++all: libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) pcretest pgrep + + pgrep: libpcre.$(LIBSUFFIX) pgrep.o + @echo ' ' +@@ -110,7 +104,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 ' ' +@@ -125,7 +119,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) pcre.c diff -urN /usr/ports/devel/pcre/pkg/PLIST pcre/pkg/PLIST --- /usr/ports/devel/pcre/pkg/PLIST Wed Nov 10 21:14:43 1999 +++ pcre/pkg/PLIST Thu Mar 9 22:42:34 2000 @@ -1,5 +1,12 @@ +bin/pcre-config bin/pgrep include/pcre.h include/pcreposix.h lib/libpcre.a +lib/libpcre.la +lib/libpcre.so +lib/libpcre.so.0 lib/libpcreposix.a +lib/libpcreposix.la +lib/libpcreposix.so +lib/libpcreposix.so.0 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000309224756.69AD52162>