Fix build on MirBSD by adding the respective stanzas to configure and fix

building the select module.

Reviewed by Bernd Ernesti and Jörg Sonnenberger.

4 files changed, 46 insertions, 11 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index edd80bb91b5..26b5120752d 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2011/06/04 03:58:58 obache Exp $
+# $NetBSD: Makefile,v 1.41 2011/09/12 20:14:06 bsiegert Exp $
 
 .include "dist.mk"
 
@@ -111,7 +111,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/python26/distinfo b/lang/python26/distinfo
index b014b62f308..ccec2e899a6 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2011/06/04 03:58:58 obache Exp $
+$NetBSD: distinfo,v 1.35 2011/09/12 20:14:06 bsiegert Exp $
 
 SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa
 RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063
@@ -10,13 +10,14 @@ SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
 SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
-SHA1 (patch-al) = e8afe8b0c9e45f868f68d6b1a07bcf99d7c2b1d0
+SHA1 (patch-al) = cbecd618884e9cfa3ff94645db6b6dd4566a9209
 SHA1 (patch-am) = 60c108d05a16c531ee6cf99e5c7ad9a5f27c5f01
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
 SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb
 SHA1 (patch-au) = 38030fc45afc2a8f53a41f26b649e731642b9148
 SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e
+SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
 SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
 SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
 SHA1 (patch-bc) = 09aaa254a54109026bb262a949b4006235df7858
diff --git a/lang/python26/patches/patch-al b/lang/python26/patches/patch-al
index abc019dc296..59ed2a244b7 100644
--- a/lang/python26/patches/patch-al
+++ b/lang/python26/patches/patch-al
@@ -1,13 +1,22 @@
-$NetBSD: patch-al,v 1.7 2011/02/05 09:34:05 hiramatsu Exp $
+$NetBSD: patch-al,v 1.8 2011/09/12 20:14:06 bsiegert Exp $
 
---- configure.orig	2010-05-25 02:27:03.000000000 +0000
+--- configure.orig	Tue May 25 02:26:39 2010
 +++ configure
+@@ -2833,7 +2833,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
 @@ -4736,15 +4736,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}
@@ -46,25 +55,34 @@ $NetBSD: patch-al,v 1.7 2011/02/05 09:34:05 hiramatsu Exp $
  	BSD/OS*/4*) LDSHARED="gcc -shared";;
  	FreeBSD*)
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -7409,7 +7404,8 @@ then
+@@ -7409,7 +7404,9 @@ then
  				   ;;
  				esac
  		fi;;
 -	NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
++	MirBSD*) LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}';;
 +	NetBSD*|DragonFly*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
 +	Interix*) LDSHARED='$(CC) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then LDSHARED='$(CC) -shared'
-@@ -7445,6 +7441,7 @@ then
+@@ -7444,7 +7441,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"
-@@ -7502,6 +7499,7 @@ then
+@@ -7497,11 +7495,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/python26/patches/patch-az b/lang/python26/patches/patch-az
new file mode 100644
index 00000000000..f4603189958
--- /dev/null
+++ b/lang/python26/patches/patch-az
@@ -0,0 +1,14 @@
+$NetBSD: patch-az,v 1.1 2011/09/12 20:14:06 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);