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 (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,181 +1,183 @@ @@ -1,181 +1,183 @@
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
15CONFLICTS+= python-[0-9]* 15CONFLICTS+= python-[0-9]*
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --with-threads 18CONFIGURE_ARGS+= --with-threads
19CONFIGURE_ARGS+= --enable-shared 19CONFIGURE_ARGS+= --enable-shared
20CONFIGURE_ARGS+= OPT=${CFLAGS:Q} 20CONFIGURE_ARGS+= OPT=${CFLAGS:Q}
21CONFIGURE_ARGS+= --with-system-ffi 21CONFIGURE_ARGS+= --with-system-ffi
22CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb 22CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb
23 23
24LDFLAGS+= -L${WRKSRC} 24LDFLAGS+= -L${WRKSRC}
25 25
26# $RANDOM usage there is fine 26# $RANDOM usage there is fine
27CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh 27CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh
28 28
29USE_LANGUAGES= c c++ 29USE_LANGUAGES= c c++
30 30
31PTHREAD_OPTS+= require 31PTHREAD_OPTS+= require
32.include "../../mk/pthread.buildlink3.mk" 32.include "../../mk/pthread.buildlink3.mk"
33.if ${PTHREAD_TYPE} == "pth" 33.if ${PTHREAD_TYPE} == "pth"
34CONFIGURE_ARGS+= --with-pth 34CONFIGURE_ARGS+= --with-pth
35.endif 35.endif
36 36
37.include "../../mk/compiler.mk" 37.include "../../mk/compiler.mk"
38 38
39# Clang needs -fwrapv 39# Clang needs -fwrapv
40.if !empty(PKGSRC_COMPILER:Mclang) 40.if !empty(PKGSRC_COMPILER:Mclang)
41CFLAGS+= -fwrapv 41CFLAGS+= -fwrapv
42.endif 42.endif
43 43
44.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
45 45
46# fdatasync() 46# fdatasync()
47LIBS.SunOS+= -lrt 47LIBS.SunOS+= -lrt
48 48
49PY_VER_SUFFIX= 2.7 49PY_VER_SUFFIX= 2.7
50 50
51PLIST_SRC= ${.CURDIR}/../../lang/python27/PLIST.common 51PLIST_SRC= ${.CURDIR}/../../lang/python27/PLIST.common
52.if exists(${.CURDIR}/../../lang/python27/PLIST.${OPSYS}) 52.if exists(${.CURDIR}/../../lang/python27/PLIST.${OPSYS})
53PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.${OPSYS} 53PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.${OPSYS}
54.endif 54.endif
55PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end 55PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.common_end
56 56
57.if ${OPSYS} == "NetBSD" 57.if ${OPSYS} == "NetBSD"
58PRIVILEGED_STAGES+= clean 58PRIVILEGED_STAGES+= clean
59# XXX work around a botched autoconf check which ignores libintl 59# XXX work around a botched autoconf check which ignores libintl
60CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes 60CONFIGURE_ENV+= ac_cv_func_bind_textdomain_codeset=yes
61.endif 61.endif
62 62
63.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" 63.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
64PY_PLATNAME= ${LOWER_OPSYS} 64PY_PLATNAME= ${LOWER_OPSYS}
65USE_TOOLS+= gmake 65USE_TOOLS+= gmake
66.elif ${OPSYS} == "IRIX" 66.elif ${OPSYS} == "IRIX"
67PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} 67PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
68.elif ${OPSYS} == "SunOS" 68.elif ${OPSYS} == "SunOS"
69PY_PLATNAME= sunos${OS_VERSION:C/\..*//} 69PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
70.elif ${OPSYS} == "HPUX" 70.elif ${OPSYS} == "HPUX"
71PY_PLATNAME= hp-ux11 71PY_PLATNAME= hp-ux11
72.else 72.else
73PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} 73PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
74.endif 74.endif
75PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} 75PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
76 76
77.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ 77.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
78 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ 78 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
79 (defined(ABI) && ${ABI} == "64") 79 (defined(ABI) && ${ABI} == "64")
80IS_64BIT_PLATFORM?= yes 80IS_64BIT_PLATFORM?= yes
81.else 81.else
82IS_64BIT_PLATFORM?= no 82IS_64BIT_PLATFORM?= no
83.endif 83.endif
84 84
85# the dl module isn't built for 64 bit archs 85# the dl module isn't built for 64 bit archs
86PLIST_VARS+= dl 86PLIST_VARS+= dl
87.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) 87.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS])
88PLIST.dl= yes 88PLIST.dl= yes
89.endif 89.endif
90 90
91# builds additional modules if OpenSSL < 0.9.8 91# builds additional modules if OpenSSL < 0.9.8
92PLIST_VARS+= openssl097 92PLIST_VARS+= openssl097
93CHECK_BUILTIN.openssl:= no 93CHECK_BUILTIN.openssl:= no
94.include "../../security/openssl/builtin.mk" 94.include "../../security/openssl/builtin.mk"
95CHECK_BUILTIN.openssl:= yes 95CHECK_BUILTIN.openssl:= yes
96.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \ 96.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && \
97 !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*) 97 !empty(BUILTIN_PKG.openssl:Mopenssl-0.9.[67]*)
98PLIST.openssl097= yes 98PLIST.openssl097= yes
99.endif 99.endif
100 100
101# setup.py causes some modules to be built if the platform is *not* 64bit. 101# setup.py causes some modules to be built if the platform is *not* 64bit.
102PLIST_VARS+= extra-so 102PLIST_VARS+= extra-so
103.if !empty(IS_64BIT_PLATFORM:M[nN][oO]) 103.if !empty(IS_64BIT_PLATFORM:M[nN][oO])
104PLIST.extra-so= yes 104PLIST.extra-so= yes
105.endif 105.endif
106 106
107# Make sure python modules can link correctly 107# Make sure python modules can link correctly
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
135.if ${OPSYS} == "OSF1" 137.if ${OPSYS} == "OSF1"
136# configure complains about buggy getaddrinfo() 138# configure complains about buggy getaddrinfo()
137CONFIGURE_ARGS+= --disable-ipv6 139CONFIGURE_ARGS+= --disable-ipv6
138.endif 140.endif
139 141
140.if defined(BUILDLINK_TRANSFORM) 142.if defined(BUILDLINK_TRANSFORM)
141MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 143MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
142.endif 144.endif
143 145
144PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 146PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
145 147
146TEST_TARGET= test 148TEST_TARGET= test
147INSTALL_TARGET= altinstall 149INSTALL_TARGET= altinstall
148 150
149REPLACE_INTERPRETER+= py27 151REPLACE_INTERPRETER+= py27
150REPLACE.py27.old= .*python[^ ]* 152REPLACE.py27.old= .*python[^ ]*
151REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 153REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
152REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py 154REPLACE_FILES.py27= Lib/*.py Lib/*/*.py Lib/*/*/*.py
153 155
154SUBST_CLASSES+= findlib 156SUBST_CLASSES+= findlib
155SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. 157SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin.
156SUBST_STAGE.findlib= pre-configure 158SUBST_STAGE.findlib= pre-configure
157SUBST_FILES.findlib= Lib/distutils/unixccompiler.py 159SUBST_FILES.findlib= Lib/distutils/unixccompiler.py
158SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' 160SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
159 161
160post-extract: 162post-extract:
161 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py 163 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
162 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 164 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
163 ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} 165 ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
164 166
165.if ${OPSYS} == "HPUX" 167.if ${OPSYS} == "HPUX"
166post-install: 168post-install:
167 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.7.sl \ 169 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.7.sl \
168 ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 170 ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0
169.endif 171.endif
170 172
171USE_GNU_READLINE= yes 173USE_GNU_READLINE= yes
172BUILDLINK_DEPMETHOD.readline= build 174BUILDLINK_DEPMETHOD.readline= build
173 175
174.include "../../archivers/bzip2/buildlink3.mk" 176.include "../../archivers/bzip2/buildlink3.mk"
175.include "../../devel/gettext-lib/buildlink3.mk" 177.include "../../devel/gettext-lib/buildlink3.mk"
176.include "../../devel/libffi/buildlink3.mk" 178.include "../../devel/libffi/buildlink3.mk"
177.include "../../devel/readline/buildlink3.mk" 179.include "../../devel/readline/buildlink3.mk"
178.include "../../devel/zlib/buildlink3.mk" 180.include "../../devel/zlib/buildlink3.mk"
179.include "../../security/openssl/buildlink3.mk" 181.include "../../security/openssl/buildlink3.mk"
180.include "../../mk/dlopen.buildlink3.mk" 182.include "../../mk/dlopen.buildlink3.mk"
181.include "../../mk/bsd.pkg.mk" 183.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/python27/distinfo (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 (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);