10 files changed, 35 insertions, 21 deletions

diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 2f5828e6a93f..3c3b50bcad0f 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -16,7 +16,8 @@ MASTER_SITE_SUBDIR=	fame
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A video encoding library
 
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -38,4 +39,8 @@ CONFIGURE_ARGS+=	--enable-sse
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/libfame/pkg-plist b/multimedia/libfame/pkg-plist
index 5025d41500e2..a87d05e1c294 100644
--- a/multimedia/libfame/pkg-plist
+++ b/multimedia/libfame/pkg-plist
@@ -27,5 +27,6 @@ include/fame_syntax_mpeg4.h
 include/fame_version.h
 lib/libfame.a
 lib/libfame.so
+lib/libfame-0.9.so
 lib/libfame-0.9.so.1
 share/aclocal/libfame.m4
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 47d7a64fea2a..b20d773b44f2 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -24,12 +24,18 @@ PLIST_FILES=	lib/xmms/Input/libsmpeg_xmms.so
 USE_X_PREFIX=	yes
 USE_SDL=	sdl
 USE_GNOME=	gnomehack gtk12
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 # This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input
 do-install:
+	${MKDIR} ${PREFIX}/lib/xmms/Input
 	${INSTALL_PROGRAM} \
 		${WRKSRC}/src/.libs/libsmpeg_xmms.so ${PREFIX}/lib/xmms/Input
 
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 547a62b683c6..3bd607c8a97f 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_SDL=	sdl
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLBASE="${X11BASE}" \
@@ -44,8 +44,8 @@ USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=	--disable-gtk-player
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-		${WRKSRC}/libtool
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 5b126e096897..bd3ca2923a0f 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
@@ -30,6 +31,10 @@ PLIST_FILES=	lib/xmps/codecs/video/libopendivx.so \
 
 LIB_VERSION=	0
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 post-install:
 	@${LN} -sf libopendivx.so ${PREFIX}/lib/xmps/codecs/video/libopendivx.so.${LIB_VERSION}
 
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 4c70fb5d40b8..68077c37afc4 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
@@ -30,10 +30,11 @@ CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 LIB_VERSION=	0
 PLIST_FILES=	lib/xmps/codecs/video/libwin32.so \
-		lib/xmps/codecs/video/libwin32.so.${LIB_VERSION} \
-		lib/xmps/codecs/video/libwin32.la
+		lib/xmps/codecs/video/libwin32.so.${LIB_VERSION}
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|/usr/lib/win32|${LOCALBASE}/lib/win32|" \
 		${WRKSRC}/src/win32_codec.c
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/src/*
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index f6553dd3fdda..b8ae840be4ff 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -33,12 +33,10 @@ BROKEN=		"Does not compile on !i386"
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-		${WRKSRC}/libtool
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/xmps/pkg-plist b/multimedia/xmps/pkg-plist
index 94719a831582..a4cfe69cc1f5 100644
--- a/multimedia/xmps/pkg-plist
+++ b/multimedia/xmps/pkg-plist
@@ -2,10 +2,8 @@ bin/xmps
 bin/xmps-config
 include/libxmps/libxmps.h
 include/libxmps/libxmps_config.h
-lib/libxmps.a
 lib/libxmps.so
 lib/libxmps.so.0
-lib/libxmpsutils.a
 lib/libxmpsutils.so
 lib/libxmpsutils.so.0
 lib/xmps/addons/video/libvob.so
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 4b847042e3de..7c68d39ed1fd 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gtk12
 USE_GL=		yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-gl
 
@@ -34,6 +34,8 @@ CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]prefix[)]/Xtheater|(libdir)/Xtheater|g ; \
 		 s|-release.*$$|-module -avoid-version|g'
diff --git a/multimedia/xtheater/pkg-plist b/multimedia/xtheater/pkg-plist
index 9fe6e0783630..6dbd34c99005 100644
--- a/multimedia/xtheater/pkg-plist
+++ b/multimedia/xtheater/pkg-plist
@@ -1,8 +1,6 @@
 bin/xtheater
 lib/Xtheater/config
-lib/Xtheater/player/libsmpeg.la
 lib/Xtheater/player/libsmpeg.so
-lib/Xtheater/ui/libgtkui.la
 lib/Xtheater/ui/libgtkui.so
 @dirrm lib/Xtheater/ui
 @dirrm lib/Xtheater/player