4 files changed, 41 insertions, 46 deletions

diff --git a/multimedia/manslide/Makefile b/multimedia/manslide/Makefile
index 211175c8f22e..bb1616229a32 100644
--- a/multimedia/manslide/Makefile
+++ b/multimedia/manslide/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	manslide
-DISTVERSION=	1.5
-DISTVERSIONSUFFIX=	rc4
+DISTVERSION=	1.5.1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://csgib36.ifrance.com/Manslide/
 
@@ -19,10 +18,12 @@ RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 		mplayer:${PORTSDIR}/multimedia/mplayer \
 		mjpegtools>=1.8.0:${PORTSDIR}/multimedia/mjpegtools \
 		ImageMagick>=6.2.9:${PORTSDIR}/graphics/ImageMagick \
+		xvid4conf:${PORTSDIR}/multimedia/xvid4conf \
 		transcode:${PORTSDIR}/multimedia/transcode
 
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc opengl qmake rcc uic
+QT_COMPONENTS=	corelib gui moc opengl qmake rcc uic \
+		imageformats inputmethods iconengines
 MANSLIDEDIR=	${PREFIX}/share/manslide
 
 MAKE_ENV?=	QTDIR=${QT_PREFIX}
@@ -30,7 +31,7 @@ QMAKE?=		${LOCALBASE}/bin/qmake-qt4
 QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
 WRKSRC=		${WRKDIR}/Manslide-${PORTVERSION}
 LANGUAGE_FILES=	_ca _en _pl _it _ru
-EFFECTS=	Explode Film Fire France Gun Record Smoke Sunset
+EFFECTS=	Explode Film Fire France Record Smoke Sunset
 
 DESKTOP_ENTRIES=	"Manslide" \
   			"Create your slideshow" \
@@ -71,4 +72,7 @@ pre-install:
 
 	${LN} -fs ${MANSLIDEDIR}/Manslide ${PREFIX}/bin/
 
+post-install:
+	${FILESDIR}/testsox.sh
+
 .include <bsd.port.mk>
diff --git a/multimedia/manslide/distinfo b/multimedia/manslide/distinfo
index 8ded37a67cc3..36b9d03cfcec 100644
--- a/multimedia/manslide/distinfo
+++ b/multimedia/manslide/distinfo
@@ -1,3 +1,3 @@
-MD5 (manslide-1.5rc4.tar.gz) = f930b689077c9a3b1ae9af9c94acf3e3
-SHA256 (manslide-1.5rc4.tar.gz) = f9015b8d704674e72df73ee4b432ea328b8e8f457db2962cb2351f196c51d508
-SIZE (manslide-1.5rc4.tar.gz) = 8013518
+MD5 (manslide-1.5.1.tar.gz) = 48dcfca845b72845b53ab880b2807435
+SHA256 (manslide-1.5.1.tar.gz) = 5a8f00d46d8c97f53f65413a2ad1d29fcb277ee7517ed5d8de56a8db7a3e3761
+SIZE (manslide-1.5.1.tar.gz) = 7989566
diff --git a/multimedia/manslide/files/testsox.sh b/multimedia/manslide/files/testsox.sh
new file mode 100644
index 000000000000..63fa843bbf64
--- /dev/null
+++ b/multimedia/manslide/files/testsox.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+echo ""
+echo "################################################"
+echo "#                                              #"
+echo "#                IMPORTANT                     #"
+echo "#                                              #"
+echo "################################################"
+echo ""
+echo "In order to get this port work properly,"
+echo "sox must handle OGG Vorbis files."
+echo ""
+echo "Now I'll run a quick test for you..."
+echo ""
+cd ${PORTSDIR}/audio/sox
+OGGTEST=`make showconfig|grep VORBIS|awk '{print $1}'`
+if test $OGGTEST = 'VORBIS=on'
+then
+	echo "It seems you have $OGGTEST. Excellent!"
+	echo ""
+else
+	echo "It seems you have $OGGTEST."
+	echo "Please go to audio/sox," 
+	echo "set WITH_VORBIS=true and recompile"
+	echo ""
+fi
+cd -
diff --git a/multimedia/manslide/pkg-plist b/multimedia/manslide/pkg-plist
index 1e04046ab1a2..36aa56d63768 100644
--- a/multimedia/manslide/pkg-plist
+++ b/multimedia/manslide/pkg-plist
@@ -458,44 +458,6 @@ bin/Manslide
 %%DATADIR%%/Effects/France/France000247.jpg
 %%DATADIR%%/Effects/France/France000248.jpg
 %%DATADIR%%/Effects/France/France000249.jpg
-%%DATADIR%%/Effects/Gun/Gun000001.jpg
-%%DATADIR%%/Effects/Gun/Gun000002.jpg
-%%DATADIR%%/Effects/Gun/Gun000003.jpg
-%%DATADIR%%/Effects/Gun/Gun000004.jpg
-%%DATADIR%%/Effects/Gun/Gun000005.jpg
-%%DATADIR%%/Effects/Gun/Gun000006.jpg
-%%DATADIR%%/Effects/Gun/Gun000007.jpg
-%%DATADIR%%/Effects/Gun/Gun000008.jpg
-%%DATADIR%%/Effects/Gun/Gun000009.jpg
-%%DATADIR%%/Effects/Gun/Gun000010.jpg
-%%DATADIR%%/Effects/Gun/Gun000011.jpg
-%%DATADIR%%/Effects/Gun/Gun000012.jpg
-%%DATADIR%%/Effects/Gun/Gun000013.jpg
-%%DATADIR%%/Effects/Gun/Gun000014.jpg
-%%DATADIR%%/Effects/Gun/Gun000015.jpg
-%%DATADIR%%/Effects/Gun/Gun000016.jpg
-%%DATADIR%%/Effects/Gun/Gun000017.jpg
-%%DATADIR%%/Effects/Gun/Gun000018.jpg
-%%DATADIR%%/Effects/Gun/Gun000019.jpg
-%%DATADIR%%/Effects/Gun/Gun000020.jpg
-%%DATADIR%%/Effects/Gun/Gun000021.jpg
-%%DATADIR%%/Effects/Gun/Gun000022.jpg
-%%DATADIR%%/Effects/Gun/Gun000023.jpg
-%%DATADIR%%/Effects/Gun/Gun000024.jpg
-%%DATADIR%%/Effects/Gun/Gun000025.jpg
-%%DATADIR%%/Effects/Gun/Gun000026.jpg
-%%DATADIR%%/Effects/Gun/Gun000027.jpg
-%%DATADIR%%/Effects/Gun/Gun000028.jpg
-%%DATADIR%%/Effects/Gun/Gun000029.jpg
-%%DATADIR%%/Effects/Gun/Gun000030.jpg
-%%DATADIR%%/Effects/Gun/Gun000031.jpg
-%%DATADIR%%/Effects/Gun/Gun000032.jpg
-%%DATADIR%%/Effects/Gun/Gun000033.jpg
-%%DATADIR%%/Effects/Gun/Gun000034.jpg
-%%DATADIR%%/Effects/Gun/Gun000035.jpg
-%%DATADIR%%/Effects/Gun/Gun000036.jpg
-%%DATADIR%%/Effects/Gun/Gun000037.jpg
-%%DATADIR%%/Effects/Gun/Gun000038.jpg
 %%DATADIR%%/Effects/Record/Record000001.jpg
 %%DATADIR%%/Effects/Record/Record000002.jpg
 %%DATADIR%%/Effects/Record/Record000003.jpg
@@ -779,6 +741,7 @@ bin/Manslide
 %%DATADIR%%/Interface/fadein.png
 %%DATADIR%%/Interface/fadeout.png
 %%DATADIR%%/Interface/fin.png
+%%DATADIR%%/Interface/fond.png
 %%DATADIR%%/Interface/font.png
 %%DATADIR%%/Interface/from.png
 %%DATADIR%%/Interface/gimp.png
@@ -799,6 +762,7 @@ bin/Manslide
 %%DATADIR%%/Interface/reload.png
 %%DATADIR%%/Interface/render.png
 %%DATADIR%%/Interface/renderer.png
+%%DATADIR%%/Interface/rotate.png
 %%DATADIR%%/Interface/rotateX.png
 %%DATADIR%%/Interface/rotateY.png
 %%DATADIR%%/Interface/rotateZ.png
@@ -809,10 +773,12 @@ bin/Manslide
 %%DATADIR%%/Interface/soundtrack.png
 %%DATADIR%%/Interface/start.png
 %%DATADIR%%/Interface/to.png
+%%DATADIR%%/Interface/swap.png
 %%DATADIR%%/Interface/toolbar.PNG
 %%DATADIR%%/Interface/top_bandeau.png
 %%DATADIR%%/Interface/tux.png
 %%DATADIR%%/Interface/volume.png
+%%DATADIR%%/Interface/vague.png
 %%DATADIR%%/Interface/zoom+.png
 %%DATADIR%%/Interface/zoom-.png
 %%DATADIR%%/Interface/zoom.png
@@ -827,7 +793,6 @@ bin/Manslide
 @dirrm %%DATADIR%%/Effects/Sunset
 @dirrm %%DATADIR%%/Effects/Smoke
 @dirrm %%DATADIR%%/Effects/Record
-@dirrm %%DATADIR%%/Effects/Gun
 @dirrm %%DATADIR%%/Effects/France
 @dirrm %%DATADIR%%/Effects/Fire
 @dirrm %%DATADIR%%/Effects/Film