Date: Sat, 4 Jan 2014 00:26:03 +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: r338605 - in head/Mk: . Uses Message-ID: <201401040026.s040Q387023863@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Jan 4 00:26:03 2014 New Revision: 338605 URL: http://svnweb.freebsd.org/changeset/ports/338605 Log: Properly add targets to the sequence they belong to, that now makes them predictable Modified: head/Mk/Uses/desktop-file-utils.mk head/Mk/Uses/dos2unix.mk head/Mk/Uses/kmod.mk head/Mk/Uses/shared-mime-info.mk head/Mk/Uses/shebangfix.mk head/Mk/Uses/webplugin.mk head/Mk/bsd.port.mk Modified: head/Mk/Uses/desktop-file-utils.mk ============================================================================== --- head/Mk/Uses/desktop-file-utils.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/Uses/desktop-file-utils.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -19,10 +19,6 @@ IGNORE= USES=desktop-file-utils does not BUILD_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils RUN_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils -# bolt our post-install target to post-install -.PHONY: desktop-file-post-install -post-install: desktop-file-post-install - desktop-file-post-install: .if defined(NO_STAGE) # run for port post-install Modified: head/Mk/Uses/dos2unix.mk ============================================================================== --- head/Mk/Uses/dos2unix.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/Uses/dos2unix.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -15,9 +15,6 @@ _INCLUDE_USES_DOS2UNIX_MK= yes _DOS2UNIX_ALL= yes .endif -.PHONY: dos2unix -pre-patch: dos2unix - dos2unix: @${ECHO_MSG} "===> Converting DOS text files to UNIX text files" .if defined(_DOS2UNIX_ALL) Modified: head/Mk/Uses/kmod.mk ============================================================================== --- head/Mk/Uses/kmod.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/Uses/kmod.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -40,12 +40,10 @@ MAKE_ENV+= NO_XREF=yes .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KMOD_POST_MK) _INCLUDE_USES_KMOD_POST_MK= yes -.PHONY: kmod-post-install pre-install: ${STAGEDIR}${KMODDIR} ${STAGEDIR}${KMODDIR}: @${MKDIR} ${.TARGET} -post-install: kmod-post-install kmod-post-install: @${ECHO_CMD} "@exec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec /usr/sbin/kldxref ${KMODDIR}" >> ${TMPPLIST} Modified: head/Mk/Uses/shared-mime-info.mk ============================================================================== --- head/Mk/Uses/shared-mime-info.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/Uses/shared-mime-info.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -19,10 +19,6 @@ IGNORE= USES=shared-mime-info does not r BUILD_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info -# bolt our post-install target to post-install -.PHONY: shared-mime-post-install -post-install: shared-mime-post-install - shared-mime-post-install: .if defined(NO_STAGE) # run for port post-install Modified: head/Mk/Uses/shebangfix.mk ============================================================================== --- head/Mk/Uses/shebangfix.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/Uses/shebangfix.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -53,9 +53,6 @@ IGNORE+= missing definition for ${lang}_ _SHEBANG_REINPLACE_ARGS+= -e "1s|^\#![[:space:]]*${${lang}_OLD_CMD}|\#!${${lang}_CMD}|" .endfor -.PHONY: fix-shebang -pre-patch: fix-shebang - fix-shebang: @cd ${WRKSRC}; \ ${ECHO_CMD} ${SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} Modified: head/Mk/Uses/webplugin.mk ============================================================================== --- head/Mk/Uses/webplugin.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/Uses/webplugin.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -166,7 +166,6 @@ WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^ PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}" -.PHONY: webplugin-post-install webplugin-post-install: @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} .for d in ${_WEBPLUGIN_LINKFARMS} @@ -180,6 +179,4 @@ webplugin-post-install: @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} -post-install: webplugin-post-install - .endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat Jan 4 00:22:33 2014 (r338604) +++ head/Mk/bsd.port.mk Sat Jan 4 00:26:03 2014 (r338605) @@ -6474,7 +6474,8 @@ _EXTRACT_SEQ= check-build-conflicts extr pre-extract pre-extract-script do-extract \ post-extract post-extract-script _PATCH_DEP= extract -_PATCH_SEQ= ask-license patch-message patch-depends pathfix-pre-patch pre-patch \ +_PATCH_SEQ= ask-license patch-message patch-depends pathfix-pre-patch dos2unix fix-shebang \ + pre-patch \ pre-patch-script do-patch charsetfix-post-patch post-patch post-patch-script _CONFIGURE_DEP= patch _CONFIGURE_SEQ= build-depends lib-depends configure-message run-autotools-fixup \ @@ -6497,8 +6498,9 @@ _STAGE_SUSEQ= create-users-groups do-ins _STAGE_SUSEQ+= stage-qa .endif .else -_STAGE_SEQ+= create-users-groups do-install post-install post-install-script post-stage compress-man \ - install-rc-script install-ldconfig-file install-license \ +_STAGE_SEQ+= create-users-groups do-install desktop-file-post-install kmod-post-install \ + shared-mime-post-install webplugin-post-install post-install post-install-script \ + post-stage compress-man install-rc-script install-ldconfig-file install-license \ install-desktop-entries add-plist-info add-plist-docs add-plist-examples \ add-plist-data add-plist-post fix-plist-sequence .if defined(DEVELOPER) @@ -6531,6 +6533,7 @@ _INSTALL_SEQ= install-message check-inst _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \ pre-su-install-script create-users-groups do-install \ install-desktop-entries install-license install-rc-script \ + desktop-file-post-install kmod-post-install shared-mime-post-install webplugin-post-install \ post-install post-install-script add-plist-buildinfo \ add-plist-info add-plist-docs add-plist-examples \ add-plist-data add-plist-post fix-plist-sequence \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401040026.s040Q387023863>