base commit: r457357 diff --git Mk/Uses/bdb.mk Mk/Uses/bdb.mk index 3f3839a..6ca2b0a 100644 --- Mk/Uses/bdb.mk +++ Mk/Uses/bdb.mk @@ -13,9 +13,6 @@ # INVALID_BDB_VER # - This variable can be defined when the port does not # support one or more versions of Berkeley DB. -# WITH_BDB_VER -# - User defined global variable to set Berkeley DB version. -# Deprecated, use DEFAULT_VERSIONS+=bdb=xx # _WITH_BDB_VER # - User defined port specific variable to set Berkeley DB # version. @@ -60,11 +57,6 @@ _bdb_ARGS?= yes BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} -.if defined(WITH_BDB_VER) -WARNING+= "WITH_BDB_VER is deprecated and will be removed on 2016-08-01. Use DEFAULT_VERSIONS+=bdb=${WITH_BDB_VER}" -BDB_DEFAULT:=${WITH_BDB_VER} -.endif - _BDB_DEFAULT_save:=${BDB_DEFAULT} _DB_PORTS= 48 5 6 diff --git Mk/Uses/cran.mk Mk/Uses/cran.mk index 28c08f7..e29ee4b 100644 --- Mk/Uses/cran.mk +++ Mk/Uses/cran.mk @@ -47,7 +47,7 @@ do-test: R_POSTCMD_INSTALL_OPTIONS+= -l ${STAGEDIR}${PREFIX}/${R_LIB_DIR} R_POSTCMD_INSTALL_OPTIONS+= --install-tests -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) R_POSTCMD_INSTALL_OPTIONS+= --no-docs --no-html .endif diff --git Mk/Uses/gem.mk Mk/Uses/gem.mk index 3a30a13..28a6466 100644 --- Mk/Uses/gem.mk +++ Mk/Uses/gem.mk @@ -111,7 +111,7 @@ do-install: ${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \ ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE} ${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE} -.if defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} -@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR} .endif .endif @@ -120,7 +120,7 @@ do-install: _USES_install+= 820:gem-autoplist gem-autoplist: @${ECHO} ${GEM_SPEC} >> ${TMPPLIST} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \ 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} .endif diff --git Mk/bsd.default-versions.mk Mk/bsd.default-versions.mk index 811dcc7..e80f520 100644 --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -50,10 +50,6 @@ LINUX_DEFAULT?= c6_64 # Possible values: c6 LINUX_DEFAULT?= c6 .endif -.if defined(OVERRIDE_LINUX_BASE_PORT) -LINUX_DEFAULT:= ${OVERRIDE_LINUX_BASE_PORT} -WARNING+= "OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}." -.endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 5.5p, 5.6p, 5.7p, 5.6w @@ -91,20 +87,7 @@ SAMBA_DEFAULT?= 4.6 .if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. -. if defined(WITH_OPENSSL_PORT) -. if defined(OPENSSL_PORT) -SSL_DEFAULT:=${OPENSSL_PORT:T} -WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf" -. else -SSL_DEFAULT=openssl -WARNING+= "Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf" -. endif -. elif defined(WITH_OPENSSL_BASE) -SSL_DEFAULT=base -WARNING+= "Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf" -. elif !defined(WITH_OPENSSL_BASE) && \ - !defined(WITH_OPENSSL_PORT) && \ - !defined(SSL_DEFAULT) && \ +. if !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base diff --git Mk/bsd.options.mk Mk/bsd.options.mk index 3cf1329..283a5c4 100644 --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -196,30 +196,7 @@ _OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \ package:300:pre package:500:do package:700:post \ stage:800:post -# Set the default values for the global options, as defined by portmgr -.if !defined(NOPORTDOCS) -PORT_OPTIONS+= DOCS -.else -OPTIONS_WARNINGS+= "NOPORTDOCS" -WITHOUT+= DOCS -OPTIONS_WARNINGS_UNSET+= DOCS -.endif - -.if !defined(WITHOUT_NLS) -PORT_OPTIONS+= NLS -.else -WITHOUT+= NLS -.endif - -.if !defined(NOPORTEXAMPLES) -PORT_OPTIONS+= EXAMPLES -.else -OPTIONS_WARNINGS+= "NOPORTEXAMPLES" -WITHOUT+= EXAMPLES -OPTIONS_WARNINGS_UNSET+= EXAMPLES -.endif - -PORT_OPTIONS+= IPV6 +PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6 # Add per arch options .for opt in ${OPTIONS_DEFINE_${ARCH}} @@ -325,21 +302,6 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endif . sinclude "${OPTIONS_FILE}.local" -### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile -# XXX once WITH_DEBUG is not magic any more, do remove the :NDEBUG from here. -.for opt in ${ALL_OPTIONS:NDEBUG} -.if defined(WITH_${opt}) -OPTIONS_WARNINGS+= "WITH_${opt}" -OPTIONS_WARNINGS_SET+= ${opt} -PORT_OPTIONS+= ${opt} -.endif -.if defined(WITHOUT_${opt}) -OPTIONS_WARNINGS+= "WITHOUT_${opt}" -OPTIONS_WARNINGS_UNSET+= ${opt} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -.endif -.endfor - _OPTIONS_UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME} .for _k in SET UNSET SET_FORCE UNSET_FORCE .if defined(${_OPTIONS_UNIQUENAME}_${_k}) @@ -348,28 +310,6 @@ WARNING+= "${OPTIONS_NAME}_${_k}= ${${_OPTIONS_UNIQUENAME}_${_k}}" .endif .endfor -.if defined(OPTIONS_WARNINGS) -WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}" -WARNING+= "If you added them on the command line, you should replace them by" -WARNING+= "WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\"" -WARNING+= "" -WARNING+= "If they are global options set in your make.conf, you should replace them with:" -.if defined(OPTIONS_WARNINGS_SET) -WARNING+= "OPTIONS_SET=${OPTIONS_WARNINGS_SET}" -.endif -.if defined(OPTIONS_WARNINGS_UNSET) -WARNING+= "OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}" -.endif -WARNING+= "" -WARNING+= "If they are local to this port, you should use:" -.if defined(OPTIONS_WARNINGS_SET) -WARNING+= "${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}" -.endif -.if defined(OPTIONS_WARNINGS_UNSET) -WARNING+= "${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}" -.endif -.endif - ## Finish by using the options set by the port config dialog, if any . for opt in ${OPTIONS_FILE_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -471,11 +411,15 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u} ## Now some compatibility .if empty(PORT_OPTIONS:MDOCS) -NOPORTDOCS= yes +PLIST_SUB+= PORTDOCS="@comment " +.else +PLIST_SUB+= PORTDOCS="" .endif .if empty(PORT_OPTIONS:MEXAMPLES) -NOPORTEXAMPLES= yes +PLIST_SUB+= PORTEXAMPLES="@comment " +.else +PLIST_SUB+= PORTEXAMPLES="" .endif .if ${PORT_OPTIONS:MDEBUG} diff --git Mk/bsd.port.mk Mk/bsd.port.mk index 1ecc739..4b6b607 100644 --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -1767,18 +1767,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} @@ -4514,7 +4502,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 \ @@ -5297,6 +5285,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 @@ -5345,7 +5344,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 \ diff --git Mk/bsd.sanity.mk Mk/bsd.sanity.mk index 5753e06..ab7ddd7 100644 --- Mk/bsd.sanity.mk +++ Mk/bsd.sanity.mk @@ -4,9 +4,42 @@ # .if defined(WITHOUT_NLS) -WARNING+= "WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead" +ERROR+= "WITHOUT_NLS is unsupported use OPTIONS_UNSET=NLS, or ${OPTIONS_NAME}_UNSET+=NLS instead" .endif +.if defined(NOPORTDOCS) +ERROR+= "NOPORTDOCS is unsupported use OPTIONS_UNSET=DOCS, or ${OPTIONS_NAME}_UNSET+=DOCS instead" +.endif + +.if defined(NOPORTEXAMPLES) +ERROR+= "NOPORTEXAMPLES is unsupported use OPTIONS_UNSET=EXAMPLES, or ${OPTIONS_NAME}_UNSET+=EXAMPLES instead" +.endif + +.if defined(WITH_BDB_VER) +ERROR+= "WITH_BDB_VER is unsupporteed, use DEFAULT_VERSIONS+=bdb=${WITH_BDB_VER}" +.endif + +.if defined(OVERRIDE_LINUX_BASE_PORT) +ERROR+= "OVERRIDE_LINUX_BASE_PORT is unsupporteed, use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}" +.endif + +.if defined(WITH_OPENSSL_PORT) +ERROR+= "WITH_OPENSSL_PORT is unsupporteed, use DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT:Uopenssl} in your make.conf" +.endif + +.if defined(WITH_OPENSSL_BASE) +ERROR+= "WITH_OPENSSL_BASE is unsupporteed, use DEFAULT_VERSIONS+=ssl=base in your make.conf" +.endif + +.for opt in ${ALL_OPTIONS:NDEBUG} +.if defined(WITH_${opt}) +WARNING+= "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port." +.endif +.if defined(WITHOUT_${opt}) +WARNING+= "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port." +.endif +.endfor + .if defined(WITH_NEW_XORG) || defined(WITHOUT_NEW_XORG) WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect" .endif diff --git audio/chromaprint/Makefile audio/chromaprint/Makefile index 53942a9..c06a4f8 100644 --- audio/chromaprint/Makefile +++ audio/chromaprint/Makefile @@ -27,9 +27,7 @@ OPTIONS_DEFINE= DOXYGEN TEST DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz DOXYGEN_PORTDOCS= * -# PORTDOCS macro won't work if NOPORTDOCS is defined or if DOCS is disabled DOXYGEN_IMPLIES= DOCS -.undef NOPORTDOCS TEST_BUILD_DEPENDS= ${NONEXISTENT}:devel/googletest:patch TEST_CMAKE_BOOL= BUILD_TESTS diff --git chinese/libtabe/Makefile chinese/libtabe/Makefile index 885be5d..5eceae2 100644 --- chinese/libtabe/Makefile +++ chinese/libtabe/Makefile @@ -35,17 +35,6 @@ X11_CONFIGURE_WITH= x .include -pre-everything:: -.if defined(WITH_BDB_VER) -pre-everything:: - @${ECHO_CMD} "" - @${ECHO_CMD} "WARNING:" - @${ECHO_CMD} " You have defined WITH_BDB_VER. Make sure you use the same" - @${ECHO_CMD} " db version for all ports that use libtabe, such as xcin." - @${ECHO_CMD} " Otherwise, ports that use libtabe may not work correctly." - @${ECHO_CMD} "" -.endif - post-patch-X11-off: ${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' \ ${WRKSRC}/src/Makefile.in diff --git chinese/p5-Lingua-ZH-TaBE/Makefile chinese/p5-Lingua-ZH-TaBE/Makefile index 1eaf6b1..01ff1d1 100644 --- chinese/p5-Lingua-ZH-TaBE/Makefile +++ chinese/p5-Lingua-ZH-TaBE/Makefile @@ -20,18 +20,4 @@ OBSOLETE_BDB_VAR= WITH_DB CONFIGURE_ARGS= DB="${BDB_LIB_NAME}" -pre-everything:: - @${ECHO_CMD} "" - @${ECHO_CMD} "You may specify db version to use:" - @${ECHO_CMD} "" - @${ECHO_CMD} " WITH_BDB_VER=version (Default 41)" -.if defined(WITH_BDB_VER) - @${ECHO_CMD} "" - @${ECHO_CMD} "WARNING:" - @${ECHO_CMD} " You have defined WITH_BDB_VER. Make sure you use the same" - @${ECHO_CMD} " db version that libtabe uses. Otherwise, this port may" - @${ECHO_CMD} " not work correctly." -.endif - @${ECHO_CMD} "" - .include diff --git databases/ruby-bdb/Makefile databases/ruby-bdb/Makefile index 9f85d96..0838305 100644 --- databases/ruby-bdb/Makefile +++ databases/ruby-bdb/Makefile @@ -9,7 +9,6 @@ MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \ http://idaemons.org/distfiles/ruby/ \ LOCAL/knu PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} -PKGNAMESUFFIX= ${WITH_BDB_VER} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org diff --git www/rubygem-passenger/Makefile www/rubygem-passenger/Makefile index 90b3600..bb870b7 100644 --- www/rubygem-passenger/Makefile +++ www/rubygem-passenger/Makefile @@ -43,8 +43,6 @@ SHEBANG_FILES= \ dev/ci/run-tests-natively \ dev/ci/setup-host -NOPORTDOCS= yes - APACHE22_USE= APACHE=22+ LIB_DEPENDS+= libuv.so:devel/libuv \