Date: Sun, 9 Apr 2017 15:35:37 +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: r438106 - head/Mk Message-ID: <201704091535.v39FZbAS006635@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Apr 9 15:35:37 2017 New Revision: 438106 URL: https://svnweb.freebsd.org/changeset/ports/438106 Log: Stop creating stubs targets calling /usr/bin/true It is not needed at all. While here remove: - the stub pre-everything:: declaration, let the framework define it if needed - remove the stub describe target with NO_DESCRIBE is set. It is useless - remove options-message it was only used by gnome and dropped a long time ago - remove pre-distclean it was never used Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D10326 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Apr 9 14:58:00 2017 (r438105) +++ head/Mk/bsd.port.mk Sun Apr 9 15:35:37 2017 (r438106) @@ -2776,24 +2776,17 @@ ${target}: .endif # !defined(NO_IGNORE) +ignorelist: .if defined(IGNORE) || defined(NO_PACKAGE) ignorelist: package-name -.else -ignorelist: - @${DO_NADA} .endif -.if defined(IGNORE) || defined(NO_PACKAGE) ignorelist-verbose: .if defined(IGNORE) @${ECHO_CMD} "${PKGNAME}|IGNORE: "${IGNORE:Q} -.else +.elif defined(NO_PACKAGE) @${ECHO_CMD} "${PKGNAME}|NO_PACKAGE: "${NO_PACKAGE:Q} .endif -.else -ignorelist-verbose: - @${DO_NADA} -.endif ################################################################ # Clean directories for ftp or CDROM. @@ -2874,40 +2867,20 @@ _OPTIONS_OK=yes # override from an individual Makefile. ################################################################ -# Disable checksum -.if defined(NO_CHECKSUM) && !target(checksum) -checksum: fetch - @${DO_NADA} -.endif - # Disable build .if defined(NO_BUILD) && !target(build) build: configure @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} .endif -# Disable test -.if defined(NO_TEST) && !target(test) -test: stage - @${DO_NADA} -.endif - # Disable package .if defined(NO_PACKAGE) && !target(package) package: -.if defined(IGNORE_SILENT) - @${DO_NADA} -.else +.if !defined(IGNORE_SILENT) @${ECHO_MSG} "===> ${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}. .endif .endif -# Disable describe -.if defined(NO_DESCRIBE) && !target(describe) -describe: - @${DO_NADA} -.endif - ################################################################ # More standard targets start here. # @@ -2916,28 +2889,11 @@ describe: # adding pre-* or post-* targets/scripts, override these. ################################################################ -# Pre-everything - -pre-everything:: - @${DO_NADA} - .if defined(TRYBROKEN) && defined(BROKEN) buildanyway-message: @${ECHO_MSG} "Trying build of ${PKGNAME} even though it is marked BROKEN." .endif -options-message: -.if defined(GNOME_OPTION_MSG) && (!defined(PACKAGE_BUILDING) || !defined(BATCH)) - @for m in ${GNOME_OPTION_MSG}; do \ - ${ECHO_MSG} $$m; \ - done -.else - @${DO_NADA} -.endif -.if defined(_OPTIONS_READ) - @${ECHO_MSG} "===> Found saved configuration for ${_OPTIONS_READ}" -.endif - # Warn user about deprecated packages. Advisory only. .if !target(check-deprecated) @@ -3325,9 +3281,6 @@ do-test: fi; \ ${FALSE}; \ fi) -.elif !target(do-test) -do-test: - @${DO_NADA} .endif # Package @@ -3708,13 +3661,8 @@ clean: .endif .endif -.if !target(pre-distclean) -pre-distclean: - @${DO_NADA} -.endif - .if !target(distclean) -distclean: pre-distclean clean +distclean: clean @cd ${.CURDIR} && ${MAKE} delete-distfiles RESTRICTED_FILES="${_DISTFILES:Q} ${_PATCHFILES:Q}" .endif @@ -3807,7 +3755,7 @@ makesum: .if !target(checksum) checksum: fetch -.if !empty(_CKSUMFILES) +.if !empty(_CKSUMFILES) && !defined(NO_CHECKSUM) @${SETENV} \ ${_CHECKSUM_INIT_ENV} \ dp_CHECKSUM_ALGORITHMS='${CHECKSUM_ALGORITHMS:tu}' \ @@ -5352,9 +5300,7 @@ ${${target:tu}_COOKIE}: ${_${target:tu}_ .else # exists(cookie) ${${target:tu}_COOKIE}:: - @if [ -e ${.TARGET} ]; then \ - ${DO_NADA}; \ - else \ + @if [ ! -e ${.TARGET} ]; then \ cd ${.CURDIR} && ${MAKE} ${.TARGET}; \ fi .endif # !exists(cookie) @@ -5376,7 +5322,10 @@ pkg: ${_PKG_DEP} ${_PKG_REAL_SEQ} .endif .if !target(test) -test: ${_TEST_DEP} ${_TEST_REAL_SEQ} +test: ${_TEST_DEP} +.if !defined(NO_TEST) +test: ${_TEST_REAL_SEQ} +.endif .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704091535.v39FZbAS006635>