INDEX patch

Kris Kennaway kris at obsecurity.org
Wed Jun 2 05:16:58 PDT 2004


A previous commit to bsd.port.mk broke the reporting of missing
dependencies from 'make index'.  This patch restores it (and makes
these errors fatal).  I plan to commit it soon.

Kris

Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.490
diff -u -r1.490 bsd.port.mk
--- Mk/bsd.port.mk	31 May 2004 18:07:57 -0000	1.490
+++ Mk/bsd.port.mk	31 May 2004 19:00:02 -0000
@@ -4381,7 +4381,7 @@
 .else
 	@${ECHO_CMD} -n '** No Description'
 .endif
-	@${ECHO_CMD} "`perl -e ' \
+	@perl -e ' \
 		if ( -f q{${DESCR}} ) { \
 			print q{|${DESCR}}; \
 		} else { \
@@ -4402,6 +4402,7 @@
 					push @$$i, $$_; \
 				} else { \
 					print STDERR qq{${PKGNAME}: \"$$_\" non-existent -- dependency list incomplete\n}; \
+					exit(1); \
 				} \
 			} \
 		} \
@@ -4421,7 +4422,7 @@
 				} \
 			} \
 		} \
-		print qq{\n};'`"
+		print qq{\n};'
 .endif
 
 www-site:
Index: Mk/bsd.port.subdir.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.subdir.mk,v
retrieving revision 1.53
diff -u -r1.53 bsd.port.subdir.mk
--- Mk/bsd.port.subdir.mk	2 Apr 2004 07:25:23 -0000	1.53
+++ Mk/bsd.port.subdir.mk	24 May 2004 00:40:50 -0000
@@ -220,9 +220,8 @@
 	if test -d ${.CURDIR}/$${sub}; then \
 		${ECHO_MSG} "===> ${DIRPRFX}$${sub}"; \
 		cd ${.CURDIR}/$${sub}; \
-		${MAKE} -B describe 2> /dev/null || \
-			(echo "===> ${DIRPRFX}$${sub} failed:" >&2 ; \
-			cd ${.CURDIR}/$${sub}; ${MAKE} -B describe >&2; \
+		${MAKE} -B describe || \
+			(echo "===> ${DIRPRFX}$${sub} failed" >&2; \
 			exit 1) ;\
 	else \
 		${ECHO_MSG} "===> ${DIRPRFX}$${sub} non-existent"; \



-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20040602/e5db0734/attachment.bin


More information about the freebsd-ports mailing list