Bug 184229 - devel/regexx: Fix build
Summary: devel/regexx: Fix build
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-24 18:10 UTC by tkato432
Modified: 2013-12-26 13:20 UTC (History)
0 users

See Also:

Attachments
file.diff (5.28 KB, patch)
2013-11-24 18:10 UTC, tkato432 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-11-24 18:10:03 UTC 
- Fix build

New file:
files/patch-src__Makefile.in
files/patch-src__regexx.hh

Remove file:
files/patch-libtool22
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-25 19:27:33 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-25 19:35:39 UTC 
Author: pawel
Date: Wed Dec 25 19:35:30 2013
New Revision: 337440
URL: http://svnweb.freebsd.org/changeset/ports/337440

Log:
  - 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>

Added:
  head/devel/regexx/files/patch-src__Makefile.in   (contents, props changed)
  head/devel/regexx/files/patch-src__regexx.hh   (contents, props changed)
Deleted:
  head/devel/regexx/files/patch-libtool22
Modified:
  head/devel/regexx/Makefile   (contents, props changed)

Modified: head/devel/regexx/Makefile
==============================================================================
--- head/devel/regexx/Makefile	Wed Dec 25 19:16:49 2013	(r337439)
+++ head/devel/regexx/Makefile	Wed Dec 25 19:35:30 2013	(r337440)
@@ -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>

Added: head/devel/regexx/files/patch-src__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/regexx/files/patch-src__Makefile.in	Wed Dec 25 19:35:30 2013	(r337440)
@@ -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 = 

Added: head/devel/regexx/files/patch-src__regexx.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/regexx/files/patch-src__regexx.hh	Wed Dec 25 19:35:30 2013	(r337440)
@@ -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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-25 19:35:44 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-26 13:16:45 UTC 
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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"