diff options
| -rw-r--r-- | lang/python25/Makefile | 11 | ||||
| -rw-r--r-- | lang/python25/distinfo | 3 | ||||
| -rw-r--r-- | lang/python25/patches/patch-ae | 43 |
3 files changed, 51 insertions, 6 deletions
diff --git a/lang/python25/Makefile b/lang/python25/Makefile index e5517020bda..560b0746e51 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ +# $NetBSD: Makefile,v 1.2 2008/04/24 04:42:00 bjs Exp $ DISTNAME= Python-2.5.2 PKGNAME= python25-2.5.2 +PKGREVISION= 1 CATEGORIES= lang python MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \ http://www.python.org/ftp/python/2.5.2/ @@ -39,11 +40,11 @@ LIBS.SunOS+= -lrt PY_VER_SUFFIX= 2.5 -PLIST_SRC= ${.CURDIR}/../../wip/python25/PLIST.common -.if exists(${.CURDIR}/../../wip/python25/PLIST.${OPSYS}) -PLIST_SRC+= ${.CURDIR}/../../wip/python25/PLIST.${OPSYS} +PLIST_SRC= ${.CURDIR}/../../lang/python25/PLIST.common +.if exists(${.CURDIR}/../../lang/python25/PLIST.${OPSYS}) +PLIST_SRC+= ${.CURDIR}/../../lang/python25/PLIST.${OPSYS} .endif -PLIST_SRC+= ${.CURDIR}/../../wip/python25/PLIST.common_end +PLIST_SRC+= ${.CURDIR}/../../lang/python25/PLIST.common_end .if ${OPSYS} == "NetBSD" PRIVILEGED_STAGES+= clean diff --git a/lang/python25/distinfo b/lang/python25/distinfo index 24366b5165b..60164e8caf3 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $ +$NetBSD: distinfo,v 1.2 2008/04/24 04:42:00 bjs Exp $ SHA1 (Python-2.5.2.tar.bz2) = 4755d212f50af704c20224a6966e23acc5aea60f RMD160 (Python-2.5.2.tar.bz2) = b23b02739833e6730799c5866e2b77aae884b63f @@ -7,6 +7,7 @@ SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 SHA1 (patch-ab) = c573f73a2509a63fc269302015a7ff6eaa8fe6ff SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f SHA1 (patch-ad) = b98c5bad13fc1ce5c1cc01fcfa8f3205fa76f2ce +SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1 diff --git a/lang/python25/patches/patch-ae b/lang/python25/patches/patch-ae new file mode 100644 index 00000000000..e2f60bf95c7 --- /dev/null +++ b/lang/python25/patches/patch-ae @@ -0,0 +1,43 @@ +$NetBSD: patch-ae,v 1.1 2008/04/24 04:42:00 bjs Exp $ + +XXXbjs: I use amd64, and audioop is broken on 64-bit platforms. +Thus, this needs to be tested. + +--- Modules/sunaudiodev.c.orig 2006-01-19 01:09:39.000000000 -0500 ++++ Modules/sunaudiodev.c +@@ -224,7 +224,11 @@ sad_ibufcount(sadobject *self) + { + audio_info_t ai; + ++#if defined(__NetBSD__) && defined(AUDIO_GETBUFINFO) ++ if (ioctl(self->x_fd, AUDIO_GETBUFINFO, &ai) < 0) { ++#else + if (ioctl(self->x_fd, AUDIO_GETINFO, &ai) < 0) { ++#endif + PyErr_SetFromErrno(SunAudioError); + return NULL; + } +@@ -236,7 +240,11 @@ sad_obufcount(sadobject *self) + { + audio_info_t ai; + ++#if defined(__NetBSD__) && defined(AUDIO_GETBUFINFO) ++ if (ioctl(self->x_fd, AUDIO_GETBUFINFO, &ai) < 0) { ++#else + if (ioctl(self->x_fd, AUDIO_GETINFO, &ai) < 0) { ++#endif + PyErr_SetFromErrno(SunAudioError); + return NULL; + } +@@ -275,7 +283,11 @@ sad_getdev(sadobject *self) + static PyObject * + sad_flush(sadobject *self) + { ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (ioctl(self->x_fd, AUDIO_FLUSH, NULL) < 0) { ++#else + if (ioctl(self->x_fd, I_FLUSH, FLUSHW) < 0) { ++#endif + PyErr_SetFromErrno(SunAudioError); + return NULL; + } |