From ae1bee24e7f42fc5160e25977b1399328c3a1ce9 Mon Sep 17 00:00:00 2001 From: bernd Date: Sat, 28 Apr 2007 10:06:24 +0000 Subject: [PATCH] Use xenocara expat. --- devel/cmake/Makefile | 7 +++---- lang/python/2.3/Makefile | 4 ++-- lang/python/2.3/patches/patch-setup_py | 15 ++++++++------- lang/python/2.4/Makefile | 4 ++-- lang/python/2.4/patches/patch-setup_py | 13 +++++++------ lang/python/2.5/Makefile | 4 ++-- lang/python/2.5/patches/patch-setup_py | 15 ++++++++------- lang/python/Makefile.inc | 4 ++-- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 1a2788cc6ab..4b2530f6516 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2007/04/25 14:56:13 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2007/04/28 10:10:29 bernd Exp $ HOMEPAGE= http://www.cmake.org/ CATEGORIES= devel COMMENT= portable build system DISTNAME= cmake-2.4.6 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 MASTER_SITES= ${HOMEPAGE}files/v2.4/ MAINTAINER= Marc Espie @@ -25,10 +25,9 @@ CONFIGURE_ARGS= --prefix=${LOCALBASE} --docdir=/share/doc/CMake \ LIB_DEPENDS= curl::net/curl \ - expat::textproc/expat \ xmlrpc,xmlrpc_client,xmlrpc_util,xmlrpc_xmlparse,xmlrpc_xmltok::net/xmlrpc-c -WANTLIB= m curses c stdc++ z crypto pthread ssl +WANTLIB= expat m curses c stdc++ z crypto pthread ssl # Add these if you need to figure out what's going on. #CONFIGURE_ARGS+= --verbose diff --git a/lang/python/2.3/Makefile b/lang/python/2.3/Makefile index 28bf87591b8..eda921051bc 100644 --- a/lang/python/2.3/Makefile +++ b/lang/python/2.3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2007/01/11 13:46:19 steven Exp $ +# $OpenBSD: Makefile,v 1.25 2007/04/28 10:06:24 bernd Exp $ .if ${MACHINE_ARCH} == "hppa" BROKEN= "compiler hangs on py-Checker for example" @@ -6,7 +6,7 @@ BROKEN= "compiler hangs on py-Checker for example" VERSION= 2.3 PATCHLEVEL= .6 -PKG_PATCHLEVEL= p0 +PKG_PATCHLEVEL= p1 SHARED_LIBS= python2.3 0.0 # needed for www/zope diff --git a/lang/python/2.3/patches/patch-setup_py b/lang/python/2.3/patches/patch-setup_py index 0c40e0a6e94..c1d0fb7df39 100644 --- a/lang/python/2.3/patches/patch-setup_py +++ b/lang/python/2.3/patches/patch-setup_py @@ -1,6 +1,6 @@ -$OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:02:06 alek Exp $ ---- setup.py.orig Mon Jan 17 22:07:49 2005 -+++ setup.py Sat Oct 21 15:56:12 2006 +$OpenBSD: patch-setup_py,v 1.3 2007/04/28 10:06:24 bernd Exp $ +--- setup.py.orig Mon Jan 17 22:07:52 2005 ++++ setup.py Tue Apr 24 13:28:41 2007 @@ -476,97 +476,13 @@ class PyBuildExt(build_ext): # NOTE: 3.1 is only partially supported; expect the extended bsddb module # test suite to show failures due to some missing methods and behaviours @@ -122,7 +122,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:02:06 alek Exp $ exts.append( Extension('bz2', ['bz2module.c'], libraries = ['bz2']) ) -@@ -732,31 +648,30 @@ class PyBuildExt(build_ext): +@@ -732,31 +648,31 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -170,7 +170,8 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:02:06 alek Exp $ + define_macros.append((feature_macro, '1')) + exts.append(Extension('pyexpat', + define_macros = define_macros, -+ include_dirs = ["!!LOCALBASE!!/include", expatinc], ++ include_dirs = ["!!X11BASE!!/include", expatinc], ++ library_dirs = ["!!X11BASE!!/lib"], + sources = ['pyexpat.c', + ], + libraries = ["expat"] @@ -178,7 +179,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:02:06 alek Exp $ # Dynamic loading module if sys.maxint == 0x7fffffff: -@@ -879,7 +794,15 @@ class PyBuildExt(build_ext): +@@ -879,7 +795,15 @@ class PyBuildExt(build_ext): self.extensions.extend(exts) # Call the method for detecting whether _tkinter can be compiled @@ -195,7 +196,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:02:06 alek Exp $ def detect_tkinter_darwin(self, inc_dirs, lib_dirs): # The _tkinter module, using frameworks. Since frameworks are quite -@@ -1148,7 +1071,7 @@ def main(): +@@ -1148,7 +1072,7 @@ def main(): ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python/2.4/Makefile b/lang/python/2.4/Makefile index 567f4445748..d298a802d3a 100644 --- a/lang/python/2.4/Makefile +++ b/lang/python/2.4/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2007/01/10 16:57:56 steven Exp $ +# $OpenBSD: Makefile,v 1.12 2007/04/28 10:06:25 bernd Exp $ VERSION= 2.4 PATCHLEVEL= .4 -PKG_PATCHLEVEL= p1 +PKG_PATCHLEVEL= p2 SHARED_LIBS= python2.4 0.0 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64" diff --git a/lang/python/2.4/patches/patch-setup_py b/lang/python/2.4/patches/patch-setup_py index ab1ecf35aaf..e0605105685 100644 --- a/lang/python/2.4/patches/patch-setup_py +++ b/lang/python/2.4/patches/patch-setup_py @@ -1,6 +1,6 @@ -$OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:38:37 alek Exp $ +$OpenBSD: patch-setup_py,v 1.3 2007/04/28 10:06:25 bernd Exp $ --- setup.py.orig Sun Oct 8 19:41:25 2006 -+++ setup.py Sat Oct 21 15:19:51 2006 ++++ setup.py Tue Apr 24 14:01:43 2007 @@ -521,141 +521,13 @@ class PyBuildExt(build_ext): # of available releases can be found at # @@ -166,7 +166,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:38:37 alek Exp $ exts.append( Extension('bz2', ['bz2module.c'], libraries = ['bz2']) ) -@@ -806,19 +678,18 @@ class PyBuildExt(build_ext): +@@ -806,19 +678,19 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -190,7 +190,8 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:38:37 alek Exp $ + ] + exts.append(Extension('pyexpat', + define_macros = define_macros, -+ include_dirs = ["!!LOCALBASE!!/include", expatinc], ++ include_dirs = ["!!X11BASE!!/include", expatinc], ++ library_dirs = ["!!X11BASE!!/lib"], + sources = ['pyexpat.c', + ], + libraries = ["expat"] @@ -198,7 +199,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:38:37 alek Exp $ # Hye-Shik Chang's CJKCodecs modules. if have_unicode: -@@ -954,7 +825,16 @@ class PyBuildExt(build_ext): +@@ -954,7 +826,16 @@ class PyBuildExt(build_ext): self.extensions.extend(exts) # Call the method for detecting whether _tkinter can be compiled @@ -216,7 +217,7 @@ $OpenBSD: patch-setup_py,v 1.2 2006/11/01 20:38:37 alek Exp $ def detect_tkinter_darwin(self, inc_dirs, lib_dirs): # The _tkinter module, using frameworks. Since frameworks are quite -@@ -1224,8 +1104,7 @@ def main(): +@@ -1224,8 +1105,7 @@ def main(): ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python/2.5/Makefile b/lang/python/2.5/Makefile index e549008f907..7ed3a9b9718 100644 --- a/lang/python/2.5/Makefile +++ b/lang/python/2.5/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2007/04/24 23:32:46 djm Exp $ +# $OpenBSD: Makefile,v 1.7 2007/04/28 10:06:25 bernd Exp $ VERSION= 2.5 PATCHLEVEL= .1 -PKG_PATCHLEVEL= +PKG_PATCHLEVEL= p0 SHARED_LIBS= python2.5 0.0 # PSUBDIR= python/${VERSION} diff --git a/lang/python/2.5/patches/patch-setup_py b/lang/python/2.5/patches/patch-setup_py index 06c5cfdefe2..85390a02fb4 100644 --- a/lang/python/2.5/patches/patch-setup_py +++ b/lang/python/2.5/patches/patch-setup_py @@ -1,6 +1,6 @@ -$OpenBSD: patch-setup_py,v 1.2 2007/04/24 23:32:47 djm Exp $ ---- setup.py.orig Wed Feb 14 23:53:41 2007 -+++ setup.py Fri Apr 20 13:31:43 2007 +$OpenBSD: patch-setup_py,v 1.3 2007/04/28 10:06:25 bernd Exp $ +--- setup.py.orig Wed Feb 14 05:53:41 2007 ++++ setup.py Sat Apr 28 03:49:19 2007 @@ -592,209 +592,14 @@ class PyBuildExt(build_ext): exts.append( Extension('_sha512', ['sha512module.c']) ) @@ -263,7 +263,7 @@ $OpenBSD: patch-setup_py,v 1.2 2007/04/24 23:32:47 djm Exp $ exts.append( Extension('gdbm', ['gdbmmodule.c'], libraries = ['gdbm'] ) ) -@@ -970,53 +757,34 @@ class PyBuildExt(build_ext): +@@ -970,53 +757,35 @@ class PyBuildExt(build_ext): libraries = ['z'], extra_link_args = zlib_extra_link_args)) @@ -321,7 +321,8 @@ $OpenBSD: patch-setup_py,v 1.2 2007/04/24 23:32:47 djm Exp $ define_macros = define_macros, - include_dirs = [expatinc], - sources = ['_elementtree.c'], -+ include_dirs = ["!!LOCALBASE!!/include", expatinc], ++ include_dirs = ["!!X11BASE!!/include", expatinc], ++ library_dirs = ["!!X11BASE!!/lib"], + sources = ['pyexpat.c'], + libraries = ['expat'], )) @@ -340,7 +341,7 @@ $OpenBSD: patch-setup_py,v 1.2 2007/04/24 23:32:47 djm Exp $ # Hye-Shik Chang's CJKCodecs modules. if have_unicode: exts.append(Extension('_multibytecodec', -@@ -1132,8 +900,16 @@ class PyBuildExt(build_ext): +@@ -1132,8 +901,16 @@ class PyBuildExt(build_ext): self.extensions.extend(exts) @@ -359,7 +360,7 @@ $OpenBSD: patch-setup_py,v 1.2 2007/04/24 23:32:47 djm Exp $ def detect_tkinter_darwin(self, inc_dirs, lib_dirs): # The _tkinter module, using frameworks. Since frameworks are quite -@@ -1516,8 +1292,7 @@ def main(): +@@ -1516,8 +1293,7 @@ def main(): ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc index d52b996352d..4db1e0a2e75 100644 --- a/lang/python/Makefile.inc +++ b/lang/python/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.45 2007/01/10 16:57:56 steven Exp $ +# $OpenBSD: Makefile.inc,v 1.46 2007/04/28 10:06:24 bernd Exp $ # IMPORTANT! If you make any changes to the Python ports, be sure # to also update files/CHANGES.OpenBSD for your change. This is a @@ -60,7 +60,7 @@ RUN_DEPENDS-idle= ${RUN_DEPENDS} \ LIB_DEPENDS-tkinter= tk84:tk-8.4.*:x11/tk/8.4 WANTLIB-tkinter= tcl84 X11 LIB_DEPENDS-mpz= gmp::devel/gmp -LIB_DEPENDS-expat= expat.>=4.0:expat->=1.95.6:textproc/expat +WANTLIB-expat= expat LIB_DEPENDS-sqlite= sqlite3.>=8.7::databases/sqlite3 SETUP_PY= "s,!!LOCALBASE!!,${LOCALBASE},g" \