From 6d8b323ab090ee089aba09dd01f19e558a5802bf Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 10 Aug 2014 19:26:38 +0000
Subject: Replace some dependencies on libtool with USES=libtool:build or a
dependency on libtoolize
---
graphics/gexiv2/Makefile | 5 ++---
math/libtommath/Makefile | 6 +++---
multimedia/handbrake/Makefile | 5 ++---
multimedia/xbmc/Makefile | 5 ++---
security/libtomcrypt/Makefile | 4 +---
sysutils/heartbeat/Makefile | 2 +-
textproc/exmpp/Makefile | 5 ++---
x11-toolkits/xmhtml/Makefile | 3 +--
8 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index 9bf8de876be7..6f16a4d2ddec 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -14,11 +14,10 @@ COMMENT= GObject-based wrapper around Exiv2 library
LICENSE= GPLv2
-BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \
- gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2
-USES= gmake pkgconfig tar:xz
+USES= gmake libtool:build pkgconfig tar:xz
USE_GNOME= glib20
USE_LDCONFIG= yes
MAKE_ARGS= REQUIRED_CFLAGS=""
diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile
index 4da2fee4d579..c38b906c352f 100644
--- a/math/libtommath/Makefile
+++ b/math/libtommath/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libtommath
PORTVERSION= 0.42.0
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://libtom.org/files/
DISTNAME= ltm-${PORTVERSION}
@@ -28,10 +29,9 @@ post-patch:
${REINPLACE_CMD} -e 's|DESTDIR=|DESTDIR?=|' ${WRKSRC}/${MAKEFILE}
.if ${PORT_OPTIONS:MSHARED}
-BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool
-USES+= libtool:keepla
+USES+= libtool:build
USE_LDCONFIG= yes
-PLIST_FILES+= lib/libtommath.la lib/libtommath.so.0 lib/libtommath.so
+PLIST_FILES+= lib/libtommath.so.0 lib/libtommath.so
MAKEFILE= makefile.shared
.else
MAKEFILE= makefile
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index f27cc33335e2..9dc2920a605e 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -28,8 +28,7 @@ COMMENT= Versatile DVD ripper and video transcoder
LICENSE= GPLv2
-BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \
- yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm
LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libfribidi.so:${PORTSDIR}/converters/fribidi \
@@ -47,7 +46,7 @@ LIB_DEPENDS+= libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
.endif
GNU_CONFIGURE= yes
-USES= gmake iconv libtool pkgconfig
+USES= gmake iconv libtool:build pkgconfig
USE_AUTOTOOLS= autoconf:env automake:env
USE_PYTHON_BUILD= yes
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index eb2c49c49041..59fd8439a1f9 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= enca:${PORTSDIR}/converters/enca \
unzip:${PORTSDIR}/archivers/unzip \
nasm:${PORTSDIR}/devel/nasm \
gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 \
- libtool:${PORTSDIR}/devel/libtool \
swig2.0:${PORTSDIR}/devel/swig20
LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass \
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
@@ -53,8 +52,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \
xdpyinfo:${PORTSDIR}/x11/xdpyinfo
-USES= gmake iconv:wchar_t libtool pkgconfig
-USE_AUTOTOOLS= autoconf automake libltdl
+USES= gmake iconv:wchar_t libtool:build pkgconfig
+USE_AUTOTOOLS= autoconf:env automake:env libltdl
GNU_CONFIGURE= yes
USE_XORG= xt xmu xtst
USE_GL= glu
diff --git a/security/libtomcrypt/Makefile b/security/libtomcrypt/Makefile
index 28106a07668c..b33c1352c8e0 100644
--- a/security/libtomcrypt/Makefile
+++ b/security/libtomcrypt/Makefile
@@ -11,8 +11,6 @@ DISTNAME= crypt-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Comprehensive, modular, and portable cryptographic toolkit
-BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool
-
CFLAGS+= -I${LOCALBASE}/include
EXTRALIBS= -L${LOCALBASE}/lib
MAKEFILE= makefile.shared
@@ -20,7 +18,7 @@ ALL_TARGET= library
MAKE_ARGS= IGNORE_SPEED=yes INCPATH="${PREFIX}/include" \
LIBPATH="${PREFIX}/lib" EXTRALIBS="${EXTRALIBS}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= gmake libtool tar:bzip2
+USES= gmake libtool:build tar:bzip2
OPTIONS_DEFINE= DOCS
OPTIONS_DEFAULT= LIBTOMMATH
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index a4b2767592d6..723d3da2f627 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
libxml2.so:${PORTSDIR}/textproc/libxml2
BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison
-PATCH_DEPENDS= libtool:${PORTSDIR}/devel/libtool
+PATCH_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool
USE_AUTOTOOLS= autoconf autoheader automake aclocal libltdl libtoolize
AUTOMAKE_ARGS+= --add-missing --include-deps --copy
diff --git a/textproc/exmpp/Makefile b/textproc/exmpp/Makefile
index 3ce1ed170c90..76434c41d298 100644
--- a/textproc/exmpp/Makefile
+++ b/textproc/exmpp/Makefile
@@ -10,8 +10,7 @@ COMMENT= Fast and scalable library for XMPP written in Erlang/OTP
LICENSE= EPL
-BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang \
- libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang
RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
libxml2.so:${PORTSDIR}/textproc/libxml2
@@ -34,7 +33,7 @@ CONFIGURE_ARGS+=--enable-static=yes \
--enable-escaping-using-cdata
GNU_CONFIGURE_PREFIX= "${PREFIX}/lib/erlang/lib"
PLIST_SUB= VERSION=${PORTVERSION}
-USE_AUTOTOOLS= autoconf:env automake:env aclocal:env autoheader:env
+USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env
USES= libtool pkgconfig
.include <bsd.port.options.mk>
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 06eb11ca3cb6..cb89eb8936df 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -11,11 +11,10 @@ COMMENT= Motif widget set for displaying HTML 3.2 documents
LICENSE= LGPL20 # (or later)
-BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool
LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng15.so:${PORTSDIR}/graphics/png
-USES= gmake libtool motif pkgconfig tar:tgz
+USES= gmake libtool:build motif pkgconfig tar:tgz
USE_XORG= xft xmu xpm xt
USE_LDCONFIG= yes
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0