INDEX patch

Oliver Eikemeier eikemeier at fillmore-labs.com
Wed Jun 2 05:47:11 PDT 2004


Kris Kennaway wrote:

> 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

May I suggest the following patch:

- check for existence of perl (cf. my RFC on ports-developers)
- enables the use of `env PATH= /usr/bin/make describe' (nice for testing)

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	2 Jun 2004 12:39:48 -0000
@@ -4375,13 +4588,17 @@
 
 .if !target(describe)
 describe:
+	@if [ ! -x "${PERL5}" ]; then \
+		${ECHO_MSG} ">> describe: perl 5 required, please install lang/perl" >&2; \
+		exit 1; \
+	fi
 	@${ECHO_CMD} -n '${PKGNAME}|${.CURDIR}|${PREFIX}|'
 .if defined(COMMENT)
 	@${ECHO_CMD} -n ${COMMENT:Q}
 .else
 	@${ECHO_CMD} -n '** No Description'
 .endif
-	@${ECHO_CMD} "`perl -e ' \
+	@${PERL5} -w -e ' \
 		if ( -f q{${DESCR}} ) { \
 			print q{|${DESCR}}; \
 		} else { \
@@ -4402,6 +4619,7 @@
 					push @$$i, $$_; \
 				} else { \
 					print STDERR qq{${PKGNAME}: \"$$_\" non-existent -- dependency list incomplete\n}; \
+					exit(1); \
 				} \
 			} \
 		} \
@@ -4421,7 +4639,7 @@
 				} \
 			} \
 		} \
-		print qq{\n};'`"
+		print qq{\n};'
 .endif
 
 www-site:



More information about the freebsd-ports mailing list