diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index e770a908047b..fe463f1a650a 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= kaffeine -PORTVERSION= 0.4.3b +PORTVERSION= 0.5 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kaffeine @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= kaffeine MAINTAINER= arved@FreeBSD.org COMMENT= A xine-base multimedia player -LIB_DEPENDS= xine.9:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.12:${PORTSDIR}/multimedia/libxine USE_BZIP2= yes USE_KDELIBS_VER= 3 @@ -23,6 +23,7 @@ CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" CONFIGURE_TARGET= CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -MAN1= kaffeine.1 +MAN1= kaffeine.1 +MANLANG= "" de .include diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo index 6f3b90a1371c..8b41e562d494 100644 --- a/multimedia/kaffeine/distinfo +++ b/multimedia/kaffeine/distinfo @@ -1,2 +1,2 @@ -MD5 (kaffeine-0.4.3b.tar.bz2) = a1bbcbf5dccffc81cb168472d9e87ecd -SIZE (kaffeine-0.4.3b.tar.bz2) = 1554547 +MD5 (kaffeine-0.5.tar.bz2) = dffc384423e6cb8e20c5ad49242814d7 +SIZE (kaffeine-0.5.tar.bz2) = 1415324 diff --git a/multimedia/kaffeine/files/patch-http.c b/multimedia/kaffeine/files/patch-http.c index b159be5c82ab..60e16f75c2a7 100644 --- a/multimedia/kaffeine/files/patch-http.c +++ b/multimedia/kaffeine/files/patch-http.c @@ -1,10 +1,34 @@ ---- kaffeine/http.c.orig Sat Mar 27 23:09:53 2004 -+++ kaffeine/http.c Sat Mar 27 23:15:12 2004 +--- 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 #include #include +#include #include + #include #include - #include +@@ -56,6 +57,11 @@ + #include + #include + #include ++#ifdef HAVE_STDINT_H ++#include ++#else ++#include ++#endif + + #include "http.h" + +@@ -514,7 +520,11 @@ + } + } else { + if (this->contentlength == 0) { ++#ifdef HAVE_STDINT_H + intmax_t contentlength; ++#else ++ int64_t contentlength; ++#endif + + if ( strlen(this->buf)<(BUFSIZE-20) && sscanf(this->buf, "Content-Length: %Ld", &contentlength) == 1) { + printf ("http: content length = %Ld bytes\n", contentlength); diff --git a/multimedia/kaffeine/files/patch-kaffeineapp.cpp b/multimedia/kaffeine/files/patch-kaffeineapp.cpp deleted file mode 100644 index efaaa25ad620..000000000000 --- a/multimedia/kaffeine/files/patch-kaffeineapp.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kaffeine/kaffeine.cpp.org Sat May 8 23:17:08 2004 -+++ kaffeine/kaffeineapp.cpp Sat May 8 23:17:31 2004 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist index 93dee2f1faf6..b43c272fb54e 100644 --- a/multimedia/kaffeine/pkg-plist +++ b/multimedia/kaffeine/pkg-plist @@ -1,29 +1,44 @@ bin/kaffeine -lib/libkaffeinepart.la -lib/libkaffeinepart.so +include/kaffeine/kaffeine_part.h +include/kaffeine/kmediapart.h +include/kaffeine/mrl.h +include/kaffeine/playlistimport.h +lib/kde3/libkaffeinepart.la +lib/kde3/libkaffeinepart.so +lib/libkmediapart.la +lib/libkmediapart.so +lib/libkmediapart.so.0 share/applnk/Multimedia/kaffeine.desktop -share/apps/kaffeine/kmp-playlist.png -share/apps/kaffeine/logo.avi +share/apps/kaffeine/kaffeine_part.rc +share/apps/kaffeine/kaffeineui.rc +share/apps/kaffeine/logo +share/apps/kaffeine/logo.mpg share/apps/kaffeine/mms.protocol share/apps/kaffeine/rtsp.protocol share/apps/konqueror/servicemenus/kaffeine_open_directory.desktop share/apps/konqueror/servicemenus/kaffeine_append_file.desktop share/apps/profiles/kaffeine.profile.xml -share/doc/HTML/en/kaffeine/controlpanel.png -share/doc/HTML/en/kaffeine/fspanel.png -share/doc/HTML/en/kaffeine/kpart.png -share/doc/HTML/en/kaffeine/playerwin.png +share/doc/HTML/en/kaffeine/startwindow.png +share/doc/HTML/en/kaffeine/kaffeinepart.png share/doc/HTML/en/kaffeine/playlistwin.png -share/doc/HTML/en/kaffeine/systemtray.png -share/doc/HTML/en/kaffeine/handbook.html share/doc/HTML/en/kaffeine/index.docbook share/doc/HTML/en/kaffeine/index.cache.bz2 share/doc/HTML/en/kaffeine/common +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 +share/doc/HTML/zh_CN/kaffeine/playlistwin.png +share/doc/HTML/zh_CN/kaffeine/startwindow.png share/icons/hicolor/128x128/apps/kaffeine.png share/icons/hicolor/16x16/apps/kaffeine.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 share/icons/hicolor/22x22/apps/kaffeine.png +share/icons/hicolor/22x22/actions/player_mute.png +share/icons/hicolor/22x22/actions/player_record.png +share/icons/hicolor/32x32/actions/player_mute.png +share/icons/hicolor/32x32/actions/player_record.png share/icons/hicolor/32x32/apps/kaffeine-pause.png share/icons/hicolor/32x32/apps/kaffeine-play.png share/icons/hicolor/32x32/apps/kaffeine-record.png @@ -32,28 +47,31 @@ share/icons/hicolor/32x32/mimetypes/mime_kaffeine.png share/icons/hicolor/48x48/apps/kaffeine.png share/icons/hicolor/48x48/mimetypes/mime_kaffeine.png 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/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/pl/LC_MESSAGES/kaffeine.mo +share/locale/nn/LC_MESSAGES/kaffeine.mo +share/locale/nl/LC_MESSAGES/kaffeine.mo +share/locale/pt_PT/LC_MESSAGES/kaffeine.mo share/locale/pt_BR/LC_MESSAGES/kaffeine.mo -share/locale/sl/LC_MESSAGES/kaffeine.mo +share/locale/ru/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/kaffeine_part.desktop +@dirrm include/kaffeine @dirrm share/apps/kaffeine +@dirrm share/doc/HTML/zh_CN/kaffeine/ @dirrm share/doc/HTML/en/kaffeine @dirrm share/apps/konqueror/servicemenus @dirrm share/apps/konqueror