Update to 4.5.24. Extract using bsdtar instead of gtar.

Fix python interpreter in installed files.

Changes:

Version 4.5.24:
- bug fixes

Version 4.5.23:
- bug fixes

Version 4.5.22:
- bug fixes

Version 4.5.21:
- bug fixes
- changed the eric mascot to be a Python (i.e. the snake). New icons
  and pixmaps provided by Thimo Kraemer.

Version 4.5.20:
- bug fixes
- Italian translations completed by Gianpietro Zamolo

Version 4.5.19:
- bug fixes

3 files changed, 41 insertions, 14 deletions

diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index 0e0576b32af..701392cffba 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.42 2014/05/09 07:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2014/08/22 09:11:59 wiz Exp $
 
-VERS=			4.5.18
+VERS=			4.5.24
 DISTNAME=		eric4-${VERS}
-PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=eric-ide/}
-EXTRACT_USING=		gtar
 
 MAINTAINER=		helgoman@users.sourceforge.net
 HOMEPAGE=		http://eric-ide.python-projects.org/index.html
 COMMENT=		Python - IDE
 LICENSE=		gnu-gpl-v3
 
-NO_BUILD=				yes
+NO_BUILD=		yes
+EXTRACT_USING=		bsdtar
 
 PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 4.5.18
@@ -20,16 +19,42 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 4.5.18
 CONFIGURE_ARGS+=		-b ${PREFIX}/bin
 CONFIGURE_ARGS+=		-d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=		-a ${PREFIX}/qt4/qsci/api
-.include "../../mk/bsd.prefs.mk"
-.if defined(DESTDIR) && !empty(DESTDIR)
 CONFIGURE_ARGS+=		-i ${DESTDIR}
-.endif
+
+REPLACE_PYTHON+=	eric/Examples/hallo.py
+REPLACE_PYTHON+=	eric/Examples/rhallo.py
+REPLACE_PYTHON+=	eric/compileUiFiles.py
+REPLACE_PYTHON+=	eric/eric4.py
+REPLACE_PYTHON+=	eric/eric4_api.py
+REPLACE_PYTHON+=	eric/eric4_compare.py
+REPLACE_PYTHON+=	eric/eric4_configure.py
+REPLACE_PYTHON+=	eric/eric4_diff.py
+REPLACE_PYTHON+=	eric/eric4_doc.py
+REPLACE_PYTHON+=	eric/eric4_editor.py
+REPLACE_PYTHON+=	eric/eric4_iconeditor.py
+REPLACE_PYTHON+=	eric/eric4_plugininstall.py
+REPLACE_PYTHON+=	eric/eric4_pluginrepository.py
+REPLACE_PYTHON+=	eric/eric4_pluginuninstall.py
+REPLACE_PYTHON+=	eric/eric4_qregexp.py
+REPLACE_PYTHON+=	eric/eric4_re.py
+REPLACE_PYTHON+=	eric/eric4_sqlbrowser.py
+REPLACE_PYTHON+=	eric/eric4_tray.py
+REPLACE_PYTHON+=	eric/eric4_trpreviewer.py
+REPLACE_PYTHON+=	eric/eric4_uipreviewer.py
+REPLACE_PYTHON+=	eric/eric4_unittest.py
+REPLACE_PYTHON+=	eric/eric4_webbrowser.py
+REPLACE_PYTHON+=	eric/install-i18n.py
+REPLACE_PYTHON+=	eric/install.py
+REPLACE_PYTHON+=	eric/uninstall.py
+REPLACE_PYTHON+=	install.py
+REPLACE_PYTHON+=	uninstall.py
 
 do-install:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} install.py ${CONFIGURE_ARGS})
 
 .include "options.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../x11/qt4-qscintilla/buildlink3.mk"
diff --git a/devel/eric4/PLIST b/devel/eric4/PLIST
index 9bd6765d1cc..28bed26b13f 100644
--- a/devel/eric4/PLIST
+++ b/devel/eric4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/01/15 16:26:25 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/08/22 09:11:59 wiz Exp $
 bin/eric4
 bin/eric4_api
 bin/eric4_compare
@@ -806,6 +806,7 @@ ${PYSITELIB}/eric4/Documentation/Source/eric4.Utilities.ModuleParser.html
 ${PYSITELIB}/eric4/Documentation/Source/eric4.Utilities.SingleApplication.html
 ${PYSITELIB}/eric4/Documentation/Source/eric4.Utilities.Startup.html
 ${PYSITELIB}/eric4/Documentation/Source/eric4.Utilities.__init__.html
+${PYSITELIB}/eric4/Documentation/Source/eric4.Utilities.mimetypesExtension.html
 ${PYSITELIB}/eric4/Documentation/Source/eric4.Utilities.uic.html
 ${PYSITELIB}/eric4/Documentation/Source/eric4.VCS.CommandOptionsDialog.html
 ${PYSITELIB}/eric4/Documentation/Source/eric4.VCS.ProjectBrowserHelper.html
@@ -2557,6 +2558,8 @@ ${PYSITELIB}/eric4/Utilities/Startup.py
 ${PYSITELIB}/eric4/Utilities/Startup.pyc
 ${PYSITELIB}/eric4/Utilities/__init__.py
 ${PYSITELIB}/eric4/Utilities/__init__.pyc
+${PYSITELIB}/eric4/Utilities/mimetypesExtension.py
+${PYSITELIB}/eric4/Utilities/mimetypesExtension.pyc
 ${PYSITELIB}/eric4/Utilities/uic.py
 ${PYSITELIB}/eric4/Utilities/uic.pyc
 ${PYSITELIB}/eric4/VCS/CommandOptionsDialog.py
@@ -3028,4 +3031,3 @@ qt4/qsci/api/python/zope-2.11.2.api
 qt4/qsci/api/python/zope-3.3.1.api
 qt4/qsci/api/ruby/Ruby-1.8.7.api
 qt4/qsci/api/ruby/eric4.api
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/eric4/i18n
diff --git a/devel/eric4/distinfo b/devel/eric4/distinfo
index 189d1d129f6..c49f48fd04a 100644
--- a/devel/eric4/distinfo
+++ b/devel/eric4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2014/01/15 16:26:25 drochner Exp $
+$NetBSD: distinfo,v 1.17 2014/08/22 09:11:59 wiz Exp $
 
-SHA1 (eric4-4.5.18.tar.gz) = b538cd9c8291ae16d454241a3b0c656a5d436e98
-RMD160 (eric4-4.5.18.tar.gz) = 6c8ca9020c361d4702a9ca80777d8ec35aa9b748
-Size (eric4-4.5.18.tar.gz) = 8190197 bytes
+SHA1 (eric4-4.5.24.tar.gz) = fe28e64b8ccbb9095f52318f89612eb83ea65a24
+RMD160 (eric4-4.5.24.tar.gz) = 944df097639720cb241efb4fbcdf7e68fe4d63dd
+Size (eric4-4.5.24.tar.gz) = 7990278 bytes