ports/55325: [PATCH] ports/Mk/bsd.port.mk handles autoconf17 and automake257 wrong

[Jens Rehsack]

>Number:         55325
>Category:       ports
>Synopsis:       [PATCH] ports/Mk/bsd.port.mk handles autoconf17 and automake257 wrong
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 06 15:10:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jens Rehsack <rehsack at liwing.de>
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Aug 3 21:07:48 GMT 2003 root at statler:/usr/obj/usr/src/sys/STATLER i386

	not machine specific
>Description:
	I'm writing on a new port which requires (own description) automake 1.6 or higher.
	FreeBSD has 1.7 in ports and it could be used by USE_AUTOMAKE_VER=17. devel/automake17
	installs autoconf-2.57 (which is devel version, not 2.54).
	Because of searching the binary in /usr/local/libexec/automake17/automake,
	bsd.port.mk fails after installation of automake17. Same for autoconf-2.57.

	This patch make workarounds for dependencies as used in devel/automake17 or
	science/mpqc obsolete and all ports which are using such a workaround may
	updated to trust on bsd.port.mk instead
>How-To-Repeat:
	Simple build a port which depends on automake-1.7 (by using USE_AUTOMAKE_VER=17).
>Fix:

	

--- patch-Mk::bsd.port.mk begins here ---
--- Mk/bsd.port.mk.orig	Wed Aug  6 16:04:40 2003
+++ Mk/bsd.port.mk	Wed Aug  6 16:29:49 2003
@@ -221,7 +221,7 @@
 # WANT_AUTOCONF_VER (PORT MAY SET THIS VALUE)
 #				- Implies GNU_CONFIGURE=yes.
 #				- Says that the port wants autoconf; legal values
-#				  are: 213, 253, 254.
+#				  are: 213, 253, 257.
 #				- Each specify a version of autoconf to use
 #				  and appropriatly set AUTOCONF{,_DIR} and other
 #				  autoconf-related program paths.
@@ -1154,7 +1154,7 @@
 dev_amver=	17
 old_acver=	213
 cur_acver=	253
-dev_acver=	254
+dev_acver=	257
 
 ########## automake setup
 .if defined(USE_AUTOMAKE_VER)
@@ -1176,12 +1176,13 @@
 .elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver}
 ACLOCAL_DIR=	${LOCALBASE}/share/aclocal${use_amver}
 AUTOMAKE_DIR=	${LOCALBASE}/share/automake${use_amver}
+.if ${use_amver} == ${old_amver}
 ampath=			${LOCALBASE}/libexec/automake${use_amver}:
 BUILD_DEPENDS+=	${ampath:S/://}/automake:${PORTSDIR}/devel/automake${use_amver}
-.if ${use_amver} == ${old_amver}
 AUTOMAKE_ARGS+=	-i
 WANT_AUTOCONF_VER?=${old_acver}
 .else
+BUILD_DEPENDS+=         ${LOCALBASE}/bin/automake${dev_amver}:${PORTSDIR}/devel/automake{dev_amver}
 WANT_AUTOCONF_VER?=${dev_acver}
 .endif # ${use_amver} == ${old_amver}
 .else # bad automake version
@@ -1206,10 +1207,13 @@
 .if ${use_acver} == ${cur_acver}
 AUTOCONF_DIR=		${LOCALBASE}/share/autoconf
 BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf
-.elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
+.elif ${use_acver} == ${old_acver}
 AUTOCONF_DIR=	${LOCALBASE}/share/autoconf${use_acver}
 acpath=			${LOCALBASE}/libexec/autoconf${use_acver}
 BUILD_DEPENDS+=	${acpath}/autoconf:${PORTSDIR}/devel/autoconf${use_acver}
+.elif ${use_acver} == ${dev_acver}
+AUTOCONF_DIR=		${LOCALBASE}/share/autoconf${dev_acver}
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf${dev_acver}:${PORTSDIR}/devel/autoconf${dev_acver}
 .else # bad autoconf version
 BROKEN="unknown AUTOCONF version: ${USE_AUTOCONF_VER}"
 .endif # ${use_acver} == ${cur_acver}
@@ -1236,8 +1240,13 @@
 ########## set up automake "names"
 .if defined(use_amver)
 .if !defined(ampath)
+.if ${use_amver} == ${cur_amver}
 ACLOCAL?=	aclocal
 AUTOMAKE?=	automake
+.else
+ACLOCAL?=	aclocal${dev_amver}
+AUTOMAKE?=	automake${dev_amver}
+.endif
 .else # defined(ampath)
 ACLOCAL?=	${ampath:S/://}/aclocal
 AUTOMAKE?=	${ampath:S/://}/automake
@@ -1247,12 +1256,21 @@
 ########## set up autoconf "names"
 .if defined(use_acver)
 .if !defined(acpath)
+.if ${use_acver} == ${cur_acver}
 AUTOCONF?=		autoconf
 AUTOHEADER?=	autoheader
 AUTOIFNAMES?=	ifnames
 AUTORECONF?=	autoreconf
 AUTOSCAN?=		autoscan
 AUTOUPDATE?=	autoupdate
+.else
+AUTOCONF?=		autoconf${dev_acver}
+AUTOHEADER?=	autoheader${dev_acver}
+AUTOIFNAMES?=	ifnames${dev_acver}
+AUTORECONF?=	autoreconf${dev_acver}
+AUTOSCAN?=		autoscan${dev_acver}
+AUTOUPDATE?=	autoupdate${dev_acver}
+.endif
 .else # defined(acpath)
 AUTOCONF?=		${acpath}/autoconf
 AUTOHEADER?=	${acpath}/autoheader
--- patch-Mk::bsd.port.mk ends here ---


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