Date: Mon, 25 Nov 2013 02:50:47 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184229: devel/regexx: Fix build Message-ID: <20131125025047.6ff942e8e0d216a3c6f86cf3@yahoo.com> Resent-Message-ID: <201311241810.rAOIA3MZ046837@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184229
>Category: ports
>Synopsis: devel/regexx: Fix build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 24 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build
New file:
files/patch-src__Makefile.in
files/patch-src__regexx.hh
Remove file:
files/patch-libtool22
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/regexx/Makefile devel/regexx/Makefile
--- /usr/ports/devel/regexx/Makefile 2013-11-06 21:49:40.000000000 +0900
+++ devel/regexx/Makefile 2013-11-25 00:00:00.000000000 +0900
@@ -3,27 +3,28 @@
PORTNAME= regexx
PORTVERSION= 0.98.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= A complete regular expressions C++ solution
+COMMENT= Complete regular expressions C++ solution
-USE_GMAKE= yes
+LICENSE= LGPL21
+
+LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
+
+USES= gmake pkgconfig
USE_AUTOTOOLS= libtool
+MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
+ AUTOMAKE="${TRUE}"
USE_LDCONFIG= yes
-MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre"
-NO_STAGE= yes
+CPPFLAGS+= $$(pkg-config --cflags libpcre)
+LDFLAGS+= $$(pkg-config --libs libpcre)
+
post-patch:
- @${REINPLACE_CMD} -e 's|@LIBTOOL@|${LIBTOOL}|g ; \
- s| \./libtool|${LIBTOOL}|g ; \
- s|\(DEFS.*\)|\1 -I${LOCALBASE}/include|' \
- ${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
+ @${REINPLACE_CMD} -e \
+ 's|"pcre"||' ${WRKSRC}/configure
.include <bsd.port.mk>
diff -urN /usr/ports/devel/regexx/files/patch-libtool22 devel/regexx/files/patch-libtool22
--- /usr/ports/devel/regexx/files/patch-libtool22 2013-11-06 21:49:40.000000000 +0900
+++ devel/regexx/files/patch-libtool22 1970-01-01 09:00:00.000000000 +0900
@@ -1,56 +0,0 @@
---- 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
diff -urN /usr/ports/devel/regexx/files/patch-src__Makefile.in devel/regexx/files/patch-src__Makefile.in
--- /usr/ports/devel/regexx/files/patch-src__Makefile.in 1970-01-01 09:00:00.000000000 +0900
+++ devel/regexx/files/patch-src__Makefile.in 2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig 2013-11-15 21:03:55.000000000 +0900
++++ src/Makefile.in 2013-11-15 21:04:18.000000000 +0900
+@@ -74,7 +74,7 @@
+
+ lib_LTLIBRARIES = libregexx.la
+ libregexx_la_SOURCES = regexx.cc regexx.hh split.cc split.hh
+-libregexx_la_LDFLAGS = -version-info 2:0:1 ../pcre/maketables.lo ../pcre/get.lo ../pcre/study.lo ../pcre/pcre.lo
++libregexx_la_LDFLAGS = -version-info 2:0:1
+ include_HEADERS = regexx.hh split.hh
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
diff -urN /usr/ports/devel/regexx/files/patch-src__regexx.hh devel/regexx/files/patch-src__regexx.hh
--- /usr/ports/devel/regexx/files/patch-src__regexx.hh 1970-01-01 09:00:00.000000000 +0900
+++ devel/regexx/files/patch-src__regexx.hh 2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- src/regexx.hh.orig 2013-11-15 21:02:42.000000000 +0900
++++ src/regexx.hh 2013-11-15 21:03:03.000000000 +0900
+@@ -29,6 +29,7 @@
+ #ifndef REGEXX_HH
+ #define REGEXX_HH
+
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <split.hh>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131125025047.6ff942e8e0d216a3c6f86cf3>