6 files changed, 68 insertions, 124 deletions

diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile
index 996da4453a19..a04bf9ad4dd6 100644
--- a/graphics/transcode/Makefile
+++ b/graphics/transcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.5$//g}pre5
@@ -74,6 +75,11 @@ WITH_XVID=	yes
 .endif
 
 .if exists(${LOCALBASE}/lib/liba52.so)
+.if exists(${LOCALBASE}/lib/liba52.la)
+LIBA52_DEP_LIBS!=	${GREP} dependency_libs ${LOCALBASE}/lib/liba52.la | ${CUT} -d \' -f 2
+.else
+LIBA52_DEP_LIBS=
+.endif
 WITH_LIBA52=	yes
 .endif
 
@@ -144,7 +150,10 @@ CONFIGURE_ARGS+=	--with-openqt=no
 LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/graphics/libmpeg2
 .endif
 .if defined(WITH_FAME)
-LIB_DEPENDS+=	fame.8:${PORTSDIR}/graphics/libfame
+LIB_DEPENDS+=	fame.10:${PORTSDIR}/graphics/libfame
+PLIST_SUB+=	WITH_FAME=""
+.else
+PLIST_SUB+=	WITH_FAME="@comment "
 .endif
 
 .if defined(WITH_XVID)
@@ -258,6 +267,9 @@ post-patch:
 	@${PERL} -pi -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c
 	@${PERL} -pi -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
 
+	@${PERL} -pi -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 pre-configure:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${PERL} -pi -e 's|-ldl||g' ${WRKSRC}/configure
@@ -268,4 +280,8 @@ post-install:
 		${PREFIX}/lib/transcode/libxvidcore.so
 .endif
 
+# Remove .la-files.
+
+	@${RM} ${PREFIX}/lib/transcode/*.la
+
 .include <bsd.port.post.mk>
diff --git a/graphics/transcode/files/patch-src:filter:subtitler:frame_list.c b/graphics/transcode/files/patch-src:filter:subtitler:frame_list.c
new file mode 100644
index 000000000000..e4823a2b8dad
--- /dev/null
+++ b/graphics/transcode/files/patch-src:filter:subtitler:frame_list.c
@@ -0,0 +1,13 @@
+--- filter/subtitler/frame_list.c.orig	Thu May 23 10:53:06 2002
++++ filter/subtitler/frame_list.c	Thu May 23 10:53:34 2002
+@@ -33,8 +33,8 @@
+ 
+ char *strsave(char *s) /*save char array s somewhere*/
+ {
+-char *p, *malloc();
+-if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
++char *p;
++if(p = (char *)malloc( strlen(s) +  1) ) strcpy(p, s);
+ return(p);
+ }
+ 
diff --git a/graphics/transcode/pkg-plist b/graphics/transcode/pkg-plist
index 8fa88017c255..f4ea949caeca 100644
--- a/graphics/transcode/pkg-plist
+++ b/graphics/transcode/pkg-plist
@@ -11,127 +11,70 @@ bin/avifix
 bin/avisync
 bin/transcode
 lib/transcode/import_nuv.so
-lib/transcode/import_nuv.la
 %%WITH_AVIFILE%%lib/transcode/import_af6.so
-%%WITH_AVIFILE%%lib/transcode/import_af6.la
 lib/transcode/import_net.so
-lib/transcode/import_net.la
 lib/transcode/import_avi.so
-lib/transcode/import_avi.la
 lib/transcode/import_mpeg2.so
-lib/transcode/import_mpeg2.la
 lib/transcode/import_vdrac3.so
-lib/transcode/import_vdrac3.la
 lib/transcode/import_ac3.so
-lib/transcode/import_ac3.la
 lib/transcode/import_dv.so
-lib/transcode/import_dv.la
 lib/transcode/import_vob.so
-lib/transcode/import_vob.la
 lib/transcode/import_raw.so
-lib/transcode/import_raw.la
 lib/transcode/import_yuv4mpeg.so
-lib/transcode/import_yuv4mpeg.la
 lib/transcode/import_yuv.so
-lib/transcode/import_yuv.la
 lib/transcode/import_nvrec.so
-lib/transcode/import_nvrec.la
 lib/transcode/import_lav.so
-lib/transcode/import_lav.la
 lib/transcode/import_null.so
-lib/transcode/import_null.la
 lib/transcode/import_divx.so
-lib/transcode/import_divx.la
 %%WITH_LIBA52%%lib/transcode/a52_decore.so
-%%WITH_LIBA52%%lib/transcode/a52_decore.la
 %%WITH_LAME%%lib/transcode/import_mp3.so
-%%WITH_LAME%%lib/transcode/import_mp3.la
 lib/transcode/import_dvd.so
-lib/transcode/import_dvd.la
 %%WITH_IMAGEMAGICK%%lib/transcode/import_im.so
-%%WITH_IMAGEMAGICK%%lib/transcode/import_im.la
 %%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
-%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.la
+lib/transcode/import_mjpeg.so
 lib/transcode/af6_decore.so
-lib/transcode/af6_decore.la
 %%WITH_LIBXML2%%lib/transcode/import_xml.so
-%%WITH_LIBXML2%%lib/transcode/import_xml.la
 lib/transcode/filter_null.so
-lib/transcode/filter_null.la
 lib/transcode/filter_32detect.so
-lib/transcode/filter_32detect.la
 lib/transcode/filter_32drop.so
-lib/transcode/filter_32drop.la
 lib/transcode/filter_yuy2toyv12.so
-lib/transcode/filter_yuy2toyv12.la
 lib/transcode/filter_skip.so
-lib/transcode/filter_skip.la
 lib/transcode/filter_cshift.so
-lib/transcode/filter_cshift.la
 lib/transcode/filter_mask.so
-lib/transcode/filter_mask.la
 lib/transcode/filter_astat.so
-lib/transcode/filter_astat.la
 lib/transcode/filter_cut.so
-lib/transcode/filter_cut.la
 lib/transcode/filter_dnr.so
-lib/transcode/filter_dnr.la
 lib/transcode/filter_xsharpen.so
-lib/transcode/filter_xsharpen.la
 lib/transcode/filter_smartdeinter.so
-lib/transcode/filter_smartdeinter.la
 lib/transcode/filter_testframe.so
-lib/transcode/filter_testframe.la
 lib/transcode/filter_dilyuvmmx.so
-lib/transcode/filter_dilyuvmmx.la
+lib/transcode/filter_logo.so
 lib/transcode/filter_divxkey.so
-lib/transcode/filter_divxkey.la
 lib/transcode/filter_extsub.so
-lib/transcode/filter_extsub.la
 lib/transcode/filter_extsub2.so
-lib/transcode/filter_extsub2.la
 lib/transcode/filter_resample.so
-lib/transcode/filter_resample.la
 lib/transcode/filter_test.so
-lib/transcode/filter_test.la
 %%WITH_SDL%%lib/transcode/filter_preview.so
-%%WITH_SDL%%lib/transcode/filter_preview.la
 lib/transcode/filter_subtitler.so
-lib/transcode/filter_subtitler.la
 lib/transcode/export_null.so
-lib/transcode/export_null.la
 lib/transcode/export_wav.so
-lib/transcode/export_wav.la
 %%WITH_AVIFILE%%lib/transcode/export_af6.so
-%%WITH_AVIFILE%%lib/transcode/export_af6.la
 lib/transcode/export_opendivx.so
-lib/transcode/export_opendivx.la
 lib/transcode/export_raw.so
-lib/transcode/export_raw.la
 lib/transcode/export_divx4.so
-lib/transcode/export_divx4.la
 lib/transcode/export_divx4raw.so
-lib/transcode/export_divx4raw.la
 lib/transcode/export_divx5.so
-lib/transcode/export_divx5.la
 lib/transcode/export_pcm.so
-lib/transcode/export_pcm.la
 lib/transcode/export_ppm.so
-lib/transcode/export_ppm.la
 lib/transcode/export_xvid.so
-lib/transcode/export_xvid.la
 lib/transcode/export_xvidcvs.so
-lib/transcode/export_xvidcvs.la
 lib/transcode/export_net.so
-lib/transcode/export_net.la
 lib/transcode/export_toolame.so
-lib/transcode/export_toolame.la
 %%WITH_LIBDV%%lib/transcode/export_dvraw.so
-%%WITH_LIBDV%%lib/transcode/export_dvraw.la
 %%WITH_LIBDV%%lib/transcode/export_dv.so
-%%WITH_LIBDV%%lib/transcode/export_dv.la
+lib/transcode/export_mpeg.so
+%%WITH_FAME%%lib/transcode/export_fame.so
 %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so
-%%WITH_IMAGEMAGICK%%lib/transcode/export_im.la
 lib/transcode/export_af6.conf
 %%WITH_XVID%%lib/transcode/libxvidcore.so
 @dirrm lib/transcode
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 996da4453a19..a04bf9ad4dd6 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.5$//g}pre5
@@ -74,6 +75,11 @@ WITH_XVID=	yes
 .endif
 
 .if exists(${LOCALBASE}/lib/liba52.so)
+.if exists(${LOCALBASE}/lib/liba52.la)
+LIBA52_DEP_LIBS!=	${GREP} dependency_libs ${LOCALBASE}/lib/liba52.la | ${CUT} -d \' -f 2
+.else
+LIBA52_DEP_LIBS=
+.endif
 WITH_LIBA52=	yes
 .endif
 
@@ -144,7 +150,10 @@ CONFIGURE_ARGS+=	--with-openqt=no
 LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/graphics/libmpeg2
 .endif
 .if defined(WITH_FAME)
-LIB_DEPENDS+=	fame.8:${PORTSDIR}/graphics/libfame
+LIB_DEPENDS+=	fame.10:${PORTSDIR}/graphics/libfame
+PLIST_SUB+=	WITH_FAME=""
+.else
+PLIST_SUB+=	WITH_FAME="@comment "
 .endif
 
 .if defined(WITH_XVID)
@@ -258,6 +267,9 @@ post-patch:
 	@${PERL} -pi -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c
 	@${PERL} -pi -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
 
+	@${PERL} -pi -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 pre-configure:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${PERL} -pi -e 's|-ldl||g' ${WRKSRC}/configure
@@ -268,4 +280,8 @@ post-install:
 		${PREFIX}/lib/transcode/libxvidcore.so
 .endif
 
+# Remove .la-files.
+
+	@${RM} ${PREFIX}/lib/transcode/*.la
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/transcode/files/patch-src:filter:subtitler:frame_list.c b/multimedia/transcode/files/patch-src:filter:subtitler:frame_list.c
new file mode 100644
index 000000000000..e4823a2b8dad
--- /dev/null
+++ b/multimedia/transcode/files/patch-src:filter:subtitler:frame_list.c
@@ -0,0 +1,13 @@
+--- filter/subtitler/frame_list.c.orig	Thu May 23 10:53:06 2002
++++ filter/subtitler/frame_list.c	Thu May 23 10:53:34 2002
+@@ -33,8 +33,8 @@
+ 
+ char *strsave(char *s) /*save char array s somewhere*/
+ {
+-char *p, *malloc();
+-if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
++char *p;
++if(p = (char *)malloc( strlen(s) +  1) ) strcpy(p, s);
+ return(p);
+ }
+ 
diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist
index 8fa88017c255..f4ea949caeca 100644
--- a/multimedia/transcode/pkg-plist
+++ b/multimedia/transcode/pkg-plist
@@ -11,127 +11,70 @@ bin/avifix
 bin/avisync
 bin/transcode
 lib/transcode/import_nuv.so
-lib/transcode/import_nuv.la
 %%WITH_AVIFILE%%lib/transcode/import_af6.so
-%%WITH_AVIFILE%%lib/transcode/import_af6.la
 lib/transcode/import_net.so
-lib/transcode/import_net.la
 lib/transcode/import_avi.so
-lib/transcode/import_avi.la
 lib/transcode/import_mpeg2.so
-lib/transcode/import_mpeg2.la
 lib/transcode/import_vdrac3.so
-lib/transcode/import_vdrac3.la
 lib/transcode/import_ac3.so
-lib/transcode/import_ac3.la
 lib/transcode/import_dv.so
-lib/transcode/import_dv.la
 lib/transcode/import_vob.so
-lib/transcode/import_vob.la
 lib/transcode/import_raw.so
-lib/transcode/import_raw.la
 lib/transcode/import_yuv4mpeg.so
-lib/transcode/import_yuv4mpeg.la
 lib/transcode/import_yuv.so
-lib/transcode/import_yuv.la
 lib/transcode/import_nvrec.so
-lib/transcode/import_nvrec.la
 lib/transcode/import_lav.so
-lib/transcode/import_lav.la
 lib/transcode/import_null.so
-lib/transcode/import_null.la
 lib/transcode/import_divx.so
-lib/transcode/import_divx.la
 %%WITH_LIBA52%%lib/transcode/a52_decore.so
-%%WITH_LIBA52%%lib/transcode/a52_decore.la
 %%WITH_LAME%%lib/transcode/import_mp3.so
-%%WITH_LAME%%lib/transcode/import_mp3.la
 lib/transcode/import_dvd.so
-lib/transcode/import_dvd.la
 %%WITH_IMAGEMAGICK%%lib/transcode/import_im.so
-%%WITH_IMAGEMAGICK%%lib/transcode/import_im.la
 %%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
-%%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.la
+lib/transcode/import_mjpeg.so
 lib/transcode/af6_decore.so
-lib/transcode/af6_decore.la
 %%WITH_LIBXML2%%lib/transcode/import_xml.so
-%%WITH_LIBXML2%%lib/transcode/import_xml.la
 lib/transcode/filter_null.so
-lib/transcode/filter_null.la
 lib/transcode/filter_32detect.so
-lib/transcode/filter_32detect.la
 lib/transcode/filter_32drop.so
-lib/transcode/filter_32drop.la
 lib/transcode/filter_yuy2toyv12.so
-lib/transcode/filter_yuy2toyv12.la
 lib/transcode/filter_skip.so
-lib/transcode/filter_skip.la
 lib/transcode/filter_cshift.so
-lib/transcode/filter_cshift.la
 lib/transcode/filter_mask.so
-lib/transcode/filter_mask.la
 lib/transcode/filter_astat.so
-lib/transcode/filter_astat.la
 lib/transcode/filter_cut.so
-lib/transcode/filter_cut.la
 lib/transcode/filter_dnr.so
-lib/transcode/filter_dnr.la
 lib/transcode/filter_xsharpen.so
-lib/transcode/filter_xsharpen.la
 lib/transcode/filter_smartdeinter.so
-lib/transcode/filter_smartdeinter.la
 lib/transcode/filter_testframe.so
-lib/transcode/filter_testframe.la
 lib/transcode/filter_dilyuvmmx.so
-lib/transcode/filter_dilyuvmmx.la
+lib/transcode/filter_logo.so
 lib/transcode/filter_divxkey.so
-lib/transcode/filter_divxkey.la
 lib/transcode/filter_extsub.so
-lib/transcode/filter_extsub.la
 lib/transcode/filter_extsub2.so
-lib/transcode/filter_extsub2.la
 lib/transcode/filter_resample.so
-lib/transcode/filter_resample.la
 lib/transcode/filter_test.so
-lib/transcode/filter_test.la
 %%WITH_SDL%%lib/transcode/filter_preview.so
-%%WITH_SDL%%lib/transcode/filter_preview.la
 lib/transcode/filter_subtitler.so
-lib/transcode/filter_subtitler.la
 lib/transcode/export_null.so
-lib/transcode/export_null.la
 lib/transcode/export_wav.so
-lib/transcode/export_wav.la
 %%WITH_AVIFILE%%lib/transcode/export_af6.so
-%%WITH_AVIFILE%%lib/transcode/export_af6.la
 lib/transcode/export_opendivx.so
-lib/transcode/export_opendivx.la
 lib/transcode/export_raw.so
-lib/transcode/export_raw.la
 lib/transcode/export_divx4.so
-lib/transcode/export_divx4.la
 lib/transcode/export_divx4raw.so
-lib/transcode/export_divx4raw.la
 lib/transcode/export_divx5.so
-lib/transcode/export_divx5.la
 lib/transcode/export_pcm.so
-lib/transcode/export_pcm.la
 lib/transcode/export_ppm.so
-lib/transcode/export_ppm.la
 lib/transcode/export_xvid.so
-lib/transcode/export_xvid.la
 lib/transcode/export_xvidcvs.so
-lib/transcode/export_xvidcvs.la
 lib/transcode/export_net.so
-lib/transcode/export_net.la
 lib/transcode/export_toolame.so
-lib/transcode/export_toolame.la
 %%WITH_LIBDV%%lib/transcode/export_dvraw.so
-%%WITH_LIBDV%%lib/transcode/export_dvraw.la
 %%WITH_LIBDV%%lib/transcode/export_dv.so
-%%WITH_LIBDV%%lib/transcode/export_dv.la
+lib/transcode/export_mpeg.so
+%%WITH_FAME%%lib/transcode/export_fame.so
 %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so
-%%WITH_IMAGEMAGICK%%lib/transcode/export_im.la
 lib/transcode/export_af6.conf
 %%WITH_XVID%%lib/transcode/libxvidcore.so
 @dirrm lib/transcode