View | Details | Raw Unified | Return to bug 55216
Collapse All | Expand All

(-)bsd.port.mk (-27 / +18 lines)
Lines 222-228 Link Here
222
# WANT_AUTOCONF_VER (PORT MAY SET THIS VALUE)
222
# WANT_AUTOCONF_VER (PORT MAY SET THIS VALUE)
223
#				- Implies GNU_CONFIGURE=yes.
223
#				- Implies GNU_CONFIGURE=yes.
224
#				- Says that the port wants autoconf; legal values
224
#				- Says that the port wants autoconf; legal values
225
#				  are: 213, 253, 254.
225
#				  are: 213, 253, 257.
226
#				- Each specify a version of autoconf to use
226
#				- Each specify a version of autoconf to use
227
#				  and appropriatly set AUTOCONF{,_DIR} and other
227
#				  and appropriatly set AUTOCONF{,_DIR} and other
228
#				  autoconf-related program paths.
228
#				  autoconf-related program paths.
Lines 1151-1157 Link Here
1151
dev_amver=	17
1151
dev_amver=	17
1152
old_acver=	213
1152
old_acver=	213
1153
cur_acver=	253
1153
cur_acver=	253
1154
dev_acver=	254
1154
dev_acver=	257
1155
1155
1156
########## automake setup
1156
########## automake setup
1157
.if defined(USE_AUTOMAKE_VER)
1157
.if defined(USE_AUTOMAKE_VER)
Lines 1173-1180 Link Here
1173
.elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver}
1173
.elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver}
1174
ACLOCAL_DIR=	${LOCALBASE}/share/aclocal${use_amver}
1174
ACLOCAL_DIR=	${LOCALBASE}/share/aclocal${use_amver}
1175
AUTOMAKE_DIR=	${LOCALBASE}/share/automake${use_amver}
1175
AUTOMAKE_DIR=	${LOCALBASE}/share/automake${use_amver}
1176
ampath=			${LOCALBASE}/libexec/automake${use_amver}:
1176
BUILD_DEPENDS+=	${LOCALBASE}/bin/automake${use_amver}:${PORTSDIR}/devel/automake${use_amver}
1177
BUILD_DEPENDS+=	${ampath:S/://}/automake:${PORTSDIR}/devel/automake${use_amver}
1178
.if ${use_amver} == ${old_amver}
1177
.if ${use_amver} == ${old_amver}
1179
AUTOMAKE_ARGS+=	-i
1178
AUTOMAKE_ARGS+=	-i
1180
WANT_AUTOCONF_VER?=${old_acver}
1179
WANT_AUTOCONF_VER?=${old_acver}
Lines 1205-1224 Link Here
1205
BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf
1204
BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf
1206
.elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
1205
.elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
1207
AUTOCONF_DIR=	${LOCALBASE}/share/autoconf${use_acver}
1206
AUTOCONF_DIR=	${LOCALBASE}/share/autoconf${use_acver}
1208
acpath=			${LOCALBASE}/libexec/autoconf${use_acver}
1207
BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf${use_acver}:${PORTSDIR}/devel/autoconf${use_acver}
1209
BUILD_DEPENDS+=	${acpath}/autoconf:${PORTSDIR}/devel/autoconf${use_acver}
1210
.else # bad autoconf version
1208
.else # bad autoconf version
1211
BROKEN="unknown AUTOCONF version: ${USE_AUTOCONF_VER}"
1209
BROKEN="unknown AUTOCONF version: ${USE_AUTOCONF_VER}"
1212
.endif # ${use_acver} == ${cur_acver}
1210
.endif # ${use_acver} == ${cur_acver}
1213
.endif # defined(WANT_AUTOCONF_VER)
1211
.endif # defined(WANT_AUTOCONF_VER)
1214
1212
1215
########## set up paths to tools
1216
.if defined(ampath)
1217
autotools_path=${ampath}${acpath}
1218
.elif defined(acpath)
1219
autotools_path=${acpath}
1220
.endif # defined(ampath)
1221
1222
########## prefix to path, add to env vars
1213
########## prefix to path, add to env vars
1223
.if defined(autotools_path)
1214
.if defined(autotools_path)
1224
MAKE_ENV+=	PATH=${autotools_path}:${PATH}
1215
MAKE_ENV+=	PATH=${autotools_path}:${PATH}
Lines 1232-1263 Link Here
1232
1223
1233
########## set up automake "names"
1224
########## set up automake "names"
1234
.if defined(use_amver)
1225
.if defined(use_amver)
1235
.if !defined(ampath)
1226
.if ${use_amver} == ${cur_amver}
1236
ACLOCAL?=	aclocal
1227
ACLOCAL?=	aclocal
1237
AUTOMAKE?=	automake
1228
AUTOMAKE?=	automake
1238
.else # defined(ampath)
1229
.elif ${use_amver} == ${old_amver} || ${use_amver} == ${dev_amver}
1239
ACLOCAL?=	${ampath:S/://}/aclocal
1230
ACLOCAL?=	aclocal${use_amver}
1240
AUTOMAKE?=	${ampath:S/://}/automake
1231
AUTOMAKE?=	automake${use_amver}
1241
.endif # !defined(ampath)
1232
.endif # unknown use_amver value
1242
.endif # defined(use_amver)
1233
.endif # defined(use_amver)
1243
1234
1244
########## set up autoconf "names"
1235
########## set up autoconf "names"
1245
.if defined(use_acver)
1236
.if defined(use_acver)
1246
.if !defined(acpath)
1237
.if ${use_acver} == ${cur_acver}
1247
AUTOCONF?=		autoconf
1238
AUTOCONF?=		autoconf
1248
AUTOHEADER?=	autoheader
1239
AUTOHEADER?=	autoheader
1249
AUTOIFNAMES?=	ifnames
1240
AUTOIFNAMES?=	ifnames
1250
AUTORECONF?=	autoreconf
1241
AUTORECONF?=	autoreconf
1251
AUTOSCAN?=		autoscan
1242
AUTOSCAN?=		autoscan
1252
AUTOUPDATE?=	autoupdate
1243
AUTOUPDATE?=	autoupdate
1253
.else # defined(acpath)
1244
.elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
1254
AUTOCONF?=		${acpath}/autoconf
1245
AUTOCONF?=		autoconf${use_acver}
1255
AUTOHEADER?=	${acpath}/autoheader
1246
AUTOHEADER?=	autoheader${use_acver}
1256
AUTOIFNAMES?=	${acpath}/ifnames
1247
AUTOIFNAMES?=	ifnames${use_acver}
1257
AUTORECONF?=	${acpath}/autoreconf
1248
AUTORECONF?=	autoreconf${use_acver}
1258
AUTOSCAN?=		${acpath}/autoscan
1249
AUTOSCAN?=		autoscan${use_acver}
1259
AUTOUPDATE?=	${acpath}/autoupdate
1250
AUTOUPDATE?=	autoupdate${use_acver}
1260
.endif # !defined(acpath)
1251
.endif # unkown use_acver value
1261
.endif # defined(use_acver)
1252
.endif # defined(use_acver)
1262
1253
1263
########## stupid port error checking
1254
########## stupid port error checking

Return to bug 55216