From dcf33e4444f94d5cb8ec6df00652d7eb38539ce0 Mon Sep 17 00:00:00 2001
From: kili <kili@openbsd.org>
Date: Sat, 21 Feb 2009 21:48:10 +0000
Subject: [PATCH] Fix pkgpath for the former -jack subpackage and add pkgpaths
 for the other ex-subpackages and conflict markers (thanks to sthen@ for
 explaining the @conflict problem).

ok sthen@, brad (maintainer)
---
 multimedia/xine-lib/Makefile  |  4 ++--
 multimedia/xine-lib/pkg/PLIST | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 45559d49816..c8dc62e9f69 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2009/02/17 19:40:38 kili Exp $
+# $OpenBSD: Makefile,v 1.51 2009/02/21 21:48:10 kili Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	multimedia decoding library
 
 V=		1.1.16.2
 DISTNAME=	xine-lib-${V}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/xine-lib/pkg/PLIST b/multimedia/xine-lib/pkg/PLIST
index 7200486d38e..42e952ad78d 100644
--- a/multimedia/xine-lib/pkg/PLIST
+++ b/multimedia/xine-lib/pkg/PLIST
@@ -1,5 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/02/16 01:24:24 sthen Exp $
-@pkgpath ${BASE_PKGPATH},jack
+@comment $OpenBSD: PLIST,v 1.7 2009/02/21 21:48:10 kili Exp $
+@conflict xine-lib-arts-*
+@conflict xine-lib-esd-*
+@conflict xine-lib-jack-*
+@pkgpath ${BASE_PKGPATH},-arts
+@pkgpath ${BASE_PKGPATH},-esd
+@pkgpath ${BASE_PKGPATH},-jack
+@pkgpath ${BASE_PKGPATH},-main
 %%i386%%
 bin/xine-config
 @bin bin/xine-list-1.1