Date: Sat, 22 May 1999 23:48:02 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11840: Feature fixup: bsd.port.mk Message-ID: <199905222148.XAA10810@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 11840
>Category: ports
>Synopsis: Feature fixup: bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat May 22 14:50:02 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports collection.
>Description:
Make some changes to the USE_LIBTOOL feature to better support the
collection. With these changes I've been able to convert most of
the libtool using ports with a minimum of fuss, including all the
GTK+/GNOME ports and the KDE ports.
It should also support non-standard install prefixes.
>How-To-Repeat:
>Fix:
Index: bsd.port.mk
===================================================================
RCS file: /usr/home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.313
diff -u -r1.313 bsd.port.mk
--- bsd.port.mk 1999/05/10 23:11:07 1.313
+++ bsd.port.mk 1999/05/22 21:20:55
@@ -126,6 +126,7 @@
# LIBTOOL - Set to path of libtool (default: libtool).
# LIBTOOLFILES - Files to patch for libtool (defaults: "aclocal.m4" if
# USE_AUTOCONF is set, "configure" otherwise).
+# LIBTOOLFLAGS - Additional flags to pass to ltconfig.
# USE_PERL5 - Says that the port uses perl5 for building and running.
# PERL5 - Set to full path of perl5, either in the system or
# installed from a port.
@@ -660,7 +661,7 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
AUTOCONF?= autoconf
-LIBTOOL?= ${LOCALBASE}/bin/libtool
+LIBTOOL?= libtool
XMKMF?= xmkmf -a
.if exists(/sbin/md5)
MD5?= /sbin/md5
@@ -1836,11 +1837,17 @@
.if !target(patch-libtool)
patch-libtool:
- @(cd ${WRKSRC}; \
+ @(LIBTOOLDIR=`${LIBTOOL} --prefix`/share/libtool || \
+ (echo "Your libtool installation is out of date. Please remove"; \
+ echo "and reinstall ${PORTSDIR}/devel/libtool."; \
+ exit 1); \
+ cd ${WRKSRC}; \
for file in ${LIBTOOLFILES}; do \
${CP} $$file $$file.tmp; \
- ${SED} -e s^\$$\(top_builddir\)/libtool^${LIBTOOL}^g \
- $$file.tmp > $$file; \
+ ${SED} -e "s^\$$ac_aux_dir/ltconfig^$${LIBTOOLDIR}/ltconfig^g" \
+ $$file.tmp | \
+ ${SED} -e "s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} $${LIBTOOLDIR}/ltmain.sh^g" \
+ > $$file; \
done);
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199905222148.XAA10810>