Update to 0.7

- a gstreamer based part was added.
- Detailed Changelog at: http://kaffeine.sourceforge.net/

4 files changed, 42 insertions, 31 deletions

diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 282945a8c28a..d772b7720f00 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kaffeine
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
@@ -19,6 +18,8 @@ LIB_DEPENDS=	xine.13:${PORTSDIR}/multimedia/libxine
 USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
+USE_GSTREAMER=		yes
+USE_INC_LIBTOOL_VER=	15
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CXXFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=
diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo
index f03bc3b98a72..486feed5c332 100644
--- a/multimedia/kaffeine/distinfo
+++ b/multimedia/kaffeine/distinfo
@@ -1,2 +1,2 @@
-MD5 (kaffeine-0.6.tar.bz2) = 7412abf5f646a0fd62ac5ad3dba80ab2
-SIZE (kaffeine-0.6.tar.bz2) = 1784898
+MD5 (kaffeine-0.7.tar.bz2) = 6b887a80af11a9a252bd3c1524ef31f5
+SIZE (kaffeine-0.7.tar.bz2) = 2423549
diff --git a/multimedia/kaffeine/files/patch-http.c b/multimedia/kaffeine/files/patch-http.c
index 60e16f75c2a7..221661f98e96 100644
--- a/multimedia/kaffeine/files/patch-http.c
+++ b/multimedia/kaffeine/files/patch-http.c
@@ -1,34 +1,22 @@
---- kaffeine/player-parts/http.c.orig	Wed Dec  8 15:07:06 2004
-+++ kaffeine/player-parts/http.c	Fri Dec 31 14:57:16 2004
-@@ -48,6 +48,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <netinet/in.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
-@@ -56,6 +57,11 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#else
-+#include <inttypes.h>
-+#endif
- 
- #include "http.h"
- 
-@@ -514,7 +520,11 @@
+--- kaffeine/player-parts/http.c.orig	Wed Aug 31 16:16:57 2005
++++ kaffeine/player-parts/http.c	Wed Aug 31 16:23:33 2005
+@@ -492,10 +492,19 @@
  	}
        } else {
  	if (this->contentlength == 0) {
 +#ifdef HAVE_STDINT_H
  	  intmax_t contentlength;
+ 
+ 	  if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %" PRIdMAX, &contentlength) == 1) {
++
+ 	    printf ("http: content length = %" PRIdMAX " bytes\n", contentlength);
 +#else
 +	  int64_t contentlength;
++
++	  if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %Ld", &contentlength) == 1) {
++	    printf ("http: content length = %Ld bytes\n", contentlength);
 +#endif
- 	  
- 	  if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %Ld", &contentlength) == 1) {
- 	    printf ("http: content length = %Ld bytes\n", contentlength);
++
+ 	    this->contentlength = (off_t)contentlength;
+ 	  }
+         }
diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist
index 7775b5ab6c67..4dae6d16d758 100644
--- a/multimedia/kaffeine/pkg-plist
+++ b/multimedia/kaffeine/pkg-plist
@@ -1,15 +1,19 @@
 bin/kaffeine
+include/kaffeine_export.h
 include/kaffeine/kaffeine_part.h
 include/kaffeine/kaffeine_part_iface.h
 include/kaffeine/kmediapart.h
 include/kaffeine/mrl.h
 include/kaffeine/playlistimport.h
+lib/kde3/libgstreamerpart.so
+lib/kde3/libgstreamerpart.la
 lib/kde3/libkaffeinepart.la
 lib/kde3/libkaffeinepart.so
 lib/libkmediapart.la
 lib/libkmediapart.so
 lib/libkmediapart.so.0
-share/applnk/Multimedia/kaffeine.desktop
+share/applications/kde/kaffeine.desktop
+share/apps/gstreamerpart/gstreamer_part.rc
 share/apps/kaffeine/kaffeine_part.rc
 share/apps/kaffeine/kaffeineui.rc
 share/apps/kaffeine/logo
@@ -19,6 +23,9 @@ share/apps/kaffeine/rtsp.protocol
 share/apps/kaffeine/dvbdata.tar.gz
 share/apps/konqueror/servicemenus/kaffeine_open_directory.desktop
 share/apps/konqueror/servicemenus/kaffeine_append_file.desktop
+share/apps/konqueror/servicemenus/kaffeine_play_audiocd.desktop
+share/apps/konqueror/servicemenus/kaffeine_play_dvd.desktop
+share/apps/konqueror/servicemenus/kaffeine_play_vcd.desktop
 share/apps/profiles/kaffeine.profile.xml
 share/doc/HTML/en/kaffeine/startwindow.png
 share/doc/HTML/en/kaffeine/kaffeinepart.png
@@ -26,12 +33,15 @@ share/doc/HTML/en/kaffeine/playlistwin.png
 share/doc/HTML/en/kaffeine/index.docbook
 share/doc/HTML/en/kaffeine/index.cache.bz2
 share/doc/HTML/en/kaffeine/common
+share/doc/HTML/en/kaffeine/dvbbroadcast.png
+share/doc/HTML/en/kaffeine/dvbclient.png
 share/doc/HTML/en/kaffeine/dvbwin.png
 share/doc/HTML/en/kaffeine/dvblive.jpg
 share/doc/HTML/en/kaffeine/dvbscan.png
 share/doc/HTML/en/kaffeine/dvbepg.png
 share/doc/HTML/en/kaffeine/dvbconfig.png
 share/doc/HTML/en/kaffeine/dvbtimers.png
+share/doc/HTML/en/kaffeine/gstpart.png
 share/doc/HTML/zh_CN/kaffeine/index.cache.bz2
 share/doc/HTML/zh_CN/kaffeine/index.docbook
 share/doc/HTML/zh_CN/kaffeine/kaffeinepart.png
@@ -39,7 +49,12 @@ share/doc/HTML/zh_CN/kaffeine/playlistwin.png
 share/doc/HTML/zh_CN/kaffeine/startwindow.png
 share/doc/HTML/zh_CN/kaffeine/common
 share/icons/hicolor/128x128/apps/kaffeine.png
+share/icons/hicolor/16x16/apps/gstreamer.png
 share/icons/hicolor/16x16/apps/kaffeine.png
+share/icons/hicolor/16x16/apps/kdvbra.png
+share/icons/hicolor/16x16/apps/kdvbrac.png
+share/icons/hicolor/16x16/apps/kdvbtv.png
+share/icons/hicolor/16x16/apps/kdvbtvc.png
 share/icons/hicolor/16x16/mimetypes/mime_kaffeine.png
 share/icons/hicolor/16x16/actions/player_mute.png
 share/icons/hicolor/16x16/actions/player_record.png
@@ -59,14 +74,18 @@ share/icons/hicolor/64x64/apps/kaffeine.png
 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/es/LC_MESSAGES/kaffeine.mo
+share/locale/et/LC_MESSAGES/kaffeine.mo
 share/locale/fi/LC_MESSAGES/kaffeine.mo
 share/locale/fr/LC_MESSAGES/kaffeine.mo
+share/locale/gl/LC_MESSAGES/kaffeine.mo
 share/locale/he/LC_MESSAGES/kaffeine.mo
 share/locale/hu/LC_MESSAGES/kaffeine.mo
 share/locale/it/LC_MESSAGES/kaffeine.mo
 share/locale/ja/LC_MESSAGES/kaffeine.mo
 share/locale/mk/LC_MESSAGES/kaffeine.mo
+share/locale/ms/LC_MESSAGES/kaffeine.mo
 share/locale/nb/LC_MESSAGES/kaffeine.mo
 share/locale/nn/LC_MESSAGES/kaffeine.mo
 share/locale/nl/LC_MESSAGES/kaffeine.mo
@@ -74,11 +93,14 @@ share/locale/pl/LC_MESSAGES/kaffeine.mo
 share/locale/pt_PT/LC_MESSAGES/kaffeine.mo
 share/locale/pt_BR/LC_MESSAGES/kaffeine.mo
 share/locale/ru/LC_MESSAGES/kaffeine.mo
+share/locale/sl/LC_MESSAGES/kaffeine.mo
 share/locale/sv/LC_MESSAGES/kaffeine.mo
 share/locale/tr/LC_MESSAGES/kaffeine.mo
 share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
+share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
 share/mimelnk/application/x-kaffeine.desktop
 share/mimelnk/application/x-mplayer2.desktop
+share/services/gstreamer_part.desktop
 share/services/kaffeine_part.desktop
 @dirrm include/kaffeine
 @dirrm share/apps/kaffeine