From 69770758ef1a1350783b039925d6454346441e64 Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Fri, 4 Jan 2008 14:52:31 +0000
Subject: [PATCH] disable broken pasf support (audio) until there is a better
 fix because it utterly breaks the build in most of the cases and bump PKGNAME

---
 editors/openoffice/Makefile              | 7 +++----
 editors/openoffice/pkg/PFRAG.shared-main | 3 +--
 editors/openoffice/pkg/PLIST-main        | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 875011e5eed..7f57f16c723 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2007/12/07 11:30:55 robert Exp $
+# $OpenBSD: Makefile,v 1.68 2008/01/04 14:52:31 robert Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -10,7 +10,7 @@ VERSION=	2.3.1
 DISTNAME=	OOo_${VERSION}
 WRKDIST=	${WRKDIR}/OOG680_m9
 PKGNAME=	openoffice-${VERSION}
-PKGNAME-main=	openoffice-${VERSION}
+PKGNAME-main=	openoffice-${VERSION}p0
 PKGNAME-kde=	openoffice-kde-${VERSION}
 PKGNAME-java=	openoffice-java-${VERSION}
 CATEGORIES=	editors productivity
@@ -88,7 +88,6 @@ LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.
 		db.>=4:db-4.*:databases/db/v4 \
 		curl.>=7::net/curl \
 		neon.>=24::net/neon \
-		sndfile.>=1::audio/libsndfile \
 		wpd.>=8::textproc/libwpd
 WANTLIB-main=	ICE SM X11 Xau Xdmcp Xext Xrender Xcursor Xfixes Xi Xinerama \
 		Xrandr atk-1.0 c cairo expat \
@@ -135,6 +134,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 CONFIGURE_ARGS=	--disable-gnome-vfs \
 		--disable-mozilla \
 		--disable-odk \
+		--disable-pasf \
 		--enable-cairo \
 		--enable-kde \
 		--with-system-jpeg \
@@ -147,7 +147,6 @@ CONFIGURE_ARGS=	--disable-gnome-vfs \
 		--with-system-expat \
 		--with-system-neon \
 		--with-system-db \
-		--with-system-sndfile \
 		--with-system-boost \
 		--with-system-libwpd \
 		--with-epm=internal \
diff --git a/editors/openoffice/pkg/PFRAG.shared-main b/editors/openoffice/pkg/PFRAG.shared-main
index 57722ff4359..11de3dc8bfc 100644
--- a/editors/openoffice/pkg/PFRAG.shared-main
+++ b/editors/openoffice/pkg/PFRAG.shared-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.4 2007/11/13 09:46:28 robert Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.5 2008/01/04 14:52:31 robert Exp $
 openoffice/program/acceptor.uno.so
 openoffice/program/basprov680.uno.so
 openoffice/program/behelper.uno.so
@@ -148,7 +148,6 @@ openoffice/program/libpackage2.so
 openoffice/program/libpcr680.so
 openoffice/program/libpdffilter680.so
 openoffice/program/libplaceware.so
-openoffice/program/libportaudio.so
 openoffice/program/libpreload680.so
 openoffice/program/libprotocolhandler680.so
 openoffice/program/libpsp680.so
diff --git a/editors/openoffice/pkg/PLIST-main b/editors/openoffice/pkg/PLIST-main
index 4dcdcf25bc6..9316086bb26 100644
--- a/editors/openoffice/pkg/PLIST-main
+++ b/editors/openoffice/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2007/12/07 11:30:55 robert Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2008/01/04 14:52:31 robert Exp $
 @pkgpath editors/openoffice
 %%SHARED%%
 bin/sbase
@@ -222,8 +222,6 @@ openoffice/program/libicule.so.36
 openoffice/program/libicuuc.so.36
 openoffice/program/libjvmaccessgcc3.so.3
 openoffice/program/libjvmfwk.so.3
-openoffice/program/libportaudio.so.0
-openoffice/program/libportaudio.so.0.0.18
 openoffice/program/libreg.so.3
 openoffice/program/librmcxt.so.3
 openoffice/program/libsal.so.3