[Midnightbsd-cvs] mports [19692] trunk/devel/re2: fix re2 port and move to its new home github

[laffer1 at midnightbsd.org]

Revision: 19692
          http://svnweb.midnightbsd.org/mports/?rev=19692
Author:   laffer1
Date:     2015-08-09 14:43:56 -0400 (Sun, 09 Aug 2015)
Log Message:
-----------
fix re2 port and move to its new home github

Modified Paths:
--------------
    trunk/devel/re2/Makefile
    trunk/devel/re2/distinfo
    trunk/devel/re2/pkg-descr
    trunk/devel/re2/pkg-plist

Added Paths:
-----------
    trunk/devel/re2/files/
    trunk/devel/re2/files/patch-Makefile

Modified: trunk/devel/re2/Makefile
===================================================================
--- trunk/devel/re2/Makefile	2015-08-08 05:28:16 UTC (rev 19691)
+++ trunk/devel/re2/Makefile	2015-08-09 18:43:56 UTC (rev 19692)
@@ -1,9 +1,8 @@
 # $MidnightBSD$ 
 
 PORTNAME=	re2
-PORTVERSION=	20140304
+PORTVERSION=	20150601
 CATEGORIES=	devel
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Fast C++ regex library
@@ -12,17 +11,17 @@
 
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" prefix=${PREFIX}
 USE_LDCONFIG=	yes
-USES=		compiler:c++11-lang gmake tar:tgz
+USES=		gmake pathfix tar:tgz
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+GH_ACCOUNT=	google
+GH_TAGNAME=	${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|}
+USE_GITHUB=	yes
 
+WRKSRC=		${WRKDIR}/re2-2015-06-01
+
 .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
+USES+=		compiler:c++11-lang
 
 post-build:
 	@${STRIP_CMD} ${WRKSRC}/obj/so/libre2.so

Modified: trunk/devel/re2/distinfo
===================================================================
--- trunk/devel/re2/distinfo	2015-08-08 05:28:16 UTC (rev 19691)
+++ trunk/devel/re2/distinfo	2015-08-09 18:43:56 UTC (rev 19692)
@@ -1,2 +1,2 @@
-SHA256 (re2-20140304.tgz) = 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7
-SIZE (re2-20140304.tgz) = 1050493
+SHA256 (re2-20150601_GH0.tgz) = 90b4f48c26b1f33f4df5f86406d8c663c8a44b103a5554387ce3c53228abf20e
+SIZE (re2-20150601_GH0.tgz) = 385441

Added: trunk/devel/re2/files/patch-Makefile
===================================================================
--- trunk/devel/re2/files/patch-Makefile	                        (rev 0)
+++ trunk/devel/re2/files/patch-Makefile	2015-08-09 18:43:56 UTC (rev 19692)
@@ -0,0 +1,26 @@
+--- 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


Property changes on: trunk/devel/re2/files/patch-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/re2/pkg-descr
===================================================================
--- trunk/devel/re2/pkg-descr	2015-08-08 05:28:16 UTC (rev 19691)
+++ trunk/devel/re2/pkg-descr	2015-08-09 18:43:56 UTC (rev 19692)
@@ -8,4 +8,4 @@
 expressions it must process; thus RE2 is useful in multithreaded environments
 where thread stacks cannot grow arbitrarily large.
 
-WWW: http://code.google.com/p/re2/
+WWW: https://github.com/google/re2

Modified: trunk/devel/re2/pkg-plist
===================================================================
--- trunk/devel/re2/pkg-plist	2015-08-08 05:28:16 UTC (rev 19691)
+++ trunk/devel/re2/pkg-plist	2015-08-09 18:43:56 UTC (rev 19692)
@@ -7,3 +7,4 @@
 lib/libre2.so
 lib/libre2.so.0
 lib/libre2.so.0.0.0
+libdata/pkgconfig/re2.pc