5 files changed, 12 insertions, 6 deletions

diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 5cc46ba973b7..7c0844d25909 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -38,8 +38,8 @@ pre-patch: build-depends
 post-patch:
 # make sure everything is prepared prior to configure stage
 # pre-configure will not work since *AUTO* tools happen in-between
-	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; libtoolize \
-		--automake
+	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
+		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
 # CFLAGS safeness
 	@${FIND} ${WRKSRC} -type f -name Makefile.am | \
 		${XARGS} -n 5 -x \
@@ -48,7 +48,7 @@ post-patch:
 
 post-configure:
 # sync the multiple libtool copies
-	@${CP} ${WRKSRC}/${LIBTOOL} ${WRKSRC}/common/mp4v2/
+	@${CP} ${WRKSRC}/libtool ${WRKSRC}/common/mp4v2/
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 511aaf0fb806..6be7061f5972 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	A powerful, fast, stable, and easily extensible sound editor for GNOME
 
-LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_GNOME=	gnomeprefix gnomehack libglade
 USE_X_PREFIX=	yes
diff --git a/audio/liba52-devel/Makefile b/audio/liba52-devel/Makefile
index d36a9234a5e0..72f5647e412a 100644
--- a/audio/liba52-devel/Makefile
+++ b/audio/liba52-devel/Makefile
@@ -58,7 +58,7 @@ post-patch:
 .endif
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index d36a9234a5e0..72f5647e412a 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -58,7 +58,7 @@ post-patch:
 .endif
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index c0f26c349c0b..11c55311ea2f 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -29,6 +29,12 @@ USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/libshout
 
+# Idiot packagers
+pre-configure:
+.for file in config.guess config.sub ltmain.sh
+	${LN} -sf ${LIBTOOL_SHAREDIR}/${file} ${WRKSRC}
+.endfor
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\
 					${WRKSRC}/examples/Makefile