From owner-freebsd-ports Mon Nov 19 3:20:27 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8641137B416 for ; Mon, 19 Nov 2001 03:20:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id fAJBK1X48162; Mon, 19 Nov 2001 03:20:01 -0800 (PST) (envelope-from gnats) Received: from cathbad.happygiraffe.net (choke.semantico.com [212.74.15.98]) by hub.freebsd.org (Postfix) with ESMTP id 26FD837B416 for ; Mon, 19 Nov 2001 03:11:45 -0800 (PST) Received: by cathbad.happygiraffe.net (Postfix, from userid 1001) id 1B4E1621F; Mon, 19 Nov 2001 11:10:22 +0000 (GMT) Message-Id: <20011119111022.1B4E1621F@cathbad.happygiraffe.net> Date: Mon, 19 Nov 2001 11:10:22 +0000 (GMT) From: Dominic Mitchell Reply-To: Dominic Mitchell To: FreeBSD-gnats-submit@freebsd.org Cc: Jeremy Norris X-Send-Pr-Version: 3.113 Subject: ports/32103: Version Bump for devel/pcre Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 32103 >Category: ports >Synopsis: Version Bump for devel/pcre >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Nov 19 03:20:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Dominic Mitchell >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD cathbad.happygiraffe.net 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Fri Nov 16 14:27:17 GMT 2001 root@cathbad.happygiraffe.net:/usr/obj/usr/src/sys/CATHBAD i386 >Description: This patch updates ports/pcre to the latest version. It also switches to the bz2 distfile. Many thanks to Jeremy Norris for supplying this patch. NB: This patch DELETES files/patch-aa. Its functionality is subsumed by the NEW files/patch-ltmain.sh. >How-To-Repeat: n/a >Fix: Here's the patch: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/pcre/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 7 Jun 2001 07:46:01 -0000 1.10 +++ Makefile 17 Nov 2001 00:28:32 -0000 @@ -6,16 +6,18 @@ # PORTNAME= pcre -PORTVERSION= 3.4 +PORTVERSION= 3.7 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= dom@happygiraffe.net -USE_LIBTOOL= yes +USE_BZIP2= yes +GNU_CONFIGURE= yes +INSTALLS_SHLIB= yes +MAN1= pcregrep.1 pcretest.1 MAN3= pcre.3 pcreposix.3 -MAN1= pcregrep.1 .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/pcre/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 3 May 2001 08:38:54 -0000 1.6 +++ distinfo 17 Nov 2001 00:25:03 -0000 @@ -1 +1 @@ -MD5 (pcre-3.4.tar.gz) = 75918d0111f592097939a7b8c490dcd0 +MD5 (pcre-3.7.tar.bz2) = 90a6efb498fa13e788b2963715bb362a Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/pcre/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 24 Jan 2001 02:09:04 -0000 1.6 +++ pkg-plist 16 Nov 2001 23:56:55 -0000 @@ -1,12 +1,11 @@ bin/pcre-config bin/pcregrep +bin/pcretest 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 Index: files/patch-aa =================================================================== RCS file: files/patch-aa diff -N files/patch-aa --- files/patch-aa 24 Jan 2001 02:09:04 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,75 +0,0 @@ ---- Makefile.in.orig Tue Aug 22 05:05:43 2000 -+++ Makefile.in Sun Dec 3 19:27:54 2000 -@@ -43,7 +43,7 @@ - # is set to "a" instead of "la", which causes the shared libraries not to be - # installed. - --LIBTOOL = @LIBTOOL@ -+LIBTOOL = $(LOCALBASE)/bin/libtool - LIBSUFFIX = @LIBSUFFIX@ - - # These are the version numbers for the shared libraries -@@ -56,8 +56,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} - - - #---------------------------------------------------------------------------# -@@ -78,7 +80,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 +114,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 +129,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 +165,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 +177,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, Index: files/patch-ltmain.sh =================================================================== RCS file: files/patch-ltmain.sh diff -N files/patch-ltmain.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ltmain.sh 16 Nov 2001 23:55:29 -0000 @@ -0,0 +1,28 @@ + +$FreeBSD$ + +--- ltmain.sh.orig Fri Aug 17 03:16:16 2001 ++++ ltmain.sh Fri Nov 16 17:54:42 2001 +@@ -2408,6 +2408,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4175,10 +4178,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message