mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00
Code Issues Releases Activity

Properly add targets to the sequence they belong to, that now makes them predictable

Browse Source
This commit is contained in:
Baptiste Daroussin 2014-01-04 00:26:03 +00:00
parent 706c69e3c9
commit b420248356
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=338605
7 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mk/Uses/desktop-file-utils.mk
View File

@ -19,10 +19,6 @@ IGNORE= USES=desktop-file-utils does not require args
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

3
Mk/Uses/dos2unix.mk
View File

@ -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)

2
Mk/Uses/kmod.mk
View File

@ -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}

4
Mk/Uses/shared-mime-info.mk
View File

@ -19,10 +19,6 @@ IGNORE= USES=shared-mime-info does not require args
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

3
Mk/Uses/shebangfix.mk
View File

@ -53,9 +53,6 @@ IGNORE+= missing definition for ${lang}_OLD_CMD
_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}

3
Mk/Uses/webplugin.mk
View File

@ -166,7 +166,6 @@ WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_N
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

9
Mk/bsd.port.mk
View File

@ -6474,7 +6474,8 @@ _EXTRACT_SEQ= check-build-conflicts extract-message checksum extract-depends \
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-install post-install post-install-script po
_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-install-conflicts run-depends lib-depends ap
_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 \