From owner-svn-ports-head@FreeBSD.ORG Wed Sep 3 05:16:13 2014 Return-Path: Delivered-To: svn-ports-head@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 E2D78A0E; Wed, 3 Sep 2014 05:16:13 +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 B4B4F1C43; Wed, 3 Sep 2014 05:16:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s835GDCp098713; Wed, 3 Sep 2014 05:16:13 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s835GD2T098711; Wed, 3 Sep 2014 05:16:13 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409030516.s835GD2T098711@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 3 Sep 2014 05:16:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367153 - in head: Keywords Mk 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.18-1 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: Wed, 03 Sep 2014 05:16:14 -0000 Author: bapt Date: Wed Sep 3 05:16:13 2014 New Revision: 367153 URL: http://svnweb.freebsd.org/changeset/ports/367153 QAT: https://qat.redports.org/buildarchive/r367153/ Log: Convert rmtry into regular Keyword Note that this allows to control when it is executed (always in post-installation) This makes @rmtry accept both absolute path and relative path (to latest prefix/cwd) While here now that it is not used, remove the old PLIST_REINPLACE macro Reviewed by: antoine Differential Revision: https://reviews.freebsd.org/D713 Added: head/Keywords/rmtry.ucl (contents, props changed) Modified: head/Mk/bsd.port.mk Added: head/Keywords/rmtry.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Keywords/rmtry.ucl Wed Sep 3 05:16:13 2014 (r367153) @@ -0,0 +1,11 @@ +# $FreeBSD$ +# +# MAINTAINER: portmgr@FreeBSD.org +actions: [] +post-deinstall: </dev/null || /usr/bin/true +EOD Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Sep 3 04:29:13 2014 (r367152) +++ head/Mk/bsd.port.mk Wed Sep 3 05:16:13 2014 (r367153) @@ -1601,9 +1601,6 @@ SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${ PLIST_SUB_SED_MIN?= 2 PLIST_SUB_SED?= ${PLIST_SUB:C/.*=.{1,${PLIST_SUB_SED_MIN}}$//g:NEXTRACT_SUFX=*:NOSREL=*:NLIB32DIR=*:NPREFIX=*:NLOCALBASE=*:NRESETPREFIX=*:N*="":N*="@comment*:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\./\\./g} -PLIST_REINPLACE+= rmtry -PLIST_REINPLACE_RMTRY=s!^@rmtry \(.*\)!@unexec rm -f %D/\1 2>/dev/null || true! - # kludge to strip trailing whitespace from CFLAGS; # sub-configure will not # survive double space CFLAGS:= ${CFLAGS:C/ $//} @@ -5321,12 +5318,6 @@ generate-plist: ${WRKDIR} @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dirrmtry ,' >> ${TMPPLIST} .endfor -.for reinplace in ${PLIST_REINPLACE} -.if defined(PLIST_REINPLACE_${reinplace:tu}) - @${SED} -i "" -e '${PLIST_REINPLACE_${reinplace:tu}}' ${TMPPLIST} -.endif -.endfor - .if defined(USE_LINUX_PREFIX) .if defined(USE_LDCONFIG) @${ECHO_CMD} "@exec ${LDCONFIG_CMD}" >> ${TMPPLIST}