Attachment 19007 Details for Bug 33916 – file.diff

[patch] file.diff

file.diff (text/plain), 1.87 KB, created by Jeremy Norris on 2002-01-15 12:00:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Norris

Created: 2002-01-15 12:00:09 UTC

Size: 1.87 KB

patch

obsolete

>Index: bsd.port.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
>retrieving revision 1.395
>diff -u -r1.395 bsd.port.mk
>--- bsd.port.mk	22 Dec 2001 17:13:38 -0000	1.395
>+++ bsd.port.mk	14 Jan 2002 23:19:43 -0000
>@@ -188,7 +188,7 @@
> # AUTOCONF_DIR	- Set to path of GNU autoconf shared directory (default:
> #				according to USE_AUTOCONF_VER value)
> # USE_LIBTOOL	- Says that the port uses Libtool.  Implies GNU_CONFIGURE.
>-# LIBTOOL		- Set to path of libtool (default: libtool).
>+# LIBTOOL		- Set to path of libtool (default: libtool13).
> # LIBTOOLFILES	- Files to patch for libtool (defaults: "aclocal.m4" if
> #				  USE_AUTOCONF is set, "configure" otherwise).
> # LIBTOOLFLAGS	- Additional flags to pass to ltconfig
>@@ -893,7 +893,7 @@
> .endif
> .if defined(USE_LIBTOOL)
> GNU_CONFIGURE=	yes
>-BUILD_DEPENDS+=		libtool:${PORTSDIR}/devel/libtool
>+BUILD_DEPENDS+=		libtool13:${PORTSDIR}/devel/libtool13
> .if defined(USE_AUTOCONF)
> LIBTOOLFILES?=		aclocal.m4
> .else
>@@ -1044,7 +1044,7 @@
> AUTOUPDATE?=		autoupdate213
> AUTOIFNAMES?=		ifnames213
> AUTOCONF_DIR?=		${LOCALBASE}/share/autoconf213/autoconf
>-LIBTOOL?=		libtool
>+LIBTOOL?=		libtool13
> XMKMF?=			xmkmf -a
> .if exists(/sbin/md5)
> MD5?=			/sbin/md5
>@@ -2310,10 +2310,10 @@
> patch-libtool:
> 	@(if ${LIBTOOL} --version | grep -vq "1\.3\.4-freebsd-ports"; then \
> 		(${ECHO} "Your libtool installation is out of date. Please remove"; \
>-		 ${ECHO} "and reinstall ${PORTSDIR}/devel/libtool."; \
>+		 ${ECHO} "and reinstall ${PORTSDIR}/devel/libtool13."; \
> 		 exit 1); \
> 	  fi; \
>-	 LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \
>+	 LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool13^/share/libtool13^'` || ${LOCALBASE}/share/libtool13; \
> 	 cd ${PATCH_WRKSRC}; \
> 	 for file in ${LIBTOOLFILES}; do \
> 		${CP} $$file $$file.tmp; \

Actions: View | Diff

Attachments on bug 33916: 19005 | 19006 | 19007