Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  4 Nov 2013 21:56:16 +0800 (CST)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/183661: [PATCH] devel/re2: update to 20131024
Message-ID:  <20131104135616.B62C2451B@sunpoet.net>
Resent-Message-ID: <201311041400.rA4E00Oc090065@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183661
>Category:       ports
>Synopsis:       [PATCH] devel/re2: update to 20131024
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 04 14:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 10.0-BETA1 amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256445: Tue Oct 15 04:48:04 CST
>Description:
- Update to 20131024
- Fix build with clang and libc++
- Remove leading indefinite article from COMMENT
- Respect CXXFLAGS
- Strip shared library
- Support STAGEDIR
- Sort PLIST
- Use single space after WWW:

Port maintainer (jlaffaye@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- re2-20131024.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 332719)
+++ Makefile	(working copy)
@@ -2,19 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	re2
-PORTVERSION=	20120226
+PORTVERSION=	20131024
 CATEGORIES=	devel
-MASTER_SITES=	LOCAL/jlaffaye
+MASTER_SITES=	GOOGLE_CODE
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jlaffaye@FreeBSD.org
-COMMENT=	A fast C++ regex library
+COMMENT=	Fast C++ regex library
 
 LICENSE=	BSD
 
+MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" prefix=${PREFIX}
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	prefix=${PREFIX}
-MAKE_ARGS+=	-e
+USES=		compiler:c++11-lang gmake
 
-NO_STAGE=	yes
-.include <bsd.port.mk>
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+.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>
Index: distinfo
===================================================================
--- distinfo	(revision 332719)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (re2-20120226.tar.gz) = be43ca5ec691b55b1ccaa3ffa91bf84a24f52bc0190fc0154d90d7b64d495897
-SIZE (re2-20120226.tar.gz) = 409176
+SHA256 (re2-20131024.tgz) = 4cbf7a98e79ba0c3f83b865049bcf3c6d60593b1a7accb60e8e10745a97cd62b
+SIZE (re2-20131024.tgz) = 1030145
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 332719)
+++ 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: http://code.google.com/p/re2/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 332719)
+++ pkg-plist	(working copy)
@@ -1,10 +1,10 @@
 include/re2/filtered_re2.h
 include/re2/re2.h
+include/re2/set.h
 include/re2/stringpiece.h
 include/re2/variadic_function.h
-include/re2/set.h
+lib/libre2.a
 lib/libre2.so
 lib/libre2.so.0
-lib/libre2.a
 lib/libre2.so.0.0.0
 @dirrm include/re2
--- re2-20131024.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131104135616.B62C2451B>