From d35d029ae334ef2507880d0ec20b66a2ab600305 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 14 Mar 2002 17:58:47 +0000 Subject: Move py-readline from misc to devel, where all the other readline packages live. Closes pkg/15444. --- devel/Makefile | 3 ++- devel/py-readline/DESCR | 2 ++ devel/py-readline/Makefile | 32 ++++++++++++++++++++++++++++++++ devel/py-readline/PLIST | 2 ++ devel/py-readline/files/Setup.in | 5 +++++ devel/py-readline/files/setup.py | 23 +++++++++++++++++++++++ misc/Makefile | 3 +-- misc/py-readline/DESCR | 2 -- misc/py-readline/Makefile | 32 -------------------------------- misc/py-readline/PLIST | 2 -- misc/py-readline/files/Setup.in | 5 ----- misc/py-readline/files/setup.py | 23 ----------------------- 12 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 devel/py-readline/DESCR create mode 100644 devel/py-readline/Makefile create mode 100644 devel/py-readline/PLIST create mode 100644 devel/py-readline/files/Setup.in create mode 100644 devel/py-readline/files/setup.py delete mode 100644 misc/py-readline/DESCR delete mode 100644 misc/py-readline/Makefile delete mode 100644 misc/py-readline/PLIST delete mode 100644 misc/py-readline/files/Setup.in delete mode 100644 misc/py-readline/files/setup.py diff --git a/devel/Makefile b/devel/Makefile index df17c7a63db..fe31d784419 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.268 2002/03/07 12:20:20 wiz Exp $ +# $NetBSD: Makefile,v 1.269 2002/03/14 17:58:48 wiz Exp $ # COMMENT= Development utilities @@ -229,6 +229,7 @@ SUBDIR+= py-curses SUBDIR+= py-distutils SUBDIR+= py-expect SUBDIR+= py-idle +SUBDIR+= py-readline SUBDIR+= py-unit SUBDIR+= py-unitgui SUBDIR+= ratfor diff --git a/devel/py-readline/DESCR b/devel/py-readline/DESCR new file mode 100644 index 00000000000..2e171893d8c --- /dev/null +++ b/devel/py-readline/DESCR @@ -0,0 +1,2 @@ +This module adds line-editing features to Python. This is handy +mainly in interactive mode of Python. diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile new file mode 100644 index 00000000000..35872de6e8b --- /dev/null +++ b/devel/py-readline/Makefile @@ -0,0 +1,32 @@ +# $NetBSD: Makefile,v 1.1 2002/03/14 17:58:49 wiz Exp $ +# + +PKGNAME= ${PYPKGPREFIX}-readline-0 +CATEGORIES= devel misc + +MAINTAINER= tsarna@netbsd.org +HOMEPAGE= http://www.python.org/doc/tut/interacting.html +COMMENT= line editing support for Python + +EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c + +USE_GNU_READLINE= # defined + +.include "../../devel/readline/buildlink.mk" + +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/devel/py-readline/PLIST b/devel/py-readline/PLIST new file mode 100644 index 00000000000..f3ee4a00467 --- /dev/null +++ b/devel/py-readline/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2002/03/14 17:58:49 wiz Exp $ +${PYSITELIB}/readline.so diff --git a/devel/py-readline/files/Setup.in b/devel/py-readline/files/Setup.in new file mode 100644 index 00000000000..2d22d327cc9 --- /dev/null +++ b/devel/py-readline/files/Setup.in @@ -0,0 +1,5 @@ +# $NetBSD: Setup.in,v 1.1 2002/03/14 17:58:49 wiz Exp $ +# +*shared* +readline readline.c @BUILDLINK_LDFLAGS@ -R@LOCALBASE@/lib \ + @BUILDLINK_CPPFLAGS@ -lreadline -ltermcap diff --git a/devel/py-readline/files/setup.py b/devel/py-readline/files/setup.py new file mode 100644 index 00000000000..ca25194e5d4 --- /dev/null +++ b/devel/py-readline/files/setup.py @@ -0,0 +1,23 @@ +# $NetBSD: setup.py,v 1.1 2002/03/14 17:58:50 wiz 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/Makefile b/misc/Makefile index da64e1e21ac..bc48bedaf14 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.119 2002/03/09 08:19:03 rh Exp $ +# $NetBSD: Makefile,v 1.120 2002/03/14 17:58:47 wiz Exp $ # COMMENT= Miscellaneous utilities @@ -80,7 +80,6 @@ SUBDIR+= php4-mbstring SUBDIR+= pinfo SUBDIR+= proj SUBDIR+= pty-redir -SUBDIR+= py-readline SUBDIR+= qterm SUBDIR+= reed SUBDIR+= root diff --git a/misc/py-readline/DESCR b/misc/py-readline/DESCR deleted file mode 100644 index 2e171893d8c..00000000000 --- a/misc/py-readline/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This module adds line-editing features to Python. This is handy -mainly in interactive mode of Python. diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile deleted file mode 100644 index 78d75afe2b5..00000000000 --- a/misc/py-readline/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.19 2002/01/28 09:24:38 drochner Exp $ -# - -PKGNAME= ${PYPKGPREFIX}-readline-0 -CATEGORIES= misc - -MAINTAINER= tsarna@netbsd.org -HOMEPAGE= http://www.python.org/doc/tut/interacting.html -COMMENT= line editing support for Python - -EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c - -USE_GNU_READLINE= # defined - -.include "../../devel/readline/buildlink.mk" - -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 deleted file mode 100644 index 97fbeb7321f..00000000000 --- a/misc/py-readline/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@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.in b/misc/py-readline/files/Setup.in deleted file mode 100644 index 45c63d96042..00000000000 --- a/misc/py-readline/files/Setup.in +++ /dev/null @@ -1,5 +0,0 @@ -# $NetBSD: Setup.in,v 1.5 2001/06/11 02:05:13 jlam Exp $ -# -*shared* -readline readline.c @BUILDLINK_LDFLAGS@ -R@LOCALBASE@/lib \ - @BUILDLINK_CPPFLAGS@ -lreadline -ltermcap diff --git a/misc/py-readline/files/setup.py b/misc/py-readline/files/setup.py deleted file mode 100644 index 8daa67b2256..00000000000 --- a/misc/py-readline/files/setup.py +++ /dev/null @@ -1,23 +0,0 @@ -# $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'] - ) - ] -) -- cgit v1.2.3