diff options
Diffstat (limited to 'devel/pcre/patches/patch-aa')
-rw-r--r-- | devel/pcre/patches/patch-aa | 77 |
1 files changed, 77 insertions, 0 deletions
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, |