Page MenuHomeFreeBSD

D10326.id27258.diff
No OneTemporary

D10326.id27258.diff

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2778,24 +2778,17 @@
.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.
@@ -2876,12 +2869,6 @@
# 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
@@ -2891,25 +2878,16 @@
# 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.
#
@@ -2921,24 +2899,14 @@
# 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
+${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR}:
+ @${MKDIR} ${.TARGET}
# Warn user about deprecated packages. Advisory only.
@@ -3329,7 +3297,6 @@
fi)
.elif !target(do-test)
do-test:
- @${DO_NADA}
.endif
# Package
@@ -3439,7 +3406,6 @@
.if !target(install-mtree)
install-mtree:
- @${DO_NADA}
.endif
.if !target(install-ldconfig-file)
@@ -3711,7 +3677,6 @@
.if !target(pre-distclean)
pre-distclean:
- @${DO_NADA}
.endif
.if !target(distclean)
@@ -3808,7 +3773,7 @@
.if !target(checksum)
checksum: fetch
-.if !empty(_CKSUMFILES)
+.if !empty(_CKSUMFILES) && !defined(NO_CHECKSUM)
@${SETENV} \
${_CHECKSUM_INIT_ENV} \
dp_CHECKSUM_ALGORITHMS='${CHECKSUM_ALGORITHMS:tu}' \
@@ -5356,9 +5321,7 @@
.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)
@@ -5380,7 +5343,10 @@
.endif
.if !target(test)
-test: ${_TEST_DEP} ${_TEST_REAL_SEQ}
+test: ${_TEST_DEP}
+.if !defined(NO_TEST)
+test: ${_TEST_REAL_SEQ}
+.endif
.endif
.endif

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 13, 2:39 AM (8 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40718770
Default Alt Text
D10326.id27258.diff (3 KB)

Event Timeline