Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1640548625164160"
MIME-Version: 1.0
Date: Sun, 26 Dec 2021 19:57:05 +0000
From: "Niclas Rosenvik" <nros@netbsd.org>
Subject: CVS commit: pkgsrc/devel/py-curses
To: pkgsrc-changes@NetBSD.org
Reply-To: nros@netbsd.org
Message-Id: <20211226195705.E3C58FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1640548625164160
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nros
Date:		Sun Dec 26 19:57:05 UTC 2021

Modified Files:
	pkgsrc/devel/py-curses: Makefile
	pkgsrc/devel/py-curses/files: setup.py

Log Message:
Fix py-curses with python 3.10 .
The fix has been tested with
python versions 2.7 3.6 3.9
and 3.10 .


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/py-curses/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-curses/files/setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1640548625164160
Content-Disposition: inline
Content-Length: 1826
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/py-curses/Makefile
diff -u pkgsrc/devel/py-curses/Makefile:1.52 pkgsrc/devel/py-curses/Makefile:1.53
--- pkgsrc/devel/py-curses/Makefile:1.52	Mon Dec  6 16:03:50 2021
+++ pkgsrc/devel/py-curses/Makefile	Sun Dec 26 19:57:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2021/12/06 16:03:50 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2021/12/26 19:57:05 nros Exp $
 
 PKGNAME=	${PYPKGPREFIX}-curses-${PY_DISTVERSION}
 PKGREVISION=	6
@@ -11,8 +11,6 @@ COMMENT=	Curses module for Python
 PYDISTUTILSPKG=		yes
 PY_PATCHPLIST=		yes
 
-#CPPFLAGS+=	-I${PREFIX}/include/python3.10/internal
-
 # NetBSD-8 curses has enough support for py-curses
 USE_CURSES=	getsyx
 # But we build as ncurses still to get the full feature set easily

Index: pkgsrc/devel/py-curses/files/setup.py
diff -u pkgsrc/devel/py-curses/files/setup.py:1.1 pkgsrc/devel/py-curses/files/setup.py:1.2
--- pkgsrc/devel/py-curses/files/setup.py:1.1	Mon Jan 28 09:32:55 2002
+++ pkgsrc/devel/py-curses/files/setup.py	Sun Dec 26 19:57:05 2021
@@ -1,19 +1,22 @@
-# $NetBSD: setup.py,v 1.1 2002/01/28 09:32:55 drochner Exp $
+# $NetBSD: setup.py,v 1.2 2021/12/26 19:57:05 nros Exp $
 
 import distutils
+import os
 from distutils.core import setup, Extension
+from distutils.sysconfig import get_python_inc
 
 ncursesprefix = '@NCURSESPREFIX@'
 ncincl = ncursesprefix + '/include'
 nclib = ncursesprefix + '/lib'
+py_inc_int = os.path.join(get_python_inc(), 'internal')
 
 setup(
 	ext_modules = [
 		Extension(
 			'_curses',
 			['Modules/_cursesmodule.c'],
-			define_macros=[('HAVE_NCURSES_H', None)],
-			include_dirs=[ncincl],
+			define_macros=[('HAVE_NCURSES_H', None), ('Py_BUILD_CORE_MODULE', None)],
+			include_dirs=[ncincl, py_inc_int],
 			library_dirs=[nclib],
 			runtime_library_dirs=[nclib],
 			libraries=['ncurses']


--_----------=_1640548625164160--