4 files changed, 24 insertions, 6 deletions
diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile
index 83a65d7427d..35c1d892d12 100644
--- a/lang/python23-pth/Makefile
+++ b/lang/python23-pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/17 00:11:43 recht Exp $
 #
 
 DISTNAME=	Python-2.3
@@ -46,6 +46,15 @@ PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}
 PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 
+# the dl module isn't built for 64 bit archs and Darwin
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
+	|| ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" \
+	|| ${OPSYS} == "Darwin"
+PLIST_SUBST+=  DLMODULE="@comment "
+.else
+PLIST_SUBST+=  DLMODULE=
+.endif
+
 .if ${OPSYS} != "NetBSD"
 .include "../../databases/db/buildlink2.mk"
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
diff --git a/lang/python23-pth/PLIST.common b/lang/python23-pth/PLIST.common
index 2ae9a72973e..1fc2f0f45d7 100644
--- a/lang/python23-pth/PLIST.common
+++ b/lang/python23-pth/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2003/08/18 20:57:14 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2003/11/17 00:11:43 recht Exp $
 bin/pydoc2p3
 bin/python2p3
 include/python2p3/Python.h
@@ -1133,7 +1133,7 @@ lib/python2p3/lib-dynload/cmath.so
 lib/python2p3/lib-dynload/crypt.so
 lib/python2p3/lib-dynload/datetime.so
 lib/python2p3/lib-dynload/dbm.so
-lib/python2p3/lib-dynload/dl.so
+${DLMODULE}lib/python2p3/lib-dynload/dl.so
 lib/python2p3/lib-dynload/fcntl.so
 lib/python2p3/lib-dynload/grp.so
 lib/python2p3/lib-dynload/itertools.so
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 19147992d78..74f37562f48 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/17 00:11:44 recht Exp $
 #
 
 DISTNAME=	Python-2.3
@@ -43,6 +43,15 @@ PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}
 PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 
+# the dl module isn't built for 64 bit archs and Darwin
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
+	|| ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" \
+	|| ${OPSYS} == "Darwin"
+PLIST_SUBST+=  DLMODULE="@comment "
+.else
+PLIST_SUBST+=  DLMODULE=
+.endif
+
 .if ${OPSYS} != "NetBSD"
 .include "../../databases/db/buildlink2.mk"
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
diff --git a/lang/python23/PLIST.common b/lang/python23/PLIST.common
index 7413da53c54..f650c4e86fd 100644
--- a/lang/python23/PLIST.common
+++ b/lang/python23/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2003/08/18 20:57:12 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2003/11/17 00:11:44 recht Exp $
 bin/pydoc2.3
 bin/python2.3
 include/python2.3/Python.h
@@ -1133,7 +1133,7 @@ lib/python2.3/lib-dynload/cmath.so
 lib/python2.3/lib-dynload/crypt.so
 lib/python2.3/lib-dynload/datetime.so
 lib/python2.3/lib-dynload/dbm.so
-lib/python2.3/lib-dynload/dl.so
+${DLMODULE}lib/python2.3/lib-dynload/dl.so
 lib/python2.3/lib-dynload/fcntl.so
 lib/python2.3/lib-dynload/grp.so
 lib/python2.3/lib-dynload/itertools.so