[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bsd.port.mk: kill DO_NADA



This does deprecate DO_NADA.   This falls under the `unneeded knob'
category.

Comments ?

Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.161
diff -u -r1.161 bsd.port.mk
--- bsd.port.mk	1999/12/20 00:07:17	1.161
+++ bsd.port.mk	1999/12/20 00:14:08
@@ -764,6 +764,7 @@
 FILE?=		/usr/bin/file
 DIRNAME?=	/usr/bin/dirname
 GREP?=		/usr/bin/grep
+DO_NADA?=		true
 
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=		echo
@@ -771,10 +772,6 @@
 # XXX
 _DEPEND_ECHO?=		echo
 
-# How to do nothing.  Override if you, for some strange reason, would rather
-# do something.
-DO_NADA?=		true
-
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
 
@@ -1080,44 +1077,21 @@
 .endif
 .endif
 
-.if defined(IGNORE)
-.if defined(IGNORE_SILENT)
-IGNORECMD=	${DO_NADA}
-.else
-IGNORECMD=	${ECHO_MSG} "===>  ${PKGNAME} ${IGNORE}."
-.endif
-.endif
 .endif		# NO_IGNORE
 
-.if defined(IGNORECMD)
-fetch:
-	@${IGNORECMD}
-checksum:
-	@${IGNORECMD}
-extract:
-	@${IGNORECMD}
-patch:
-	@${IGNORECMD}
-configure:
-	@${IGNORECMD}
-all:
-	@${IGNORECMD}
-build:
-	@${IGNORECMD}
-install:
-	@${IGNORECMD}
-uninstall deinstall:
-	@${IGNORECMD}
-package:
-	@${IGNORECMD}
-.else # IGNORECMD
+.if defined(IGNORE) && !defined(NO_IGNORE)
+fetch checksum extract patch configure all build install \
+uninstall deinstall package:
+.if !defined(IGNORE_SILENT)
+	@${ECHO_MSG} "===>  ${PKGNAME} ${IGNORE}."
+.endif
+
+.else 
 
 fetch: real-fetch
 
 checksum: fetch
-.if defined(NO_CHECKSUM) || defined(NO_EXTRACT)
-	${DO_NADA}
-.else
+.if ! (defined(NO_CHECKSUM) || defined(NO_EXTRACT))
 	@if [ ! -f ${CHECKSUM_FILE} ]; then \
 	  ${ECHO_MSG} ">> No checksum file."; \
 	else \
@@ -1210,9 +1184,7 @@
 
 # Disable checksum
 makesum: fetch-all
-.if defined(NO_CHECKSUM) || defined(NO_EXTRACT)
-	@${DO_NADA}
-.else
+.if !(defined(NO_CHECKSUM) || defined(NO_EXTRACT))
 	@mkdir -p ${FILESDIR} && rm -f ${CHECKSUM_FILE}
 	@cd ${DISTDIR} && \
 		for cipher in ${_CIPHERS}; do \
@@ -1225,9 +1197,7 @@
 .endif
 
 addsum: fetch-all
-.if defined(NO_CHECKSUM) || defined(NO_EXTRACT)
-	@${DO_NADA}
-.else
+.if !(defined(NO_CHECKSUM) || defined(NO_EXTRACT))
 	@mkdir -p ${FILESDIR} && touch ${CHECKSUM_FILE}
 	@cd ${DISTDIR} && \
 	 	for cipher in ${_CIPHERS}; do \
@@ -1721,12 +1691,10 @@
 
 .if !target(pre-${name})
 pre-${name}:
-	@${DO_NADA}
 .endif
 
 .if !target(post-${name})
 post-${name}:
-	@${DO_NADA}
 .endif
 
 .endfor
@@ -1770,7 +1738,6 @@
 
 .if !target(pre-clean)
 pre-clean:
-	@${DO_NADA}
 .endif
 
 .if !target(clean)
@@ -1799,7 +1766,6 @@
 
 .if !target(pre-distclean)
 pre-distclean:
-	@${DO_NADA}
 .endif
 
 .if !target(distclean)
@@ -2004,8 +1970,6 @@
 		fi; \
 	done
 .endif
-.else
-	@${DO_NADA}
 .endif
 .endfor
 
@@ -2068,8 +2032,6 @@
 	done
 .endif
 .endif
-.else
-	@${DO_NADA}
 .endif
 
 misc-depends:
@@ -2094,8 +2056,6 @@
 		fi \
 	done
 .endif
-.else
-	@${DO_NADA}
 .endif
 
 .endif
@@ -2141,9 +2101,7 @@
 #  description-file|maintainer|categories|build deps|run deps|for arch
 #
 describe:
-.if defined(NO_DESCRIBE) 
-	@${DO_NADA}
-.else
+.if !defined(NO_DESCRIBE) 
 	@echo -n "${PKGNAME}|${.CURDIR}|"; \
 	echo -n "${PREFIX}|"; \
 	if [ -f ${COMMENT} ]; then \

-- 
	Marc Espie		
|anime, sf, juggling, unicycle, acrobatics, comics...
|AmigaOS, OpenBSD, C++, perl, Icon, PostScript...
| `real programmers don't die, they just get out of beta'



Visit your host, monkey.org