svn commit: r367153 - in head: Keywords Mk

[Baptiste Daroussin]

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 at FreeBSD.org
+actions: []
+post-deinstall: <<EOD
+	case "%@" in
+	/*) f="%@" ;;
+	 *) f="%D/%@" ;;
+	esac
+	/bin/rm -f $f 2>/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,^, at 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}