From owner-cvs-all  Fri Jan  7  8:55:10 2000
Delivered-To: cvs-all@freebsd.org
Received: from m0.cs.berkeley.edu (m0.CS.Berkeley.EDU [128.32.45.176])
	by hub.freebsd.org (Postfix) with ESMTP
	id E3A561582F; Fri,  7 Jan 2000 08:54:50 -0800 (PST)
	(envelope-from asami@stampede.cs.berkeley.edu)
Received: from silvia.hip.berkeley.edu (sji-ca7-252.ix.netcom.com [209.109.235.252])
	by m0.cs.berkeley.edu (8.9.3/8.9.3) with ESMTP id IAA68831;
	Fri, 7 Jan 2000 08:54:45 -0800 (PST)
	(envelope-from asami@stampede.cs.berkeley.edu)
Received: (from asami@localhost) by silvia.hip.berkeley.edu (8.9.3/8.6.9) id IAA57373; Fri, 7 Jan 2000 08:54:38 -0800 (PST)
To: cvs-committers@FreeBSD.org
Cc: cvs-all@FreeBSD.org, nsayer@FreeBSD.org, obrien@FreeBSD.org
Subject: Re: cvs commit: ports/devel/codecrusader Makefile ports/editors/vim-lite          Makefile ports/graphics/gfont Makefile ports/graphics/killustrator          Makefile ports/graphics/kplot3d Makefile ports/lang/p5-F77          Makefile ports/misc/dnetc Makefile ports/news/pan Makefile ...
References: <200001071640.IAA95153@freefall.freebsd.org>
From: asami@FreeBSD.org (Satoshi - Ports Wraith - Asami)
Date: 07 Jan 2000 08:54:34 -0800
In-Reply-To: Satoshi Asami's message of "Fri, 7 Jan 2000 08:40:18 -0800 (PST)"
Message-ID: <vqcr9ftg6ut.fsf@silvia.hip.berkeley.edu>
Lines: 66
X-Mailer: Gnus v5.7/Emacs 20.5
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

 *   Log:
 *   Don't include bsd.port.pre.mk twice.  This usually is caused by first
 *   including bsd.port.pre.mk and then later including bsd.port.mk (the
 *   latter of which of course should be bsd.port.post.mk).
 *   
 *   Revision  Changes    Path
 *   1.7       +2 -2      ports/devel/codecrusader/Makefile
 *   1.6       +1 -6      ports/editors/vim-lite/Makefile
 *   1.10      +2 -2      ports/graphics/gfont/Makefile
 *   1.9       +2 -2      ports/graphics/killustrator/Makefile
 *   1.3       +2 -2      ports/graphics/kplot3d/Makefile
 *   1.2       +2 -2      ports/lang/p5-F77/Makefile
 *   1.3       +2 -2      ports/misc/dnetc/Makefile
 *   1.13      +2 -2      ports/news/pan/Makefile
 *   1.7       +2 -2      ports/mail/wmpop3/Makefile
 *   1.2       +2 -2      ports/misc/proxyper/Makefile
 *   1.4       +2 -2      ports/security/nessus-libnasl/Makefile
 *   1.4       +2 -2      ports/security/nessus-libraries/Makefile
 *   1.5       +2 -2      ports/security/nessus-plugins/Makefile
 *   1.7       +2 -2      ports/security/nessus/Makefile
 *   1.32      +2 -2      ports/security/openssh/Makefile
 *   1.5       +2 -2      ports/misc/videotext/Makefile
 *   1.11      +2 -2      ports/net/netatalk-asun/Makefile
 *   1.2       +2 -2      ports/www/kdreamsite/Makefile
 *   1.22      +2 -2      ports/japanese/perl5/Makefile

Whoa!  There were quite a few. ;)

I've fixed the inadvertent ones, but there are some that do a
(paraphrased):

===
.include <bsd.port.pre.mk>
.if !exists(${DESTDIR}/somefile)
IGNORE=	somemessage
.endif
.include "${MASTERDIR}/Makefile"
===

Of course, ${MASTERDIR}/Makefile includes bsd.port.mk so this is not
good.  mail/pine4-ssl and www/netscape47-*.us do this.

One solution is to move the check to MASTERDIR and pass the necessary
stuff as variables.  Something like:

===
FILE=		${DESTDIR}/somefile
MESSAGE=	somemessage
CHECKFILE=	t
.include "${MASTERDIR}/Makefile"
===

and in ${MASTERDIR}/Makefile:

===
.if defined(CHECKFILE)
.if !exists(${FILE})
IGNORE=	${MESSAGE}
.endif
.endif
===

Depending on how modular things have to be, less things can be passed,
of course.

-PW


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message