Attachment 33835 Details for Bug 55216 – file.diff

[patch] file.diff

file.diff (text/plain), 3.33 KB, created by Ulrich Spoerlein on 2003-08-03 21:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Spoerlein

Created: 2003-08-03 21:20:05 UTC

Size: 3.33 KB

patch

obsolete

>--- bsd.port.mk.orig	Sun Aug  3 21:54:24 2003
>+++ bsd.port.mk	Sun Aug  3 22:17:12 2003
>@@ -222,7 +222,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.
>@@ -1151,7 +1151,7 @@
> dev_amver=	17
> old_acver=	213
> cur_acver=	253
>-dev_acver=	254
>+dev_acver=	257
> 
> ########## automake setup
> .if defined(USE_AUTOMAKE_VER)
>@@ -1173,8 +1173,7 @@
> .elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver}
> ACLOCAL_DIR=	${LOCALBASE}/share/aclocal${use_amver}
> AUTOMAKE_DIR=	${LOCALBASE}/share/automake${use_amver}
>-ampath=			${LOCALBASE}/libexec/automake${use_amver}:
>-BUILD_DEPENDS+=	${ampath:S/://}/automake:${PORTSDIR}/devel/automake${use_amver}
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/automake${use_amver}:${PORTSDIR}/devel/automake${use_amver}
> .if ${use_amver} == ${old_amver}
> AUTOMAKE_ARGS+=	-i
> WANT_AUTOCONF_VER?=${old_acver}
>@@ -1205,20 +1204,12 @@
> BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf
> .elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
> AUTOCONF_DIR=	${LOCALBASE}/share/autoconf${use_acver}
>-acpath=			${LOCALBASE}/libexec/autoconf${use_acver}
>-BUILD_DEPENDS+=	${acpath}/autoconf:${PORTSDIR}/devel/autoconf${use_acver}
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf${use_acver}:${PORTSDIR}/devel/autoconf${use_acver}
> .else # bad autoconf version
> BROKEN="unknown AUTOCONF version: ${USE_AUTOCONF_VER}"
> .endif # ${use_acver} == ${cur_acver}
> .endif # defined(WANT_AUTOCONF_VER)
> 
>-########## set up paths to tools
>-.if defined(ampath)
>-autotools_path=${ampath}${acpath}
>-.elif defined(acpath)
>-autotools_path=${acpath}
>-.endif # defined(ampath)
>-
> ########## prefix to path, add to env vars
> .if defined(autotools_path)
> MAKE_ENV+=	PATH=${autotools_path}:${PATH}
>@@ -1232,32 +1223,32 @@
> 
> ########## set up automake "names"
> .if defined(use_amver)
>-.if !defined(ampath)
>+.if ${use_amver} == ${cur_amver}
> ACLOCAL?=	aclocal
> AUTOMAKE?=	automake
>-.else # defined(ampath)
>-ACLOCAL?=	${ampath:S/://}/aclocal
>-AUTOMAKE?=	${ampath:S/://}/automake
>-.endif # !defined(ampath)
>+.elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver}
>+ACLOCAL?=	aclocal${use_amver}
>+AUTOMAKE?=	automake${use_amver}
>+.endif # unknown use_amver value
> .endif # defined(use_amver)
> 
> ########## 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 # defined(acpath)
>-AUTOCONF?=		${acpath}/autoconf
>-AUTOHEADER?=	${acpath}/autoheader
>-AUTOIFNAMES?=	${acpath}/ifnames
>-AUTORECONF?=	${acpath}/autoreconf
>-AUTOSCAN?=		${acpath}/autoscan
>-AUTOUPDATE?=	${acpath}/autoupdate
>-.endif # !defined(acpath)
>+.elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
>+AUTOCONF?=		autoconf${use_acver}
>+AUTOHEADER?=	autoheader${use_acver}
>+AUTOIFNAMES?=	ifnames${use_acver}
>+AUTORECONF?=	autoreconf${use_acver}
>+AUTOSCAN?=		autoscan${use_acver}
>+AUTOUPDATE?=	autoupdate${use_acver}
>+.endif # unkown use_acver value
> .endif # defined(use_acver)
> 
> ########## stupid port error checking

Actions: View | Diff

Attachments on bug 55216: 33835