Add devel/gettext-lib as dependency to avoid problems with the locale module not being built.

- fix suggested by Simon Kuhn in PR 29735

Add a patch from darwinports to workaround for deprecated ostat in sys/stat.h on OS X 10.4.

bump PKGREVISION

3 files changed, 34 insertions, 4 deletions

diff --git a/lang/python24-pth/Makefile b/lang/python24-pth/Makefile
index c3c5dbfdcea..690a2c8db7a 100644
--- a/lang/python24-pth/Makefile
+++ b/lang/python24-pth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/03 19:48:22 recht Exp $
 #
 
-DISTNAME=	Python-2.4
-PKGNAME=	python24-pth-2.4
+DISTNAME=	Python-2.4.1
+PKGNAME=	python24-pth-2.4.1
 CATEGORIES=	lang python
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index dfd3eb9bd03..d1ec9b9db67 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/05/10 22:27:44 abs Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/03 19:48:22 recht Exp $
 #
 
 DISTNAME=	Python-2.4.1
 PKGNAME=	python24-2.4.1
+PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.4.1/
 EXTRACT_SUFX=	.tar.bz2
@@ -115,6 +116,7 @@ post-extract:
 	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
 
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/lang/python24/patches/patch-an b/lang/python24/patches/patch-an
new file mode 100644
index 00000000000..d0e78c02e72
--- /dev/null
+++ b/lang/python24/patches/patch-an
@@ -0,0 +1,28 @@
+$NetBSD: patch-an,v 1.3 2005/07/03 19:48:22 recht Exp $
+
+--- Include/pyport.h.orig	2004-09-23 21:11:21.000000000 +0200
++++ Include/pyport.h	2005-07-03 20:02:08.000000000 +0200
+@@ -152,11 +152,23 @@
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+ #include <sys/types.h>
+ #endif
++
++#if (defined __APPLE__) && (!defined _POSIX_C_SOURCE)
++#define TEMPORARILY_DEFINING__POSIX_C_SOURCE    /* so we can #undef it later */
++#define _POSIX_C_SOURCE   /* avoid deprecated struct ostat in sys/stat.h */
++#endif
++
+ #include <sys/stat.h>
+ #elif defined(HAVE_STAT_H)
+ #include <stat.h>
+ #endif
+ 
++/* Mac OS X: undefine _POSIX_C_SOURCE if it wasn't defined before */
++#ifdef TEMPORARILY_DEFINING__POSIX_C_SOURCE
++#undef _POSIX_C_SOURCE
++#undef TEMPORARILY_DEFINING__POSIX_C_SOURCE
++#endif
++
+ #if defined(PYCC_VACPP)
+ /* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
+ #define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)