From owner-svn-ports-all@freebsd.org Fri Sep 25 23:30:41 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B44BBA092D3; Fri, 25 Sep 2015 23:30:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.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 8D5071ED7; Fri, 25 Sep 2015 23:30:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8PNUf80008299; Fri, 25 Sep 2015 23:30:41 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8PNUfvu008298; Fri, 25 Sep 2015 23:30:41 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201509252330.t8PNUfvu008298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 25 Sep 2015 23:30:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397904 - head/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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2015 23:30:41 -0000 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