2 files changed, 37 insertions, 13 deletions

diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 5c898094431b..98bb70b30786 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 USE_GNOME=	gtk20
 USE_SDL=	sdl
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_INC_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/SDL11 -I${LOCALBASE}/include/ffmpeg -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
@@ -136,7 +136,7 @@ PLIST_SUB+=	XVID="@comment "
 
 post-patch:
 	${TOUCH} -f ${WRKSRC}/bootstrapped
-#	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
+	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
 # don't compile or use libmp4v2
 	@${REINPLACE_CMD} -e 's|mp4v2||; s|gnu||; s|mp4av||' \
 		${WRKSRC}/lib/Makefile.in
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index d97a81a19944..2cb3977f8564 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -26,92 +26,116 @@ include/rtp_plugin.h
 include/sdp.h
 include/sdp_error.h
 include/text_plugin.h
-lib/libh264util.a
+lib/libh264util.la
 lib/libh264util.so
 lib/libh264util.so.0
-lib/libhttp.a
+lib/libhttp.la
 lib/libhttp.so
 lib/libhttp.so.0
-lib/libismacryp.a
+lib/libismacryp.la
 lib/libismacryp.so
 lib/libismacryp.so.0
-lib/libmp4.a
+lib/libmp4.la
 lib/libmp4.so
 lib/libmp4.so.0
-lib/libmp4util.a
+lib/libmp4util.la
 lib/libmp4util.so
 lib/libmp4util.so.0
 lib/libmpeg4ipSDL-1.2.so
 lib/libmpeg4ipSDL-1.2.so.7
 lib/libmpeg4ipSDL.la
 lib/libmpeg4ipSDL.so
-lib/libmpeg4ip_celp.a
+lib/libmpeg4ip_celp.la
 lib/libmpeg4ip_celp.so
 lib/libmpeg4ip_celp.so.0
-lib/libmpeg4ip_celpbs.a
+lib/libmpeg4ip_celpbs.la
 lib/libmpeg4ip_celpbs.so
 lib/libmpeg4ip_celpbs.so.0
-lib/libmpeg4ip_faad.a
+lib/libmpeg4ip_faad.la
 lib/libmpeg4ip_faad.so
 lib/libmpeg4ip_faad.so.0
-lib/libmpeg4ip_fposrec.a
+lib/libmpeg4ip_fposrec.la
 lib/libmpeg4ip_fposrec.so
 lib/libmpeg4ip_fposrec.so.0
 lib/libmpeg4ip_mpeg4_iso.la
 lib/libmpeg4ip_mpeg4_iso.so
 lib/libmpeg4ip_mpeg4_iso.so.0
-lib/libmsg_queue.a
+lib/libmsg_queue.la
 lib/libmsg_queue.so
 lib/libmsg_queue.so.0
-lib/libsdp.a
+lib/libsdp.la
 lib/libsdp.so
 lib/libsdp.so.0
+lib/mp4player_plugin/a52_audio_plugin.la
 lib/mp4player_plugin/a52_audio_plugin.so
 lib/mp4player_plugin/a52_audio_plugin.so.0
+lib/mp4player_plugin/aac_plugin.la
 lib/mp4player_plugin/aac_plugin.so
 lib/mp4player_plugin/aac_plugin.so.0
+lib/mp4player_plugin/celp_plugin.la
 lib/mp4player_plugin/celp_plugin.so
 lib/mp4player_plugin/celp_plugin.so.0
+lib/mp4player_plugin/ffmpeg_audio_plugin.la
 lib/mp4player_plugin/ffmpeg_audio_plugin.so
 lib/mp4player_plugin/ffmpeg_audio_plugin.so.0
+lib/mp4player_plugin/ffmpeg_video_plugin.la
 lib/mp4player_plugin/ffmpeg_video_plugin.so
 lib/mp4player_plugin/ffmpeg_video_plugin.so.0
+lib/mp4player_plugin/g711_audio_plugin.la
 lib/mp4player_plugin/g711_audio_plugin.so
 lib/mp4player_plugin/g711_audio_plugin.so.0
+lib/mp4player_plugin/h261_plugin.la
 lib/mp4player_plugin/h261_plugin.so
 lib/mp4player_plugin/h261_plugin.so.0
+lib/mp4player_plugin/h261_rtp_plugin.la
 lib/mp4player_plugin/h261_rtp_plugin.so
 lib/mp4player_plugin/h261_rtp_plugin.so.0
+lib/mp4player_plugin/h264_rtp_plugin.la
 lib/mp4player_plugin/h264_rtp_plugin.so
 lib/mp4player_plugin/h264_rtp_plugin.so.0
+lib/mp4player_plugin/href_rtp_plugin.la
 lib/mp4player_plugin/href_rtp_plugin.so
 lib/mp4player_plugin/href_rtp_plugin.so.0
+lib/mp4player_plugin/href_text_plugin.la
 lib/mp4player_plugin/href_text_plugin.so
 lib/mp4player_plugin/href_text_plugin.so.0
+lib/mp4player_plugin/isma_enc_rtp_plugin.la
 lib/mp4player_plugin/isma_enc_rtp_plugin.so
 lib/mp4player_plugin/isma_enc_rtp_plugin.so.0
+lib/mp4player_plugin/isma_enc_video_rtp_plugin.la
 lib/mp4player_plugin/isma_enc_video_rtp_plugin.so
 lib/mp4player_plugin/isma_enc_video_rtp_plugin.so.0
+lib/mp4player_plugin/isma_rtp_plugin.la
 lib/mp4player_plugin/isma_rtp_plugin.so
 lib/mp4player_plugin/isma_rtp_plugin.so.0
+lib/mp4player_plugin/mp3_plugin.la
 lib/mp4player_plugin/mp3_plugin.so
 lib/mp4player_plugin/mp3_plugin.so.0
+lib/mp4player_plugin/mpeg2dec_video_plugin.la
 lib/mp4player_plugin/mpeg2dec_video_plugin.so
 lib/mp4player_plugin/mpeg2dec_video_plugin.so.0
+lib/mp4player_plugin/mpeg4_iso_plugin.la
 lib/mp4player_plugin/mpeg4_iso_plugin.so
 lib/mp4player_plugin/mpeg4_iso_plugin.so.0
+lib/mp4player_plugin/plaintext_text_plugin.la
 lib/mp4player_plugin/plaintext_text_plugin.so
 lib/mp4player_plugin/plaintext_text_plugin.so.0
+lib/mp4player_plugin/raw_audio_plugin.la
 lib/mp4player_plugin/raw_audio_plugin.so
 lib/mp4player_plugin/raw_audio_plugin.so.0
+lib/mp4player_plugin/raw_video_plugin.la
 lib/mp4player_plugin/raw_video_plugin.so
 lib/mp4player_plugin/raw_video_plugin.so.0
+lib/mp4player_plugin/rfc2429_rtp_plugin.la
 lib/mp4player_plugin/rfc2429_rtp_plugin.so
 lib/mp4player_plugin/rfc2429_rtp_plugin.so.0
+lib/mp4player_plugin/rfc3267_plugin.la
 lib/mp4player_plugin/rfc3267_plugin.so
 lib/mp4player_plugin/rfc3267_plugin.so.0
+lib/mp4player_plugin/wav_plugin.la
 lib/mp4player_plugin/wav_plugin.so
 lib/mp4player_plugin/wav_plugin.so.0
+%%XVID%%lib/mp4player_plugin/xvid10_plugin.la
 %%XVID%%lib/mp4player_plugin/xvid10_plugin.so
 %%XVID%%lib/mp4player_plugin/xvid10_plugin.so.0
 %%DATADIR%%/mp4venc_template.par