- Update to 0.7.7

- Account for DISABLE_NLS
- Add patch for runtime bug

PR:	ports/164202
Submitted by: maintainer
Approved by:	crees, rene (mentors)

4 files changed, 102 insertions, 77 deletions

diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile
index eac2d855f88e..e47aba0b75be 100644
--- a/graphics/ocrfeeder/Makefile
+++ b/graphics/ocrfeeder/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ocrfeeder
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=sources/ocrfeeder/0.7
+MASTER_SITE_SUBDIR=sources/ocrfeeder/${PORTVERSION:R}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Document layout analysis and optical character recognition
@@ -34,6 +34,14 @@ USE_GNOME=	pygtk2 pygnomeextras
 USE_GETTEXT=	yes
 USE_GHOSTSCRIPT=yes
 
+.if defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/graphics/ocrfeeder/distinfo b/graphics/ocrfeeder/distinfo
index 7c17a4be951a..20eb68855c4c 100644
--- a/graphics/ocrfeeder/distinfo
+++ b/graphics/ocrfeeder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ocrfeeder-0.7.6.tar.xz) = ffe87cccd62d12943c03d9076410e43f1b7afce1077b1eba02e41b6514575736
-SIZE (ocrfeeder-0.7.6.tar.xz) = 703592
+SHA256 (ocrfeeder-0.7.7.tar.xz) = 09bb021dca7997b52b080ba34ec4cc2a649ea0c6bdd4c37f58fe269ed8387e97
+SIZE (ocrfeeder-0.7.7.tar.xz) = 738952
diff --git a/graphics/ocrfeeder/files/patch-src-ocrfeeder-util-lib.py b/graphics/ocrfeeder/files/patch-src-ocrfeeder-util-lib.py
new file mode 100644
index 000000000000..6efd838e51d2
--- /dev/null
+++ b/graphics/ocrfeeder/files/patch-src-ocrfeeder-util-lib.py
@@ -0,0 +1,11 @@
+--- src/ocrfeeder/util/lib.py.orig	2012-01-16 23:38:47.000000000 +0800
++++ src/ocrfeeder/util/lib.py	2012-01-16 23:38:54.000000000 +0800
+@@ -130,7 +130,7 @@
+     return command
+ 
+ def unpaperImage(configuration_manager, image_path):
+-    tmp_dir = configuration_manager.temporary_dir
++    tmp_dir = configuration_manager.TEMPORARY_FOLDER
+     prefix = os.path.splitext(image_path)[0]
+     unpapered_name = os.path.join(tmp_dir, os.path.basename(prefix) + '.ppm')
+     if os.path.exists(unpapered_name):
diff --git a/graphics/ocrfeeder/pkg-plist b/graphics/ocrfeeder/pkg-plist
index 0a8b53020db7..03438112998d 100644
--- a/graphics/ocrfeeder/pkg-plist
+++ b/graphics/ocrfeeder/pkg-plist
@@ -1,28 +1,29 @@
 bin/ocrfeeder
 bin/ocrfeeder-cli
-lib/locale/ca/LC_MESSAGES/ocrfeeder.mo
-lib/locale/ca@valencia/LC_MESSAGES/ocrfeeder.mo
-lib/locale/cs/LC_MESSAGES/ocrfeeder.mo
-lib/locale/da/LC_MESSAGES/ocrfeeder.mo
-lib/locale/de/LC_MESSAGES/ocrfeeder.mo
-lib/locale/el/LC_MESSAGES/ocrfeeder.mo
-lib/locale/en_GB/LC_MESSAGES/ocrfeeder.mo
-lib/locale/es/LC_MESSAGES/ocrfeeder.mo
-lib/locale/fr/LC_MESSAGES/ocrfeeder.mo
-lib/locale/gl/LC_MESSAGES/ocrfeeder.mo
-lib/locale/hu/LC_MESSAGES/ocrfeeder.mo
-lib/locale/it/LC_MESSAGES/ocrfeeder.mo
-lib/locale/nb/LC_MESSAGES/ocrfeeder.mo
-lib/locale/pl/LC_MESSAGES/ocrfeeder.mo
-lib/locale/pt/LC_MESSAGES/ocrfeeder.mo
-lib/locale/pt_BR/LC_MESSAGES/ocrfeeder.mo
-lib/locale/ro/LC_MESSAGES/ocrfeeder.mo
-lib/locale/sl/LC_MESSAGES/ocrfeeder.mo
-lib/locale/sv/LC_MESSAGES/ocrfeeder.mo
-lib/locale/uk/LC_MESSAGES/ocrfeeder.mo
-lib/locale/zh_CN/LC_MESSAGES/ocrfeeder.mo
-lib/locale/zh_HK/LC_MESSAGES/ocrfeeder.mo
-lib/locale/zh_TW/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/ca/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/ca@valencia/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/cs/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/da/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/de/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/el/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/en_GB/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/eo/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/es/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/fr/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/gl/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/hu/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/it/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/nb/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/pl/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/pt/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/pt_BR/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/ro/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/sl/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/sv/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/uk/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/zh_CN/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/zh_HK/LC_MESSAGES/ocrfeeder.mo
+%%NLS%%lib/locale/zh_TW/LC_MESSAGES/ocrfeeder.mo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/__init__.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/__init__.pyo
@@ -137,15 +138,15 @@ lib/locale/zh_TW/LC_MESSAGES/ocrfeeder.mo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/__init__.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ocrfeeder/studio/configuration.py
-%%PYTHON_SITELIBDIR%%/ocrfeeder/studio/configuration.pyc
-%%PYTHON_SITELIBDIR%%/ocrfeeder/studio/configuration.pyo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/customWidgets.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/customWidgets.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/customWidgets.pyo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/dataHolder.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/dataHolder.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/dataHolder.pyo
+%%PYTHON_SITELIBDIR%%/ocrfeeder/studio/project.py
+%%PYTHON_SITELIBDIR%%/ocrfeeder/studio/project.pyc
+%%PYTHON_SITELIBDIR%%/ocrfeeder/studio/project.pyo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/studioBuilder.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/studioBuilder.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/studio/studioBuilder.pyo
@@ -161,6 +162,9 @@ lib/locale/zh_TW/LC_MESSAGES/ocrfeeder.mo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/util/asyncworker.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/util/asyncworker.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/util/asyncworker.pyo
+%%PYTHON_SITELIBDIR%%/ocrfeeder/util/configuration.py
+%%PYTHON_SITELIBDIR%%/ocrfeeder/util/configuration.pyc
+%%PYTHON_SITELIBDIR%%/ocrfeeder/util/configuration.pyo
 %%PYTHON_SITELIBDIR%%/ocrfeeder/util/constants.py
 %%PYTHON_SITELIBDIR%%/ocrfeeder/util/constants.pyc
 %%PYTHON_SITELIBDIR%%/ocrfeeder/util/constants.pyo
@@ -269,50 +273,52 @@ share/gnome/help/ocrfeeder/sl/unpaper.page
 @dirrm %%PYTHON_SITELIBDIR%%/ocrfeeder/odf
 @dirrm %%PYTHON_SITELIBDIR%%/ocrfeeder/feeder
 @dirrm %%PYTHON_SITELIBDIR%%/ocrfeeder
-@dirrmtry lib/locale/ca/LC_MESSAGES
-@dirrmtry lib/locale/ca
-@dirrmtry lib/locale/ca@valencia/LC_MESSAGES
-@dirrmtry lib/locale/ca@valencia
-@dirrmtry lib/locale/cs/LC_MESSAGES
-@dirrmtry lib/locale/cs
-@dirrmtry lib/locale/da/LC_MESSAGES
-@dirrmtry lib/locale/da
-@dirrmtry lib/locale/de/LC_MESSAGES
-@dirrmtry lib/locale/de
-@dirrmtry lib/locale/el/LC_MESSAGES
-@dirrmtry lib/locale/el
-@dirrmtry lib/locale/en_GB/LC_MESSAGES
-@dirrmtry lib/locale/en_GB
-@dirrmtry lib/locale/es/LC_MESSAGES
-@dirrmtry lib/locale/es
-@dirrmtry lib/locale/fr/LC_MESSAGES
-@dirrmtry lib/locale/fr
-@dirrmtry lib/locale/gl/LC_MESSAGES
-@dirrmtry lib/locale/gl
-@dirrmtry lib/locale/hu/LC_MESSAGES
-@dirrmtry lib/locale/hu
-@dirrmtry lib/locale/it/LC_MESSAGES
-@dirrmtry lib/locale/it
-@dirrmtry lib/locale/nb/LC_MESSAGES
-@dirrmtry lib/locale/nb
-@dirrmtry lib/locale/pl/LC_MESSAGES
-@dirrmtry lib/locale/pl
-@dirrmtry lib/locale/pt/LC_MESSAGES
-@dirrmtry lib/locale/pt
-@dirrmtry lib/locale/pt_BR/LC_MESSAGES
-@dirrmtry lib/locale/pt_BR
-@dirrmtry lib/locale/ro/LC_MESSAGES
-@dirrmtry lib/locale/ro
-@dirrmtry lib/locale/sl/LC_MESSAGES
-@dirrmtry lib/locale/sl
-@dirrmtry lib/locale/sv/LC_MESSAGES
-@dirrmtry lib/locale/sv
-@dirrmtry lib/locale/uk/LC_MESSAGES
-@dirrmtry lib/locale/uk
-@dirrmtry lib/locale/zh_CN/LC_MESSAGES
-@dirrmtry lib/locale/zh_CN
-@dirrmtry lib/locale/zh_HK/LC_MESSAGES
-@dirrmtry lib/locale/zh_HK
-@dirrmtry lib/locale/zh_TW/LC_MESSAGES
-@dirrmtry lib/locale/zh_TW
-@dirrmtry lib/locale
+%%NLS%%@dirrmtry lib/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/ca
+%%NLS%%@dirrmtry lib/locale/ca@valencia/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/ca@valencia
+%%NLS%%@dirrmtry lib/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/cs
+%%NLS%%@dirrmtry lib/locale/da/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/da
+%%NLS%%@dirrmtry lib/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/de
+%%NLS%%@dirrmtry lib/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/el
+%%NLS%%@dirrmtry lib/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/en_GB
+%%NLS%%@dirrmtry lib/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/eo
+%%NLS%%@dirrmtry lib/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/es
+%%NLS%%@dirrmtry lib/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/fr
+%%NLS%%@dirrmtry lib/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/gl
+%%NLS%%@dirrmtry lib/locale/hu/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/hu
+%%NLS%%@dirrmtry lib/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/it
+%%NLS%%@dirrmtry lib/locale/nb/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/nb
+%%NLS%%@dirrmtry lib/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/pl
+%%NLS%%@dirrmtry lib/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/pt
+%%NLS%%@dirrmtry lib/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/pt_BR
+%%NLS%%@dirrmtry lib/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/ro
+%%NLS%%@dirrmtry lib/locale/sl/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/sl
+%%NLS%%@dirrmtry lib/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/sv
+%%NLS%%@dirrmtry lib/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/uk
+%%NLS%%@dirrmtry lib/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/zh_CN
+%%NLS%%@dirrmtry lib/locale/zh_HK/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/zh_HK
+%%NLS%%@dirrmtry lib/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/zh_TW
+%%NLS%%@dirrmtry lib/locale