diff options
| author | mat <mat@FreeBSD.org> | 2018-01-09 15:40:55 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2018-01-09 15:40:55 +0800 |
| commit | 9383586309dec014705390cfb7dcbc875260bcd6 (patch) | |
| tree | 3a9c2be4469b755e07de4bf2850a1b143ad46e2e /Mk/bsd.port.mk | |
| parent | 90a17f1f9f87aeb37516f266f002228cece17c9f (diff) | |
| download | freebsd-ports-gnome-9383586309dec014705390cfb7dcbc875260bcd6.tar.gz freebsd-ports-gnome-9383586309dec014705390cfb7dcbc875260bcd6.tar.zst freebsd-ports-gnome-9383586309dec014705390cfb7dcbc875260bcd6.zip | |
Remove support for variables that have been deprecated for a while.
variables deprecation revision
WITHOUT_NLS 2013-12-13 r336337
WITH_/WITHOUT_ 2014-02-24 r345870
NOPORT(DOC|EXAMPLE)S 2014-04-19 r351587
WITH_BDB_VER 2016-05-02 r414444
OVERRIDE_LINUX_BASE_PORT 2016-09-05 r421387
WITH_OPENSSL_(BASE|PORT) 2016-06-16 r416965
While there, add an ERROR variable that works like DEV_ERROR, but for
user facing errors, and move NOPORTDOCS,
NOPORTEXAMPLES and WITHOUT_NLS to it.
Cleanup bsd.sanity.mk a bit.
Fix fallout.
PR: 224613
Submitted by: mat
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D13490
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 7d9702b4ed82..258ff7d4899e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1773,18 +1773,6 @@ MAKE_ENV+= WITHOUT_DEBUG_FILES=yes MAKE_ENV+= WITHOUT_KERNEL_SYMBOLS=yes .endif -.if defined(NOPORTDOCS) -PLIST_SUB+= PORTDOCS="@comment " -.else -PLIST_SUB+= PORTDOCS="" -.endif - -.if defined(NOPORTEXAMPLES) -PLIST_SUB+= PORTEXAMPLES="@comment " -.else -PLIST_SUB+= PORTEXAMPLES="" -.endif - CONFIGURE_SHELL?= ${SH} MAKE_SHELL?= ${SH} @@ -4525,7 +4513,7 @@ ${TMPPLIST}: .for _type in EXAMPLES DOCS .if !target(add-plist-${_type:tl}) -.if defined(PORT${_type}) && !defined(NOPORT${_type}) +.if defined(PORT${_type}) && !empty(PORT_OPTIONS:M${_type}) add-plist-${_type:tl}: .for x in ${PORT${_type}} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ @@ -5308,6 +5296,17 @@ show-warnings: @sleep ${WARNING_WAIT} .endif +.if defined(ERROR) +show-errors: + @${ECHO_MSG} "/!\\ ERRORS /!\\" + @${ECHO_MSG} +.for m in ${ERROR} + @${ECHO_MSG} "${m}" | ${FMT_80} + @${ECHO_MSG} +.endfor + @${FALSE} +.endif + .if defined(DEVELOPER) .if defined(DEV_WARNING) DEV_WARNING_WAIT?= 10 @@ -5356,7 +5355,8 @@ _TARGETS_STAGES= SANITY PKG FETCH EXTRACT PATCH CONFIGURE BUILD INSTALL TEST PAC _SANITY_SEQ= 050:post-chroot 100:pre-everything \ 125:show-unsupported-system-error 150:check-makefile \ - 200:show-warnings 210:show-dev-warnings 220:show-dev-errors \ + 190:show-errors 200:show-warnings \ + 210:show-dev-errors 220:show-dev-warnings \ 250:check-categories 300:check-makevars \ 350:check-desktop-entries 400:check-depends \ 450:identify-install-conflicts 500:check-deprecated \ |