update multimedia/smpeg-xmms: 0.3.4 -> 0.3.5

PR:		55247
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 13 insertions, 49 deletions

diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 108aa383d660..ed05111bdf34 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	smpeg-xmms
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
+MASTER_SITES=	http://www.xmms.org/files/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/multimedia/xmms/%SUBDIR%/ \
+		ftp://ftp.fu-berlin.de/unix/sound/xmms/%SUBDIR%/
+MASTER_SITE_SUBDIR=	plugins/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A mpeg video plugin for XMMS
@@ -16,21 +19,16 @@ COMMENT=	A mpeg video plugin for XMMS
 LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg \
 		xmms.3:${PORTSDIR}/multimedia/xmms
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
+USE_SDL=	yes
+USE_GNOME=	gnomehack gtk12
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
-post-configure:
-	@${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-		${WRKSRC}/libtool
+# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/Input
+do-install:
+	${INSTALL_PROGRAM} \
+		${WRKSRC}/src/.libs/libsmpeg_xmms.so ${PREFIX}/lib/xmms/Input
 
 .include <bsd.port.mk>
diff --git a/multimedia/smpeg-xmms/distinfo b/multimedia/smpeg-xmms/distinfo
index 755f96a411b2..b6384088e9a7 100644
--- a/multimedia/smpeg-xmms/distinfo
+++ b/multimedia/smpeg-xmms/distinfo
@@ -1 +1 @@
-MD5 (smpeg-xmms-0.3.4.tar.gz) = d42622e606ac66346b376bc225f90dec
+MD5 (smpeg-xmms-0.3.5.tar.gz) = 07e49327e0d9e7f24781f29a12de94cf
diff --git a/multimedia/smpeg-xmms/files/patch-aa b/multimedia/smpeg-xmms/files/patch-aa
deleted file mode 100644
index 3cadfc0adee1..000000000000
--- a/multimedia/smpeg-xmms/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue Nov 28 23:04:39 2000
-+++ src/Makefile.in	Tue Dec 19 18:37:56 2000
-@@ -101,7 +101,7 @@
- libsmpeg_xmms_la_LDFLAGS = -module -avoid-version
- 
- INCLUDES =  @XMMS_CFLAGS@ @SDL_CFLAGS@ @SMPEG_CFLAGS@
--libsmpeg_xmms_la_LIBADD =  @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@
-+libsmpeg_xmms_la_LIBADD =  @XMMS_LIBS@ @PTHREAD_LIBS@ @SDL_LIBS@ @SMPEG_LIBS@
- 
- libsmpeg_xmms_la_SOURCES = smpeg-xmms.c smpeg-xmms.h configure.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/smpeg-xmms/files/patch-configure b/multimedia/smpeg-xmms/files/patch-configure
deleted file mode 100644
index c4372e071456..000000000000
--- a/multimedia/smpeg-xmms/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- configure	2001/04/03 09:08:00	1.1
-+++ configure	2001/04/03 09:08:19
-@@ -3015,14 +3015,14 @@
- fi
- 
- 
--echo $ac_n "checking for XvGetVideo in -lSDL""... $ac_c" 1>&6
--echo "configure:3020: checking for XvGetVideo in -lSDL" >&5
-+echo $ac_n "checking for XvGetVideo in -lSDL-1.1""... $ac_c" 1>&6
-+echo "configure:3020: checking for XvGetVideo in -lSDL-1.1" >&5
- ac_lib_var=`echo SDL'_'XvGetVideo | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lSDL -lpthread $LIBS"
-+LIBS="-lSDL-1.1 -lpthread $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3028 "configure"
- #include "confdefs.h"