diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-09-25 23:30:40 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-09-25 23:30:40 +0000 |
| commit | fa5faefc2118dce3338c34179acff797b5330066 (patch) | |
| tree | bddfc07d37ad11d81eef0be71a66f19706bcd863 /Mk/bsd.port.mk | |
| parent | fd9f2469cd362c39c2f88ce86b366e566fa268c5 (diff) | |
| download | ports-fa5faefc2118dce3338c34179acff797b5330066.tar.gz ports-fa5faefc2118dce3338c34179acff797b5330066.zip | |
Use @post[un]exec for ldconfig to ensure ldconfig is run when needed instead of
the hackish _FORCE_POST_PATTERNS
Notes
Notes:
svn path=/head/; revision=397904
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index bc02f6927594..01958a618579 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1817,7 +1817,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ fonts.dir fonts.scale gtk-update-icon-cache \ gio-querymodules \ gtk-query-immodules \ - ldconfig \ load-octave-pkg \ ocamlfind \ update-desktop-database update-mime-database \ @@ -4766,26 +4765,26 @@ generate-plist: ${WRKDIR} .if defined(USE_LINUX_PREFIX) .if defined(USE_LDCONFIG) - @${ECHO_CMD} "@exec ${LDCONFIG_CMD}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG_CMD}" >> ${TMPPLIST} + @${ECHO_CMD} "@postexec ${LDCONFIG_CMD}" >> ${TMPPLIST} + @${ECHO_CMD} "@postunexec ${LDCONFIG_CMD}" >> ${TMPPLIST} .endif .else .if defined(USE_LDCONFIG) .if !defined(INSTALL_AS_USER) - @${ECHO_CMD} "@exec ${LDCONFIG} -m ${USE_LDCONFIG}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG} -R" >> ${TMPPLIST} + @${ECHO_CMD} "@postexec ${LDCONFIG} -m ${USE_LDCONFIG}" >> ${TMPPLIST} + @${ECHO_CMD} "@postunexec ${LDCONFIG} -R" >> ${TMPPLIST} .else - @${ECHO_CMD} "@exec ${LDCONFIG} -m ${USE_LDCONFIG} || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG} -R || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@postexec ${LDCONFIG} -m ${USE_LDCONFIG} || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@postunexec ${LDCONFIG} -R || ${TRUE}" >> ${TMPPLIST} .endif .endif .if defined(USE_LDCONFIG32) .if !defined(INSTALL_AS_USER) - @${ECHO_CMD} "@exec ${LDCONFIG} -32 -m ${USE_LDCONFIG32}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG} -32 -R" >> ${TMPPLIST} + @${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32}" >> ${TMPPLIST} + @${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R" >> ${TMPPLIST} .else - @${ECHO_CMD} "@exec ${LDCONFIG} -32 -m ${USE_LDCONFIG32} || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32} || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPLIST} .endif .endif .endif |