convert to new Python framework

4 files changed, 32 insertions, 148 deletions

diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index 427adcc62db..ce8311b5aef 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,39 +1,45 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/29 11:12:47 drochner Exp $
 #
 
-DISTNAME=	${PY_DISTNAME}
-PKGNAME=	py-idle-0.6
+PKGNAME=	${PYPKGPREFIX}-idle-0
 CATEGORIES=	devel
-MASTER_SITES=	${PY_MASTER_SITES}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.python.org/idle/
 COMMENT=	IDLE - The Integrated DeveLopment Environment for Python
 
-DEPENDS+=	py-Tk>=${PY_VERSION}:../../x11/py-Tk
-
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/Python-${PY_VERSION}/Tools
 
-EXTRACT_ELEMENTS=	Python-${PY_VERSION}/Tools/idle/*
+EXTRACT_ELEMENTS=	${PYSUBDIR}/Tools/idle/*
+
+PYTHON_PATCH_SCRIPTS= ${WRKSRC}/Tools/idle/idle.py
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
+PY_PATCHPLIST=	yes
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+
+# ignore errors due to missing files (EXTRACT_ELEMENTS!)
+do-patch:
+	(cd ${WRKSRC}; \
+	for f in ${PATCHDIR}/patch-*;do \
+	${PATCH} --batch <$$f || true; \
+	done)
 
 do-build:
-	${PY_COMPILEDIR} ${WRKSRC}/idle
+	${PYTHONBIN} ${LOCALBASE}/${PYLIB}/compileall.py ${WRKSRC}/Tools/idle
 
 do-install:
-	${INSTALL_SCRIPT_DIR} ${PY_LIBDIR}/idle
-	${INSTALL_SCRIPT_DIR} ${PY_LIBDIR}/idle/Icons
-	${INSTALL_DATA} ${WRKSRC}/idle/*.py ${PY_LIBDIR}/idle
-	${INSTALL_DATA} ${WRKSRC}/idle/*.pyc ${PY_LIBDIR}/idle
-	${INSTALL_DATA} ${WRKSRC}/idle/*.txt ${PY_LIBDIR}/idle
-	${INSTALL_DATA} ${WRKSRC}/idle/ChangeLog ${PY_LIBDIR}/idle
-	${INSTALL_DATA} ${WRKSRC}/idle/Icons/* ${PY_LIBDIR}/idle/Icons
-	${INSTALL_SCRIPT} ${WRKSRC}/idle/BrowserControl.py ${PY_LIBDIR}/idle
-	${INSTALL_SCRIPT} ${WRKSRC}/idle/idle.py ${PY_LIBDIR}/idle
-
-post-install:
-	${LN} -s ${PY_LIBDIR}/idle/idle.py \
-		${LOCALBASE}/bin/idle
-
-.include "../../lang/python/Makefile.inc"
+	${CP} -r ${WRKSRC}/Tools/idle ${PREFIX}/${PYSITELIB}
+	${CHMOD} +x ${PREFIX}/${PYSITELIB}/idle/idle.py
+	${LN} -sf ${PREFIX}/${PYSITELIB}/idle/idle.py \
+		${PREFIX}/bin/idle${PYVERSSUFFIX}
+	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
+	(cd ${PREFIX}; ${FIND} ${PYSITELIB}/idle -type f -print \
+		>>${PLIST_SRC})
+	(cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/idle -type d -print | \
+		${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+
+.include "../../lang/python/extension.buildlink.mk"
+.include "../../lang/python/application.buildlink.mk"
+.include "../../lang/python/srcdist.mk"
+.include "../../x11/py-Tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-idle/PLIST b/devel/py-idle/PLIST
deleted file mode 100644
index 6cab9f8c930..00000000000
--- a/devel/py-idle/PLIST
+++ /dev/null
@@ -1,120 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:08 zuntum Exp $
-lib/python2.0/idle/AutoExpand.py
-lib/python2.0/idle/AutoExpand.pyc
-lib/python2.0/idle/AutoIndent.py
-lib/python2.0/idle/AutoIndent.pyc
-lib/python2.0/idle/Bindings.py
-lib/python2.0/idle/Bindings.pyc
-lib/python2.0/idle/BrowserControl.py
-lib/python2.0/idle/BrowserControl.pyc
-lib/python2.0/idle/CallTipWindow.py
-lib/python2.0/idle/CallTipWindow.pyc
-lib/python2.0/idle/CallTips.py
-lib/python2.0/idle/CallTips.pyc
-lib/python2.0/idle/ChangeLog
-lib/python2.0/idle/ClassBrowser.py
-lib/python2.0/idle/ClassBrowser.pyc
-lib/python2.0/idle/ColorDelegator.py
-lib/python2.0/idle/ColorDelegator.pyc
-lib/python2.0/idle/Debugger.py
-lib/python2.0/idle/Debugger.pyc
-lib/python2.0/idle/Delegator.py
-lib/python2.0/idle/Delegator.pyc
-lib/python2.0/idle/EditorWindow.py
-lib/python2.0/idle/EditorWindow.pyc
-lib/python2.0/idle/FileList.py
-lib/python2.0/idle/FileList.pyc
-lib/python2.0/idle/FormatParagraph.py
-lib/python2.0/idle/FormatParagraph.pyc
-lib/python2.0/idle/FrameViewer.py
-lib/python2.0/idle/FrameViewer.pyc
-lib/python2.0/idle/GrepDialog.py
-lib/python2.0/idle/GrepDialog.pyc
-lib/python2.0/idle/IOBinding.py
-lib/python2.0/idle/IOBinding.pyc
-lib/python2.0/idle/Icons/folder.gif
-lib/python2.0/idle/Icons/minusnode.gif
-lib/python2.0/idle/Icons/openfolder.gif
-lib/python2.0/idle/Icons/plusnode.gif
-lib/python2.0/idle/Icons/python.gif
-lib/python2.0/idle/Icons/tk.gif
-lib/python2.0/idle/IdleConf.py
-lib/python2.0/idle/IdleConf.pyc
-lib/python2.0/idle/IdleHistory.py
-lib/python2.0/idle/IdleHistory.pyc
-lib/python2.0/idle/MultiScrolledLists.py
-lib/python2.0/idle/MultiScrolledLists.pyc
-lib/python2.0/idle/MultiStatusBar.py
-lib/python2.0/idle/MultiStatusBar.pyc
-lib/python2.0/idle/NEWS.txt
-lib/python2.0/idle/ObjectBrowser.py
-lib/python2.0/idle/ObjectBrowser.pyc
-lib/python2.0/idle/OldStackViewer.py
-lib/python2.0/idle/OldStackViewer.pyc
-lib/python2.0/idle/OutputWindow.py
-lib/python2.0/idle/OutputWindow.pyc
-lib/python2.0/idle/ParenMatch.py
-lib/python2.0/idle/ParenMatch.pyc
-lib/python2.0/idle/PathBrowser.py
-lib/python2.0/idle/PathBrowser.pyc
-lib/python2.0/idle/Percolator.py
-lib/python2.0/idle/Percolator.pyc
-lib/python2.0/idle/PyParse.py
-lib/python2.0/idle/PyParse.pyc
-lib/python2.0/idle/PyShell.py
-lib/python2.0/idle/PyShell.pyc
-lib/python2.0/idle/README.txt
-lib/python2.0/idle/RemoteInterp.py
-lib/python2.0/idle/RemoteInterp.pyc
-lib/python2.0/idle/ReplaceDialog.py
-lib/python2.0/idle/ReplaceDialog.pyc
-lib/python2.0/idle/ScriptBinding.py
-lib/python2.0/idle/ScriptBinding.pyc
-lib/python2.0/idle/ScrolledList.py
-lib/python2.0/idle/ScrolledList.pyc
-lib/python2.0/idle/SearchBinding.py
-lib/python2.0/idle/SearchBinding.pyc
-lib/python2.0/idle/SearchDialog.py
-lib/python2.0/idle/SearchDialog.pyc
-lib/python2.0/idle/SearchDialogBase.py
-lib/python2.0/idle/SearchDialogBase.pyc
-lib/python2.0/idle/SearchEngine.py
-lib/python2.0/idle/SearchEngine.pyc
-lib/python2.0/idle/Separator.py
-lib/python2.0/idle/Separator.pyc
-lib/python2.0/idle/StackViewer.py
-lib/python2.0/idle/StackViewer.pyc
-lib/python2.0/idle/TODO.txt
-lib/python2.0/idle/ToolTip.py
-lib/python2.0/idle/ToolTip.pyc
-lib/python2.0/idle/TreeWidget.py
-lib/python2.0/idle/TreeWidget.pyc
-lib/python2.0/idle/UndoDelegator.py
-lib/python2.0/idle/UndoDelegator.pyc
-lib/python2.0/idle/WidgetRedirector.py
-lib/python2.0/idle/WidgetRedirector.pyc
-lib/python2.0/idle/WindowList.py
-lib/python2.0/idle/WindowList.pyc
-lib/python2.0/idle/ZoomHeight.py
-lib/python2.0/idle/ZoomHeight.pyc
-lib/python2.0/idle/__init__.py
-lib/python2.0/idle/__init__.pyc
-lib/python2.0/idle/config-unix.txt
-lib/python2.0/idle/config-win.txt
-lib/python2.0/idle/config.txt
-lib/python2.0/idle/eventparse.py
-lib/python2.0/idle/eventparse.pyc
-lib/python2.0/idle/extend.txt
-lib/python2.0/idle/help.txt
-lib/python2.0/idle/idle.py
-lib/python2.0/idle/idle.pyc
-lib/python2.0/idle/idlever.py
-lib/python2.0/idle/idlever.pyc
-lib/python2.0/idle/keydefs.py
-lib/python2.0/idle/keydefs.pyc
-lib/python2.0/idle/testcode.py
-lib/python2.0/idle/testcode.pyc
-@exec ln -s %D/lib/python2.0/idle/idle.py %D/bin/idle
-@unexec rm -f %D/bin/idle
-@dirrm lib/python2.0/idle/Icons
-@dirrm lib/python2.0/idle
diff --git a/devel/py-idle/PLIST.pre b/devel/py-idle/PLIST.pre
new file mode 100644
index 00000000000..2c29d818463
--- /dev/null
+++ b/devel/py-idle/PLIST.pre
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.pre,v 1.1 2002/01/29 11:12:48 drochner Exp $
+bin/idle${PYVERSSUFFIX}
diff --git a/devel/py-idle/distinfo b/devel/py-idle/distinfo
deleted file mode 100644
index 554c9206871..00000000000
--- a/devel/py-idle/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:44 wiz Exp $
-
-SHA1 (python/BeOpen-Python-2.0.tar.gz) = 16ca42c5be1ddf5dc08d9b59b97f728f330e1fdc
-Size (python/BeOpen-Python-2.0.tar.gz) = 4066781 bytes