Attachment 158111 Details for Bug 201159 – re2 diff

[patch] re2 diff

re2.diff (text/plain), 3.76 KB, created by Po-Chuan Hsieh on 2015-06-28 08:32:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2015-06-28 08:32:54 UTC

Size: 3.76 KB

patch

obsolete

>Index: devel/re2/Makefile
>===================================================================
>--- devel/re2/Makefile	(revision 390735)
>+++ devel/re2/Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	re2
>-PORTVERSION=	20140304
>+PORTVERSION=	20150601
> CATEGORIES=	devel
>-MASTER_SITES=	GOOGLE_CODE
> 
> MAINTAINER=	jlaffaye@FreeBSD.org
> COMMENT=	Fast C++ regex library
>@@ -13,19 +12,13 @@
> 
> MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" prefix=${PREFIX}
> USE_LDCONFIG=	yes
>-USES=		compiler:c++11-lang gmake tar:tgz
>+USES=		compiler:c++11-lang gmake pathfix
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>+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.post.mk>
>+.include <bsd.port.mk>
>Index: devel/re2/distinfo
>===================================================================
>--- devel/re2/distinfo	(revision 390735)
>+++ devel/re2/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (re2-20140304.tgz) = 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7
>-SIZE (re2-20140304.tgz) = 1050493
>+SHA256 (google-re2-20150601-2015-06-01_GH0.tar.gz) = 90b4f48c26b1f33f4df5f86406d8c663c8a44b103a5554387ce3c53228abf20e
>+SIZE (google-re2-20150601-2015-06-01_GH0.tar.gz) = 385441
>Index: devel/re2/files/patch-Makefile
>===================================================================
>--- devel/re2/files/patch-Makefile	(revision 0)
>+++ devel/re2/files/patch-Makefile	(working copy)
>@@ -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: devel/re2/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>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
>Index: devel/re2/pkg-descr
>===================================================================
>--- devel/re2/pkg-descr	(revision 390735)
>+++ devel/re2/pkg-descr	(working copy)
>@@ -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
>Index: devel/re2/pkg-plist
>===================================================================
>--- devel/re2/pkg-plist	(revision 390735)
>+++ devel/re2/pkg-plist	(working copy)
>@@ -7,3 +7,4 @@
> lib/libre2.so
> lib/libre2.so.0
> lib/libre2.so.0.0.0
>+libdata/pkgconfig/re2.pc

Actions: View | Diff

Attachments on bug 201159: 158111