update to 2.4.2

Fix for PyQt < 3.8. The BlackAdder generated files are now hacked (again) to
eliminate an attibute error for WState_Polished. Also, backreferences are now
supported in the replace output.

4 files changed, 116 insertions, 10 deletions

diff --git a/misc/kodos/Makefile b/misc/kodos/Makefile
index 019dd306056..1ebdac88ff0 100644
--- a/misc/kodos/Makefile
+++ b/misc/kodos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/02/08 12:44:43 recht Exp $
-#
+# $NetBSD: Makefile,v 1.3 2004/05/09 17:23:21 recht Exp $
 
-DISTNAME=	kodos-2.4.0
+DISTNAME=	kodos-2.4.2
 CATEGORIES=	misc python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kodos/}
 
@@ -9,10 +8,17 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://kodos.sourceforge.net/
 COMMENT=	GUI for creating, testing and debugging Python REs
 
-USE_BUILDLINK2=	yes
+DEPENDS=	${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules
+DEPENDS+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3:../../x11/py-qt3-sip
+
+USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
+USE_LANGUAGES=
+
+SUBST_CLASSES+=		libpath
+SUBST_STAGE.libpath=	pre-configure
+SUBST_FILES.libpath=	setup.py
+SUBST_SED.libpath=	-e "s|@LIBPATH@|${PREFIX}/share/kodos|g"
 
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-qt3-modules/buildlink2.mk"
-.include "../../x11/py-qt3-sip/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kodos/PLIST b/misc/kodos/PLIST
index 0eb8a2a6a7a..171a7b5956b 100644
--- a/misc/kodos/PLIST
+++ b/misc/kodos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/08 12:44:43 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:23:21 recht Exp $
 bin/kodos.py
 ${PYSITELIB}/kodos.pth
 ${PYSITELIB}/kodos/__init__.py
@@ -100,5 +100,91 @@ ${PYSITELIB}/kodos/modules/webbrowser.pyo
 ${PYSITELIB}/kodos/modules/xpm.py
 ${PYSITELIB}/kodos/modules/xpm.pyc
 ${PYSITELIB}/kodos/modules/xpm.pyo
+share/kodos/help/examine.html
+share/kodos/help/example.html
+share/kodos/help/importURL.html
+share/kodos/help/kodos.html
+share/kodos/help/mainwin.html
+share/kodos/help/overview.html
+share/kodos/help/pause.html
+share/kodos/help/prefs.html
+share/kodos/help/python/about.html
+share/kodos/help/python/match-objects.html
+share/kodos/help/python/matching-searching.html
+share/kodos/help/python/module-re.html
+share/kodos/help/python/node102.html
+share/kodos/help/python/node99.html
+share/kodos/help/python/re-objects.html
+share/kodos/help/python/re-syntax.html
+share/kodos/help/regex-lib.xml
+share/kodos/help/running.html
+share/kodos/help/toolbar.html
+share/kodos/images/blank.png
+share/kodos/images/book.png
+share/kodos/images/green.png
+share/kodos/images/help.png
+share/kodos/images/kodos.png
+share/kodos/images/kodos_icon.png
+share/kodos/images/kodos_icon_old.png
+share/kodos/images/kodos_icon_small.png
+share/kodos/images/kodos_logo.png
+share/kodos/images/kodos_text_logo.png
+share/kodos/images/kodos_text_logo1.png
+share/kodos/images/library.png
+share/kodos/images/pause.png
+share/kodos/images/pause_toolbar.png
+share/kodos/images/red.png
+share/kodos/images/spacer.png
+share/kodos/images/yellow.png
+share/kodos/kodos.pro
+share/kodos/kodosqt.pro
+share/kodos/modules/aboutBA.ui
+share/kodos/modules/kodosBA.ui
+share/kodos/modules/newUserDialogBA.ui
+share/kodos/modules/prefsBA.ui
+share/kodos/modules/referenceBA.ui
+share/kodos/modules/regexLibraryBA.ui
+share/kodos/modules/reportBugBA.ui
+share/kodos/modules/resultsBA.ui
+share/kodos/modules/urlDialogBA.ui
+share/kodos/screenshots/bug.png
+share/kodos/screenshots/code.png
+share/kodos/screenshots/examine1.png
+share/kodos/screenshots/examine2.png
+share/kodos/screenshots/example.png
+share/kodos/screenshots/flags.png
+share/kodos/screenshots/flags2.png
+share/kodos/screenshots/green.png
+share/kodos/screenshots/group.png
+share/kodos/screenshots/groups.png
+share/kodos/screenshots/groups2.png
+share/kodos/screenshots/groups3.png
+share/kodos/screenshots/groups4.png
+share/kodos/screenshots/kodos.png
+share/kodos/screenshots/match.png
+share/kodos/screenshots/match2.png
+share/kodos/screenshots/matchnum.png
+share/kodos/screenshots/prefs.png
+share/kodos/screenshots/red.png
+share/kodos/screenshots/ref.png
+share/kodos/screenshots/regex.png
+share/kodos/screenshots/regex2.png
+share/kodos/screenshots/statuspaused.png
+share/kodos/screenshots/string.png
+share/kodos/screenshots/string2.png
+share/kodos/screenshots/string3.png
+share/kodos/screenshots/toolbar.png
+share/kodos/screenshots/toolbarpaused.png
+share/kodos/screenshots/yellow.png
+share/kodos/translations/kodos_en.ts
+share/kodos/translations/kodos_pl.qm
+share/kodos/translations/kodos_pl.ts
+@dirrm share/kodos/translations
+@dirrm share/kodos/screenshots
+@dirrm share/kodos/modules
+@dirrm share/kodos/images
+@dirrm share/kodos/help/python
+@dirrm share/kodos/help
+@dirrm share/kodos
 @dirrm ${PYSITELIB}/kodos/modules
 @dirrm ${PYSITELIB}/kodos
diff --git a/misc/kodos/distinfo b/misc/kodos/distinfo
index 6e3419ad8c7..90407c8f61c 100644
--- a/misc/kodos/distinfo
+++ b/misc/kodos/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/02/08 12:44:43 recht Exp $
+$NetBSD: distinfo,v 1.3 2004/05/09 17:23:21 recht Exp $
 
-SHA1 (kodos-2.4.0.tar.gz) = 590392a7b6fd53e92c12a0660f0e16e1e514bbd3
-Size (kodos-2.4.0.tar.gz) = 355706 bytes
+SHA1 (kodos-2.4.2.tar.gz) = a360135af26b4e4ad68bd2adb44453bc5fd0b233
+Size (kodos-2.4.2.tar.gz) = 356286 bytes
+SHA1 (patch-aa) = 2b77ce699c1b2f334f5e76c65363e35172d29c97
diff --git a/misc/kodos/patches/patch-aa b/misc/kodos/patches/patch-aa
new file mode 100644
index 00000000000..129da615df1
--- /dev/null
+++ b/misc/kodos/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/05/09 17:23:21 recht Exp $
+
+--- setup.py.orig	2004-05-09 19:11:24.000000000 +0200
++++ setup.py	2004-05-09 19:11:37.000000000 +0200
+@@ -18,7 +18,7 @@
+      libpath = r"lib\site-packages\kodos"
+ else:
+      #libpath = "/usr/local/kodos" # 2.4.0 and prior
+-     libpath = "/usr/share/kodos"  # as of 2.4.1
++     libpath = "@LIBPATH@"  # as of 2.4.1
+ 
+ for arg in args:
+     if arg == "--formats=wininst":