cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build after after 4.9->5.0; with help from rpointel@

Browse Source
This commit is contained in:
naddy 2011-07-18 15:32:18 +00:00
parent db1acbc813
commit 97797cc0a0
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/python/2.4/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2011/07/09 09:43:59 jasper Exp $ # $OpenBSD: Makefile,v 1.38 2011/07/18 15:32:18 naddy Exp $
VERSION= 2.4 VERSION= 2.4
PATCHLEVEL= .6 PATCHLEVEL= .6
REVISION= 9 REVISION= 10
SHARED_LIBS= python2.4 1.0 SHARED_LIBS= python2.4 1.0
ALL_TARGET?= all ${WRKSRC}/Lib/plat-openbsd4 ALL_TARGET?= all ${WRKSRC}/Lib/plat-openbsd5
AUTOCONF_VERSION = 2.59 AUTOCONF_VERSION = 2.59
.include <bsd.port.mk> .include <bsd.port.mk>

8
lang/python/2.4/patches/patch-setup_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.5 2010/11/15 20:55:24 sthen Exp $ $OpenBSD: patch-setup_py,v 1.6 2011/07/18 15:32:18 naddy Exp $
--- setup.py.orig Mon Oct 9 03:41:25 2006 --- setup.py.orig Sun Oct 8 11:41:25 2006
+++ setup.py Fri Dec 26 13:14:40 2008 +++ setup.py Mon Jul 18 08:25:57 2011
@@ -17,6 +17,11 @@ from distutils.command.install_lib import install_lib @@ -17,6 +17,11 @@ from distutils.command.install_lib import install_lib
# This global variable is used to hold the list of modules to be disabled. # This global variable is used to hold the list of modules to be disabled.
disabled_module_list = [] disabled_module_list = []
@ -105,7 +105,7 @@ $OpenBSD: patch-setup_py,v 1.5 2010/11/15 20:55:24 sthen Exp $
if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+ if platform in ('openbsd4'): + if platform.startswith('openbsd'):
+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c'], + exts.append( Extension('ossaudiodev', ['ossaudiodev.c'],
+ libraries=['ossaudio']) ) + libraries=['ossaudio']) )

12
lang/python/2.4/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2010/01/20 08:15:21 espie Exp $ @comment $OpenBSD: PLIST-main,v 1.4 2011/07/18 15:32:18 naddy Exp $
@option no-default-conflict @option no-default-conflict
@conflict python->=2.4,<2.5 @conflict python->=2.4,<2.5
@conflict python-bz2->=2.4,<2.5 @conflict python-bz2->=2.4,<2.5
@ -1310,11 +1310,11 @@ lib/python2.4/pipes.pyo
lib/python2.4/pkgutil.py lib/python2.4/pkgutil.py
lib/python2.4/pkgutil.pyc lib/python2.4/pkgutil.pyc
lib/python2.4/pkgutil.pyo lib/python2.4/pkgutil.pyo
lib/python2.4/plat-openbsd4/ lib/python2.4/plat-openbsd5/
lib/python2.4/plat-openbsd4/IN.py lib/python2.4/plat-openbsd5/IN.py
lib/python2.4/plat-openbsd4/IN.pyc lib/python2.4/plat-openbsd5/IN.pyc
lib/python2.4/plat-openbsd4/IN.pyo lib/python2.4/plat-openbsd5/IN.pyo
lib/python2.4/plat-openbsd4/regen lib/python2.4/plat-openbsd5/regen
lib/python2.4/platform.py lib/python2.4/platform.py
lib/python2.4/platform.pyc lib/python2.4/platform.pyc
lib/python2.4/platform.pyo lib/python2.4/platform.pyo

4
lang/python/2.5/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.49 2011/07/07 20:55:05 sthen Exp $ # $OpenBSD: Makefile,v 1.50 2011/07/18 15:32:18 naddy Exp $
VERSION= 2.5 VERSION= 2.5
PATCHLEVEL= .4 PATCHLEVEL= .4
REVISION= 12 REVISION= 13
SHARED_LIBS= python2.5 1.0 SHARED_LIBS= python2.5 1.0
AUTOCONF_VERSION= 2.61 AUTOCONF_VERSION= 2.61

8
lang/python/2.5/patches/patch-setup_py
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.6 2010/11/15 20:55:25 sthen Exp $ $OpenBSD: patch-setup_py,v 1.7 2011/07/18 15:32:18 naddy Exp $
--- setup.py.orig Fri Oct 17 04:58:19 2008 --- setup.py.orig Thu Oct 16 12:58:19 2008
+++ setup.py Fri Dec 26 12:42:10 2008 +++ setup.py Mon Jul 18 08:20:35 2011
@@ -17,6 +17,11 @@ from distutils.command.install_lib import install_lib @@ -17,6 +17,11 @@ from distutils.command.install_lib import install_lib
# This global variable is used to hold the list of modules to be disabled. # This global variable is used to hold the list of modules to be disabled.
disabled_module_list = [] disabled_module_list = []
@ -133,7 +133,7 @@ $OpenBSD: patch-setup_py,v 1.6 2010/11/15 20:55:25 sthen Exp $
if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
'freebsd7'): 'freebsd7'):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+ elif platform in ('openbsd4'): + elif platform.startswith('openbsd'):
+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c'], + exts.append( Extension('ossaudiodev', ['ossaudiodev.c'],
+ libraries = ['ossaudio'],) ) + libraries = ['ossaudio'],) )

12
lang/python/2.5/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.10 2010/01/20 08:15:21 espie Exp $ @comment $OpenBSD: PLIST-main,v 1.11 2011/07/18 15:32:18 naddy Exp $
@option no-default-conflict @option no-default-conflict
@conflict python->=2.5,<2.6 @conflict python->=2.5,<2.6
@conflict python-bz2->=2.5,<2.6 @conflict python-bz2->=2.5,<2.6
@ -1331,11 +1331,11 @@ lib/python2.5/pipes.pyo
lib/python2.5/pkgutil.py lib/python2.5/pkgutil.py
lib/python2.5/pkgutil.pyc lib/python2.5/pkgutil.pyc
lib/python2.5/pkgutil.pyo lib/python2.5/pkgutil.pyo
lib/python2.5/plat-openbsd4/ lib/python2.5/plat-openbsd5/
lib/python2.5/plat-openbsd4/IN.py lib/python2.5/plat-openbsd5/IN.py
lib/python2.5/plat-openbsd4/IN.pyc lib/python2.5/plat-openbsd5/IN.pyc
lib/python2.5/plat-openbsd4/IN.pyo lib/python2.5/plat-openbsd5/IN.pyo
lib/python2.5/plat-openbsd4/regen lib/python2.5/plat-openbsd5/regen
lib/python2.5/platform.py lib/python2.5/platform.py
lib/python2.5/platform.pyc lib/python2.5/platform.pyc
lib/python2.5/platform.pyo lib/python2.5/platform.pyo

4
lang/python/2.7/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2011/07/07 21:32:58 jasper Exp $ # $OpenBSD: Makefile,v 1.11 2011/07/18 15:32:18 naddy Exp $
VERSION = 2.7 VERSION = 2.7
PATCHLEVEL = .1 PATCHLEVEL = .1
REVISION = 8 REVISION = 9
SHARED_LIBS = python2.7 0.0 SHARED_LIBS = python2.7 0.0
AUTOCONF_VERSION = 2.65 AUTOCONF_VERSION = 2.65

12
lang/python/2.7/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2011/05/03 17:18:28 fgsch Exp $ @comment $OpenBSD: PLIST-main,v 1.3 2011/07/18 15:32:18 naddy Exp $
@option no-default-conflict @option no-default-conflict
@conflict python->=2.7,<2.8 @conflict python->=2.7,<2.8
@conflict python-bz2->=2.7,<2.8 @conflict python-bz2->=2.7,<2.8
@ -1811,11 +1811,11 @@ lib/python2.7/pipes.pyo
lib/python2.7/pkgutil.py lib/python2.7/pkgutil.py
lib/python2.7/pkgutil.pyc lib/python2.7/pkgutil.pyc
lib/python2.7/pkgutil.pyo lib/python2.7/pkgutil.pyo
lib/python2.7/plat-openbsd4/ lib/python2.7/plat-openbsd5/
lib/python2.7/plat-openbsd4/IN.py lib/python2.7/plat-openbsd5/IN.py
lib/python2.7/plat-openbsd4/IN.pyc lib/python2.7/plat-openbsd5/IN.pyc
lib/python2.7/plat-openbsd4/IN.pyo lib/python2.7/plat-openbsd5/IN.pyo
lib/python2.7/plat-openbsd4/regen lib/python2.7/plat-openbsd5/regen
lib/python2.7/platform.py lib/python2.7/platform.py
lib/python2.7/platform.pyc lib/python2.7/platform.pyc
lib/python2.7/platform.pyo lib/python2.7/platform.pyo

4
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.80 2011/07/16 20:22:48 sthen Exp $ # $OpenBSD: Makefile.inc,v 1.81 2011/07/18 15:32:18 naddy Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure # IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a # to also update files/CHANGES.OpenBSD for your change. This is a
@ -118,7 +118,7 @@ MAKE_FLAGS+= LD_LIBRARY_PATH=${WRKSRC} PATH="${WRKDIST}:${PORTPATH}"
MAKE_FLAGS+= LDFLAGS='-L${WRKSRC}' MAKE_FLAGS+= LDFLAGS='-L${WRKSRC}'
FAKE_FLAGS+= RANLIB=: FAKE_FLAGS+= RANLIB=:
ALL_TARGET?= everything ./Lib/plat-openbsd4 ALL_TARGET?= everything ./Lib/plat-openbsd5
post-extract: post-extract:
rm -r ${WRKDIST}/Modules/expat rm -r ${WRKDIST}/Modules/expat