Thu Apr 25 15:59:54 2019 UTC ()
python: Don't install nis_failed.so if no yp headers

Because python won't even try to build it.
You only see nis_failed.so if there is an error building it, when
it wanted to build it, and that should be fixed accordingly.

In a nutshell, if the yp headers are installed, python will build
the nis module, otherwise it won't.

On netbsd systems at least, if you have the yp headers installed and
subsequently re-install over the top with MKYP=no you get into the state
where the headers are installed, but the functions are no longer in libc.
This is an error with *your* system - either rebuild with MKYP=yes OR
remove the yp headers from include/rpc and include/rpcsvc.

Follow on fix for PR pkg/53673.


(roy)
diff -r1.79 -r1.80 pkgsrc/lang/python27/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/python27/PLIST
diff -r1.31 -r1.32 pkgsrc/lang/python34/Makefile
diff -r1.11 -r1.12 pkgsrc/lang/python34/PLIST
diff -r1.18 -r1.19 pkgsrc/lang/python35/Makefile
diff -r1.9 -r1.10 pkgsrc/lang/python35/PLIST
diff -r1.17 -r1.18 pkgsrc/lang/python36/Makefile
diff -r1.13 -r1.14 pkgsrc/lang/python36/PLIST
diff -r1.6 -r1.7 pkgsrc/lang/python37/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/python37/PLIST
cvs diff -r1.79 -r1.80 pkgsrc/lang/python27/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python27/Makefile 2019/04/03 13:17:27 1.79
+++ pkgsrc/lang/python27/Makefile 2019/04/25 15:59:54 1.80
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.79 2019/04/03 13:17:27 maya Exp $ 1# $NetBSD: Makefile,v 1.80 2019/04/25 15:59:54 roy 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= https://www.python.org/ 9HOMEPAGE= https://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
13DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts 13DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
14 14
@@ -70,27 +70,27 @@ PY_PLATNAME= linux2 @@ -70,27 +70,27 @@ PY_PLATNAME= linux2
70PY_PLATNAME= sco_sv3 70PY_PLATNAME= sco_sv3
71.else 71.else
72PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} 72PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
73.endif 73.endif
74PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} 74PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
75 75
76.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ 76.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
77 (defined(ABI) && ${ABI} == "64") 77 (defined(ABI) && ${ABI} == "64")
78IS_64BIT_PLATFORM?= yes 78IS_64BIT_PLATFORM?= yes
79.else 79.else
80IS_64BIT_PLATFORM?= no 80IS_64BIT_PLATFORM?= no
81.endif 81.endif
82 82
83PLIST_VARS+= dl dll extra-so nis no-nis qt 83PLIST_VARS+= dl dll extra-so nis qt
84 84
85# the dl module isn't built for 64 bit archs 85# the dl module isn't built for 64 bit archs
86.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) 86.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS])
87PLIST.dl= yes 87PLIST.dl= yes
88.endif 88.endif
89 89
90# setup.py causes some modules to be built if the platform is *not* 64bit. 90# setup.py causes some modules to be built if the platform is *not* 64bit.
91.if !empty(IS_64BIT_PLATFORM:M[nN][oO]) 91.if !empty(IS_64BIT_PLATFORM:M[nN][oO])
92PLIST.extra-so= yes 92PLIST.extra-so= yes
93.endif 93.endif
94 94
95# For Xcode 5 we need to search the SDK path for headers, otherwise certain 95# For Xcode 5 we need to search the SDK path for headers, otherwise certain
96# modules will not be built. 96# modules will not be built.
@@ -107,28 +107,26 @@ PLIST.qt= yes @@ -107,28 +107,26 @@ PLIST.qt= yes
107PLIST.dll= yes 107PLIST.dll= yes
108.endif 108.endif
109 109
110.for incdir in ${_OPSYS_INCLUDE_DIRS} 110.for incdir in ${_OPSYS_INCLUDE_DIRS}
111. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h)) 111. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
112HAVE_RPC_H= yes 112HAVE_RPC_H= yes
113. endif 113. endif
114. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h)) 114. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
115HAVE_YP_PROT_H= yes 115HAVE_YP_PROT_H= yes
116. endif 116. endif
117.endfor 117.endfor
118.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes) 118.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
119PLIST.nis= yes 119PLIST.nis= yes
120.else 
121PLIST.no-nis= yes 
122.endif 120.endif
123 121
124# configure complains about buggy getaddrinfo() 122# configure complains about buggy getaddrinfo()
125CONFIGURE_ARGS.OSF1+= --disable-ipv6 123CONFIGURE_ARGS.OSF1+= --disable-ipv6
126 124
127PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 125PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
128 126
129TEST_TARGET= test 127TEST_TARGET= test
130INSTALL_TARGET= altinstall 128INSTALL_TARGET= altinstall
131 129
132REPLACE_INTERPRETER+= py27 130REPLACE_INTERPRETER+= py27
133REPLACE.py27.old= .*python[^ ]* 131REPLACE.py27.old= .*python[^ ]*
134REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 132REPLACE.py27.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
cvs diff -r1.2 -r1.3 pkgsrc/lang/python27/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python27/PLIST 2019/03/05 12:43:40 1.2
+++ pkgsrc/lang/python27/PLIST 2019/04/25 15:59:54 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2019/03/05 12:43:40 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/04/25 15:59:54 roy Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6bin/smtpd${PY_VER_SUFFIX}.py 6bin/smtpd${PY_VER_SUFFIX}.py
7include/python${PY_VER_SUFFIX}/Python-ast.h 7include/python${PY_VER_SUFFIX}/Python-ast.h
8include/python${PY_VER_SUFFIX}/Python.h 8include/python${PY_VER_SUFFIX}/Python.h
9include/python${PY_VER_SUFFIX}/abstract.h 9include/python${PY_VER_SUFFIX}/abstract.h
10include/python${PY_VER_SUFFIX}/asdl.h 10include/python${PY_VER_SUFFIX}/asdl.h
11include/python${PY_VER_SUFFIX}/ast.h 11include/python${PY_VER_SUFFIX}/ast.h
12include/python${PY_VER_SUFFIX}/bitset.h 12include/python${PY_VER_SUFFIX}/bitset.h
13include/python${PY_VER_SUFFIX}/boolobject.h 13include/python${PY_VER_SUFFIX}/boolobject.h
14include/python${PY_VER_SUFFIX}/bufferobject.h 14include/python${PY_VER_SUFFIX}/bufferobject.h
@@ -1928,27 +1928,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/c @@ -1928,27 +1928,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/c
1928lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so 1928lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
1929lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so 1929lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so
1930lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so 1930lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
1931lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so 1931lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
1932${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so 1932${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
1933lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1933lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1934lib/python${PY_VER_SUFFIX}/lib-dynload/future_builtins.so 1934lib/python${PY_VER_SUFFIX}/lib-dynload/future_builtins.so
1935lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1935lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1936${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so 1936${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
1937lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so 1937lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
1938lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1938lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1939lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1939lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1940${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1940${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1941${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 
1942lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so 1941lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
1943lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1942lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1944lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1943lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1945lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1944lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1946lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so 1945lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
1947lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1946lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1948lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1947lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1949lib/python${PY_VER_SUFFIX}/lib-dynload/time.so 1948lib/python${PY_VER_SUFFIX}/lib-dynload/time.so
1950lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1949lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1951lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1950lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1952lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py 1951lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py
1953lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc 1952lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc
1954lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo 1953lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo
cvs diff -r1.31 -r1.32 pkgsrc/lang/python34/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python34/Attic/Makefile 2019/04/03 13:17:27 1.31
+++ pkgsrc/lang/python34/Attic/Makefile 2019/04/25 15:59:54 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2019/04/03 13:17:27 maya Exp $ 1# $NetBSD: Makefile,v 1.32 2019/04/25 15:59:54 roy Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python34-${PY_DISTVERSION} 5PKGNAME= python34-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.python.org/ 9HOMEPAGE= https://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
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -65,39 +65,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -65,39 +65,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
65# ossaudiodev is only available on x86 for the following platforms 65# ossaudiodev is only available on x86 for the following platforms
66PLIST_VARS+= oss 66PLIST_VARS+= oss
67.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 67.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
68 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 68 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
69PLIST.oss= yes 69PLIST.oss= yes
70.endif 70.endif
71 71
72# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 72# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
73# certain modules will not be built. 73# certain modules will not be built.
74.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 74.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
75CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 75CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
76.endif 76.endif
77 77
78PLIST_VARS+= nis no-nis 78PLIST_VARS+= nis
79.for incdir in ${_OPSYS_INCLUDE_DIRS} 79.for incdir in ${_OPSYS_INCLUDE_DIRS}
80. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h)) 80. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
81HAVE_RPC_H= yes 81HAVE_RPC_H= yes
82. endif 82. endif
83. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h)) 83. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
84HAVE_YP_PROT_H= yes 84HAVE_YP_PROT_H= yes
85. endif 85. endif
86.endfor 86.endfor
87.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes) 87.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
88PLIST.nis= yes 88PLIST.nis= yes
89.else 
90PLIST.no-nis= yes 
91.endif 89.endif
92 90
93PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 91PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
94 92
95PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 93PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
96PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 94PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
97 "python$${PY_VER_SUFFIX}") } 95 "python$${PY_VER_SUFFIX}") }
98 96
99TEST_TARGET= test 97TEST_TARGET= test
100INSTALL_TARGET= altinstall 98INSTALL_TARGET= altinstall
101 99
102REPLACE_INTERPRETER+= python 100REPLACE_INTERPRETER+= python
103REPLACE.python.old= .*python[^ ]* 101REPLACE.python.old= .*python[^ ]*
cvs diff -r1.11 -r1.12 pkgsrc/lang/python34/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python34/Attic/PLIST 2019/03/20 19:29:11 1.11
+++ pkgsrc/lang/python34/Attic/PLIST 2019/04/25 15:59:54 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2019/03/20 19:29:11 adam Exp $ 1@comment $NetBSD: PLIST,v 1.12 2019/04/25 15:59:54 roy Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6bin/pyvenv-${PY_VER_SUFFIX} 6bin/pyvenv-${PY_VER_SUFFIX}
7include/python${PY_VER_SUFFIX}/Python-ast.h 7include/python${PY_VER_SUFFIX}/Python-ast.h
8include/python${PY_VER_SUFFIX}/Python.h 8include/python${PY_VER_SUFFIX}/Python.h
9include/python${PY_VER_SUFFIX}/abstract.h 9include/python${PY_VER_SUFFIX}/abstract.h
10include/python${PY_VER_SUFFIX}/accu.h 10include/python${PY_VER_SUFFIX}/accu.h
11include/python${PY_VER_SUFFIX}/asdl.h 11include/python${PY_VER_SUFFIX}/asdl.h
12include/python${PY_VER_SUFFIX}/ast.h 12include/python${PY_VER_SUFFIX}/ast.h
13include/python${PY_VER_SUFFIX}/bitset.h 13include/python${PY_VER_SUFFIX}/bitset.h
14include/python${PY_VER_SUFFIX}/bltinmodule.h 14include/python${PY_VER_SUFFIX}/bltinmodule.h
@@ -1770,27 +1770,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ @@ -1770,27 +1770,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
1770lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so 1770lib/python${PY_VER_SUFFIX}/lib-dynload/_struct.so
1771lib/python${PY_VER_SUFFIX}/lib-dynload/_testbuffer.so 1771lib/python${PY_VER_SUFFIX}/lib-dynload/_testbuffer.so
1772lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so 1772lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
1773lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so 1773lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so
1774lib/python${PY_VER_SUFFIX}/lib-dynload/array.so 1774lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
1775lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so 1775lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
1776lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so 1776lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
1777lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so 1777lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
1778lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1778lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1779lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1779lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1780lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1780lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1781lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1781lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1782${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1782${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1783${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 
1784lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1783lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1785lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1784lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1786lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1785lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1787lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1786lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1788lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1787lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1789lib/python${PY_VER_SUFFIX}/lib-dynload/time.so 1788lib/python${PY_VER_SUFFIX}/lib-dynload/time.so
1790lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1789lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1791lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1790lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1792lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle 1791lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle
1793lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt 1792lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt
1794lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle 1793lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle
1795lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt 1794lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt
1796lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py 1795lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py
cvs diff -r1.18 -r1.19 pkgsrc/lang/python35/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/Makefile 2019/04/03 13:17:27 1.18
+++ pkgsrc/lang/python35/Attic/Makefile 2019/04/25 15:59:54 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2019/04/03 13:17:27 maya Exp $ 1# $NetBSD: Makefile,v 1.19 2019/04/25 15:59:54 roy Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python35-${PY_DISTVERSION} 5PKGNAME= python35-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.python.org/ 9HOMEPAGE= https://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
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -67,39 +67,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -67,39 +67,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
67# ossaudiodev is only available on x86 for the following platforms 67# ossaudiodev is only available on x86 for the following platforms
68PLIST_VARS+= oss 68PLIST_VARS+= oss
69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
71PLIST.oss= yes 71PLIST.oss= yes
72.endif 72.endif
73 73
74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
75# certain modules will not be built. 75# certain modules will not be built.
76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
78.endif 78.endif
79 79
80PLIST_VARS+= nis no-nis 80PLIST_VARS+= nis
81.for incdir in ${_OPSYS_INCLUDE_DIRS} 81.for incdir in ${_OPSYS_INCLUDE_DIRS}
82. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h)) 82. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
83HAVE_RPC_H= yes 83HAVE_RPC_H= yes
84. endif 84. endif
85. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h)) 85. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
86HAVE_YP_PROT_H= yes 86HAVE_YP_PROT_H= yes
87. endif 87. endif
88.endfor 88.endfor
89.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes) 89.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
90PLIST.nis= yes 90PLIST.nis= yes
91.else 
92PLIST.no-nis= yes 
93.endif 91.endif
94 92
95PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 93PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
96 94
97PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 95PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
98PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 96PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
99 "python$${PY_VER_SUFFIX}") } 97 "python$${PY_VER_SUFFIX}") }
100 98
101TEST_TARGET= test 99TEST_TARGET= test
102INSTALL_TARGET= altinstall 100INSTALL_TARGET= altinstall
103 101
104REPLACE_INTERPRETER+= python 102REPLACE_INTERPRETER+= python
105REPLACE.python.old= .*python[^ ]* 103REPLACE.python.old= .*python[^ ]*
cvs diff -r1.9 -r1.10 pkgsrc/lang/python35/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/PLIST 2019/03/20 19:27:47 1.9
+++ pkgsrc/lang/python35/Attic/PLIST 2019/04/25 15:59:54 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2019/03/20 19:27:47 adam Exp $ 1@comment $NetBSD: PLIST,v 1.10 2019/04/25 15:59:54 roy Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6bin/pyvenv-${PY_VER_SUFFIX} 6bin/pyvenv-${PY_VER_SUFFIX}
7include/python${PY_VER_SUFFIX}/Python-ast.h 7include/python${PY_VER_SUFFIX}/Python-ast.h
8include/python${PY_VER_SUFFIX}/Python.h 8include/python${PY_VER_SUFFIX}/Python.h
9include/python${PY_VER_SUFFIX}/abstract.h 9include/python${PY_VER_SUFFIX}/abstract.h
10include/python${PY_VER_SUFFIX}/accu.h 10include/python${PY_VER_SUFFIX}/accu.h
11include/python${PY_VER_SUFFIX}/asdl.h 11include/python${PY_VER_SUFFIX}/asdl.h
12include/python${PY_VER_SUFFIX}/ast.h 12include/python${PY_VER_SUFFIX}/ast.h
13include/python${PY_VER_SUFFIX}/bitset.h 13include/python${PY_VER_SUFFIX}/bitset.h
14include/python${PY_VER_SUFFIX}/bltinmodule.h 14include/python${PY_VER_SUFFIX}/bltinmodule.h
@@ -1821,27 +1821,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ @@ -1821,27 +1821,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
1821lib/python${PY_VER_SUFFIX}/lib-dynload/_testbuffer.so 1821lib/python${PY_VER_SUFFIX}/lib-dynload/_testbuffer.so
1822lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so 1822lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
1823lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so 1823lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so
1824lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so 1824lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so
1825lib/python${PY_VER_SUFFIX}/lib-dynload/array.so 1825lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
1826lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so 1826lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
1827lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so 1827lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
1828lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so 1828lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
1829lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1829lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1830lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1830lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1831lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1831lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1832lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1832lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1833${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1833${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1834${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 
1835lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1834lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1836lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1835lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1837lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1836lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1838lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1837lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1839lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1838lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1840lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1839lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1841lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1840lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1842lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle 1841lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle
1843lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt 1842lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt
1844lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle 1843lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle
1845lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt 1844lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt
1846lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py 1845lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py
1847lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc 1846lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc
cvs diff -r1.17 -r1.18 pkgsrc/lang/python36/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/Makefile 2019/04/03 13:17:27 1.17
+++ pkgsrc/lang/python36/Attic/Makefile 2019/04/25 15:59:54 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2019/04/03 13:17:27 maya Exp $ 1# $NetBSD: Makefile,v 1.18 2019/04/25 15:59:54 roy Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python36-${PY_DISTVERSION} 5PKGNAME= python36-${PY_DISTVERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
@@ -68,39 +68,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -68,39 +68,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
68# ossaudiodev is only available on x86 for the following platforms 68# ossaudiodev is only available on x86 for the following platforms
69PLIST_VARS+= oss 69PLIST_VARS+= oss
70.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 70.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
71 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 71 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
72PLIST.oss= yes 72PLIST.oss= yes
73.endif 73.endif
74 74
75# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 75# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
76# certain modules will not be built. 76# certain modules will not be built.
77.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 77.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
78CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 78CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
79.endif 79.endif
80 80
81PLIST_VARS+= nis no-nis 81PLIST_VARS+= nis
82.for incdir in ${_OPSYS_INCLUDE_DIRS} 82.for incdir in ${_OPSYS_INCLUDE_DIRS}
83. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h)) 83. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
84HAVE_RPC_H= yes 84HAVE_RPC_H= yes
85. endif 85. endif
86. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h)) 86. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
87HAVE_YP_PROT_H= yes 87HAVE_YP_PROT_H= yes
88. endif 88. endif
89.endfor 89.endfor
90.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes) 90.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
91PLIST.nis= yes 91PLIST.nis= yes
92.else 
93PLIST.no-nis= yes 
94.endif 92.endif
95 93
96PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 94PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
97 95
98PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 96PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
99PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 97PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
100 "python$${PY_VER_SUFFIX}") } 98 "python$${PY_VER_SUFFIX}") }
101 99
102TEST_TARGET= test 100TEST_TARGET= test
103INSTALL_TARGET= altinstall 101INSTALL_TARGET= altinstall
104 102
105REPLACE_INTERPRETER+= python 103REPLACE_INTERPRETER+= python
106REPLACE.python.old= .*python[^ ]* 104REPLACE.python.old= .*python[^ ]*
cvs diff -r1.13 -r1.14 pkgsrc/lang/python36/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/PLIST 2018/12/31 10:06:45 1.13
+++ pkgsrc/lang/python36/Attic/PLIST 2019/04/25 15:59:54 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2018/12/31 10:06:45 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2019/04/25 15:59:54 roy Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6bin/pyvenv-${PY_VER_SUFFIX} 6bin/pyvenv-${PY_VER_SUFFIX}
7include/python${PY_VER_SUFFIX}/Python-ast.h 7include/python${PY_VER_SUFFIX}/Python-ast.h
8include/python${PY_VER_SUFFIX}/Python.h 8include/python${PY_VER_SUFFIX}/Python.h
9include/python${PY_VER_SUFFIX}/abstract.h 9include/python${PY_VER_SUFFIX}/abstract.h
10include/python${PY_VER_SUFFIX}/accu.h 10include/python${PY_VER_SUFFIX}/accu.h
11include/python${PY_VER_SUFFIX}/asdl.h 11include/python${PY_VER_SUFFIX}/asdl.h
12include/python${PY_VER_SUFFIX}/ast.h 12include/python${PY_VER_SUFFIX}/ast.h
13include/python${PY_VER_SUFFIX}/bitset.h 13include/python${PY_VER_SUFFIX}/bitset.h
14include/python${PY_VER_SUFFIX}/bltinmodule.h 14include/python${PY_VER_SUFFIX}/bltinmodule.h
@@ -1920,27 +1920,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ @@ -1920,27 +1920,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
1920lib/python${PY_VER_SUFFIX}/lib-dynload/_testbuffer.so 1920lib/python${PY_VER_SUFFIX}/lib-dynload/_testbuffer.so
1921lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so 1921lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
1922lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so 1922lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so
1923lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so 1923lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so
1924lib/python${PY_VER_SUFFIX}/lib-dynload/array.so 1924lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
1925lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so 1925lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
1926lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so 1926lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
1927lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so 1927lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
1928lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1928lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1929lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1929lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1930lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1930lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1931lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1931lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1932${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1932${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1933${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 
1934lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1933lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1935lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1934lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1936lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1935lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1937lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1936lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1938lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1937lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1939lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1938lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1940lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1939lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1941lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle 1940lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle
1942lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt 1941lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt
1943lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle 1942lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle
1944lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt 1943lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt
1945lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py 1944lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py
1946lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc 1945lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc
cvs diff -r1.6 -r1.7 pkgsrc/lang/python37/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python37/Makefile 2019/04/03 13:17:28 1.6
+++ pkgsrc/lang/python37/Makefile 2019/04/25 15:59:54 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2019/04/03 13:17:28 maya Exp $ 1# $NetBSD: Makefile,v 1.7 2019/04/25 15:59:54 roy Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python37-${PY_DISTVERSION} 5PKGNAME= python37-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.python.org/ 9HOMEPAGE= https://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
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -67,39 +67,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -67,39 +67,37 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
67# ossaudiodev is only available on x86 for the following platforms 67# ossaudiodev is only available on x86 for the following platforms
68PLIST_VARS+= oss 68PLIST_VARS+= oss
69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 69.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 70 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
71PLIST.oss= yes 71PLIST.oss= yes
72.endif 72.endif
73 73
74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 74# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
75# certain modules will not be built. 75# certain modules will not be built.
76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 76.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 77CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
78.endif 78.endif
79 79
80PLIST_VARS+= nis no-nis 80PLIST_VARS+= nis
81.for incdir in ${_OPSYS_INCLUDE_DIRS} 81.for incdir in ${_OPSYS_INCLUDE_DIRS}
82. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h)) 82. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
83HAVE_RPC_H= yes 83HAVE_RPC_H= yes
84. endif 84. endif
85. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h)) 85. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
86HAVE_YP_PROT_H= yes 86HAVE_YP_PROT_H= yes
87. endif 87. endif
88.endfor 88.endfor
89.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes) 89.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
90PLIST.nis= yes 90PLIST.nis= yes
91.else 
92PLIST.no-nis= yes 
93.endif 91.endif
94 92
95PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 93PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
96 94
97PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 95PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
98PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 96PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
99 "python$${PY_VER_SUFFIX}") } 97 "python$${PY_VER_SUFFIX}") }
100 98
101TEST_TARGET= test 99TEST_TARGET= test
102INSTALL_TARGET= altinstall 100INSTALL_TARGET= altinstall
103 101
104REPLACE_INTERPRETER+= python 102REPLACE_INTERPRETER+= python
105REPLACE.python.old= .*python[^ ]* 103REPLACE.python.old= .*python[^ ]*
cvs diff -r1.5 -r1.6 pkgsrc/lang/python37/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python37/PLIST 2019/03/26 20:54:55 1.5
+++ pkgsrc/lang/python37/PLIST 2019/04/25 15:59:54 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2019/03/26 20:54:55 adam Exp $ 1@comment $NetBSD: PLIST,v 1.6 2019/04/25 15:59:54 roy Exp $
2bin/2to3-${PY_VER_SUFFIX} 2bin/2to3-${PY_VER_SUFFIX}
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4${PLIST.pymalloc}bin/python${PY_VER_SUFFIX} 4${PLIST.pymalloc}bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}${M} 5bin/python${PY_VER_SUFFIX}${M}
6bin/python${PY_VER_SUFFIX}${M}-config 6bin/python${PY_VER_SUFFIX}${M}-config
7bin/pyvenv-${PY_VER_SUFFIX} 7bin/pyvenv-${PY_VER_SUFFIX}
8include/python${PY_VER_SUFFIX}${M}/Python-ast.h 8include/python${PY_VER_SUFFIX}${M}/Python-ast.h
9include/python${PY_VER_SUFFIX}${M}/Python.h 9include/python${PY_VER_SUFFIX}${M}/Python.h
10include/python${PY_VER_SUFFIX}${M}/abstract.h 10include/python${PY_VER_SUFFIX}${M}/abstract.h
11include/python${PY_VER_SUFFIX}${M}/accu.h 11include/python${PY_VER_SUFFIX}${M}/accu.h
12include/python${PY_VER_SUFFIX}${M}/asdl.h 12include/python${PY_VER_SUFFIX}${M}/asdl.h
13include/python${PY_VER_SUFFIX}${M}/ast.h 13include/python${PY_VER_SUFFIX}${M}/ast.h
14include/python${PY_VER_SUFFIX}${M}/bitset.h 14include/python${PY_VER_SUFFIX}${M}/bitset.h
@@ -1947,27 +1947,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ @@ -1947,27 +1947,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
1947lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so 1947lib/python${PY_VER_SUFFIX}/lib-dynload/_testimportmultiple.so
1948lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so 1948lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so
1949lib/python${PY_VER_SUFFIX}/lib-dynload/_uuid.so 1949lib/python${PY_VER_SUFFIX}/lib-dynload/_uuid.so
1950lib/python${PY_VER_SUFFIX}/lib-dynload/_xxtestfuzz.so 1950lib/python${PY_VER_SUFFIX}/lib-dynload/_xxtestfuzz.so
1951lib/python${PY_VER_SUFFIX}/lib-dynload/array.so 1951lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
1952lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so 1952lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
1953lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so 1953lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
1954lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so 1954lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
1955lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1955lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1956lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1956lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1957lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1957lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1958lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1958lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1959${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1959${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1960${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 
1961lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1960lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1962lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1961lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1963lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1962lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1964lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1963lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1965lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1964lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1966lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1965lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1967lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1966lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1968lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle 1967lib/python${PY_VER_SUFFIX}/lib2to3/Grammar${PKGVERSION}.final.0.pickle
1969lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt 1968lib/python${PY_VER_SUFFIX}/lib2to3/Grammar.txt
1970lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle 1969lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar${PKGVERSION}.final.0.pickle
1971lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt 1970lib/python${PY_VER_SUFFIX}/lib2to3/PatternGrammar.txt
1972lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py 1971lib/python${PY_VER_SUFFIX}/lib2to3/__init__.py
1973lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc 1972lib/python${PY_VER_SUFFIX}/lib2to3/__init__.pyc