Date: Thu, 18 Jan 2001 09:24:18 -0500 (EST) From: yds@dppl.com To: FreeBSD-gnats-submit@freebsd.org Cc: dom@myrddin.demon.co.uk Subject: ports/24430: UPDATE: devel/pcre to 3.4 Message-ID: <20010118142418.8D9287441B@sapas.dppl.com>
next in thread | raw e-mail | index | archive | help
>Number: 24430 >Category: ports >Synopsis: UPDATE: devel/pcre to 3.4 >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 Jan 18 06:30:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: Yarema >Release: FreeBSD 4.2-STABLE i386 >Organization: Digital Page Publishers, Ltd. >Environment: FreeBSD 4.2-STABLE i386 >Description: Update pcre to 3.4 and switch to using the bzip2 tarball. Move the fix for installing pgrep (now known as pcregrep) properly from the port skeleton's Makefile to the port's own Makefile.in. As far as I can tell the reason pgrep/pcregrep doesn't install right without these hacks is because we're using our own libtool instead of the one supplied with the port. Personally I prefer the pgrep name to pcregrep but I didn't wanna do anything about it without some feedback. >How-To-Repeat: cd /usr/ports/devel/pcre && make install >Fix: diff -ruN pcre.old/Makefile pcre/Makefile --- pcre.old/Makefile Thu Oct 26 02:38:18 2000 +++ pcre/Makefile Sun Dec 3 09:29:44 2000 @@ -6,21 +6,18 @@ # PORTNAME= pcre -PORTVERSION= 3.1 +PORTVERSION= 3.4 CATEGORIES= devel MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/ MAINTAINER= dom@myrddin.demon.co.uk +USE_BZIP2= yes + # Implies GNU_CONFIGURE. USE_LIBTOOL= yes MAN3= pcre.3 pcreposix.3 -MAN1= pgrep.1 - -# Otherwise we get a broken pgrep shell script installed -# instead of the binary we really want. -pre-install: - @${LN} -f ${WRKSRC}/.libs/pgrep ${WRKSRC}/pgrep +MAN1= pcregrep.1 .include <bsd.port.mk> diff -ruN pcre.old/distinfo pcre/distinfo --- pcre.old/distinfo Thu Mar 23 20:57:50 2000 +++ pcre/distinfo Sun Dec 3 09:15:46 2000 @@ -1 +1 @@ -MD5 (pcre-3.1.tar.gz) = e24369e30177e2580dac9fe655dd8ad8 +MD5 (pcre-3.4.tar.bz2) = 477c8e7fda57dd0a1a4b9d226b386812 diff -ruN pcre.old/files/patch-aa pcre/files/patch-aa --- pcre.old/files/patch-aa Thu Mar 23 20:58:45 2000 +++ pcre/files/patch-aa Sun Dec 3 19:31:08 2000 @@ -1,7 +1,7 @@ ---- 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 +--- 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@ @@ -9,36 +9,67 @@ LIBSUFFIX = @LIBSUFFIX@ # These are the version numbers for the shared libraries -@@ -76,13 +76,7 @@ +@@ -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 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 @@ +-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) + $(LIBTOOL) $(CC) -version-info '$(PCRELIBVERSION)' -o libpcre.la -rpath $(LIBDIR) $(LOBJ) libpcreposix.a: pcreposix.o @echo ' ' -@@ -125,7 +119,7 @@ +@@ -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 + $(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 + $(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, diff -ruN pcre.old/pkg-plist pcre/pkg-plist --- pcre.old/pkg-plist Sat Jun 3 05:16:52 2000 +++ pcre/pkg-plist Sun Dec 3 09:28:16 2000 @@ -1,5 +1,5 @@ bin/pcre-config -bin/pgrep +bin/pcregrep include/pcre.h include/pcreposix.h lib/libpcre.a >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?20010118142418.8D9287441B>