Date: Thu, 26 Dec 2013 13:16:34 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337505 - in branches/2014Q1/devel/regexx: . files Message-ID: <201312261316.rBQDGYfE091192@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Dec 26 13:16:34 2013 New Revision: 337505 URL: http://svnweb.freebsd.org/changeset/ports/337505 Log: MFH: r337440 - Fix build on -current - Depend on pcre from ports instead of bundled one - Strip library file PR: ports/184229 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Approved by: portmgr (implicit) Added: branches/2014Q1/devel/regexx/files/patch-src__Makefile.in - copied unchanged from r337440, head/devel/regexx/files/patch-src__Makefile.in branches/2014Q1/devel/regexx/files/patch-src__regexx.hh - copied unchanged from r337440, head/devel/regexx/files/patch-src__regexx.hh Deleted: branches/2014Q1/devel/regexx/files/patch-libtool22 Modified: branches/2014Q1/devel/regexx/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/regexx/Makefile ============================================================================== --- branches/2014Q1/devel/regexx/Makefile Thu Dec 26 13:16:24 2013 (r337504) +++ branches/2014Q1/devel/regexx/Makefile Thu Dec 26 13:16:34 2013 (r337505) @@ -3,27 +3,31 @@ 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 + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libregexx.so.2 .include <bsd.port.mk> Copied: branches/2014Q1/devel/regexx/files/patch-src__Makefile.in (from r337440, head/devel/regexx/files/patch-src__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/regexx/files/patch-src__Makefile.in Thu Dec 26 13:16:34 2013 (r337505, copy of r337440, head/devel/regexx/files/patch-src__Makefile.in) @@ -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 = Copied: branches/2014Q1/devel/regexx/files/patch-src__regexx.hh (from r337440, head/devel/regexx/files/patch-src__regexx.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/regexx/files/patch-src__regexx.hh Thu Dec 26 13:16:34 2013 (r337505, copy of r337440, head/devel/regexx/files/patch-src__regexx.hh) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312261316.rBQDGYfE091192>