Attachment #158111 for bug #201159

View | Details | Raw Unified | Return to bug 201159
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	re2
PORTVERSION=	20150601
CATEGORIES=	devel
MASTER_SITES=	GOOGLE_CODE

MAINTAINER=	jlaffaye@FreeBSD.org
COMMENT=	Fast C++ regex library


MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" prefix=${PREFIX}
USE_LDCONFIG=	yes
USES=		compiler:c++11-lang gmake pathfix

GH_ACCOUNT=	google
GH_TAGNAME=	${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|}
USE_GITHUB=	yes

.include <bsd.port.pre.mk>

post-patch:
# remove tr1 if using libc++
.if ${COMPILER_FEATURES:Mlibc++}
	@${REINPLACE_CMD} -e 's|tr1/||; s|tr1::||' ${WRKSRC}/util/util.h
.endif

post-build:
	@${STRIP_CMD} ${WRKSRC}/obj/so/libre2.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/re2/distinfo (-2 / +2 lines)
1	SHA256 (re2-20140304.tgz) = 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7	1	SHA256 (google-re2-20150601-2015-06-01_GH0.tar.gz) = 90b4f48c26b1f33f4df5f86406d8c663c8a44b103a5554387ce3c53228abf20e
2	SIZE (re2-20140304.tgz) = 1050493	2	SIZE (google-re2-20150601-2015-06-01_GH0.tar.gz) = 385441




--- Makefile.orig	2015-05-29 02:13:42 UTC
+++ Makefile
@@ -25,6 +25,7 @@ exec_prefix=$(prefix)
 bindir=$(exec_prefix)/bin
 includedir=$(prefix)/include
 libdir=$(exec_prefix)/lib
+libdatadir=$(exec_prefix)/libdata
 INSTALL=install
 INSTALL_PROGRAM=$(INSTALL)
 INSTALL_DATA=$(INSTALL) -m 644
@@ -245,13 +246,13 @@ shared-bigtest: $(STESTS) $(SBIGTESTS)
 benchmark: obj/test/regexp_benchmark
 
 install: obj/libre2.a obj/so/libre2.so
-	mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdir)/pkgconfig
+	mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdatadir)/pkgconfig
 	$(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2
 	$(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a
 	$(INSTALL) obj/so/libre2.so $(DESTDIR)$(libdir)/libre2.so.$(SONAME).0.0
 	ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so.$(SONAME)
 	ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so
-	sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdir)/pkgconfig/re2.pc
+	sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdatadir)/pkgconfig/re2.pc
 
 testinstall:
 	@mkdir -p obj

Lines 8-11 Link Here

(-)devel/re2/pkg-descr (-1 / +1 lines)
8	expressions it must process; thus RE2 is useful in multithreaded environments	8	expressions it must process; thus RE2 is useful in multithreaded environments
9	where thread stacks cannot grow arbitrarily large.	9	where thread stacks cannot grow arbitrarily large.
10		10
11	WWW: http://code.google.com/p/re2/	11	WWW: https://github.com/google/re2

Lines 7-9 Link Here

(-)devel/re2/pkg-plist (+1 lines)
7	lib/libre2.so	7	lib/libre2.so
8	lib/libre2.so.0	8	lib/libre2.so.0
9	lib/libre2.so.0.0.0	9	lib/libre2.so.0.0.0
		10	libdata/pkgconfig/re2.pc

Return to bug 201159

Lines 2-10 Link Here

(-)devel/re2/Makefile (-13 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= re2	4	PORTNAME= re2
5	PORTVERSION= 20140304	5	PORTVERSION= 20150601
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= GOOGLE_CODE
8		7
9	MAINTAINER= jlaffaye@FreeBSD.org	8	MAINTAINER= jlaffaye@FreeBSD.org
10	COMMENT= Fast C++ regex library	9	COMMENT= Fast C++ regex library
Lines 13-31 Link Here
13		12
14	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" prefix=${PREFIX}	13	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" prefix=${PREFIX}
15	USE_LDCONFIG= yes	14	USE_LDCONFIG= yes
16	USES= compiler:c++11-lang gmake tar:tgz	15	USES= compiler:c++11-lang gmake pathfix
17		16
18	WRKSRC= ${WRKDIR}/${PORTNAME}	17	GH_ACCOUNT= google
		18	GH_TAGNAME= ${PORTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}
		19	USE_GITHUB= yes
19		20
20	.include <bsd.port.pre.mk>
21
22	post-patch:
23	# remove tr1 if using libc++
24	.if ${COMPILER_FEATURES:Mlibc++}
25	@${REINPLACE_CMD} -e 's\|tr1/\|\|; s\|tr1::\|\|' ${WRKSRC}/util/util.h
26	.endif
27
28	post-build:	21	post-build:
29	@${STRIP_CMD} ${WRKSRC}/obj/so/libre2.so	22	@${STRIP_CMD} ${WRKSRC}/obj/so/libre2.so
30		23
31	.include <bsd.port.post.mk>	24	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/re2/files/patch-Makefile (+26 lines)
	1	--- Makefile.orig 2015-05-29 02:13:42 UTC
	2	+++ Makefile
	3	@@ -25,6 +25,7 @@ exec_prefix=$(prefix)
	4	bindir=$(exec_prefix)/bin
	5	includedir=$(prefix)/include
	6	libdir=$(exec_prefix)/lib
	7	+libdatadir=$(exec_prefix)/libdata
	8	INSTALL=install
	9	INSTALL_PROGRAM=$(INSTALL)
	10	INSTALL_DATA=$(INSTALL) -m 644
	11	@@ -245,13 +246,13 @@ shared-bigtest: $(STESTS) $(SBIGTESTS)
	12	benchmark: obj/test/regexp_benchmark
	13
	14	install: obj/libre2.a obj/so/libre2.so
	15	- mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdir)/pkgconfig
	16	+ mkdir -p $(DESTDIR)$(includedir)/re2 $(DESTDIR)$(libdatadir)/pkgconfig
	17	$(INSTALL_DATA) $(INSTALL_HFILES) $(DESTDIR)$(includedir)/re2
	18	$(INSTALL) obj/libre2.a $(DESTDIR)$(libdir)/libre2.a
	19	$(INSTALL) obj/so/libre2.so $(DESTDIR)$(libdir)/libre2.so.$(SONAME).0.0
	20	ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so.$(SONAME)
	21	ln -sf libre2.so.$(SONAME).0.0 $(DESTDIR)$(libdir)/libre2.so
	22	- sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdir)/pkgconfig/re2.pc
	23	+ sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdatadir)/pkgconfig/re2.pc
	24
	25	testinstall:
	26	@mkdir -p obj