On NetBSD, assume that MKYP=no when /usr/bin/ypcat doesn't exist.

The NIS module is not available in that case.
Call the regen script with RUNSHARED, so that it finds libpython.so,
even in the DESTDIR case.

XXX The call to regen should be moved to the build phase.

4 files changed, 38 insertions, 18 deletions

diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index f36a3527b5c..d6d393c6caf 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/08/26 15:29:05 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/11/03 07:15:41 joerg Exp $
 #
 
 DISTNAME=	Python-2.4.3
@@ -13,6 +13,8 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # Remember to update pkgsrc/lang/python/srcdist.mk when version changes
 
 CONFLICTS+=	python-[0-9]*
@@ -94,8 +96,10 @@ INSTALL_UNSTRIPPED=	yes
 .if ${OPSYS} == "IRIX"
 .  if ${ABI} == "64"
 PLIST_SUBST+=	NISMODULE="@comment "
+PLIST_SUBST+=	NO_NISMODULE="@comment "
 .  else
 PLIST_SUBST+=	NISMODULE=
+PLIST_SUBST+=	NO_NISMODULE="@comment "
 .  endif
 PLIST_SUBST+=	BSDDBMODULE="@comment "
 PLIST_SUBST+=	NOSHLIB="@comment "
@@ -106,7 +110,13 @@ MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
 PLIST_SUBST+=	BSDDBMODULE=
 PLIST_SUBST+=	NOSHLIB=
+.if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
 PLIST_SUBST+=	NISMODULE=
+PLIST_SUBST+=	NO_NISMODULE="@comment "
+.else
+PLIST_SUBST+=	NISMODULE="@comment "
+PLIST_SUBST+=	NO_NISMODULE=
+.endif
 .endif
 
 .if defined(BUILDLINK_TRANSFORM)
@@ -134,8 +144,8 @@ post-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} libpython2.4.2.dylib)
 
 post-install:
-	${LN} -fs ${PREFIX}/lib/libpython2.4.2.dylib	\
-		${PREFIX}/lib/libpython2.4.dylib
+	${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.4.2.dylib	\
+		${DESTDIR}${PREFIX}/lib/libpython2.4.dylib
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/lang/python24/PLIST.common b/lang/python24/PLIST.common
index 60514795081..108f28c61c6 100644
--- a/lang/python24/PLIST.common
+++ b/lang/python24/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2006/06/01 15:25:03 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2006/11/03 07:15:41 joerg Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 bin/smtpd${PY_VER_SUFFIX}.py
@@ -1292,6 +1292,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/md5.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
 ${NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+${NO_NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/regex.so
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 63db794ff9d..c52e083a314 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2006/10/11 18:20:37 rillig Exp $
+$NetBSD: distinfo,v 1.22 2006/11/03 07:15:41 joerg Exp $
 
 SHA1 (Python-2.4.3.tar.bz2) = d6b81e1aec0045b5acff99676f2abe303da1b384
 RMD160 (Python-2.4.3.tar.bz2) = c86247554975e6c44f91d05e44e68e280d5244dc
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
 SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
 SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1
 SHA1 (patch-ae) = ccf62e62129f6f09bf46bb026bfb03d131a3aa1a
-SHA1 (patch-af) = cf066348c706c6a778e7dbd8d123b51b6772c40e
+SHA1 (patch-af) = 640a4dab8a96744ade37b3f3a5b0e7b0efabbe59
 SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
 SHA1 (patch-ah) = 8d56adee024b29e5d538a9fcd1994e38eb2b33c1
 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
diff --git a/lang/python24/patches/patch-af b/lang/python24/patches/patch-af
index 67543f68df5..8863713d67c 100644
--- a/lang/python24/patches/patch-af
+++ b/lang/python24/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
+$NetBSD: patch-af,v 1.7 2006/11/03 07:15:41 joerg Exp $
 
---- Makefile.pre.in.orig	2006-03-13 14:08:41.000000000 +0100
-+++ Makefile.pre.in	2006-09-20 12:51:11.139973424 +0200
-@@ -30,6 +30,7 @@
+--- Makefile.pre.in.orig	2006-03-13 13:08:41.000000000 +0000
++++ Makefile.pre.in
+@@ -30,6 +30,7 @@ VPATH=		@srcdir@
  
  CC=		@CC@
  CXX=		@CXX@
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  LINKCC=		@LINKCC@
  AR=		@AR@
  RANLIB=		@RANLIB@
-@@ -56,7 +57,7 @@
+@@ -56,7 +57,7 @@ MAKESETUP=      $(srcdir)/Modules/makese
  OPT=		@OPT@
  BASECFLAGS=	@BASECFLAGS@
  CFLAGS=		$(BASECFLAGS) $(OPT)
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -153,7 +154,6 @@
+@@ -153,7 +154,6 @@ LIBC=		@LIBC@
  SYSLIBS=	$(LIBM) $(LIBC)
  SHLIBS=		@SHLIBS@
  
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  THREADOBJ=	@THREADOBJ@
  DLINCLDIR=	@DLINCLDIR@
  DYNLOADFILE=	@DYNLOADFILE@
-@@ -308,10 +308,10 @@
+@@ -308,10 +308,10 @@ LIBRARY_OBJS=	\
  all:		$(BUILDPYTHON) oldsharedmods sharedmods
  
  # Build the interpreter
@@ -41,7 +41,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  
  platform: $(BUILDPYTHON)
  	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -351,14 +351,18 @@
+@@ -351,14 +351,18 @@ $(LIBRARY): $(LIBRARY_OBJS)
  
  libpython$(VERSION).so: $(LIBRARY_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -63,7 +63,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  
  # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
  # minimal framework (not including the Lib directory and such) in the current
-@@ -437,8 +441,8 @@
+@@ -437,8 +441,8 @@ Modules/getpath.o: $(srcdir)/Modules/get
  		-DVPATH='"$(VPATH)"' \
  		-o $@ $(srcdir)/Modules/getpath.c
  
@@ -74,7 +74,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  
  
  $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-@@ -520,7 +524,7 @@
+@@ -520,7 +524,7 @@ PYTHON_HEADERS= \
  		Include/weakrefobject.h \
  		pyconfig.h
  
@@ -83,7 +83,7 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  
  
  ######################################################################
-@@ -629,7 +633,12 @@
+@@ -629,7 +633,12 @@ altbininstall:	$(BUILDPYTHON)
  				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
  			fi \
  		fi; \
@@ -97,7 +97,16 @@ $NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $
  	fi
  
  # Install the manual page
-@@ -792,7 +801,7 @@
+@@ -747,7 +756,7 @@ $(srcdir)/Lib/$(PLATDIR):
+ 	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
+ 	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
+ 	export EXE; EXE="$(BUILDEXE)"; \
+-	cd $(srcdir)/Lib/$(PLATDIR); ./regen
++	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
+ 
+ # Install the include files
+ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
+@@ -792,7 +801,7 @@ libainstall:	all
  		fi; \
  	fi
  	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c