View | Details | Raw Unified | Return to bug 33916 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.port.mk (-5 / +5 lines)
Lines 188-194 Link Here
188
# AUTOCONF_DIR	- Set to path of GNU autoconf shared directory (default:
188
# AUTOCONF_DIR	- Set to path of GNU autoconf shared directory (default:
189
#				according to USE_AUTOCONF_VER value)
189
#				according to USE_AUTOCONF_VER value)
190
# USE_LIBTOOL	- Says that the port uses Libtool.  Implies GNU_CONFIGURE.
190
# USE_LIBTOOL	- Says that the port uses Libtool.  Implies GNU_CONFIGURE.
191
# LIBTOOL		- Set to path of libtool (default: libtool).
191
# LIBTOOL		- Set to path of libtool (default: libtool13).
192
# LIBTOOLFILES	- Files to patch for libtool (defaults: "aclocal.m4" if
192
# LIBTOOLFILES	- Files to patch for libtool (defaults: "aclocal.m4" if
193
#				  USE_AUTOCONF is set, "configure" otherwise).
193
#				  USE_AUTOCONF is set, "configure" otherwise).
194
# LIBTOOLFLAGS	- Additional flags to pass to ltconfig
194
# LIBTOOLFLAGS	- Additional flags to pass to ltconfig
Lines 893-899 Link Here
893
.endif
893
.endif
894
.if defined(USE_LIBTOOL)
894
.if defined(USE_LIBTOOL)
895
GNU_CONFIGURE=	yes
895
GNU_CONFIGURE=	yes
896
BUILD_DEPENDS+=		libtool:${PORTSDIR}/devel/libtool
896
BUILD_DEPENDS+=		libtool13:${PORTSDIR}/devel/libtool13
897
.if defined(USE_AUTOCONF)
897
.if defined(USE_AUTOCONF)
898
LIBTOOLFILES?=		aclocal.m4
898
LIBTOOLFILES?=		aclocal.m4
899
.else
899
.else
Lines 1044-1050 Link Here
1044
AUTOUPDATE?=		autoupdate213
1044
AUTOUPDATE?=		autoupdate213
1045
AUTOIFNAMES?=		ifnames213
1045
AUTOIFNAMES?=		ifnames213
1046
AUTOCONF_DIR?=		${LOCALBASE}/share/autoconf213/autoconf
1046
AUTOCONF_DIR?=		${LOCALBASE}/share/autoconf213/autoconf
1047
LIBTOOL?=		libtool
1047
LIBTOOL?=		libtool13
1048
XMKMF?=			xmkmf -a
1048
XMKMF?=			xmkmf -a
1049
.if exists(/sbin/md5)
1049
.if exists(/sbin/md5)
1050
MD5?=			/sbin/md5
1050
MD5?=			/sbin/md5
Lines 2310-2319 Link Here
2310
patch-libtool:
2310
patch-libtool:
2311
	@(if ${LIBTOOL} --version | grep -vq "1\.3\.4-freebsd-ports"; then \
2311
	@(if ${LIBTOOL} --version | grep -vq "1\.3\.4-freebsd-ports"; then \
2312
		(${ECHO} "Your libtool installation is out of date. Please remove"; \
2312
		(${ECHO} "Your libtool installation is out of date. Please remove"; \
2313
		 ${ECHO} "and reinstall ${PORTSDIR}/devel/libtool."; \
2313
		 ${ECHO} "and reinstall ${PORTSDIR}/devel/libtool13."; \
2314
		 exit 1); \
2314
		 exit 1); \
2315
	  fi; \
2315
	  fi; \
2316
	 LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \
2316
	 LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool13^/share/libtool13^'` || ${LOCALBASE}/share/libtool13; \
2317
	 cd ${PATCH_WRKSRC}; \
2317
	 cd ${PATCH_WRKSRC}; \
2318
	 for file in ${LIBTOOLFILES}; do \
2318
	 for file in ${LIBTOOLFILES}; do \
2319
		${CP} $$file $$file.tmp; \
2319
		${CP} $$file $$file.tmp; \

Return to bug 33916