Update to minitube-2.1.3; fix WANTLIB

pirofti@ (maintainer) timeout

www/minitube/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.29 2013/05/14 10:36:19 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.30 2013/09/30 08:06:09 dcoppa Exp $
 
 COMMENT =	standalone YouTube.com video browser/player
 
-DISTNAME =	minitube-2.0
+DISTNAME =	minitube-2.1.3
 CATEGORIES =	www multimedia
 
 HOMEPAGE =	http://flavio.tordini.org/minitube
@@ -16,9 +16,10 @@ MASTER_SITES =	http://flavio.tordini.org/files/minitube/
 
 MODULES =	x11/qt4
 
-WANTLIB +=	ICE QtDBus QtGui QtNetwork QtXml SM X11
-WANTLIB +=	Xext Xi Xinerama Xrender c fontconfig
-WANTLIB +=	freetype m phonon pthread stdc++
+WANTLIB +=	ICE SM X11 Xext Xi Xinerama Xrender c fontconfig
+WANTLIB +=	freetype lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
+WANTLIB +=	lib/qt4/QtScript lib/qt4/QtSql lib/qt4/QtXml m
+WANTLIB +=	phonon pthread stdc++
 
 RUN_DEPENDS =	multimedia/gstreamer-0.10/plugins-good \
 		multimedia/gstreamer-0.10/plugins-ffmpeg \
@@ -27,11 +28,15 @@ RUN_DEPENDS =	multimedia/gstreamer-0.10/plugins-good \
 
 WRKDIST =	${WRKDIR}/minitube
 
+MAKE_FLAGS =	CXX=${CXX} \
+		LINK=${CXX}
+
 FAKE_FLAGS =	INSTALL_ROOT=${WRKINST}
 
 NO_TEST =	Yes
 
 do-configure:
-	cd ${WRKDIST} && env -i ${CONFIGURE_ENV} qmake4 PREFIX=${PREFIX}
+	cd ${WRKDIST} && env -i ${CONFIGURE_ENV} \
+		${LOCALBASE}/bin/qmake4 PREFIX=${PREFIX}
 
 .include <bsd.port.mk>

www/minitube/distinfo

@@ -1,2 +1,2 @@
-SHA256 (minitube-2.0.tar.gz) = G6HddyXm4MkmU/3ue8+kuDM0bS70wJHZSxgbYLtZJVQ=
-SIZE (minitube-2.0.tar.gz) = 713577
+SHA256 (minitube-2.1.3.tar.gz) = OHtD/J7mjaV9abBiKyphyC+BZAHaWtiDBWPXkuQCuPw=
+SIZE (minitube-2.1.3.tar.gz) = 816226

www/minitube/patches/patch-src_aggregatevideosource_cpp

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_aggregatevideosource_cpp,v 1.1 2013/09/30 08:06:10 dcoppa Exp $
+
+Remove garbage:
+
+src/aggregatevideosource.cpp:1: error: stray '\357' in program
+src/aggregatevideosource.cpp:1: error: stray '\273' in program
+src/aggregatevideosource.cpp:1: error: stray '\277' in program
+
+--- src/aggregatevideosource.cpp.orig	Wed Sep 25 13:31:10 2013
++++ src/aggregatevideosource.cpp	Wed Sep 25 13:31:18 2013
+@@ -1,4 +1,4 @@
+-/* $BEGIN_LICENSE
++/* $BEGIN_LICENSE
+ 
+ This file is part of Minitube.
+ Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>

www/minitube/patches/patch-src_utils_cpp

@@ -1,16 +1,16 @@
-$OpenBSD: patch-src_utils_cpp,v 1.1 2013/05/14 10:28:17 dcoppa Exp $
+$OpenBSD: patch-src_utils_cpp,v 1.2 2013/09/30 08:06:10 dcoppa Exp $
 
 Use the gnome icon theme unconditionally: fixes a problem with
 minitube GUI not having icons when executed outside of a Desktop
 Environment
 
---- src/utils.cpp.orig	Tue Feb  5 10:00:26 2013
-+++ src/utils.cpp	Tue Feb  5 10:00:51 2013
-@@ -5,6 +5,7 @@
+--- src/utils.cpp.orig	Mon Sep 23 11:30:27 2013
++++ src/utils.cpp	Wed Sep 25 13:22:21 2013
+@@ -24,6 +24,7 @@ $END_LICENSE */
+ #endif
  
- QIcon getIcon(const QString &name) {
- #ifdef Q_WS_X11
+ QIcon Utils::themeIcon(const QString &name) {
 +    QIcon::setThemeName("gnome");
-     return QIcon::fromTheme(name);
- #else
-     return Extra::getIcon(name);
+     if (QIcon::hasThemeIcon(name))
+         return QIcon::fromTheme(name);
+     else

www/minitube/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2013/05/14 10:28:17 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.17 2013/09/30 08:06:10 dcoppa Exp $
 @bin bin/minitube
 share/applications/minitube.desktop
 share/icons/hicolor/128x128/apps/minitube.png
@@ -15,8 +15,9 @@ share/icons/hicolor/scalable/apps/minitube.svg
 share/minitube/
 share/minitube/locale/
 share/minitube/locale/ar.qm
+share/minitube/locale/ast.qm
+share/minitube/locale/bg_BG.qm
 share/minitube/locale/ca.qm
-share/minitube/locale/ca_ES.qm
 share/minitube/locale/cs_CZ.qm
 share/minitube/locale/da.qm
 share/minitube/locale/de_DE.qm
@@ -28,14 +29,15 @@ share/minitube/locale/es_ES.qm
 share/minitube/locale/fi.qm
 share/minitube/locale/fi_FI.qm
 share/minitube/locale/fr.qm
+share/minitube/locale/gl.qm
 share/minitube/locale/he_IL.qm
-share/minitube/locale/hr.qm
 share/minitube/locale/hu.qm
 share/minitube/locale/ia.qm
 share/minitube/locale/it.qm
 share/minitube/locale/ja_JP.qm
-share/minitube/locale/jv.qm
 share/minitube/locale/ky.qm
+share/minitube/locale/ms_MY.qm
+share/minitube/locale/nb.qm
 share/minitube/locale/nl.qm
 share/minitube/locale/pl.qm
 share/minitube/locale/pl_PL.qm
@@ -44,8 +46,13 @@ share/minitube/locale/ro.qm
 share/minitube/locale/ru.qm
 share/minitube/locale/sk.qm
 share/minitube/locale/sl.qm
+share/minitube/locale/sq.qm
+share/minitube/locale/sv_SE.qm
 share/minitube/locale/tr.qm
+share/minitube/locale/uk.qm
+share/minitube/locale/uk_UA.qm
 share/minitube/locale/zh_CN.qm
+share/minitube/locale/zh_TW.qm
 @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
 @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
 @exec %D/bin/update-desktop-database