diff options
| author | bapt <bapt@FreeBSD.org> | 2013-09-19 16:05:05 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-09-19 16:05:05 +0800 |
| commit | 6e792276d33efbc93e8d6333669e7def8301851a (patch) | |
| tree | 88a2a42dc250ea943bbc0ec8ecc37d869d720bea /Mk | |
| parent | 29a876ccef82461e40ceb3e95e656226bbd81ec7 (diff) | |
| download | freebsd-ports-gnome-6e792276d33efbc93e8d6333669e7def8301851a.tar.gz freebsd-ports-gnome-6e792276d33efbc93e8d6333669e7def8301851a.tar.zst freebsd-ports-gnome-6e792276d33efbc93e8d6333669e7def8301851a.zip | |
Move the target for sanity checking to the end of bsd.port.mk so that
WARNING and DEV_* can be defined anywhere
While here, change sleep time from 5 to 10 so that users have time to read it [1]
Suggested by: many [1]
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 37 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 35 |
2 files changed, 37 insertions, 35 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 671f5b6a4791..4dbdb65c1d56 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6491,6 +6491,43 @@ install-license: @${DO_NADA} .endif +.if defined(WARNING) +show-warnings: + @${ECHO_MSG} "/!\\ WARNING /!\\" +.for m in ${WARNING} + @${ECHO_MSG} "${m}" +.endfor + @${ECHO_MSG} + @sleep 10 + +check-makefile:: show-warnings +.endif + +.if defined(DEVELOPER) +.if defined(DEV_WARNING) +show-dev-warnings: + @${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\" + @${ECHO_MSG} +.for m in ${DEV_WARNING} + @${ECHO_MSG} "${m}" +.endfor + @${ECHO_MSG} + @sleep 10 +check-makefile:: show-dev-warnings +.endif + +.if defined(DEV_ERROR) +show-dev-errors: + @${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile errors /!\\" + @${ECHO_MSG} +.for m in ${DEV_WARNING} + @${ECHO_MSG} "${m}" +.endfor + @${ECHO_MSG} + @${FALSE} +check-makefile:: show-dev-errors +.endif +.endif #DVELOPER .endif # End of post-makefile section. diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 1e6fb371f368..6110845c9211 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -91,41 +91,6 @@ DEV_WARNING+= "USE_GNOME=ltverhack is now useless LIB_DEPENDS can properly handl DEV_WARNING+= "Please use the new format for LIB_DEPENDS, see handbook for details" .endif -.if defined(WARNING) -show-warnings: -.for m in ${WARNING} - @${ECHO_MSG} "${m}" -.endfor - @sleep 5 - -check-makefile:: show-warnings -.endif - .if defined(_PREMKINCLUDED) DEV_ERROR+= "you cannot include bsd.port[.pre].mk twice" .endif - -.if defined(DEVELOPER) -.if defined(DEV_WARNING) -show-dev-warnings: - @${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\" - @${ECHO_MSG} -.for m in ${DEV_WARNING} - @${ECHO_MSG} "${m}" -.endfor - @${ECHO_MSG} - @sleep 5 -check-makefile:: show-dev-warnings -.endif - -.if defined(DEV_ERROR) -show-dev-errors: - @${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile errors /!\\" - @${ECHO_MSG} -.for m in ${DEV_WARNING} - @${ECHO_MSG} "${m}" -.endfor - @${FALSE} -check-makefile:: show-dev-errors -.endif -.endif |