From owner-freebsd-advocacy@FreeBSD.ORG Mon Nov 29 21:10:29 2004 Return-Path: Delivered-To: freebsd-advocacy@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2654316A4CE for ; Mon, 29 Nov 2004 21:10:29 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95D1A43D69 for ; Mon, 29 Nov 2004 21:10:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iATLARwH004321 for ; Mon, 29 Nov 2004 21:10:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iATLARBO004320; Mon, 29 Nov 2004 21:10:27 GMT (envelope-from gnats) Resent-Date: Mon, 29 Nov 2004 21:10:27 GMT Resent-Message-Id: <200411292110.iATLARBO004320@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-advocacy@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Michael Johnson" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D42B16A4CE for ; Mon, 29 Nov 2004 21:06:06 +0000 (GMT) Received: from imf19aec.mail.bellsouth.net (imf19aec.mail.bellsouth.net [205.152.59.67]) by mx1.FreeBSD.org (Postfix) with ESMTP id B18E443D6A for ; Mon, 29 Nov 2004 21:06:05 +0000 (GMT) (envelope-from ahze@FreeBSD.org) Received: from blueheron.ahze.net ([68.209.163.3]) by imf19aec.mail.bellsouth.netESMTP <20041129210604.KBGN2049.imf19aec.mail.bellsouth.net@blueheron.ahze.net> for ; Mon, 29 Nov 2004 16:06:04 -0500 Message-Id: <1101762364.0@blueheron.ahze.net> Date: Mon, 29 Nov 2004 16:06:04 -0500 From: "Michael Johnson" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.1 Subject: advocacy/74536: [PATCH] bsd.port.mk -- Move .if defined(GNU_CONFIGURE) below .include .. bsd.autotools.mk X-BeenThere: freebsd-advocacy@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: FreeBSD Evangelism List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 21:10:29 -0000 >Number: 74536 >Category: advocacy >Synopsis: [PATCH] bsd.port.mk -- Move .if defined(GNU_CONFIGURE) below .include .. bsd.autotools.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-advocacy >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 29 21:10:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Michael Johnson >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD 5.3-STABLE #70: Thu Nov 11 16:03:02 EST 2004 ahze@blueheron.ahze.net:/usr/obj/usr/src/sys/GreatBlueHeron >Description: This patch moves .if defined(GNU_CONFIGURE) below .include "${PORTSDIR}/Mk/bsd.autotools.mk" so it will work with USE/WITH_LIBTOOL_ since GNU_CONFIGURE is defined in bsd.autotools.mk >How-To-Repeat: >Fix: --- bsd.port.mk.patch begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.500 diff -u -r1.500 bsd.port.mk --- bsd.port.mk 19 Nov 2004 13:45:07 -0000 1.500 +++ bsd.port.mk 29 Nov 2004 01:24:03 -0000 @@ -1597,14 +1597,6 @@ .endif # Check for correct libs .endif # USE_MYSQL -.if defined(USE_XLIB) -LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} -# Add explicit X options to avoid problems with false positives in configure -.if defined(GNU_CONFIGURE) -CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include -.endif -.endif - # XXX: (not yet): .if defined(USE_AUTOTOOLS) .include "${PORTSDIR}/Mk/bsd.autotools.mk" # XXX: (not yet): .endif @@ -1626,6 +1618,14 @@ USE_SUBMAKE= yes .endif +.if defined(USE_XLIB) +LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} +# Add explicit X options to avoid problems with false positives in configure +.if defined(GNU_CONFIGURE) +CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +.endif +.endif + # Set the default for the installation of Postscript(TM)- # compatible functionality. .if !defined(WITHOUT_X11) --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: