ports/89999: Move location of bsd.autotools.mk within bsd.port.mk + patches from PR ports/77359.

[Thierry Thomas]

>Number:         89999
>Category:       ports
>Synopsis:       Move location of bsd.autotools.mk within bsd.port.mk + patches from PR ports/77359.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 05 22:30:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 6.0-STABLE FreeBSD 6.0-STABLE #1: Fri Nov 4 23:55:27 CET 2005 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF051104 i386


	
>Description:
	A new port, graphics/gephex, submitted in PR ports/77359 requires
	some reorganization in bsd.port.mk and bsd.autotools.mk.

	See the history at <http://www.freebsd.org/cgi/query-pr.cgi?pr=77359>.

	Since that means a full test run, merge these patches with the one
	already included into PR ports/89265 (as seen with ade).

	Credit: these new patches have been written by Igor Pokrovsky
	(<ip (at) doom.homeunix.org>).

>How-To-Repeat:
	- Try to build graphics/gephex from PR ports/77359: the included
	  libtool will be used;

	- Apply the hereunder patches and try again: it should be OK.
	(A full log is available at <http://pompo.net/ports/gephex-0.4.3b.log.bz2>)

>Fix:
	Please apply the following patches:

--- bsd.autotools.mk.diff begins here ---
--- Mk/bsd.autotools.mk.orig	Fri Dec  2 07:28:41 2005
+++ Mk/bsd.autotools.mk	Mon Dec  5 22:00:53 2005
@@ -338,7 +338,7 @@
 # the order of autotools running.
 
 .if !target(run-autotools)
-run-autotools:: run-autotools-aclocal run-autotools-automake \
+run-autotools:: run-autotools-aclocal patch-autotools run-autotools-automake \
 		run-autotools-autoconf run-autotools-autoheader
 .endif
 
--- bsd.autotools.mk.diff ends here ---

--- bsd.port.mk.diff begins here ---
--- Mk/bsd.port.mk.orig	Wed Nov  9 20:41:24 2005
+++ Mk/bsd.port.mk	Mon Dec  5 22:52:06 2005
@@ -379,7 +379,6 @@
 # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
 #				  (libtool, autoconf, autoheader, automake et al.)
 #				  See bsd.autotools.mk for more details.
-#				  XXX: not currently in active use - this is a placeholder.
 ##
 # USE_JAVA		- If set, this port relies on the Java language.
 #				  Implies inclusion of bsd.java.mk.  (Also see
@@ -1307,10 +1306,6 @@
 PERL=		${LOCALBASE}/bin/perl
 .endif
 
-# XXX: (not yet): .if defined(USE_AUTOTOOLS)
-# .include "${PORTSDIR}/Mk/bsd.autotools.mk"
-# XXX: (not yet): .endif
-
 .if defined(USE_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
@@ -1729,13 +1724,9 @@
 .endif
 .endif
 
-# XXX: (not yet): .if defined(USE_AUTOTOOLS)
-.include "${PORTSDIR}/Mk/bsd.autotools.mk"
-# XXX: (not yet): .endif
-
 .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
 	defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \
-	defined(USE_BDB) || defined(USE_SQLITE) 
+	defined(USE_BDB) || defined(USE_SQLITE)
 .include "${PORTSDIR}/Mk/bsd.database.mk"
 .endif
 
@@ -1763,6 +1754,10 @@
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .endif
 
+# XXX: (not yet): .if defined(USE_AUTOTOOLS)
+.include "${PORTSDIR}/Mk/bsd.autotools.mk"
+# XXX: (not yet): .endif
+
 .if exists(${PORTSDIR}/../Makefile.inc)
 .include "${PORTSDIR}/../Makefile.inc"
 USE_SUBMAKE=	yes
@@ -3691,8 +3686,8 @@
 				do-patch post-patch post-patch-script
 _CONFIGURE_DEP=	patch
 _CONFIGURE_SEQ=	build-depends lib-depends misc-depends configure-message \
-		pre-configure pre-configure-script patch-autotools \
-		run-autotools do-configure post-configure post-configure-script
+				pre-configure pre-configure-script run-autotools \
+				do-configure post-configure post-configure-script
 _BUILD_DEP=		configure
 _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
 				post-build post-build-script
--- bsd.port.mk.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: