Update to 0.8.2

Make lame plugin optional.

3 files changed, 40 insertions, 26 deletions

diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 81057e8d6ac7..224cc802d23b 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kaffeine
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
@@ -14,14 +14,16 @@ MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A xine-base multimedia player
 
 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
 USE_GETTEXT=		yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
+USE_AUTOTOOLS=		libtool:15
+CONFIGURE_ENV=		CXXFLAGS="${CFLAGS}"
+CONFIGURE_TARGET=
 
 .ifndef (WITHOUT_GSTREAMER)
 USE_GSTREAMER80=	yes
@@ -29,10 +31,13 @@ PLIST_SUB+=		NOGSTREAMER=""
 .else
 PLIST_SUB+=		NOGSTREAMER="@comment "
 .endif
-
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
-CONFIGURE_TARGET=
+.ifdef (WITH_LAME)
+LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+PLIST_SUB+=	NOLAME=""
+.else
+CONFIGURE_ARGS+=	--without-lame
+PLIST_SUB+=	NOLAME="@comment "
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -46,5 +51,7 @@ CONFIGURE_ARGS+=	--without-gstreamer
 
 post-patch:
 	${REINPLACE_CMD} -e "s,xx,," ${WRKSRC}/po/Makefile.in
+	${REINPLACE_CMD} "s,#include <endian.h>,," \
+		${WRKSRC}/kaffeine/src/input/disc/paranoia.cpp
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo
index d67e8c652812..8324fb6193c2 100644
--- a/multimedia/kaffeine/distinfo
+++ b/multimedia/kaffeine/distinfo
@@ -1,3 +1,3 @@
-MD5 (kaffeine-0.8.1.tar.bz2) = 3abba4ff76ffdd109e1f1cfe286e5b5b
-SHA256 (kaffeine-0.8.1.tar.bz2) = eda787214563cee684aa868cb82ef198144fe247a3ffd9032d7ae312e2d9bcd2
-SIZE (kaffeine-0.8.1.tar.bz2) = 2703094
+MD5 (kaffeine-0.8.2.tar.bz2) = bfb57b62fa72267cc5b01ce9b037cb41
+SHA256 (kaffeine-0.8.2.tar.bz2) = aac31487f9bab519ff8cfb113aec895ccefcd4baac357599460c59b42d901200
+SIZE (kaffeine-0.8.2.tar.bz2) = 2880225
diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist
index ebf4cba77f24..62e0d8b2fd52 100644
--- a/multimedia/kaffeine/pkg-plist
+++ b/multimedia/kaffeine/pkg-plist
@@ -1,34 +1,33 @@
 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
+include/kaffeine/kaffeinepart.h
+include/kaffeine/xine_part.h
+include/kaffeine/xine_part_iface.h
 %%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
+%%NOLAME%%lib/kde3/libkaffeinemp3lame.a
+%%NOLAME%%lib/kde3/libkaffeinemp3lame.la
+%%NOLAME%%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
 lib/libkaffeineaudioencoder.so.0
-lib/libkmediapart.a
-lib/libkmediapart.la
-lib/libkmediapart.so
-lib/libkmediapart.so.0
+lib/libkaffeinepart.so.0
+lib/libkaffeinepart.so
+lib/libkaffeinepart.la
+lib/libkaffeinepart.a
+lib/kde3/libxinepart.so
+lib/kde3/libxinepart.la
+lib/kde3/libxinepart.a
 share/applications/kde/kaffeine.desktop
 %%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
@@ -38,6 +37,7 @@ share/apps/kaffeine/logo.mpg
 share/apps/kaffeine/mms.protocol
 share/apps/kaffeine/rtsp.protocol
 share/apps/kaffeine/dvbdata.tar.gz
+share/apps/kaffeine/xine_part.rc
 share/apps/kaffeine/pics/playing.png
 share/apps/konqueror/servicemenus/kaffeine_open_directory.desktop
 share/apps/konqueror/servicemenus/kaffeine_append_file.desktop
@@ -73,6 +73,7 @@ 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/apps/kilogram.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
@@ -120,12 +121,17 @@ 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/locale/et/LC_MESSAGES/kaffeine.mo
+share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
+share/locale/ar/LC_MESSAGES/kaffeine.mo
+share/locale/ka/LC_MESSAGES/kaffeine.mo
+share/locale/km/LC_MESSAGES/kaffeine.mo
 share/mimelnk/application/x-kaffeine.desktop
 share/mimelnk/application/x-mplayer2.desktop
 %%NOGSTREAMER%%share/services/gstreamer_part.desktop
-share/services/kaffeine_part.desktop
-share/services/kaffeinemp3lame.desktop
+%%NOLAME%%share/services/kaffeinemp3lame.desktop
 share/services/kaffeineoggvorbis.desktop
+share/services/xine_part.desktop
 share/servicetypes/kaffeineaudioencoder.desktop
 @dirrm include/kaffeine
 @dirrm share/apps/kaffeine/pics
@@ -133,3 +139,4 @@ share/servicetypes/kaffeineaudioencoder.desktop
 @dirrm share/doc/HTML/en/kaffeine
 @dirrmtry share/apps/konqueror/servicemenus
 @dirrmtry share/apps/konqueror
+%%NOGSTREAMER%%@dirrm share/apps/gstreamerpart