- Don't install .a files.

- Add USE_GCC=4.1+ for amd64 to avoid internal compiler error. [*]

PR:		ports/109213 [*]
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> [*]

2 files changed, 14 insertions, 116 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fcaee4de6861..9f4915eb1227 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,11 +38,10 @@ USE_ICONV=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack gnometarget ltverhack
+USE_GNOME=	gnomehack gnometarget
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_SDL=	sdl
-USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -60,6 +60,10 @@ DOCSDIR=	${TARGETDIR}/share/doc/xine-lib
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64"
+USE_GCC=	4.1+
+.endif
+
 .if !defined(WITHOUT_ARTS) && (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS))
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 PLIST_SUB+=	WITH_ARTS=""
@@ -208,11 +212,12 @@ pre-everything::
 	@${ECHO_MSG} "===>"
 
 post-patch:
-# fix the shlib version by using the libtool patched by ltverhack
-	@${REINPLACE_CMD} -e 's|^LIBTOOL = .*|LIBTOOL = @LIBTOOL@|' \
-		${WRKSRC}/src/xine-utils/Makefile.in \
-		${WRKSRC}/src/xine-engine/Makefile.in \
-		${WRKSRC}/src/libw32dll/wine/Makefile.in
+.for f in libtool ltmain.sh
+	@${REINPLACE_CMD} -e \
+		'/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
+		/freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \
+		${WRKSRC}/${f}
+.endfor
 
 pre-configure:
 	@${REINPLACE_CMD} -e \
@@ -222,7 +227,8 @@ pre-configure:
 		 s|-I/usr/local/include||g ; \
 		 s|-lgiconv|-liconv|g ; \
 		 s|-funroll-loops||g ; \
-		 s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g' ${WRKSRC}/configure
+		 s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g ; \
+		 s|echo aout|echo elf|g' ${WRKSRC}/configure
 .if ${OSVERSION} >= 500035
 	@${REINPLACE_CMD} -e \
 		 's|-malign-loops|-falign-loops|g ; \
@@ -230,7 +236,4 @@ pre-configure:
 		  s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
 .endif
 
-pre-build:
-	${CP} ${LTMAIN} ${WRKSRC}/ltmain.sh
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index c9b29578135f..478ff312a78e 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -37,218 +37,113 @@ include/xine/xineintl.h
 include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
-lib/libxine.a
 lib/libxine.la
 lib/libxine.so
 lib/libxine.so.1
-lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.a
 lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.so
-lib/xine/plugins/1.1.4/post/xineplug_post_goom.a
 lib/xine/plugins/1.1.4/post/xineplug_post_goom.so
-lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.a
 lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.so
-lib/xine/plugins/1.1.4/post/xineplug_post_planar.a
 lib/xine/plugins/1.1.4/post/xineplug_post_planar.so
-lib/xine/plugins/1.1.4/post/xineplug_post_switch.a
 lib/xine/plugins/1.1.4/post/xineplug_post_switch.so
-lib/xine/plugins/1.1.4/post/xineplug_post_tvtime.a
 lib/xine/plugins/1.1.4/post/xineplug_post_tvtime.so
-lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.a
 lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.so
 @exec mkdir -p %D/lib/xine/plugins/1.1.4/vidix
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/cyberblade_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mach64_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mach64_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/mga_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/nvidia_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/nvidia_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm2_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm2_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm3_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/pm3_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/radeon_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/radeon_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/rage128_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/rage128_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/savage_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/savage_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/sis_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/sis_vid.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/unichrome_vid.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/vidix/unichrome_vid.so
-%%WITH_ARTS%%lib/xine/plugins/1.1.4/xineplug_ao_out_arts.a
 %%WITH_ARTS%%lib/xine/plugins/1.1.4/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%lib/xine/plugins/1.1.4/xineplug_ao_out_esd.a
 %%WITH_ESOUND%%lib/xine/plugins/1.1.4/xineplug_ao_out_esd.so
-%%WITH_JACK%%lib/xine/plugins/1.1.4/xineplug_ao_out_jack.a
 %%WITH_JACK%%lib/xine/plugins/1.1.4/xineplug_ao_out_jack.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_file.a
 lib/xine/plugins/1.1.4/xineplug_ao_out_file.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_none.a
 lib/xine/plugins/1.1.4/xineplug_ao_out_none.so
-lib/xine/plugins/1.1.4/xineplug_ao_out_oss.a
 lib/xine/plugins/1.1.4/xineplug_ao_out_oss.so
-%%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.4/xineplug_ao_out_pulseaudio.a
 %%WITH_PULSEAUDIO%%lib/xine/plugins/1.1.4/xineplug_ao_out_pulseaudio.so
-lib/xine/plugins/1.1.4/xineplug_decode_a52.a
 lib/xine/plugins/1.1.4/xineplug_decode_a52.so
-lib/xine/plugins/1.1.4/xineplug_decode_bitplane.a
 lib/xine/plugins/1.1.4/xineplug_decode_bitplane.so
-lib/xine/plugins/1.1.4/xineplug_decode_dts.a
 lib/xine/plugins/1.1.4/xineplug_decode_dts.so
-lib/xine/plugins/1.1.4/xineplug_decode_dvaudio.a
 lib/xine/plugins/1.1.4/xineplug_decode_dvaudio.so
-lib/xine/plugins/1.1.4/xineplug_decode_faad.a
 lib/xine/plugins/1.1.4/xineplug_decode_faad.so
-lib/xine/plugins/1.1.4/xineplug_decode_ff.a
 lib/xine/plugins/1.1.4/xineplug_decode_ff.so
-%%WITH_GTK2%%lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.a
 %%WITH_GTK2%%lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.so
-lib/xine/plugins/1.1.4/xineplug_decode_gsm610.a
 lib/xine/plugins/1.1.4/xineplug_decode_gsm610.so
-%%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.4/xineplug_decode_image.a
 %%WITH_IMAGEMAGICK%%lib/xine/plugins/1.1.4/xineplug_decode_image.so
-lib/xine/plugins/1.1.4/xineplug_decode_lpcm.a
 lib/xine/plugins/1.1.4/xineplug_decode_lpcm.so
-lib/xine/plugins/1.1.4/xineplug_decode_mad.a
 lib/xine/plugins/1.1.4/xineplug_decode_mad.so
-lib/xine/plugins/1.1.4/xineplug_decode_mpc.a
 lib/xine/plugins/1.1.4/xineplug_decode_mpc.so
-lib/xine/plugins/1.1.4/xineplug_decode_mpeg2.a
 lib/xine/plugins/1.1.4/xineplug_decode_mpeg2.so
-lib/xine/plugins/1.1.4/xineplug_decode_nsf.a
 lib/xine/plugins/1.1.4/xineplug_decode_nsf.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_qt.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_qt.so
-lib/xine/plugins/1.1.4/xineplug_decode_real.a
 lib/xine/plugins/1.1.4/xineplug_decode_real.so
-lib/xine/plugins/1.1.4/xineplug_decode_real_audio.a
 lib/xine/plugins/1.1.4/xineplug_decode_real_audio.so
-lib/xine/plugins/1.1.4/xineplug_decode_rgb.a
 lib/xine/plugins/1.1.4/xineplug_decode_rgb.so
-lib/xine/plugins/1.1.4/xineplug_decode_speex.a
 lib/xine/plugins/1.1.4/xineplug_decode_speex.so
-lib/xine/plugins/1.1.4/xineplug_decode_spu.a
 lib/xine/plugins/1.1.4/xineplug_decode_spu.so
-lib/xine/plugins/1.1.4/xineplug_decode_spucc.a
 lib/xine/plugins/1.1.4/xineplug_decode_spucc.so
-lib/xine/plugins/1.1.4/xineplug_decode_spucmml.a
 lib/xine/plugins/1.1.4/xineplug_decode_spucmml.so
-lib/xine/plugins/1.1.4/xineplug_decode_spudvb.a
 lib/xine/plugins/1.1.4/xineplug_decode_spudvb.so
-lib/xine/plugins/1.1.4/xineplug_decode_sputext.a
 lib/xine/plugins/1.1.4/xineplug_decode_sputext.so
-lib/xine/plugins/1.1.4/xineplug_decode_theora.a
 lib/xine/plugins/1.1.4/xineplug_decode_theora.so
-lib/xine/plugins/1.1.4/xineplug_decode_vorbis.a
 lib/xine/plugins/1.1.4/xineplug_decode_vorbis.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_w32dll.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_decode_w32dll.so
-lib/xine/plugins/1.1.4/xineplug_decode_yuv.a
 lib/xine/plugins/1.1.4/xineplug_decode_yuv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_asf.a
 lib/xine/plugins/1.1.4/xineplug_dmx_asf.so
-lib/xine/plugins/1.1.4/xineplug_dmx_audio.a
 lib/xine/plugins/1.1.4/xineplug_dmx_audio.so
-lib/xine/plugins/1.1.4/xineplug_dmx_avi.a
 lib/xine/plugins/1.1.4/xineplug_dmx_avi.so
-lib/xine/plugins/1.1.4/xineplug_dmx_fli.a
 lib/xine/plugins/1.1.4/xineplug_dmx_fli.so
-lib/xine/plugins/1.1.4/xineplug_dmx_flv.a
 lib/xine/plugins/1.1.4/xineplug_dmx_flv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_games.a
 lib/xine/plugins/1.1.4/xineplug_dmx_games.so
-lib/xine/plugins/1.1.4/xineplug_dmx_iff.a
 lib/xine/plugins/1.1.4/xineplug_dmx_iff.so
-%%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.4/xineplug_dmx_image.a
 %%WITH_DMX_IMAGE%%lib/xine/plugins/1.1.4/xineplug_dmx_image.so
-lib/xine/plugins/1.1.4/xineplug_dmx_matroska.a
 lib/xine/plugins/1.1.4/xineplug_dmx_matroska.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mng.a
 lib/xine/plugins/1.1.4/xineplug_dmx_mng.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg.a
 lib/xine/plugins/1.1.4/xineplug_dmx_mpeg.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_block.a
 lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_block.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_elem.a
 lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_elem.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_pes.a
 lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_pes.so
-lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_ts.a
 lib/xine/plugins/1.1.4/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/1.1.4/xineplug_dmx_nsv.a
 lib/xine/plugins/1.1.4/xineplug_dmx_nsv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_ogg.a
 lib/xine/plugins/1.1.4/xineplug_dmx_ogg.so
-lib/xine/plugins/1.1.4/xineplug_dmx_pva.a
 lib/xine/plugins/1.1.4/xineplug_dmx_pva.so
-lib/xine/plugins/1.1.4/xineplug_dmx_qt.a
 lib/xine/plugins/1.1.4/xineplug_dmx_qt.so
-lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.a
 lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.so
-lib/xine/plugins/1.1.4/xineplug_dmx_real.a
 lib/xine/plugins/1.1.4/xineplug_dmx_real.so
-lib/xine/plugins/1.1.4/xineplug_dmx_slave.a
 lib/xine/plugins/1.1.4/xineplug_dmx_slave.so
-lib/xine/plugins/1.1.4/xineplug_dmx_sputext.a
 lib/xine/plugins/1.1.4/xineplug_dmx_sputext.so
-lib/xine/plugins/1.1.4/xineplug_dmx_yuv4mpeg2.a
 lib/xine/plugins/1.1.4/xineplug_dmx_yuv4mpeg2.so
-lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.a
 lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.so
-lib/xine/plugins/1.1.4/xineplug_flac.a
 lib/xine/plugins/1.1.4/xineplug_flac.so
-lib/xine/plugins/1.1.4/xineplug_inp_cdda.a
 lib/xine/plugins/1.1.4/xineplug_inp_cdda.so
-lib/xine/plugins/1.1.4/xineplug_inp_dvb.a
 lib/xine/plugins/1.1.4/xineplug_inp_dvb.so
-lib/xine/plugins/1.1.4/xineplug_inp_dvd.a
 lib/xine/plugins/1.1.4/xineplug_inp_dvd.so
-lib/xine/plugins/1.1.4/xineplug_inp_file.a
 lib/xine/plugins/1.1.4/xineplug_inp_file.so
-%%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.a
 %%WITH_GNOMEVFS2%%lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.so
-lib/xine/plugins/1.1.4/xineplug_inp_http.a
 lib/xine/plugins/1.1.4/xineplug_inp_http.so
-lib/xine/plugins/1.1.4/xineplug_inp_mms.a
 lib/xine/plugins/1.1.4/xineplug_inp_mms.so
-lib/xine/plugins/1.1.4/xineplug_inp_net.a
 lib/xine/plugins/1.1.4/xineplug_inp_net.so
-lib/xine/plugins/1.1.4/xineplug_inp_pnm.a
 lib/xine/plugins/1.1.4/xineplug_inp_pnm.so
-lib/xine/plugins/1.1.4/xineplug_inp_rtp.a
 lib/xine/plugins/1.1.4/xineplug_inp_rtp.so
-lib/xine/plugins/1.1.4/xineplug_inp_rtsp.a
 lib/xine/plugins/1.1.4/xineplug_inp_rtsp.so
-%%WITH_SMB%%lib/xine/plugins/1.1.4/xineplug_inp_smb.a
 %%WITH_SMB%%lib/xine/plugins/1.1.4/xineplug_inp_smb.so
-lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.a
 lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/1.1.4/xineplug_inp_vcd.a
 lib/xine/plugins/1.1.4/xineplug_inp_vcd.so
-lib/xine/plugins/1.1.4/xineplug_inp_vcdo.a
 lib/xine/plugins/1.1.4/xineplug_inp_vcdo.so
-%%WITH_AALIB%%lib/xine/plugins/1.1.4/xineplug_vo_out_aa.a
 %%WITH_AALIB%%lib/xine/plugins/1.1.4/xineplug_vo_out_aa.so
-%%WITH_CACA%%lib/xine/plugins/1.1.4/xineplug_vo_out_caca.a
 %%WITH_CACA%%lib/xine/plugins/1.1.4/xineplug_vo_out_caca.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_none.a
 lib/xine/plugins/1.1.4/xineplug_vo_out_none.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.a
 lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.a
 lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.a
 %%WITH_VIDIX%%lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.a
 lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.so
-lib/xine/plugins/1.1.4/xineplug_vo_out_xv.a
 lib/xine/plugins/1.1.4/xineplug_vo_out_xv.so
-%%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.a
 %%WITH_XVMC%%lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4