From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 2 06:50:18 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E48A816A4B3 for ; Thu, 2 Oct 2003 06:50:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BA3F43FF7 for ; Thu, 2 Oct 2003 06:50:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h92DoGFY001805 for ; Thu, 2 Oct 2003 06:50:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h92DoGfa001804; Thu, 2 Oct 2003 06:50:16 -0700 (PDT) (envelope-from gnats) Resent-Date: Thu, 2 Oct 2003 06:50:16 -0700 (PDT) Resent-Message-Id: <200310021350.h92DoGfa001804@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Eikemeier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5980316A4B3 for ; Thu, 2 Oct 2003 06:43:20 -0700 (PDT) Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id C657143FF3 for ; Thu, 2 Oct 2003 06:43:18 -0700 (PDT) (envelope-from eikemeier@fillmore-labs.com) Received: from pd958a54a.dip.t-dialin.net ([217.88.165.74] helo=fillmore-labs.com ident=s5yqundonkqfr44q) by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256) (Exim 4.24; FreeBSD 4.9) id 1A53jh-0004tg-7D for FreeBSD-gnats-submit@FreeBSD.org; Thu, 02 Oct 2003 15:43:17 +0200 Message-Id: <3F7C2B72.6080407@fillmore-labs.com> Date: Thu, 02 Oct 2003 15:43:14 +0200 From: Oliver Eikemeier To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57496: [PATCH] bsd.port.mk: check for USE_* used to late X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2003 13:50:18 -0000 >Number: 57496 >Category: ports >Synopsis: [PATCH] bsd.port.mk: check for USE_* used to late >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Oct 02 06:50:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Oliver Eikemeier >Release: FreeBSD 4.8-STABLE i386 >Organization: Fillmore Labs - http://www.fillmore-labs.com >Environment: System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE >Description: Multiple ports are having problems with defining USE_OPENLDAP or USE_OPENSSL after they included bsd.port.pre.mk, which results in that that directive being ignored. This patch checks if a USE_* variable is defined too late, and if it is the port is marked as broken. More bugs are fixed in PR 56600, and PR 56960 is an improvement, too... >How-To-Repeat: The latest one is PR 57491, there are a lot of others. This patch is expected to break some ports ;-) >Fix: --- bsd.port.mk.patch begins here --- --- bsd.port.mk.orig 3 Sep 2003 19:50:24 -0000 +++ bsd.port.mk 2 Oct 2003 13:41:10 -0000 @@ -988,6 +988,10 @@ SCRIPTDIR?= ${MASTERDIR}/scripts PKGDIR?= ${MASTERDIR} +_PRE_MAKE_DEFINES= EMACS_PORT_NAME USE_GNUSTEP USE_IMAKE USE_JAVA USE_KDEBASE_VER USE_KDELIBS_VER \ + USE_LIBRUBY USE_LINUX_PREFIX USE_OPENLDAP USE_OPENLDAP_VER USE_OPENSSL \ + USE_PYTHON USE_QT USE_QT2 USE_QT_VER USE_RUBY USE_X_PREFIX + .if defined(USE_IMAKE) && !defined(USE_X_PREFIX) USE_X_PREFIX= yes .endif @@ -1082,6 +1086,12 @@ # Location of mounted CDROM(s) to search for files CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} +.for var in ${_PRE_MAKE_DEFINES} +.ifndef ${var} +_PRE_MAKE_UNDEFINED+= ${var} +.endif +.endfor + .endif # End of pre-makefile section. @@ -1095,6 +1105,12 @@ .endif _POSTMKINCLUDED= yes + +.for var in ${_PRE_MAKE_UNDEFINED} +.ifdef ${var} +BROKEN= "${var} defined after including bsd.port.pre.mk" +.endif +.endfor WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work .if defined(NO_WRKSUBDIR) --- bsd.port.mk.patch ends here --- bsd.gnome.mk (no patch provided) should include _PRE_MAKE_DEFINES+= USE_GNOME USE_GTK they belong there because this is the place where they are tested. >Release-Note: >Audit-Trail: >Unformatted: