From owner-freebsd-ports  Sat Aug 31 23:19: 3 2002
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8EAF537B400; Sat, 31 Aug 2002 23:18:58 -0700 (PDT)
Received: from wwweasel.geeksrus.net (wwweasel.geeksrus.net [64.8.210.226])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C6F7543E65; Sat, 31 Aug 2002 23:18:57 -0700 (PDT)
	(envelope-from alane@wwweasel.geeksrus.net)
Received: from wwweasel.geeksrus.net (alane@localhost [127.0.0.1])
	by wwweasel.geeksrus.net (8.12.5/8.12.5) with ESMTP id g816Iue6070053;
	Sun, 1 Sep 2002 02:18:56 -0400 (EDT)
	(envelope-from alane@wwweasel.geeksrus.net)
Received: (from alane@localhost)
	by wwweasel.geeksrus.net (8.12.5/8.12.5/Submit) id g816IuMP070052;
	Sun, 1 Sep 2002 02:18:56 -0400 (EDT)
	(envelope-from alane)
Date: Sun, 1 Sep 2002 02:18:56 -0400
From: Alan E <alane@geeksrus.net>
To: ade@freebsd.org
Cc: FreeBSD Ports List <ports@freebsd.org>,
	FreeBSD Port Mgr <portmgr@freebsd.org>
Subject: Here's is a patch
Message-ID: <20020901061856.GA70035@wwweasel.geeksrus.net>
Reply-To: alane@geeksrus.net
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-message-flag: Magic 8-Ball says "Outlook not so good." I'll ask it about Exchange next.
User-Agent: Mutt/1.5.1i
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org

==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
--- bsd.port.mk.prod	Mon Aug 19 13:12:59 2002
+++ bsd.port.mk	Sun Sep  1 02:10:33 2002
@@ -873,36 +873,70 @@
 BUILD_DEPENDS+=		gmake:${PORTSDIR}/devel/gmake
 CONFIGURE_ENV+=	MAKE=${GMAKE}
 .endif
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-USE_AUTOMAKE?=	yes
-USE_AUTOMAKE_VER?=	14
 
-USE_AUTOCONF=	yes
-.endif
-.if defined(USE_AUTOMAKE_VER)
-.if ${USE_AUTOMAKE_VER} == 15
-BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
+# Proof of concept for autotools versioning using PATH 
+#		AlanE <ports@geeksrus.net>
 
-ACLOCAL?=		aclocal
-AUTOMAKE?=		automake
-ACLOCAL_DIR?=		${LOCALBASE}/share/aclocal
-AUTOMAKE_DIR?=		${LOCALBASE}/share/automake
-.else
-BUILD_DEPENDS+=		automake14:${PORTSDIR}/devel/automake14
+.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
+USE_AUTOMAKE?=		yes
+USE_AUTOMAKE_VER?=	14
 
+.if ${USE_AUTOMAKE_VER} == 14
 AUTOMAKE_ARGS+=		-i
-USE_AUTOCONF_VER?=	213
+ACLOCAL_DIR=		${LOCALBASE}/share/automake14/aclocal
+AUTOMAKE_DIR=		${LOCALBASE}/share/automake14/automake
+_AUTOMAKE_PATH=		${LOCALBASE}/libexec/automake14
+BUILD_DEPENDS+=		automake-14:${PORTSDIR}/devel/automake14
+USE_AUTOCONF_VER=	213
+.else
+AUTOMAKE_DIR=		${LOCALBASE}/share/automake
+BUILD_DEPENDS+=		automake:${PORTSDIR}/devel/automake
+USE_AUTOCONF_VER=	current
 .endif
 .endif
+
 .if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-USE_AUTOCONF?=	yes
+USE_AUTOCONF?=		yes
 USE_AUTOCONF_VER?=	213
 
+.if ${USE_AUTOCONF_VER} == 213
+_AUTOCONF_PATH=		${LOCALBASE}/libexec/autoconf213
+AUTOCONF_DIR=		${LOCALBASE}/share/autoconf213
+BUILD_DEPENDS+=		autoconf-213:${PORTSDIR}/devel/autoconf213
+.else
+AUTOCONF_DIR=		${LOCALBASE}/share/autoconf
+BUILD_DEPENDS+=		autoconf:${PORTSDIR}/devel/autoconf
+.endif
+.endif
+
+.if defined(USE_AUTOMAKE_VER)
+ACLOCAL=		aclocal
+AUTOMAKE=		automake
 GNU_CONFIGURE=	yes
 .endif
 .if defined(USE_AUTOCONF_VER)
-BUILD_DEPENDS+=		autoconf213:${PORTSDIR}/devel/autoconf213
+AUTOCONF=	autoconf
+AUTOHEADER=	autoheader
+AUTORECONF=	autoreconf
+AUTOSCAN=	autoscan
+AUTOUPDATE=	autoupdate
+AUTOIFNAMES=	ifnames
+GNU_CONFIGURE=	yes
 .endif
+
+.if defined(_AUTOCONF_PATH) && defined(_AUTOMAKE_PATH)
+_AUTOTOOLS_PATH=	${_AUTOMAKE_PATH}:${_AUTOCONF_PATH}
+.elsif defined(_AUTOCONF_PATH)
+_AUTOTOOLS_PATH=	${_AUTOCONF_PATH}
+.endif
+
+.if defined(_AUTOTOOLS_PATH)
+MAKE_ENV+=		PATH=${_AUTOTOOLS_PATH}:$$PATH
+CONFIGURE_ENV+=	PATH=${_AUTOTOOLS_PATH}:$$PATH
+.endif
+
+# END test autotools code
+
 .if defined(USE_LIBTOOL)
 GNU_CONFIGURE=	yes
 BUILD_DEPENDS+=		libtool:${PORTSDIR}/devel/libtool
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==

-- 
AlanE
KDE-FreeBSD Team (http://freebsd.kde.org/)

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