From owner-svn-ports-all@FreeBSD.ORG Wed Jul 2 21:31:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D0042DC; Wed, 2 Jul 2014 21:31:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A41A2461; Wed, 2 Jul 2014 21:31:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62LVBIH004038; Wed, 2 Jul 2014 21:31:11 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62LVB9a004036; Wed, 2 Jul 2014 21:31:11 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201407022131.s62LVB9a004036@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 2 Jul 2014 21:31:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360267 - head/textproc/libtre X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 21:31:11 -0000 Author: tijl Date: Wed Jul 2 21:31:10 2014 New Revision: 360267 URL: http://svnweb.freebsd.org/changeset/ports/360267 QAT: https://qat.redports.org/buildarchive/r360267/ Log: - USES=libtool tar:bzip2 - Use option helpers - Silence post-patch - Remove .error because it is dangerous - Use MAKE_CMD Modified: head/textproc/libtre/Makefile head/textproc/libtre/pkg-plist Modified: head/textproc/libtre/Makefile ============================================================================== --- head/textproc/libtre/Makefile Wed Jul 2 21:11:34 2014 (r360266) +++ head/textproc/libtre/Makefile Wed Jul 2 21:31:10 2014 (r360267) @@ -3,7 +3,7 @@ PORTNAME= libtre PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://laurikari.net/tre/ \ LOCAL/bf @@ -15,50 +15,34 @@ COMMENT= Lightweight fully POSIX complia LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -USE_BZIP2= yes -USES= pathfix pkgconfig -USE_AUTOTOOLS= libtool -CONFIGURE_ARGS+= --enable-static +USES= libtool pathfix pkgconfig tar:bzip2 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-static USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPTIMIZED_CFLAGS PGO DOCS - -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.include - -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -Wuninitialized -ffast-math -finline-functions \ +OPTIONS_SUB= yes +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +OPTIMIZED_CFLAGS_CFLAGS= \ + -Wuninitialized -ffast-math -finline-functions \ -fomit-frame-pointer -fexpensive-optimizations \ -fforce-mem -fforce-addr -O3 -.endif +PGO_CFLAGS= -fprofile-generate +PGO_LDFLAGS= -fprofile-generate -.if ${PORT_OPTIONS:MPGO} -LDFLAGS+= -fprofile-generate -CFLAGS+= -fprofile-generate -.endif +.include -post-patch: +post-patch: .SILENT ${MV} ${WRKSRC}/doc/agrep.1.in ${WRKSRC}/doc/tre_agrep.1.in ${REINPLACE_CMD} -e 's;agrep\.1;tre_agrep\.1;g' ${WRKSRC}/configure \ ${WRKSRC}/tre.spec.in ${WRKSRC}/doc/Makefile.in ${REINPLACE_CMD} -e 's;agrep;tre_agrep;g' ${WRKSRC}/tests/agrep/*.ok .if ${PORT_OPTIONS:MPGO} -.if target(pre-build) -.error Makefile error since pre-build target has already been defined -.endif pre-build: pgo .endif @@ -69,7 +53,7 @@ post-install: .endfor regression-test: build - @(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} check ) + @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check ) .if ${PORT_OPTIONS:MPGO} pgo: pgo-pre-build pgo-build pgo-run pgo-post-run pgo-clean @@ -83,11 +67,11 @@ pgo-pre-build: {} \; pgo-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}) pgo-run: # Check everything to generate profiling information. - @-(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} check) + @-(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) pgo-post-run: @${FIND} ${BUILD_WRKSRC} -type f -name Makefile -exec \ @@ -107,11 +91,11 @@ pgo-post-run: pgo-clean: # Selectively clean some directories. . for dir in src tests - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} clean) + @(cd ${BUILD_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} clean) . endfor # Only remove some files from lib to preserve profiling information. @${FIND} -E ${BUILD_WRKSRC}/lib -iregex ".*\.(a|la|lai|lo|o|so|so\..*)$$" \ -exec ${RM} -f {} \; .endif # if ${PORT_OPTIONS:MPGO} -.include +.include Modified: head/textproc/libtre/pkg-plist ============================================================================== --- head/textproc/libtre/pkg-plist Wed Jul 2 21:11:34 2014 (r360266) +++ head/textproc/libtre/pkg-plist Wed Jul 2 21:31:10 2014 (r360267) @@ -3,9 +3,9 @@ include/tre/regex.h include/tre/tre.h include/tre/tre-config.h lib/libtre.a -lib/libtre.la lib/libtre.so lib/libtre.so.5 +lib/libtre.so.5.0.0 libdata/pkgconfig/tre.pc man/man1/tre_agrep.1.gz %%NLS%%share/locale/fi/LC_MESSAGES/tre.mo