use distutils to build the extension module, to make it work with

newer Python versions too,
move a patch which is specific for a particular Python release into
the Python pkg subdir, pull patches and checksums from there
XXX we have to override the do-patch role to avoid patch errors
    (we use EXTRACT_ELEMENTS, so we don't generally have all the
     original files)

4 files changed, 43 insertions, 40 deletions

diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile
index cf2f8048c88..78d75afe2b5 100644
--- a/misc/py-readline/Makefile
+++ b/misc/py-readline/Makefile
@@ -1,29 +1,32 @@
-# $NetBSD: Makefile,v 1.18 2001/12/20 19:32:27 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/01/28 09:24:38 drochner Exp $
 #
 
-DISTNAME=	${PY_DISTNAME}
-PKGNAME=	py-readline-${PY_VERSION}
-WRKSRC=		${PY_WRKSRC}
+PKGNAME=	${PYPKGPREFIX}-readline-0
 CATEGORIES=	misc
-MASTER_SITES=	${PY_MASTER_SITES}
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.python.org/doc/tut/interacting.html
 COMMENT=	line editing support for Python
 
-EXTRACT_ELEMENTS=	${PY_MODULES}/readline.c
+EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/readline.c
 
 USE_GNU_READLINE=	# defined
 
 .include "../../devel/readline/buildlink.mk"
 
-PY_SETUP_SUBST+=	BUILDLINK_CPPFLAGS=${_BUILDLINK_CPPFLAGS}
-PY_SETUP_SUBST+=	BUILDLINK_LDFLAGS=${_BUILDLINK_LDFLAGS}
-
-do-configure:	python-std-do-configure
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/readline.so ${PY_LIBDIR}/lib-dynload
-
-.include "../../lang/python/Makefile.inc"
+PYDISTUTILSPKG=	yes
+PYBINMODULE=	yes
+PY_PATCHPLIST=	yes
+PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_DIR}
+PY_SETUP_SUBST+= RLRTPREFIX=${BUILDLINK_PREFIX.readline}
+
+# ignore errors due to missing files (EXTRACT_ELEMENTS!)
+do-patch:
+	(cd ${WRKSRC}; \
+	for f in ${PATCHDIR}/patch-*;do \
+	${PATCH} --batch <$$f || true; \
+	done)
+
+.include "../../lang/python/srcdist.mk"
+.include "../../lang/python/extension.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/py-readline/PLIST b/misc/py-readline/PLIST
index ca7f1617d80..97fbeb7321f 100644
--- a/misc/py-readline/PLIST
+++ b/misc/py-readline/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:19 zuntum Exp $
-lib/python2.0/lib-dynload/readline.so
+@comment $NetBSD: PLIST,v 1.2 2002/01/28 09:24:39 drochner Exp $
+${PYSITELIB}/readline.so
diff --git a/misc/py-readline/files/setup.py b/misc/py-readline/files/setup.py
new file mode 100644
index 00000000000..8daa67b2256
--- /dev/null
+++ b/misc/py-readline/files/setup.py
@@ -0,0 +1,23 @@
+# $NetBSD: setup.py,v 1.1 2002/01/28 09:24:40 drochner Exp $
+
+import distutils
+from distutils.core import setup, Extension
+
+rlprefix = '@RLPREFIX@'
+rlincl = rlprefix + '/include'
+rllib = rlprefix + '/lib'
+rlrtprefix = '@RLRTPREFIX@'
+rlrtlib = rlrtprefix + '/lib'
+
+setup(
+	ext_modules = [
+		Extension(
+			'readline',
+			['Modules/readline.c'],
+			include_dirs=[rlincl],
+			library_dirs=[rllib],
+			runtime_library_dirs=[rlrtlib],
+			libraries=['readline', 'termcap']
+		)
+	]
+)
diff --git a/misc/py-readline/patches/patch-aa b/misc/py-readline/patches/patch-aa
deleted file mode 100644
index 540258d9a24..00000000000
--- a/misc/py-readline/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/08/07 15:04:28 tron Exp $
-
---- readline.c.orig	Mon Oct 16 23:49:34 2000
-+++ readline.c	Tue Aug  7 17:00:33 2001
-@@ -26,18 +26,6 @@
- #include <unistd.h>
- #else
- #include <readline/readline.h> /* You may need to add an -I option to Setup */
--
--extern int rl_parse_and_bind(char *);
--extern int rl_read_init_file(char *);
--extern int rl_insert_text(char *);
--extern int rl_bind_key(int, Function *);
--extern int rl_bind_key_in_map(int, Function *, Keymap);
--extern int rl_initialize(void);
--extern int add_history(char *);
--extern int read_history(char *);
--extern int write_history(char *);
--extern int history_truncate_file(char *, int);
--extern Function *rl_event_hook;
- #endif
- 
- /* Pointers needed from outside (but not declared in a header file). */