Update to 0.5.

5 files changed, 24 insertions, 49 deletions

diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index bf8051c67635..d26831ce47ad 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -1,21 +1,15 @@
-# New ports collection makefile for:	labyrinth
-# Date created:		2008-09-28
-# Whom:			Romain Tartiere <romain@blogreen.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	labyrinth
-PORTVERSION=	0.4.1
-PORTREVISION=	6
+PORTVERSION=	0.5
 CATEGORIES=	deskutils python
 MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Mind-mapping tool for GNOME
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.4.0
+RUN_DEPENDS+=	f2py:${PORTSDIR}/math/py-numpy
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	GMSGFMT=msgfmt
diff --git a/deskutils/labyrinth/distinfo b/deskutils/labyrinth/distinfo
index 63c79ddfacc1..1962ee11e601 100644
--- a/deskutils/labyrinth/distinfo
+++ b/deskutils/labyrinth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (labyrinth_0.4.1.tar.gz) = 3fafcbd622074eaa80710d7eb76849d5e9b1e36742f48110e2425eb760e2d53c
-SIZE (labyrinth_0.4.1.tar.gz) = 553527
+SHA256 (labyrinth-0.5.tar.gz) = 68994e8ff07f5cf521e440f17863f50117f895edbe93d39e73e4fad6b5ba6b25
+SIZE (labyrinth-0.5.tar.gz) = 514325
diff --git a/deskutils/labyrinth/files/patch-data_Makefile.in b/deskutils/labyrinth/files/patch-data_Makefile.in
deleted file mode 100644
index eef192e3d638..000000000000
--- a/deskutils/labyrinth/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- data/Makefile.in.orig
-+++ data/Makefile.in
-@@ -437,8 +437,7 @@
- @INTLTOOL_DESKTOP_RULE@
- 
- install-icons:
--# This sucks
--	for size in 16x16 22x22 24x24 scalable; do mkdir --parents $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
-+	for size in 16x16 22x22 24x24 scalable; do install -d $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
- 	install -m 644 $(srcdir)/labyrinth-16.png $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/labyrinth.png
- 	install -m 644 $(srcdir)/labyrinth-22.png $(DESTDIR)/$(datadir)/icons/hicolor/22x22/apps/labyrinth.png
- 	install -m 644 $(srcdir)/labyrinth-24.png $(DESTDIR)/$(datadir)/icons/hicolor/24x24/apps/labyrinth.png
diff --git a/deskutils/labyrinth/files/patch-src_labyrinth.py b/deskutils/labyrinth/files/patch-src_labyrinth.py
deleted file mode 100644
index a4c9d273a40e..000000000000
--- a/deskutils/labyrinth/files/patch-src_labyrinth.py
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/labyrinth.py.orig
-+++ src/labyrinth.py
-@@ -56,11 +56,12 @@
- if hasattr(gettext, 'bind_textdomain_codeset'):
- 	gettext.bind_textdomain_codeset('labyrinth','UTF-8')
- gettext.textdomain('labyrinth')
--if not os.name == 'nt':
--	locale.bindtextdomain('labyrinth', localedir)
--	if hasattr(locale, 'bind_textdomain_codeset'):
--		locale.bind_textdomain_codeset('labyrinth','UTF-8')
--	locale.textdomain('labyrinth')
-+if hasattr(locale, 'bindtextdomain'):
-+	if not os.name == 'nt':
-+		locale.bindtextdomain('labyrinth', localedir)
-+		if hasattr(locale, 'bind_textdomain_codeset'):
-+			locale.bind_textdomain_codeset('labyrinth','UTF-8')
-+		locale.textdomain('labyrinth')
- 
- gtk.glade.bindtextdomain('labyrinth')
- gtk.glade.textdomain('labyrinth')
diff --git a/deskutils/labyrinth/pkg-plist b/deskutils/labyrinth/pkg-plist
index 41b48175d792..60cc6c2b1f6f 100644
--- a/deskutils/labyrinth/pkg-plist
+++ b/deskutils/labyrinth/pkg-plist
@@ -27,6 +27,9 @@ bin/labyrinth
 %%PYTHON_SITELIBDIR%%/labyrinth/PeriodicSaveThread.py
 %%PYTHON_SITELIBDIR%%/labyrinth/PeriodicSaveThread.pyc
 %%PYTHON_SITELIBDIR%%/labyrinth/PeriodicSaveThread.pyo
+%%PYTHON_SITELIBDIR%%/labyrinth/ResourceThought.pyo
+%%PYTHON_SITELIBDIR%%/labyrinth/ResourceThought.py
+%%PYTHON_SITELIBDIR%%/labyrinth/ResourceThought.pyc
 %%PYTHON_SITELIBDIR%%/labyrinth/TextBufferMarkup.py
 %%PYTHON_SITELIBDIR%%/labyrinth/TextBufferMarkup.pyc
 %%PYTHON_SITELIBDIR%%/labyrinth/TextBufferMarkup.pyo
@@ -52,6 +55,15 @@ bin/labyrinth
 %%PYTHON_SITELIBDIR%%/labyrinth/utils.pyc
 %%PYTHON_SITELIBDIR%%/labyrinth/utils.pyo
 share/applications/labyrinth.desktop
+share/gnome/help/labyrinth/C/figures/lab_alignment.png
+share/gnome/help/labyrinth/C/figures/lab_browser_start.png
+share/gnome/help/labyrinth/C/figures/lab_map_start.png
+share/gnome/help/labyrinth/C/labyrinth.xml
+share/gnome/help/labyrinth/C/legal.xml
+share/gnome/help/labyrinth/de/figures/lab_alignment.png
+share/gnome/help/labyrinth/de/figures/lab_browser_start.png
+share/gnome/help/labyrinth/de/figures/lab_map_start.png
+share/gnome/help/labyrinth/de/labyrinth.xml
 share/icons/hicolor/16x16/apps/labyrinth.png
 share/icons/hicolor/22x22/apps/labyrinth.png
 share/icons/hicolor/24x24/apps/labyrinth.png
@@ -61,6 +73,7 @@ share/icons/hicolor/scalable/apps/labyrinth.svg
 share/locale/ca/LC_MESSAGES/labyrinth.mo
 share/locale/cs/LC_MESSAGES/labyrinth.mo
 share/locale/de/LC_MESSAGES/labyrinth.mo
+share/locale/es/LC_MESSAGES/labyrinth.mo
 share/locale/eu/LC_MESSAGES/labyrinth.mo
 share/locale/fa/LC_MESSAGES/labyrinth.mo
 share/locale/fr/LC_MESSAGES/labyrinth.mo
@@ -71,5 +84,11 @@ share/locale/pt_BR/LC_MESSAGES/labyrinth.mo
 share/locale/pt_PT/LC_MESSAGES/labyrinth.mo
 share/locale/ru/LC_MESSAGES/labyrinth.mo
 share/locale/sv/LC_MESSAGES/labyrinth.mo
+share/locale/zh_CN/LC_MESSAGES/labyrinth.mo
+@dirrm share/gnome/help/labyrinth/de/figures
+@dirrm share/gnome/help/labyrinth/de
+@dirrm share/gnome/help/labyrinth/C/figures
+@dirrm share/gnome/help/labyrinth/C
+@dirrm share/gnome/help/labyrinth
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/labyrinth