Sync with new bsd.autotools.mk

13 files changed, 20 insertions, 20 deletions

diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 61a31fc9d337..5515c6d3798a 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -16,11 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
-		ltdl.4:${PORTSDIR}/devel/libltdl \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		gpgme.9:${PORTSDIR}/security/gpgme \
 		pspell.15:${PORTSDIR}/textproc/aspell
 
+USE_LIBLTDL=	yes
 USE_BZIP2=	yes
 USE_GCC=	3.2
 USE_X_PREFIX=	yes
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index aa22e24c70f0..21dfcc9c63ba 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -16,11 +16,10 @@ MASTER_SITE_SUBDIR=		dict
 MAINTAINER?=	dd@FreeBSD.org
 COMMENT=	Dict protocol (RFC 2229) server
 
-LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
-
 MAN1=		dictzip.1
 MAN8=		dictd.8
 
+USE_LIBLTDL=	yes
 USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_LIBTOOL_VER=13
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 3830cdf7e5f2..21e55c7366e9 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -15,12 +15,13 @@ MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free RADIUS server implementation
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
+
+USE_LIBLTDL=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_LIBTOOL_VER=13
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 3830cdf7e5f2..21e55c7366e9 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -15,12 +15,13 @@ MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free RADIUS server implementation
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
+
+USE_LIBLTDL=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_LIBTOOL_VER=13
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 61f2fc98b448..3ae75092a920 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -15,13 +15,13 @@ DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 MAINTAINER=	shoesoft@gmx.net
 COMMENT=	An OpenFT, Gnutella and FastTrack p2p network client
 
-LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
-		vorbis.3:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		Magick.6:${PORTSDIR}/graphics/ImageMagick
 .if defined(WITH_LIBMAGIC)
 LIB_DEPENDS+=	magic.1:${PORTSDIR}/sysutils/file
 .endif
 
+USE_LIBLTDL=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gkrellm-gift/Makefile b/net/gkrellm-gift/Makefile
index 6c6e523db539..6e5b7e574091 100644
--- a/net/gkrellm-gift/Makefile
+++ b/net/gkrellm-gift/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gift.0:${PORTSDIR}/net/gift
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 15a6e6ca29a3..49101c838bd4 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A nice frontend to the telnet, ssh, and rlogin clients for GNOME
 
-BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
-
+WANT_AUTOMAKE_VER=15
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
@@ -26,7 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-configure:
-	@${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}
+	@${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}
 	@${RM} -f ${WRKSRC}/config.cache
 .for file in config.guess config.sub
 	@${RM} -f ${WRKSRC}/${file} && ${TOUCH} ${WRKSRC}/${file}
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index f15bdc7cebb4..9da1d2744771 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -17,8 +17,7 @@ DISTNAME=	GNUnet-${PORTVERSION}
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	An anonymous, distributed, reputation-based network
 
-LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL=	yes
 USE_BZIP2=	yes
 USE_GETOPT_LONG=	yes
 USE_GETTEXT=	yes
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index bacbeb176472..030574eb1fe2 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -18,6 +18,7 @@ COMMENT=	A C++ wrapper library to the sockets
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	253
 USE_LIBTOOL_VER=	13
 
 INFO=	socket++
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index b659ef52aebf..eb92e51eb3ba 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	yb@sainte-barbe.org
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
-LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
-		netdude.0:${PORTSDIR}/net/libnetdude
+LIB_DEPENDS=	netdude.0:${PORTSDIR}/net/libnetdude
 
+USE_LIBLTDL=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LIBTOOL_VER=	13
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 003fa0235555..8b00daa4d0f1 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -218,7 +218,7 @@ LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if defined(WITH_SLAPI)
-LIB_DEPENDS+=		ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL=		yes
 CONFIGURE_ARGS+=	--enable-slapi \
 			--enable-modules
 PLIST_SUB+=		SLAPI=""
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 003fa0235555..8b00daa4d0f1 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -218,7 +218,7 @@ LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if defined(WITH_SLAPI)
-LIB_DEPENDS+=		ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL=		yes
 CONFIGURE_ARGS+=	--enable-slapi \
 			--enable-modules
 PLIST_SUB+=		SLAPI=""
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 003fa0235555..8b00daa4d0f1 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -218,7 +218,7 @@ LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if defined(WITH_SLAPI)
-LIB_DEPENDS+=		ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL=		yes
 CONFIGURE_ARGS+=	--enable-slapi \
 			--enable-modules
 PLIST_SUB+=		SLAPI=""