Fri Sep 16 19:17:52 2011 UTC ()
Add MirBSD support here, too, same as in python26.


(bsiegert)
diff -r1.6 -r1.7 pkgsrc/lang/python27/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/python27/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/python27/patches/patch-al
diff -r0 -r1.1 pkgsrc/lang/python27/patches/patch-az
cvs diff -r1.6 -r1.7 pkgsrc/lang/python27/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python27/Makefile 2011/09/16 08:50:44 1.6
+++ pkgsrc/lang/python27/Makefile 2011/09/16 19:17:52 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2011/09/16 08:50:44 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2011/09/16 19:17:52 bsiegert Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python27-${PY_DISTVERSION} 5PKGNAME= python27-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python.org/ 9HOMEPAGE= http://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 10COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 11LICENSE= python-software-foundation
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -108,27 +108,29 @@ PLIST.extra-so= yes @@ -108,27 +108,29 @@ PLIST.extra-so= yes
108.if ${OPSYS} == "Darwin" 108.if ${OPSYS} == "Darwin"
109INSTALL_UNSTRIPPED= yes 109INSTALL_UNSTRIPPED= yes
110.endif 110.endif
111 111
112PLIST_VARS+= dll nis no-nis 112PLIST_VARS+= dll nis no-nis
113.if ${OPSYS} == "IRIX" 113.if ${OPSYS} == "IRIX"
114. if ${ABI} == "64" 114. if ${ABI} == "64"
115PLIST.no-nis= yes 115PLIST.no-nis= yes
116. else 116. else
117PLIST.nis= yes 117PLIST.nis= yes
118. endif 118. endif
119.else 119.else
120PLIST.dll= yes 120PLIST.dll= yes
121. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 121. if ${OPSYS} == "MirBSD"
 122# neither nis nor no-nis
 123. elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
122PLIST.nis= yes 124PLIST.nis= yes
123. else 125. else
124PLIST.no-nis= yes 126PLIST.no-nis= yes
125. endif 127. endif
126.endif 128.endif
127 129
128.include "../../mk/bdb.buildlink3.mk" 130.include "../../mk/bdb.buildlink3.mk"
129MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} 131MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
130.if empty(BDB_LIBS) 132.if empty(BDB_LIBS)
131BUILDLINK_TRANSFORM+= rm:-ldb 133BUILDLINK_TRANSFORM+= rm:-ldb
132.endif 134.endif
133CFLAGS+= -DHAVE_DB_185_H 135CFLAGS+= -DHAVE_DB_185_H
134 136
cvs diff -r1.7 -r1.8 pkgsrc/lang/python27/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python27/distinfo 2011/09/16 08:50:44 1.7
+++ pkgsrc/lang/python27/distinfo 2011/09/16 19:17:52 1.8
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.7 2011/09/16 08:50:44 adam Exp $ 1$NetBSD: distinfo,v 1.8 2011/09/16 19:17:52 bsiegert Exp $
2 2
3SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547 3SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
4RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5 4RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
5Size (Python-2.7.2.tar.bz2) = 11754834 bytes 5Size (Python-2.7.2.tar.bz2) = 11754834 bytes
6SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa 6SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
7SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a 7SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a
8SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec 8SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
9SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 9SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
10SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891 10SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
11SHA1 (patch-al) = 01cd5a1c29f03d6ad13bfb0584b95f85b4761dba 11SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19
12SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66 12SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66
13SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca 13SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
14SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04 14SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
15SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7 15SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
16SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 16SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
17SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 17SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
18SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b 18SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b
 19SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
cvs diff -r1.4 -r1.5 pkgsrc/lang/python27/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/lang/python27/patches/Attic/patch-al 2011/09/16 08:50:44 1.4
+++ pkgsrc/lang/python27/patches/Attic/patch-al 2011/09/16 19:17:52 1.5
@@ -1,80 +1,103 @@ @@ -1,80 +1,103 @@
1$NetBSD: patch-al,v 1.4 2011/09/16 08:50:44 adam Exp $ 1$NetBSD: patch-al,v 1.5 2011/09/16 19:17:52 bsiegert Exp $
2 2
3--- configure.orig 2011-06-11 15:46:28.000000000 +0000 3--- configure.orig Sat Jun 11 15:46:04 2011
4+++ configure 4+++ configure
 5@@ -3026,7 +3026,7 @@ case $ac_sys_system/$ac_sys_release in
 6 # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
 7 # In addition, Stefan Krah confirms that issue #1244610 exists through
 8 # OpenBSD 4.6, but is fixed in 4.7.
 9- OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123456])
 10+ OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123456] | MirBSD/*)
 11 define_xopen_source=no
 12 # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
 13 # also defined. This can be overridden by defining _BSD_SOURCE
5@@ -4927,15 +4927,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> 14@@ -4927,15 +4927,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
6 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} 15 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
7 INSTSONAME="$LDLIBRARY".$SOVERSION 16 INSTSONAME="$LDLIBRARY".$SOVERSION
8 ;; 17 ;;
9- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) 18- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
10+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*) 19+ Linux*|GNU*|NetBSD*|FreeBSD*|Interix*|DragonFly*|OpenBSD*|MirBSD*)
11 LDLIBRARY='libpython$(VERSION).so' 20 LDLIBRARY='libpython$(VERSION).so'
12 BLDLIBRARY='-L. -lpython$(VERSION)' 21 BLDLIBRARY='-L. -lpython$(VERSION)'
13 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} 22 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
14- case $ac_sys_system in 23- case $ac_sys_system in
15- FreeBSD*) 24- FreeBSD*)
16- SOVERSION=`echo $SOVERSION|cut -d "." -f 1` 25- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
17- ;; 26- ;;
18- esac 27- esac
19 INSTSONAME="$LDLIBRARY".$SOVERSION 28 INSTSONAME="$LDLIBRARY".$SOVERSION
20 ;; 29 ;;
21 hp*|HP*) 30 hp*|HP*)
22@@ -7648,9 +7647,9 @@ then 31@@ -7648,9 +7643,9 @@ then
23 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 32 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
24 else 33 else
25 # No framework, use the Python app as bundle-loader 34 # No framework, use the Python app as bundle-loader
26- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' 35- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
27- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 36- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
28- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 37- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
29+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' 38+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
30+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 39+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
31+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 40+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
32 fi ;; 41 fi ;;
33 Darwin/*) 42 Darwin/*)
34 # Use -undefined dynamic_lookup whenever possible (10.3 and later). 43 # Use -undefined dynamic_lookup whenever possible (10.3 and later).
35@@ -7674,15 +7673,15 @@ then 44@@ -7674,15 +7669,15 @@ then
36 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' 45 LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
37 else 46 else
38 # No framework, use the Python app as bundle-loader 47 # No framework, use the Python app as bundle-loader
39- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' 48- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
40- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 49- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
41- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 50- LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
42+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)' 51+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
43+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 52+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
44+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' 53+ LDCXXSHARED="$LDCXXSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
45 fi 54 fi
46 fi 55 fi
47 ;; 56 ;;
48 Linux*|GNU*|QNX*) 57 Linux*|GNU*|QNX*)
49 LDSHARED='$(CC) -shared' 58 LDSHARED='$(CC) -shared'
50- LDCXXSHARED='$(CXX) -shared';; 59- LDCXXSHARED='$(CXX) -shared';;
51+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; 60+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";;
52 BSD/OS*/4*) 61 BSD/OS*/4*)
53 LDSHARED="gcc -shared" 62 LDSHARED="gcc -shared"
54 LDCXXSHARED="g++ -shared";; 63 LDCXXSHARED="g++ -shared";;
55@@ -7713,6 +7712,9 @@ then 64@@ -7710,9 +7705,15 @@ then
 65 ;;
 66 esac
 67 fi;;
 68+ MirBSD*)
 69+ LDSHARED='$(CC) -shared $(CCSHARED)'
 70+ LDCXXSHARED='$(CXX) -shared $(CCSHARED)';;
56 NetBSD*|DragonFly*) 71 NetBSD*|DragonFly*)
57 LDSHARED='$(CC) -shared' 72 LDSHARED='$(CC) -shared'
58 LDCXXSHARED='$(CXX) -shared';; 73 LDCXXSHARED='$(CXX) -shared';;
59+ Interix*) 74+ Interix*)
60+ LDSHARED='$(CC) -shared'" ${LDFLAGS}" 75+ LDSHARED='$(CC) -shared'" ${LDFLAGS}"
61+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack 76+ LDCXXSHARED='$(CXX) -shared'" ${LDFLAGS}";; # XXX tv needs image-base hack
62 OpenUNIX*|UnixWare*) 77 OpenUNIX*|UnixWare*)
63 if test "$GCC" = "yes" ; then 78 if test "$GCC" = "yes" ; then
64 LDSHARED='$(CC) -shared' 79 LDSHARED='$(CC) -shared'
65@@ -7757,6 +7759,7 @@ then 80@@ -7756,7 +7757,8 @@ then
 81 fi;;
66 Linux*|GNU*) CCSHARED="-fPIC";; 82 Linux*|GNU*) CCSHARED="-fPIC";;
67 BSD/OS*/4*) CCSHARED="-fpic";; 83 BSD/OS*/4*) CCSHARED="-fpic";;
68 FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; 84- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
 85+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*) CCSHARED="-fPIC";;
69+ Interix*) CCSHARED="";; 86+ Interix*) CCSHARED="";;
70 OpenUNIX*|UnixWare*) 87 OpenUNIX*|UnixWare*)
71 if test "$GCC" = "yes" 88 if test "$GCC" = "yes"
72 then CCSHARED="-fPIC" 89 then CCSHARED="-fPIC"
73@@ -7813,6 +7816,7 @@ then 90@@ -7808,11 +7810,12 @@ then
 91 OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
 92 SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
 93 ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
 94- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
 95+ FreeBSD*|NetBSD*|OpenBSD*|MirBSD*|DragonFly*)
 96 if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
74 then 97 then
75 LINKFORSHARED="-Wl,--export-dynamic" 98 LINKFORSHARED="-Wl,--export-dynamic"
76 fi;; 99 fi;;
77+ Interix*) LINKFORSHARED="-Wl,-E";; 100+ Interix*) LINKFORSHARED="-Wl,-E";;
78 SunOS/5*) case $CC in 101 SunOS/5*) case $CC in
79 *gcc*) 102 *gcc*)
80 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null 103 if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
File Added: pkgsrc/lang/python27/patches/Attic/patch-az
$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);