Date: Wed, 2 Jun 2004 05:16:48 -0700 From: Kris Kennaway <kris@obsecurity.org> To: ports@FreeBSD.org Subject: INDEX patch Message-ID: <20040602121648.GA51625@xor.obsecurity.org>
next in thread | raw e-mail | index | archive | help
--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 i=
ncomplete\n}; \
+ exit(1); \
} \
} \
} \
@@ -4421,7 +4422,7 @@
} \
} \
} \
- print qq{\n};'`"
+ print qq{\n};'
.endif
=20
www-site:
Index: Mk/bsd.port.subdir.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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} "=3D=3D=3D> ${DIRPRFX}$${sub}"; \
cd ${.CURDIR}/$${sub}; \
- ${MAKE} -B describe 2> /dev/null || \
- (echo "=3D=3D=3D> ${DIRPRFX}$${sub} failed:" >&2 ; \
- cd ${.CURDIR}/$${sub}; ${MAKE} -B describe >&2; \
+ ${MAKE} -B describe || \
+ (echo "=3D=3D=3D> ${DIRPRFX}$${sub} failed" >&2; \
exit 1) ;\
else \
${ECHO_MSG} "=3D=3D=3D> ${DIRPRFX}$${sub} non-existent"; \
--X1bOJ3K7DJ5YkBrT
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFAvcUwWry0BWjoQKURAg1VAJ966FQfXFDuOraNQ8jGNHWv/oYuRACcDflL
KV7d+Xu/7h9XfwTI0D96hE0=
=aR0U
-----END PGP SIGNATURE-----
--X1bOJ3K7DJ5YkBrT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040602121648.GA51625>