diff options
author | Jeremy Messenger <mezz@FreeBSD.org> | 2009-07-14 04:16:37 +0000 |
---|---|---|
committer | Jeremy Messenger <mezz@FreeBSD.org> | 2009-07-14 04:16:37 +0000 |
commit | 60e1c76f66213790fe50b3e5fb9accb76eb7452d (patch) | |
tree | 215da20a44bebe25a3123c711a7d3211ca583bf6 /devel/regexx | |
parent | 3218121bc8575b88fbb084c2222eb7791a6e8ac8 (diff) | |
download | ports-60e1c76f66213790fe50b3e5fb9accb76eb7452d.tar.gz ports-60e1c76f66213790fe50b3e5fb9accb76eb7452d.zip |
Notes
Diffstat (limited to 'devel/regexx')
-rw-r--r-- | devel/regexx/Makefile | 6 | ||||
-rw-r--r-- | devel/regexx/files/patch-libtool22 | 56 |
2 files changed, 59 insertions, 3 deletions
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile index b02ee10da4e9..a85945939c48 100644 --- a/devel/regexx/Makefile +++ b/devel/regexx/Makefile @@ -8,7 +8,7 @@ PORTNAME= regexx PORTVERSION= 0.98.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,8 +16,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A complete regular expressions C++ solution -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre - USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes @@ -29,5 +27,7 @@ post-patch: ${WRKSRC}/src/Makefile.in ${WRKSRC}/pcre/Makefile.in @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's| examples||g' \ + ${WRKSRC}/Makefile.am .include <bsd.port.mk> diff --git a/devel/regexx/files/patch-libtool22 b/devel/regexx/files/patch-libtool22 new file mode 100644 index 000000000000..000fff2495ad --- /dev/null +++ b/devel/regexx/files/patch-libtool22 @@ -0,0 +1,56 @@ +--- pcre/Makefile.in.orig 2001-03-13 10:31:36.000000000 -0600 ++++ pcre/Makefile.in 2009-07-13 22:54:21.000000000 -0500 +@@ -90,13 +90,13 @@ + @echo ' ' + @echo '--- Building pcregrep utility' + @echo ' ' +- $(LIBTOOL) $(CC) $(CFLAGS) -o pcregrep pcregrep.o libpcre.$(LIBSUFFIX) ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o pcregrep pcregrep.o libpcre.$(LIBSUFFIX) + + pcretest: libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) pcretest.o + @echo ' ' + @echo '--- Building pcretest testing program' + @echo ' ' +- $(LIBTOOL) $(PURIFY) $(CC) $(CFLAGS) -o pcretest pcretest.o \ ++ $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(CFLAGS) -o pcretest pcretest.o \ + libpcre.$(LIBSUFFIX) libpcreposix.$(LIBSUFFIX) + + libpcre.a: $(OBJ) +@@ -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 --mode=link $(CC) -version-info '$(PCRELIBVERSION)' -o libpcre.la -rpath $(LIBDIR) $(LOBJ) + + libpcreposix.a: pcreposix.o + @echo ' ' +@@ -127,22 +127,22 @@ + @echo '--- Building shared library: libpcreposix' + @echo ' ' + -rm -f libpcreposix.la +- ./libtool $(CC) -version-info '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la -rpath $(LIBDIR) pcreposix.lo ++ ./libtool --mode=link $(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 ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(UTF8) pcre.c + + pcreposix.o: pcreposix.c pcreposix.h internal.h pcre.h config.h Makefile +- $(LIBTOOL) $(CC) -c $(CFLAGS) pcreposix.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) pcreposix.c + + maketables.o: maketables.c pcre.h internal.h config.h Makefile +- $(LIBTOOL) $(CC) -c $(CFLAGS) maketables.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) maketables.c + + get.o: get.c pcre.h internal.h config.h Makefile +- $(LIBTOOL) $(CC) -c $(CFLAGS) get.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) get.c + + study.o: study.c pcre.h internal.h config.h Makefile +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(UTF8) study.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(UTF8) study.c + + pcretest.o: pcretest.c pcre.h config.h Makefile + $(CC) -c $(CFLAGS) $(UTF8) pcretest.c |