Add missing file "_scproxy.so" to Mac OS X specific package list and

bump pack revision.

While here remove two Mac OS X patches which are no longer necessary.

5 files changed, 5 insertions, 45 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 8e6bf71d290..c70f8bb6f73 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/10/21 06:36:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/10/21 08:24:11 tron Exp $
 
 DISTNAME=	Python-2.6.3
 PKGNAME=	${DISTNAME:S/Python/python26/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang python
 MASTER_SITES=	http://www.python.org/ftp/python/2.6.3/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/python26/PLIST.Darwin b/lang/python26/PLIST.Darwin
index 0453c27321e..918109041b8 100644
--- a/lang/python26/PLIST.Darwin
+++ b/lang/python26/PLIST.Darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.4 2009/09/21 13:06:43 tron Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.5 2009/10/21 08:24:11 tron Exp $
 lib/libpython${PY_VER_SUFFIX}.dylib
 lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so
@@ -30,6 +30,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_Qd.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qdoffs.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Res.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_scproxy.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Scrap.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Snd.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_TE.so
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index e0b34c294bf..dded45f3022 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/10/21 06:36:04 wiz Exp $
+$NetBSD: distinfo,v 1.12 2009/10/21 08:24:11 tron Exp $
 
 SHA1 (Python-2.6.3.tar.bz2) = 8e598f7f9299da96899bd8c0afd0d1313221f00f
 RMD160 (Python-2.6.3.tar.bz2) = 8af600f29c06d0a1bd7e5476750cdd7fac5d7529
@@ -7,9 +7,7 @@ SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
 SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
 SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5
 SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
-SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
 SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
-SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
 SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
 SHA1 (patch-am) = 5a7706aa04b71b24d1400e96f2973699e5c4d147
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
diff --git a/lang/python26/patches/patch-ag b/lang/python26/patches/patch-ag
deleted file mode 100644
index dc9bb6a0fe3..00000000000
--- a/lang/python26/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
-
---- Misc/setuid-prog.c.orig	1998-09-10 16:18:09.000000000 -0400
-+++ Misc/setuid-prog.c
-@@ -70,6 +70,12 @@
- #define environ _environ
- #endif
- 
-+#if defined(__APPLE__)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif /* __APPLE__ */
-+
- /* don't change def_IFS */
- char def_IFS[] = "IFS= \t\n";
- /* you may want to change def_PATH, but you should really change it in */
diff --git a/lang/python26/patches/patch-ak b/lang/python26/patches/patch-ak
deleted file mode 100644
index 9bc0a138c00..00000000000
--- a/lang/python26/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
-
---- Modules/posixmodule.c.orig	2007-04-04 14:30:56.000000000 -0400
-+++ Modules/posixmodule.c
-@@ -339,7 +339,7 @@ extern int lstat(const char *, struct st
- #endif
- 
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -357,7 +357,7 @@ convertenviron(void)
- 	d = PyDict_New();
- 	if (d == NULL)
- 		return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- 	if (environ == NULL)
- 		environ = *_NSGetEnviron();
- #endif