Wed Dec 13 12:55:32 2017 UTC ()
python35: Disable libpython3.so.

This is a useless library (we've built it incorrectly for a long time so it
contains no valid symbols) that only creates CONFLICTS with other python3
packages.  No objection on tech-pkg.  Bump PKGREVISION.


(jperkin)
diff -r1.11 -r1.12 pkgsrc/lang/python35/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/python35/PLIST
diff -r1.13 -r1.14 pkgsrc/lang/python35/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/python35/patches/patch-Makefile.pre.in
cvs diff -r1.11 -r1.12 pkgsrc/lang/python35/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/Makefile 2017/11/22 19:16:20 1.11
+++ pkgsrc/lang/python35/Attic/Makefile 2017/12/13 12:55:32 1.12
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.11 2017/11/22 19:16:20 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.12 2017/12/13 12:55:32 jperkin Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python35-${PY_DISTVERSION} 5PKGNAME= python35-${PY_DISTVERSION}
 6PKGREVISION= 1
6CATEGORIES= lang python 7CATEGORIES= lang python
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 12LICENSE= python-software-foundation
12 13
13CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
14 15
15PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk 16PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk
16PLIST_AWK_ENV+= PYVERS=35 17PLIST_AWK_ENV+= PYVERS=35
17PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.pyc$$/ { 18PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.pyc$$/ {
18PRINT_PLIST_AWK+= sub(/__pycache__\//, "") 19PRINT_PLIST_AWK+= sub(/__pycache__\//, "")
cvs diff -r1.6 -r1.7 pkgsrc/lang/python35/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/PLIST 2017/08/14 09:16:28 1.6
+++ pkgsrc/lang/python35/Attic/PLIST 2017/12/13 12:55:32 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2017/08/14 09:16:28 adam Exp $ 1@comment $NetBSD: PLIST,v 1.7 2017/12/13 12:55:32 jperkin 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
@@ -94,27 +94,26 @@ include/python${PY_VER_SUFFIX}/structmem @@ -94,27 +94,26 @@ include/python${PY_VER_SUFFIX}/structmem
94include/python${PY_VER_SUFFIX}/structseq.h 94include/python${PY_VER_SUFFIX}/structseq.h
95include/python${PY_VER_SUFFIX}/symtable.h 95include/python${PY_VER_SUFFIX}/symtable.h
96include/python${PY_VER_SUFFIX}/sysmodule.h 96include/python${PY_VER_SUFFIX}/sysmodule.h
97include/python${PY_VER_SUFFIX}/token.h 97include/python${PY_VER_SUFFIX}/token.h
98include/python${PY_VER_SUFFIX}/traceback.h 98include/python${PY_VER_SUFFIX}/traceback.h
99include/python${PY_VER_SUFFIX}/tupleobject.h 99include/python${PY_VER_SUFFIX}/tupleobject.h
100include/python${PY_VER_SUFFIX}/typeslots.h 100include/python${PY_VER_SUFFIX}/typeslots.h
101include/python${PY_VER_SUFFIX}/ucnhash.h 101include/python${PY_VER_SUFFIX}/ucnhash.h
102include/python${PY_VER_SUFFIX}/unicodeobject.h 102include/python${PY_VER_SUFFIX}/unicodeobject.h
103include/python${PY_VER_SUFFIX}/warnings.h 103include/python${PY_VER_SUFFIX}/warnings.h
104include/python${PY_VER_SUFFIX}/weakrefobject.h 104include/python${PY_VER_SUFFIX}/weakrefobject.h
105lib/libpython${PY_VER_SUFFIX}.so 105lib/libpython${PY_VER_SUFFIX}.so
106lib/libpython${PY_VER_SUFFIX}.so.1.0 106lib/libpython${PY_VER_SUFFIX}.so.1.0
107lib/libpython3.so 
108lib/pkgconfig/python-${PY_VER_SUFFIX}.pc 107lib/pkgconfig/python-${PY_VER_SUFFIX}.pc
109lib/python${PY_VER_SUFFIX}/LICENSE.txt 108lib/python${PY_VER_SUFFIX}/LICENSE.txt
110lib/python${PY_VER_SUFFIX}/__future__.py 109lib/python${PY_VER_SUFFIX}/__future__.py
111lib/python${PY_VER_SUFFIX}/__future__.pyc 110lib/python${PY_VER_SUFFIX}/__future__.pyc
112lib/python${PY_VER_SUFFIX}/__future__.pyo 111lib/python${PY_VER_SUFFIX}/__future__.pyo
113lib/python${PY_VER_SUFFIX}/__phello__.foo.py 112lib/python${PY_VER_SUFFIX}/__phello__.foo.py
114lib/python${PY_VER_SUFFIX}/__phello__.foo.pyc 113lib/python${PY_VER_SUFFIX}/__phello__.foo.pyc
115lib/python${PY_VER_SUFFIX}/__phello__.foo.pyo 114lib/python${PY_VER_SUFFIX}/__phello__.foo.pyo
116lib/python${PY_VER_SUFFIX}/_bootlocale.py 115lib/python${PY_VER_SUFFIX}/_bootlocale.py
117lib/python${PY_VER_SUFFIX}/_bootlocale.pyc 116lib/python${PY_VER_SUFFIX}/_bootlocale.pyc
118lib/python${PY_VER_SUFFIX}/_bootlocale.pyo 117lib/python${PY_VER_SUFFIX}/_bootlocale.pyo
119lib/python${PY_VER_SUFFIX}/_collections_abc.py 118lib/python${PY_VER_SUFFIX}/_collections_abc.py
120lib/python${PY_VER_SUFFIX}/_collections_abc.pyc 119lib/python${PY_VER_SUFFIX}/_collections_abc.pyc
cvs diff -r1.13 -r1.14 pkgsrc/lang/python35/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python35/Attic/distinfo 2017/11/01 21:51:22 1.13
+++ pkgsrc/lang/python35/Attic/distinfo 2017/12/13 12:55:32 1.14
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.13 2017/11/01 21:51:22 wiz Exp $ 1$NetBSD: distinfo,v 1.14 2017/12/13 12:55:32 jperkin Exp $
2 2
3SHA1 (Python-3.5.4.tar.xz) = 4aacbd09ca6988255de84a98ab9e4630f584efba 3SHA1 (Python-3.5.4.tar.xz) = 4aacbd09ca6988255de84a98ab9e4630f584efba
4RMD160 (Python-3.5.4.tar.xz) = b0df9be4047421672456c9c57b4ddc0aaad7c095 4RMD160 (Python-3.5.4.tar.xz) = b0df9be4047421672456c9c57b4ddc0aaad7c095
5SHA512 (Python-3.5.4.tar.xz) = dbbe2740ee1cce5404b7b6436a9b3887e15f415a1006efa22014ec7e5b1e48c43eed0ff98f6f5b365c527b8d2525be4ce72bbe404ce71c0835529fcd6f0267ff 5SHA512 (Python-3.5.4.tar.xz) = dbbe2740ee1cce5404b7b6436a9b3887e15f415a1006efa22014ec7e5b1e48c43eed0ff98f6f5b365c527b8d2525be4ce72bbe404ce71c0835529fcd6f0267ff
6Size (Python-3.5.4.tar.xz) = 15332320 bytes 6Size (Python-3.5.4.tar.xz) = 15332320 bytes
7SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 7SHA1 (patch-Lib_distutils_command_install.py) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
8SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d0b70a64b79ee6084c41d8fbb01c8e8e4553419 8SHA1 (patch-Lib_distutils_unixccompiler.py) = 7d0b70a64b79ee6084c41d8fbb01c8e8e4553419
9SHA1 (patch-Makefile.pre.in) = 330a1a74fbd967e0777860fa3ceecb88ac2eb7fd 9SHA1 (patch-Makefile.pre.in) = a142218a5fe424891faab2f9c77715b4dd196fd8
10SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593 10SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
11SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 11SHA1 (patch-Modules_makesetup) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
12SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a 12SHA1 (patch-Modules_nismodule.c) = bd290417c265846e238660180e60e76c0f5f696a
13SHA1 (patch-Modules_socketmodule.c) = 63d583340b071b07ff3e31cf332fcc2ca9ab50e3 13SHA1 (patch-Modules_socketmodule.c) = 63d583340b071b07ff3e31cf332fcc2ca9ab50e3
14SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c 14SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
15SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be 15SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
16SHA1 (patch-configure) = fcdc55c8cc84017364f840f35e7ec4a131074520 16SHA1 (patch-configure) = fcdc55c8cc84017364f840f35e7ec4a131074520
17SHA1 (patch-pyconfig.h.in) = 5d11bd737a949f89b3fbd14db4920873bcc3282e 17SHA1 (patch-pyconfig.h.in) = 5d11bd737a949f89b3fbd14db4920873bcc3282e
18SHA1 (patch-setup.py) = 7d8afe5e799c8373fe41fbb65e283e0c6f3967d2 18SHA1 (patch-setup.py) = 7d8afe5e799c8373fe41fbb65e283e0c6f3967d2
cvs diff -r1.4 -r1.5 pkgsrc/lang/python35/patches/Attic/patch-Makefile.pre.in (expand / switch to unified diff)

--- pkgsrc/lang/python35/patches/Attic/patch-Makefile.pre.in 2017/08/14 09:16:28 1.4
+++ pkgsrc/lang/python35/patches/Attic/patch-Makefile.pre.in 2017/12/13 12:55:32 1.5
@@ -1,26 +1,37 @@ @@ -1,26 +1,37 @@
1$NetBSD: patch-Makefile.pre.in,v 1.4 2017/08/14 09:16:28 adam Exp $ 1$NetBSD: patch-Makefile.pre.in,v 1.5 2017/12/13 12:55:32 jperkin Exp $
 2
 3Do not build/install libpython3.so.
2 4
3--- Makefile.pre.in.orig 2017-08-07 07:59:11.000000000 +0000 5--- Makefile.pre.in.orig 2017-08-07 07:59:11.000000000 +0000
4+++ Makefile.pre.in 6+++ Makefile.pre.in
5@@ -92,7 +92,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI 7@@ -92,7 +92,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
6 # be able to build extension modules using the directories specified in the 8 # be able to build extension modules using the directories specified in the
7 # environment variables 9 # environment variables
8 PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) 10 PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
9-PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) 11-PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
10+PY_LDFLAGS= -L. $(CONFIGURE_LDFLAGS) $(LDFLAGS) 12+PY_LDFLAGS= -L. $(CONFIGURE_LDFLAGS) $(LDFLAGS)
11 NO_AS_NEEDED= @NO_AS_NEEDED@ 13 NO_AS_NEEDED= @NO_AS_NEEDED@
12 LDLAST= @LDLAST@ 14 LDLAST= @LDLAST@
13 SGI_ABI= @SGI_ABI@ 15 SGI_ABI= @SGI_ABI@
 16@@ -202,7 +202,7 @@ DIST= $(DISTFILES) $(DISTDIRS)
 17 LIBRARY= @LIBRARY@
 18 LDLIBRARY= @LDLIBRARY@
 19 BLDLIBRARY= @BLDLIBRARY@
 20-PY3LIBRARY= @PY3LIBRARY@
 21+PY3LIBRARY=
 22 DLLLIBRARY= @DLLLIBRARY@
 23 LDLIBRARYDIR= @LDLIBRARYDIR@
 24 INSTSONAME= @INSTSONAME@
14@@ -864,7 +864,7 @@ regen-opcode-targets: 25@@ -864,7 +864,7 @@ regen-opcode-targets:
15 $(PYTHON_FOR_REGEN) $(srcdir)/Python/makeopcodetargets.py \ 26 $(PYTHON_FOR_REGEN) $(srcdir)/Python/makeopcodetargets.py \
16 $(srcdir)/Python/opcode_targets.h 27 $(srcdir)/Python/opcode_targets.h
17  28
18-Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h 29-Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h
19+#Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h 30+#Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h
20  31
21 Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h 32 Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h
22  33
23@@ -1110,7 +1110,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK 34@@ -1110,7 +1110,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
24 if test -n "$(PY3LIBRARY)"; then \ 35 if test -n "$(PY3LIBRARY)"; then \
25 $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \ 36 $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
26 fi; \ 37 fi; \