From owner-svn-ports-head@FreeBSD.ORG Thu Mar 21 00:11:35 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 720662FC; Thu, 21 Mar 2013 00:11:35 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 53F62CDD; Thu, 21 Mar 2013 00:11:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L0BZRE042018; Thu, 21 Mar 2013 00:11:35 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L0BZga042017; Thu, 21 Mar 2013 00:11:35 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201303210011.r2L0BZga042017@svn.freebsd.org> From: Jason Helfman Date: Thu, 21 Mar 2013 00:11:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314782 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2013 00:11:35 -0000 Author: jgh Date: Thu Mar 21 00:11:34 2013 New Revision: 314782 URL: http://svnweb.freebsd.org/changeset/ports/314782 Log: - adopt optionsNG - trim historical header - convert gnomehack and pkgconfig to: - USES= pathfix - USE_PKGCONFIG= build Approved by: portmgr (miwi) Modified: head/textproc/libtre/Makefile Modified: head/textproc/libtre/Makefile ============================================================================== --- head/textproc/libtre/Makefile Thu Mar 21 00:07:37 2013 (r314781) +++ head/textproc/libtre/Makefile Thu Mar 21 00:11:34 2013 (r314782) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: libtre -# Date created: Oct 14, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= libtre PORTVERSION= 0.8.0 @@ -15,12 +10,14 @@ MASTER_SITES= http://laurikari.net/tre/ DISTNAME= tre-${PORTVERSION} MAINTAINER= bf@FreeBSD.org -COMMENT= A lightweight fully POSIX compliant regexp matching library +COMMENT= Lightweight fully POSIX compliant regexp matching library LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE + USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig +USES= pathfix +USE_PKGCONFIG= build USE_AUTOTOOLS= libtool CONFIGURE_ARGS+= --enable-static USE_LDCONFIG= yes @@ -28,15 +25,15 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= NLS "native language support" off \ - OPTIMIZED_CFLAGS "append optimization flags to CFLAGS" off \ - PGO "Enable Profile-Guided Optimization" off +OPTIONS_DEFINE= NLS OPTIMIZED_CFLAGS PGO DOCS +PGO_DESC= Enable Profile-Guided Optimization MAN1= tre_agrep.1 .include +.include -.if defined(WITH_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -44,13 +41,13 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -Wuninitialized -ffast-math -finline-functions \ -fomit-frame-pointer -fexpensive-optimizations \ -fforce-mem -fforce-addr -O3 .endif -.if defined(WITH_PGO) +.if ${PORT_OPTIONS:MPGO} LDFLAGS+= -fprofile-generate CFLAGS+= -fprofile-generate .endif @@ -61,7 +58,7 @@ post-patch: ${WRKSRC}/tre.spec.in ${WRKSRC}/doc/Makefile.in ${REINPLACE_CMD} -e 's;agrep;tre_agrep;g' ${WRKSRC}/tests/agrep/*.ok -.if defined(WITH_PGO) +.if ${PORT_OPTIONS:MPGO} .if target(pre-build) .error Makefile error since pre-build target has already been defined .endif @@ -69,7 +66,7 @@ pre-build: pgo .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for i in tre-api.html tre-syntax.html ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} @@ -79,7 +76,7 @@ post-install: regression-test: build @(cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} check ) -.if defined(WITH_PGO) +.if ${PORT_OPTIONS:MPGO} pgo: pgo-pre-build pgo-build pgo-run pgo-post-run pgo-clean pgo-pre-build: @@ -120,6 +117,6 @@ pgo-clean: # 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 defined(WITH_PGO) +.endif # if ${PORT_OPTIONS:MPGO} .include