Update to 0.8.5

5 files changed, 34 insertions, 21 deletions

diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index fd6f3fd14236..747bdd1fa356 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kaffeine
-PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
@@ -57,8 +56,7 @@ post-patch:
 		${WRKSRC}/kaffeine/src/input/disc/paranoia.cpp
 	${MKDIR} ${WRKSRC}/linux/dvb
 	cd ${FILESDIR}; ${CP} ${DVB_HEADERS} ${WRKSRC}/linux/dvb
-
-post-install:
-	${RM} ${PREFIX}/share/doc/HTML/en/doc/CMakeLists.txt
+	${REINPLACE_CMD} -e "s,^LIBTOOL=,#LIBTOOL=," ${WRKSRC}/configure
+	${TOUCH} -t 200401230000 ${WRKSRC}/admin/acinclude.m4.in
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo
index b9ab01a32ab7..faded2678a55 100644
--- a/multimedia/kaffeine/distinfo
+++ b/multimedia/kaffeine/distinfo
@@ -1,3 +1,3 @@
-MD5 (kaffeine-0.8.4.tar.bz2) = 6f62ebb7a6f88ff49f452856a1660d95
-SHA256 (kaffeine-0.8.4.tar.bz2) = a15ad9f6b154ef1c83f3d0e818f94efd7ba6c2ae4e6affcc9d28afacb701df74
-SIZE (kaffeine-0.8.4.tar.bz2) = 2903979
+MD5 (kaffeine-0.8.5.tar.bz2) = 71814e7612f1f7e1b6cd954d352e4201
+SHA256 (kaffeine-0.8.5.tar.bz2) = 653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97
+SIZE (kaffeine-0.8.5.tar.bz2) = 2887566
diff --git a/multimedia/kaffeine/files/patch-dvbsection.cpp b/multimedia/kaffeine/files/patch-dvbsection.cpp
new file mode 100644
index 000000000000..9a9ae7f1e413
--- /dev/null
+++ b/multimedia/kaffeine/files/patch-dvbsection.cpp
@@ -0,0 +1,22 @@
+--- kaffeine/src/input/dvb/dvbsection.cpp.orig	2007-07-28 18:45:37.000000000 +0200
++++ kaffeine/src/input/dvb/dvbsection.cpp	2007-07-29 15:30:30.000000000 +0200
+@@ -157,7 +157,8 @@
+ 	int i;
+ 	char buffer[1000];
+ 	size_t inSize, outSize=sizeof(buffer);
+-	char *inBuf, *outBuf;
++	const char *inBuf;
++	char *outBuf;
+ 	iconv_t cd;
+ 	QCString table=defaultCharset;
+ 
+@@ -232,7 +233,8 @@
+ 	char c[4];
+ 	QString s;
+ 
+-	memset( mempcpy( c, buf+2, 3 ), 0, 1 );
++	memcpy(c,buf+2,3);
++	c[3] = 0;
+ 	s = c;
+ 	return s;
+ }
diff --git a/multimedia/kaffeine/files/patch-raaf-dvb b/multimedia/kaffeine/files/patch-raaf-dvb
index 85c9a8904838..96096ef34b9d 100644
--- a/multimedia/kaffeine/files/patch-raaf-dvb
+++ b/multimedia/kaffeine/files/patch-raaf-dvb
@@ -1,15 +1,3 @@
---- kaffeine/src/input/dvb/dvbsection.cpp.orig	Fri Dec 29 08:33:41 2006
-+++ kaffeine/src/input/dvb/dvbsection.cpp	Fri Dec 29 08:34:31 2006
-@@ -482,7 +482,8 @@
- 	char c[4];
- 	QString s;
- 
--	memset( mempcpy( c, buf+2, 3 ), 0, 1 );
-+	memcpy(c,buf+2,3);
-+	c[3] = 0;
- 	s = c;
- 	return s;
- }
 --- kaffeine/src/input/dvb/dvbstream.cpp.orig	Fri Dec 29 08:36:14 2006
 +++ kaffeine/src/input/dvb/dvbstream.cpp	Fri Dec 29 08:36:51 2006
 @@ -24,14 +24,13 @@
diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist
index fcbd026ef413..af228a5d608a 100644
--- a/multimedia/kaffeine/pkg-plist
+++ b/multimedia/kaffeine/pkg-plist
@@ -130,6 +130,8 @@ 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/locale/se/LC_MESSAGES/kaffeine.mo
+share/locale/tg/LC_MESSAGES/kaffeine.mo
 share/mimelnk/application/x-kaffeine.desktop
 %%NOGSTREAMER%%share/services/gstreamer_part.desktop
 %%NOLAME%%share/services/kaffeinemp3lame.desktop
@@ -141,9 +143,12 @@ share/servicetypes/kaffeinedvbplugin.desktop
 @dirrm share/apps/kaffeine/pics
 @dirrm share/apps/kaffeine
 @dirrm share/doc/HTML/en/kaffeine
-@dirrm share/doc/HTML/en/doc
 @dirrmtry share/apps/konqueror/servicemenus
 @dirrmtry share/apps/konqueror
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
+@dirrmtry share/locale/tg/LC_MESSAGES
+@dirrmtry share/locale/tg
+@dirrmtry share/locale/se/LC_MESSAGES
+@dirrmtry share/locale/se
 %%NOGSTREAMER%%@dirrm share/apps/gstreamerpart