Date: Fri, 25 Sep 2015 23:30:41 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397904 - head/Mk Message-ID: <201509252330.t8PNUfvu008298@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Sep 25 23:30:40 2015 New Revision: 397904 URL: https://svnweb.freebsd.org/changeset/ports/397904 Log: Use @post[un]exec for ldconfig to ensure ldconfig is run when needed instead of the hackish _FORCE_POST_PATTERNS Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Sep 25 23:20:48 2015 (r397903) +++ head/Mk/bsd.port.mk Fri Sep 25 23:30:40 2015 (r397904) @@ -1817,7 +1817,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfo 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509252330.t8PNUfvu008298>