- Fix build for NetBSD <= 1.5.

- Include bzip2's buildlink2.mk to work-around different API versions.
- Include db's buildlink2.mk on non-NetBSD platforms to get a similar
  feature-set on a pkgsrc platforms.

3 files changed, 23 insertions, 9 deletions

diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 7e160907957..791d47af4f8 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/08/06 11:51:30 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/08/18 17:16:53 recht Exp $
 #
 
 DISTNAME=	Python-2.3
@@ -29,6 +29,14 @@ post-install:
 	${LN} -s ${PREFIX}/lib/libpython2.3.so.1.0 \
 		${PREFIX}/lib/libpython2.3.so
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "NetBSD"
+.include "../../databases/db/buildlink2.mk"
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
+.endif
+
+.include "../../archivers/bzip2/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 6fcf3e84ca3..95a50dcfd2f 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/08/06 11:38:10 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/08/18 17:16:53 recht Exp $
 
 SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1
 Size (Python-2.3.tgz) = 8436880 bytes
@@ -6,5 +6,5 @@ SHA1 (patch-aa) = cf9b037bdd2c7db5ebee79d6327d1961d519cd31
 SHA1 (patch-ae) = ff045dc1b42ce8a4fe5e64fde72469e1be8dab28
 SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e
 SHA1 (patch-aj) = 1e3ce4072e90cb7be6d0a5539ec213b56518dcc7
-SHA1 (patch-al) = 5429c1c50e1b58495ad93477d19a82b81a713076
+SHA1 (patch-al) = d45b39b975ea3b8d1e62b5e9006c79a40716f470
 SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f
diff --git a/lang/python23/patches/patch-al b/lang/python23/patches/patch-al
index fa5272eb73c..bce64f485d2 100644
--- a/lang/python23/patches/patch-al
+++ b/lang/python23/patches/patch-al
@@ -1,23 +1,26 @@
-$NetBSD: patch-al,v 1.1 2003/08/06 11:38:10 drochner Exp $
+$NetBSD: patch-al,v 1.2 2003/08/18 17:16:54 recht Exp $
 
 --- pyconfig.h.in.orig	2003-07-22 17:20:49.000000000 +0200
-+++ pyconfig.h.in	2003-08-02 15:50:34.000000000 +0200
-@@ -835,6 +835,10 @@
++++ pyconfig.h.in	2003-08-18 18:24:43.000000000 +0200
+@@ -835,6 +835,12 @@
  /* Define _OSF_SOURCE to get the makedev macro. */
  #undef _OSF_SOURCE
  
 +/* These defines disable needed library functions on NetBSD < 1.6T */
 +/* ( _NETBSD_SOURCE doesn't exist prior to 1.6T ) */
-+#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106200000)
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 106200000)
 +
  /* Define to 2 if the system does not provide POSIX.1 features except with
     this defined. */
  #undef _POSIX_1_SOURCE
-@@ -845,18 +849,26 @@
+@@ -845,18 +851,30 @@
  /* Define to 1 if you need to in order for `stat' and other things to work. */
  #undef _POSIX_SOURCE
  
 +#endif
++#endif /* __NetBSD__ */
 +
  /* Define if you have POSIX threads, and your system does not define that. */
  #undef _POSIX_THREADS
@@ -27,7 +30,9 @@ $NetBSD: patch-al,v 1.1 2003/08/06 11:38:10 drochner Exp $
  
 +/* These defines disable needed library functions on NetBSD < 1.6T */
 +/* ( _NETBSD_SOURCE doesn't exists prior to 1.6T ) */
-+#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106200000)
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 106200000)
 +
  /* Define to the level of X/Open that your system supports */
  #undef _XOPEN_SOURCE
@@ -36,6 +41,7 @@ $NetBSD: patch-al,v 1.1 2003/08/06 11:38:10 drochner Exp $
  #undef _XOPEN_SOURCE_EXTENDED
  
 +#endif
++#endif /* __NetBSD__ */
 +
  /* Define on FreeBSD to activate all library features */
  #undef __BSD_VISIBLE