From 4474ad8f8bdd1e2d3a0f774fe224b0e1ff0dcfad Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Fri, 6 Aug 2004 07:35:11 +0000
Subject: [PATCH] deal with python,-expat on no shared libs archs..

---
 www/zope/Makefile         | 11 +++++++----
 www/zope/pkg/PFRAG.shared | 14 +-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 2e3c9d5b294..068b23b1492 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.18 2004/08/03 10:16:36 xsa Exp $
+# $OpenBSD: Makefile,v 1.19 2004/08/06 07:35:11 xsa Exp $
 
-NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
+SHARED_ONLY=	Yes
 
 COMMENT=	"object-oriented web application server"
 
@@ -26,8 +26,11 @@ PYTHON_VER=	2.3
 PYTHON_BIN=	${LOCALBASE}/bin/python${PYTHON_VER}
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	::lang/python/${PYTHON_VER} \
-		::lang/python/${PYTHON_VER},-expat
+RUN_DEPENDS=	::lang/python/${PYTHON_VER}
+
+.if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
+RUN_DEPENDS+=	::lang/python/${PYTHON_VER},-expat
+.endif
 
 CONFIGURE_STYLE=simple
 CONFIGURE_ARGS=	--with-python=${LOCALBASE}/bin/python${PYTHON_VER} \
diff --git a/www/zope/pkg/PFRAG.shared b/www/zope/pkg/PFRAG.shared
index 7c9078bd9b1..010f67fbbf0 100644
--- a/www/zope/pkg/PFRAG.shared
+++ b/www/zope/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2004/08/03 10:16:37 xsa Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/06 07:35:11 xsa Exp $
 lib/zope/lib/python/AccessControl/cAccessControl.so
 lib/zope/lib/python/Acquisition.so
 lib/zope/lib/python/BDBStorage/_helper.so
@@ -33,15 +33,3 @@ lib/zope/lib/python/ZODB/coptimizations.so
 lib/zope/lib/python/ZODB/winlock.so
 lib/zope/lib/python/initgroups.so
 lib/zope/lib/python/intSet.so
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/AccessControl)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/BDBStorage)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/BTrees)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/DocumentTemplate)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/ZCTextIndex)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/SearchIndex)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Shared/DC/xml/pyexpat)
-@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/ZODB)