From owner-freebsd-ports@FreeBSD.ORG  Wed Jun  2 05:47:11 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9612B16A4CE
	for <ports@FreeBSD.org>; Wed,  2 Jun 2004 05:47:11 -0700 (PDT)
Received: from fillmore.dyndns.org (port-212-202-49-130.dynamic.qsc.de
	[212.202.49.130])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 15C4D43D2F
	for <ports@FreeBSD.org>; Wed,  2 Jun 2004 05:47:11 -0700 (PDT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from [172.16.0.2] (helo=fillmore-labs.com)
	by fillmore.dyndns.org with esmtp (Exim 4.34 (FreeBSD))
	id 1BVV9A-000Msk-0D; Wed, 02 Jun 2004 14:47:10 +0200
Message-ID: <40BDCC4B.9000708@fillmore-labs.com>
Date: Wed, 02 Jun 2004 14:47:07 +0200
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Organization: Fillmore Labs GmbH - http://www.fillmore-labs.com/
MIME-Version: 1.0
To: Kris Kennaway <kris@obsecurity.org>
References: <20040602121648.GA51625@xor.obsecurity.org>
In-Reply-To: <20040602121648.GA51625@xor.obsecurity.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
User-Agent: KMail/1.5.9
cc: ports@FreeBSD.org
Subject: Re: INDEX patch
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2004 12:47:11 -0000

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: