Update to 1.0-pre3

5 files changed, 43 insertions, 12 deletions

diff --git a/multimedia/kaffeine-devel/Makefile b/multimedia/kaffeine-devel/Makefile
index 0afa2df1f1bb..af386c2685bb 100644
--- a/multimedia/kaffeine-devel/Makefile
+++ b/multimedia/kaffeine-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kaffeine
-PORTVERSION=	1.0.p.2
-PORTREVISION=	2
+PORTVERSION=	1.0.p.3
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine/kaffeine/${DISTNAME}
@@ -15,11 +14,12 @@ DISTNAME=	kaffeine-${PORTVERSION:S/.p./-pre/}
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	KDE4 version of kaffeine
 
+LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine
 LATEST_LINK=	${PORTNAME}-devel
 USE_KDE4=	kdehier kdeprefix automoc4 kdelibs
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui phonon svg network dbus xml \
-		qmake_build moc_build rcc_build uic_build 
+QT_COMPONENTS=	corelib gui phonon svg network dbus xml sql \
+		qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 CMAKE_VERBOSE=	yes
 USE_GETTEXT=	yes
diff --git a/multimedia/kaffeine-devel/distinfo b/multimedia/kaffeine-devel/distinfo
index c47edc65bbc4..4677a6c166ef 100644
--- a/multimedia/kaffeine-devel/distinfo
+++ b/multimedia/kaffeine-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (kaffeine-1.0-pre2.tar.gz) = 24eee004427d6b3f73ffb85a94fc6e3b
-SHA256 (kaffeine-1.0-pre2.tar.gz) = 5612f3e81aac971a7695fcab68735770cadadfed0f64c494a0eafb0e8741faa2
-SIZE (kaffeine-1.0-pre2.tar.gz) = 272825
+MD5 (kaffeine-1.0-pre3.tar.gz) = 919e29a95b599db5eef74b5983f135f4
+SHA256 (kaffeine-1.0-pre3.tar.gz) = 8b2c4bb08c9f2d85bf430b39c91a4305f34123ca2b42db618bf6aa50cb6361ca
+SIZE (kaffeine-1.0-pre3.tar.gz) = 337369
diff --git a/multimedia/kaffeine-devel/files/patch-dmx.h b/multimedia/kaffeine-devel/files/patch-dmx.h
index b6b54d60f876..f358283c105d 100644
--- a/multimedia/kaffeine-devel/files/patch-dmx.h
+++ b/multimedia/kaffeine-devel/files/patch-dmx.h
@@ -1,5 +1,5 @@
---- include/dmx.h.orig	2009-10-06 18:35:56.000000000 +0200
-+++ include/dmx.h	2009-10-06 18:36:31.000000000 +0200
+--- include/dmx.h.orig	2010-02-06 19:07:48.000000000 +0100
++++ include/dmx.h	2010-02-06 19:11:53.000000000 +0100
 @@ -24,7 +24,15 @@
  #ifndef _DVBDMX_H_
  #define _DVBDMX_H_
@@ -14,6 +14,6 @@
 +typedef uint8_t __u8;
 +#endif
 +
- #ifdef __KERNEL__
- #include <linux/time.h>
- #else
+ #include <time.h>
+ 
+ 
diff --git a/multimedia/kaffeine-devel/files/patch-src-mediawidget.cpp b/multimedia/kaffeine-devel/files/patch-src-mediawidget.cpp
new file mode 100644
index 000000000000..667b1dbf1628
--- /dev/null
+++ b/multimedia/kaffeine-devel/files/patch-src-mediawidget.cpp
@@ -0,0 +1,12 @@
+--- src/mediawidget.cpp.orig	2010-02-06 19:05:37.000000000 +0100
++++ src/mediawidget.cpp	2010-02-06 19:06:10.000000000 +0100
+@@ -18,6 +18,9 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #include "mediawidget.h"
+ #include "mediawidget_p.h"
+ 
diff --git a/multimedia/kaffeine-devel/pkg-plist b/multimedia/kaffeine-devel/pkg-plist
index 38be50ecf0c5..d1d069972c30 100644
--- a/multimedia/kaffeine-devel/pkg-plist
+++ b/multimedia/kaffeine-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/kaffeine
+bin/kaffeine-xbu
 lib/kde4/kaffeinedvb.so
 share/applications/kde4/kaffeine.desktop
 share/apps/kaffeine/scanfile.dvb
@@ -13,11 +14,16 @@ share/icons/oxygen/32x32/actions/audio-radio-encrypted.png
 share/icons/oxygen/32x32/actions/video-television-encrypted.png
 share/icons/oxygen/48x48/actions/audio-radio-encrypted.png
 share/icons/oxygen/48x48/actions/video-television-encrypted.png
+share/locale/ast/LC_MESSAGES/kaffeine.mo
+share/locale/be/LC_MESSAGES/kaffeine.mo
+share/locale/ca/LC_MESSAGES/kaffeine.mo
+share/locale/ca@valencia/LC_MESSAGES/kaffeine.mo
 share/locale/cs/LC_MESSAGES/kaffeine.mo
 share/locale/da/LC_MESSAGES/kaffeine.mo
 share/locale/de/LC_MESSAGES/kaffeine.mo
 share/locale/el/LC_MESSAGES/kaffeine.mo
 share/locale/en_GB/LC_MESSAGES/kaffeine.mo
+share/locale/eo/LC_MESSAGES/kaffeine.mo
 share/locale/es/LC_MESSAGES/kaffeine.mo
 share/locale/et/LC_MESSAGES/kaffeine.mo
 share/locale/fi/LC_MESSAGES/kaffeine.mo
@@ -25,6 +31,7 @@ share/locale/fr/LC_MESSAGES/kaffeine.mo
 share/locale/ga/LC_MESSAGES/kaffeine.mo
 share/locale/gl/LC_MESSAGES/kaffeine.mo
 share/locale/hu/LC_MESSAGES/kaffeine.mo
+share/locale/hr/LC_MESSAGES/kaffeine.mo
 share/locale/it/LC_MESSAGES/kaffeine.mo
 share/locale/ja/LC_MESSAGES/kaffeine.mo
 share/locale/km/LC_MESSAGES/kaffeine.mo
@@ -51,14 +58,26 @@ share/locale/uk/LC_MESSAGES/kaffeine.mo
 share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
 share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
 @dirrm share/apps/kaffeine
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/eo/LC_MESSAGES
+@dirrmtry share/locale/eo
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/gl/LC_MESSAGES
 @dirrmtry share/locale/gl
+@dirrmtry share/locale/hr/LC_MESSAGES
+@dirrmtry share/locale/hr
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
 @dirrmtry share/locale/ko/LC_MESSAGES