kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert rmtry into regular Keyword

Browse source 
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
This commit is contained in:
Baptiste Daroussin 2014-09-03 05:16:13 +00:00
parent 4763c7d4d0
commit c4526308ea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=367153
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Keywords/rmtry.ucl Normal file
View file

@ -0,0 +1,11 @@
# $FreeBSD$
#
# MAINTAINER: portmgr@FreeBSD.org
actions: []
post-deinstall: <<EOD
case "%@" in
/*) f="%@" ;;
*) f="%D/%@" ;;
esac
/bin/rm -f $f 2>/dev/null || /usr/bin/true
EOD

9
Mk/bsd.port.mk
View file

@ -1601,9 +1601,6 @@ SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${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}