Add MirBSD support here, too, same as in python26.

4 files changed, 53 insertions, 13 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 115bdf96fbb..8e38513c55f 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/09/16 08:50:44 adam Exp $
+# $NetBSD: Makefile,v 1.7 2011/09/16 19:17:52 bsiegert Exp $
 
 .include "dist.mk"
 
@@ -118,7 +118,9 @@ PLIST.nis=	yes
 .  endif
 .else
 PLIST.dll=	yes
-.  if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
+.  if ${OPSYS} == "MirBSD"
+# neither nis nor no-nis
+.  elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
 PLIST.nis=	yes
 .  else
 PLIST.no-nis=	yes
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 5765f0ce8fd..60c6d6adc91 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/09/16 08:50:44 adam Exp $
+$NetBSD: distinfo,v 1.8 2011/09/16 19:17:52 bsiegert Exp $
 
 SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a
 SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
-SHA1 (patch-al) = 01cd5a1c29f03d6ad13bfb0584b95f85b4761dba
+SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19
 SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
@@ -16,3 +16,4 @@ SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
 SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
 SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
 SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b
+SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al
index c0ec5c124c7..09b9867c98e 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,13 +1,22 @@
-$NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $
+$NetBSD: patch-al,v 1.5 2011/09/16 19:17:52 bsiegert Exp $
 
---- configure.orig	2011-06-11 15:46:28.000000000 +0000
+--- configure.orig	Sat Jun 11 15:46:04 2011
 +++ configure
+@@ -3026,7 +3026,7 @@ case $ac_sys_system/$ac_sys_release in
+   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
+   # In addition, Stefan Krah confirms that issue #1244610 exists through
+   # OpenBSD 4.6, but is fixed in 4.7.
+-  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123456])
++  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123456] | MirBSD/*)
+     define_xopen_source=no
+     # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
+     # also defined. This can be overridden by defining _BSD_SOURCE
 @@ -4927,15 +4927,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
 -    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*|MirBSD*)
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -19,7 +28,7 @@ $NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
      hp*|HP*)
-@@ -7648,9 +7647,9 @@ then
+@@ -7648,9 +7643,9 @@ then
  			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -32,7 +41,7 @@ $NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $
  		fi ;;
  	Darwin/*)
  		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -7674,15 +7673,15 @@ then
+@@ -7674,15 +7669,15 @@ then
  				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -52,7 +61,13 @@ $NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $
  	BSD/OS*/4*)
  		LDSHARED="gcc -shared"
  		LDCXXSHARED="g++ -shared";;
-@@ -7713,6 +7712,9 @@ then
+@@ -7710,9 +7705,15 @@ then
+ 				   ;;
+ 				esac
+ 		fi;;
++	MirBSD*)
++		LDSHARED='$(CC) -shared $(CCSHARED)'
++		LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
  	NetBSD*|DragonFly*)
  		LDSHARED='$(CC) -shared'
  		LDCXXSHARED='$(CXX) -shared';;
@@ -62,15 +77,23 @@ $NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes" ; then
  			LDSHARED='$(CC) -shared'
-@@ -7757,6 +7759,7 @@ then
+@@ -7756,7 +7757,8 @@ then
+ 		 fi;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
- 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+-	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
++	FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
 +	Interix*) CCSHARED="";;
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -7813,6 +7816,7 @@ then
+@@ -7808,11 +7810,12 @@ then
+ 	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
+ 	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
+ 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
+-	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
++	FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
+ 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
diff --git a/lang/python27/patches/patch-az b/lang/python27/patches/patch-az
new file mode 100644
index 00000000000..a2f478e1438
--- /dev/null
+++ b/lang/python27/patches/patch-az
@@ -0,0 +1,14 @@
+$NetBSD: patch-az,v 1.1 2011/09/16 19:17:52 bsiegert Exp $
+
+--- Modules/selectmodule.c.orig	Mon Jul 25 08:09:14 2011
++++ Modules/selectmodule.c
+@@ -1824,7 +1824,9 @@ initselect(void)
+     PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);
+ #endif
+     PyModule_AddIntConstant(m, "KQ_FILTER_SIGNAL", EVFILT_SIGNAL);
++#ifdef EVFILT_TIMER
+     PyModule_AddIntConstant(m, "KQ_FILTER_TIMER", EVFILT_TIMER);
++#endif
+ 
+     /* event flags */
+     PyModule_AddIntConstant(m, "KQ_EV_ADD", EV_ADD);