unbreak python build on 4.0, bump PKGNAMEs.

"fine" sturm@, "ok if it works" alek@
This commit is contained in:
steven 2006-07-28 22:36:41 +00:00
parent e84cb5a44a
commit b152800ccb
7 changed files with 22 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2005/12/27 19:41:21 alek Exp $
# $OpenBSD: Makefile,v 1.20 2006/07/28 22:36:41 steven 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= .5
PKG_PATCHLEVEL= p3
PKG_PATCHLEVEL= p4
SHARED_LIBS= python2.3 0.0
# needed for www/zope

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.8 2006/01/22 11:33:32 alek Exp $
$OpenBSD: patch-configure_in,v 1.9 2006/07/28 22:36:41 steven Exp $
--- configure.in.orig Fri May 7 21:13:47 2004
+++ configure.in Wed Aug 11 09:55:49 2004
@@ -136,7 +136,7 @@ case $ac_sys_system/$ac_sys_release in
@ -6,7 +6,7 @@ $OpenBSD: patch-configure_in,v 1.8 2006/01/22 11:33:32 alek Exp $
# even though select is a POSIX function. Reported by J. Ribbens.
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
- OpenBSD/2.* | OpenBSD/3.@<:@01234@:>@)
+ OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@)
+ OpenBSD*)
define_xopen_source=no;;
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/18 10:11:57 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2006/07/28 22:36:41 steven Exp $
@option no-default-conflict
@conflict python->=2.3,<2.4
%%tkinter%%
@ -1159,11 +1159,11 @@ lib/python2.3/pipes.pyo
lib/python2.3/pkgutil.py
lib/python2.3/pkgutil.pyc
lib/python2.3/pkgutil.pyo
lib/python2.3/plat-openbsd3/
lib/python2.3/plat-openbsd3/IN.py
lib/python2.3/plat-openbsd3/IN.pyc
lib/python2.3/plat-openbsd3/IN.pyo
lib/python2.3/plat-openbsd3/regen
lib/python2.3/plat-openbsd4/
lib/python2.3/plat-openbsd4/IN.py
lib/python2.3/plat-openbsd4/IN.pyc
lib/python2.3/plat-openbsd4/IN.pyo
lib/python2.3/plat-openbsd4/regen
lib/python2.3/platform.py
lib/python2.3/platform.pyc
lib/python2.3/platform.pyo

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2006/04/18 17:29:35 alek Exp $
# $OpenBSD: Makefile,v 1.7 2006/07/28 22:36:41 steven Exp $
VERSION= 2.4
PATCHLEVEL= .3
PKG_PATCHLEVEL=
PKG_PATCHLEVEL= p0
SHARED_LIBS= python2.4 0.0
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.4 2006/04/18 17:29:35 alek Exp $
$OpenBSD: patch-configure_in,v 1.5 2006/07/28 22:36:41 steven Exp $
--- configure.in.orig Fri Feb 17 09:39:55 2006
+++ configure.in Mon Apr 17 20:41:15 2006
@@ -140,7 +140,7 @@ case $ac_sys_system/$ac_sys_release in
@ -6,7 +6,7 @@ $OpenBSD: patch-configure_in,v 1.4 2006/04/18 17:29:35 alek Exp $
# even though select is a POSIX function. Reported by J. Ribbens.
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
- OpenBSD/2.* | OpenBSD/3.@<:@012345678@:>@)
+ OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@)
+ OpenBSD*)
define_xopen_source=no;;
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2006/04/18 17:29:35 alek Exp $
@comment $OpenBSD: PLIST,v 1.3 2006/07/28 22:36:41 steven Exp $
@option no-default-conflict
@conflict python->=2.4,<2.5
%%SHARED%%
@ -1243,11 +1243,11 @@ lib/python2.4/pipes.pyo
lib/python2.4/pkgutil.py
lib/python2.4/pkgutil.pyc
lib/python2.4/pkgutil.pyo
lib/python2.4/plat-openbsd3/
lib/python2.4/plat-openbsd3/IN.py
lib/python2.4/plat-openbsd3/IN.pyc
lib/python2.4/plat-openbsd3/IN.pyo
lib/python2.4/plat-openbsd3/regen
lib/python2.4/plat-openbsd4/
lib/python2.4/plat-openbsd4/IN.py
lib/python2.4/plat-openbsd4/IN.pyc
lib/python2.4/plat-openbsd4/IN.pyo
lib/python2.4/plat-openbsd4/regen
lib/python2.4/platform.py
lib/python2.4/platform.pyc
lib/python2.4/platform.pyo

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.35 2005/12/27 19:41:21 alek Exp $
# $OpenBSD: Makefile.inc,v 1.36 2006/07/28 22:36:41 steven 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
@ -205,7 +205,7 @@ FAKE_FLAGS+= LDLIBRARY=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION} \
LD_LIBRARY_PATH=${WRKSRC} RANLIB=:
.endif
ALL_TARGET= all ${WRKSRC}/Lib/plat-openbsd3
ALL_TARGET= all ${WRKSRC}/Lib/plat-openbsd4
post-configure:
@sed -e 's,@NOSHARED@,${NOSHARED},g' \