From ahze@FreeBSD.org  Mon Nov 29 21:06:06 2004
Return-Path: <ahze@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3D42B16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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.net
          (InterMail vM.5.01.06.11 201-253-122-130-111-20040605) with ESMTP
          id <20041129210604.KBGN2049.imf19aec.mail.bellsouth.net@blueheron.ahze.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          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" <ahze@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [PATCH] bsd.port.mk -- Move .if defined(GNU_CONFIGURE) below .include .. bsd.autotools.mk
X-Send-Pr-Version: gtk-send-pr 0.4.1 
X-GNATS-Notify:

>Number:         74536
>Category:       ports
>Synopsis:       [PATCH] bsd.port.mk -- Move .if defined(GNU_CONFIGURE) below .include .. bsd.autotools.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 29 21:10:26 GMT 2004
>Closed-Date:    Thu Dec 09 22:12:25 GMT 2004
>Last-Modified:  Thu Dec 09 22:12:25 GMT 2004
>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:
Responsible-Changed-From-To: freebsd-advocacy->freebsd-ports 
Responsible-Changed-By: ade 
Responsible-Changed-When: Mon Nov 29 21:14:52 GMT 2004 
Responsible-Changed-Why:  
Reassign PR to the right place. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74536 
Responsible-Changed-From-To: freebsd-ports->portmgr 
Responsible-Changed-By: ceri 
Responsible-Changed-When: Mon Nov 29 21:20:22 GMT 2004 
Responsible-Changed-Why:  
Touches bsd.port.mk. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74536 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Thu Dec 9 22:12:20 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74536 
>Unformatted:
