From 9af94e6962d8a140557549cdca5bc68dd3228e14 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Fri, 11 Aug 2006 13:28:55 +0000
Subject: [PATCH] resolve conflict with kdelibs package

ok espie@
---
 multimedia/kaffeine/Makefile  | 4 ++--
 multimedia/kaffeine/pkg/PLIST | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index e4e7037376f..e07fe3dc864 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2006/08/03 23:15:57 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2006/08/11 13:28:55 steven Exp $
 
 CATEGORIES=	multimedia x11 x11/kde
 COMMENT=	'video player for kde'
@@ -6,7 +6,7 @@ COMMENT=	'video player for kde'
 HOMEPAGE=	http://kaffeine.sourceforge.net/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}
 DISTNAME=	kaffeine-0.8.1
-PKGNAME=	${DISTNAME}
+PKGNAME=	${DISTNAME}p0
 EXTRACT_SUFX=	.tar.bz2
 
 		
diff --git a/multimedia/kaffeine/pkg/PLIST b/multimedia/kaffeine/pkg/PLIST
index b4ae1ba6094..87350579fbb 100644
--- a/multimedia/kaffeine/pkg/PLIST
+++ b/multimedia/kaffeine/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/11 10:32:57 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/08/11 13:28:55 steven Exp $
 bin/kaffeine
 include/kaffeine/
 include/kaffeine/kaffeine_part.h
@@ -122,7 +122,7 @@ share/locale/xx/LC_MESSAGES/
 share/locale/xx/LC_MESSAGES/kaffeine.mo
 share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
 share/mimelnk/application/x-kaffeine.desktop
-share/mimelnk/application/x-mplayer2.desktop
+@comment share/mimelnk/application/x-mplayer2.desktop
 share/services/kaffeine_part.desktop
 share/services/kaffeineoggvorbis.desktop
 share/servicetypes/kaffeineaudioencoder.desktop