Sync w/ FreeBSD ports tree, update it to 0.8.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6006 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 93 insertions, 41 deletions

diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 84646ebe0..e2eea8295 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kaffeine
-PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTVERSION=	0.8
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
@@ -14,23 +13,36 @@ MASTER_SITE_SUBDIR=	kaffeine
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A xine-base multimedia player
 
-LIB_DEPENDS=	xine.15:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS=	xine.15:${PORTSDIR}/multimedia/libxine \
+		mp3lame.0:${PORTSDIR}/audio/lame \
+		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 
 USE_BZIP2=		yes
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
+
+.ifndef (WITHOUT_GSTREAMER)
 USE_GSTREAMER80=	yes
+PLIST_SUB+=		NOGSTREAMER=""
+.else
+PLIST_SUB+=		NOGSTREAMER="@comment "
+.endif
+
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=
 
-MAN1=		kaffeine.1
-MANLANG=	"" de
-
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} == xorg
 CONFIGURE_ARGS+=	--with-xorg
 .endif
 
+.ifdef (WITHOUT_GSTREAMER)
+CONFIGURE_ARGS+=	--without-gstreamer
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e "s,xx,," ${WRKSRC}/po/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo
index 7588ebcb9..162538298 100644
--- a/multimedia/kaffeine/distinfo
+++ b/multimedia/kaffeine/distinfo
@@ -1,3 +1,3 @@
-MD5 (kaffeine-0.7.1.tar.bz2) = afde61516eb8f6cf2c3bf085a22ef427
-SHA256 (kaffeine-0.7.1.tar.bz2) = 7e2611ba4fb4cc5b6a1802250a5c404b22cca434ce1d3bbe83088f6189bfa145
-SIZE (kaffeine-0.7.1.tar.bz2) = 2276747
+MD5 (kaffeine-0.8.tar.bz2) = e2bd3f0416664dbfe3262f1fc7155667
+SHA256 (kaffeine-0.8.tar.bz2) = b22d85d767c2e84cedd422fd629aeff5d7754d9f13a0991baa49165cf8f1dcf3
+SIZE (kaffeine-0.8.tar.bz2) = 2700690
diff --git a/multimedia/kaffeine/files/patch-http.c b/multimedia/kaffeine/files/patch-http.c
deleted file mode 100644
index 221661f98..000000000
--- a/multimedia/kaffeine/files/patch-http.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
-+
- 	    this->contentlength = (off_t)contentlength;
- 	  }
-         }
diff --git a/multimedia/kaffeine/files/patch-koggenc.cpp b/multimedia/kaffeine/files/patch-koggenc.cpp
new file mode 100644
index 000000000..b2265baae
--- /dev/null
+++ b/multimedia/kaffeine/files/patch-koggenc.cpp
@@ -0,0 +1,29 @@
+--- kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp.orig	Sun Mar 26 15:12:09 2006
++++ kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp	Sun Mar 26 15:12:37 2006
+@@ -159,7 +159,7 @@
+ 	while( ogg_stream_flush( &os, &og ) ){
+ 		delete [] bufEncode;
+ 		bufEncode = new char[ og.header_len+og.body_len+buflen ];
+-		memcpy( mempcpy( mempcpy( bufEncode, tmpBuf, buflen ), og.header, og.header_len ), og.body, og.body_len );
++		memcpy( (char *)memcpy( (char *)memcpy( bufEncode, tmpBuf, buflen ) + buflen, og.header, og.header_len ) + og.header_len, og.body, og.body_len );
+ 		buflen+= og.header_len;
+ 		buflen+= og.body_len;
+ 		delete [] tmpBuf;
+@@ -192,7 +192,7 @@
+ 			while( ogg_stream_pageout( &os, &og ) ) {
+ 				delete [] bufEncode;
+ 				bufEncode = new char[ og.header_len+og.body_len+buflen ];
+-				memcpy( mempcpy( mempcpy( bufEncode, tmpBuf, buflen ), og.header, og.header_len ), og.body, og.body_len );
++				memcpy( (char *)memcpy( (char *)memcpy( bufEncode, tmpBuf, buflen ) + buflen, og.header, og.header_len ) + og.header_len, og.body, og.body_len );
+ 				buflen+= og.header_len;
+ 				buflen+= og.body_len;
+ 				delete [] tmpBuf;
+@@ -220,7 +220,7 @@
+ 			while( ogg_stream_pageout( &os, &og ) ) {
+ 				delete [] bufEncode;
+ 				bufEncode = new char[ og.header_len+og.body_len+buflen ];
+-				memcpy( mempcpy( mempcpy( bufEncode, tmpBuf, buflen ), og.header, og.header_len ), og.body, og.body_len );
++				memcpy( (char *)memcpy( (char *)memcpy( bufEncode, tmpBuf, buflen ) + buflen, og.header, og.header_len ) + og.header_len, og.body, og.body_len );
+ 				buflen+= og.header_len;
+ 				buflen+= og.body_len;
+ 				delete [] tmpBuf;
diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist
index a98c04b05..55474f363 100644
--- a/multimedia/kaffeine/pkg-plist
+++ b/multimedia/kaffeine/pkg-plist
@@ -2,25 +2,42 @@ bin/kaffeine
 include/kaffeine_export.h
 include/kaffeine/kaffeine_part.h
 include/kaffeine/kaffeine_part_iface.h
+include/kaffeine/kaffeineaudioencoder.h
 include/kaffeine/kmediapart.h
 include/kaffeine/mrl.h
 include/kaffeine/playlistimport.h
-lib/kde3/libgstreamerpart.so
-lib/kde3/libgstreamerpart.la
+%%NOGSTREAMER%%lib/kde3/libgstreamerpart.a
+%%NOGSTREAMER%%lib/kde3/libgstreamerpart.so
+%%NOGSTREAMER%%lib/kde3/libgstreamerpart.la
+lib/kde3/libkaffeinemp3lame.a
+lib/kde3/libkaffeinemp3lame.la
+lib/kde3/libkaffeinemp3lame.so
+lib/kde3/libkaffeineoggvorbis.a
+lib/kde3/libkaffeineoggvorbis.la
+lib/kde3/libkaffeineoggvorbis.so
+lib/kde3/libkaffeinepart.a
 lib/kde3/libkaffeinepart.la
 lib/kde3/libkaffeinepart.so
+lib/libkaffeineaudioencoder.a
+lib/libkaffeineaudioencoder.la
+lib/libkaffeineaudioencoder.so.0
+lib/libkmediapart.a
 lib/libkmediapart.la
 lib/libkmediapart.so
 lib/libkmediapart.so.0
 share/applications/kde/kaffeine.desktop
-share/apps/gstreamerpart/gstreamer_part.rc
+%%NOGSTREAMER%%share/apps/gstreamerpart/gstreamer_part.rc
 share/apps/kaffeine/kaffeine_part.rc
+share/apps/kaffeine/kaffeinedisc.rc
+share/apps/kaffeine/kaffeineplaylist.rc
 share/apps/kaffeine/kaffeineui.rc
+share/apps/kaffeine/nocover
 share/apps/kaffeine/logo
 share/apps/kaffeine/logo.mpg
 share/apps/kaffeine/mms.protocol
 share/apps/kaffeine/rtsp.protocol
 share/apps/kaffeine/dvbdata.tar.gz
+share/apps/kaffeine/pics/playing.png
 share/apps/konqueror/servicemenus/kaffeine_open_directory.desktop
 share/apps/konqueror/servicemenus/kaffeine_append_file.desktop
 share/apps/konqueror/servicemenus/kaffeine_play_audiocd.desktop
@@ -33,6 +50,7 @@ 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/discwindow.png
 share/doc/HTML/en/kaffeine/dvbbroadcast.png
 share/doc/HTML/en/kaffeine/dvbclient.png
 share/doc/HTML/en/kaffeine/dvbwin.png
@@ -43,12 +61,13 @@ share/doc/HTML/en/kaffeine/dvbconfig.png
 share/doc/HTML/en/kaffeine/dvbtimers.png
 share/doc/HTML/en/kaffeine/gstpart.png
 share/icons/hicolor/128x128/apps/kaffeine.png
-share/icons/hicolor/16x16/apps/gstreamer.png
+%%NOGSTREAMER%%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/apps/kilogram.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
@@ -61,40 +80,54 @@ share/icons/hicolor/32x32/apps/kaffeine-pause.png
 share/icons/hicolor/32x32/apps/kaffeine-play.png
 share/icons/hicolor/32x32/apps/kaffeine-record.png
 share/icons/hicolor/32x32/apps/kaffeine.png
+share/icons/hicolor/32x32/apps/kilogram.png
 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/bg/LC_MESSAGES/kaffeine.mo
+share/locale/bn/LC_MESSAGES/kaffeine.mo
+share/locale/br/LC_MESSAGES/kaffeine.mo
 share/locale/ca/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/es/LC_MESSAGES/kaffeine.mo
 share/locale/fi/LC_MESSAGES/kaffeine.mo
 share/locale/fr/LC_MESSAGES/kaffeine.mo
+share/locale/ga/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/lt/LC_MESSAGES/kaffeine.mo
 share/locale/mk/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
+share/locale/pa/LC_MESSAGES/kaffeine.mo
 share/locale/pl/LC_MESSAGES/kaffeine.mo
-share/locale/pt_PT/LC_MESSAGES/kaffeine.mo
+share/locale/pt/LC_MESSAGES/kaffeine.mo
 share/locale/pt_BR/LC_MESSAGES/kaffeine.mo
 share/locale/ru/LC_MESSAGES/kaffeine.mo
+share/locale/sr/LC_MESSAGES/kaffeine.mo
+share/locale/sr@Latn/LC_MESSAGES/kaffeine.mo
 share/locale/sv/LC_MESSAGES/kaffeine.mo
 share/locale/tr/LC_MESSAGES/kaffeine.mo
+share/locale/uk/LC_MESSAGES/kaffeine.mo
+share/locale/uz/LC_MESSAGES/kaffeine.mo
 share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
 share/mimelnk/application/x-kaffeine.desktop
 share/mimelnk/application/x-mplayer2.desktop
-share/services/gstreamer_part.desktop
+%%NOGSTREAMER%%share/services/gstreamer_part.desktop
 share/services/kaffeine_part.desktop
+share/services/kaffeinemp3lame.desktop
+share/services/kaffeineoggvorbis.desktop
+share/servicetypes/kaffeineaudioencoder.desktop
 @dirrm include/kaffeine
+@dirrm share/apps/kaffeine/pics
 @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
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror