3 files changed, 18 insertions, 12 deletions

diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile
index b3f2d59a6dc8..18e3f53bb0c4 100644
--- a/graphics/ocre/Makefile
+++ b/graphics/ocre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ocre
-PORTVERSION=	0.037
+PORTVERSION=	0.039
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://lem.eui.upm.es/pub/ocre/
 DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/}
@@ -15,23 +15,27 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple optical character recognition solution
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS=	display:${PORTSDIR}/graphics/ImageMagick \
 		gnuplot:${PORTSDIR}/math/gnuplot \
 		ispell:${PORTSDIR}/textproc/ispell
 
-LICENSE=	GPLv2
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 
 USE_GNOME=	gtk20
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CFLAGS1="${CFLAGS}"
+MAKE_JOBS_SAFE=	yes
 
 MANLANG=	"" es
 MAN1=		${PORTNAME}.1
 
+post-extract:
+	@cd ${WRKSRC} && ${TAR} --exclude "*.orig" -xof ocre-decsWood-${PORTVERSION}.tgz
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CC =|CC ?=|g ; \
 		 s|^CFLAGS1=|CFLAGS1 ?=| ; \
@@ -53,7 +57,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-es.1 ${MAN1PREFIX}/man/es/man1/${PORTNAME}.1
 	${INSTALL_DATA} ${WRKSRC}/po/es.mo ${PREFIX}/share/locale/es/LC_MESSAGES/${PORTNAME}.mo
 	@${MKDIR} ${DATADIR}
-	@${TAR} --exclude "*.orig" -xof ${WRKSRC}/ocre-decsWood-${PORTVERSION}.tgz -C ${DATADIR}
-	@${CHMOD} -h 755 ${DATADIR}/decsWood
+.for dir in conv decsWood decsWoodCur decsWoodCyrillic decsWoodLatin decsWoodLatinW
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/ocre/distinfo b/graphics/ocre/distinfo
index 7495726c0ee2..bb0c4a119f33 100644
--- a/graphics/ocre/distinfo
+++ b/graphics/ocre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ocre_v0_037.tgz) = 2e26ac8c621fdb16b88543d611e9d74c8696e7ef9a201f76538b84576bee4ee5
-SIZE (ocre_v0_037.tgz) = 659311
+SHA256 (ocre_v0_039.tgz) = b8fe752677dfa21c858a8c168bb20dc49df4433017bacbfbae10adbe12729e4f
+SIZE (ocre_v0_039.tgz) = 622355
diff --git a/graphics/ocre/pkg-plist b/graphics/ocre/pkg-plist
index 38e43591bb0e..33c41257c4aa 100644
--- a/graphics/ocre/pkg-plist
+++ b/graphics/ocre/pkg-plist
@@ -1,6 +1,5 @@
 bin/ocre
 share/locale/es/LC_MESSAGES/ocre.mo
-%%DATADIR%%/conv/cod39a2c
 %%DATADIR%%/conv/maymin
 %%DATADIR%%/conv/minmay
 %%DATADIR%%/conv/puntua
@@ -41,6 +40,7 @@ share/locale/es/LC_MESSAGES/ocre.mo
 %%DATADIR%%/decsWoodCur/arbol-u004d.dcw
 %%DATADIR%%/decsWoodCur/arbol-u004e.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0050.dcw
+%%DATADIR%%/decsWoodCur/arbol-u0051.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0052.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0053.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0054.dcw
@@ -67,6 +67,7 @@ share/locale/es/LC_MESSAGES/ocre.mo
 %%DATADIR%%/decsWoodCur/arbol-u0070.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0071.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0072.dcw
+%%DATADIR%%/decsWoodCur/arbol-u0072u0061.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0073.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0074.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0075.dcw
@@ -74,6 +75,7 @@ share/locale/es/LC_MESSAGES/ocre.mo
 %%DATADIR%%/decsWoodCur/arbol-u0078.dcw
 %%DATADIR%%/decsWoodCur/arbol-u0079.dcw
 %%DATADIR%%/decsWoodCur/arbol-u007a.dcw
+%%DATADIR%%/decsWoodCur/arbol-u00ab.dcw
 %%DATADIR%%/decsWoodCur/arbol-u00bb.dcw
 %%DATADIR%%/decsWoodCur/arbol-u00bf.dcw
 %%DATADIR%%/decsWoodCur/arbol-u00e0.dcw
@@ -84,6 +86,8 @@ share/locale/es/LC_MESSAGES/ocre.mo
 %%DATADIR%%/decsWoodCur/arbol-u00ed.dcw
 %%DATADIR%%/decsWoodCur/arbol-u00f1.dcw
 %%DATADIR%%/decsWoodCur/arbol-u00f3.dcw
+%%DATADIR%%/decsWoodCur/arbol-u00fa.dcw
+%%DATADIR%%/decsWoodCur/arbol-u0131.dcw
 %%DATADIR%%/decsWoodCur/arbol-u2019.dcw
 %%DATADIR%%/decsWoodCur/arbol-u201b.dcw
 %%DATADIR%%/decsWoodCyrillic/0.tu2i
@@ -184,7 +188,6 @@ share/locale/es/LC_MESSAGES/ocre.mo
 %%DATADIR%%/decsWoodCyrillic/arbol-u2015.dcw
 %%DATADIR%%/decsWoodLatin/0.tu2i
 %%DATADIR%%/decsWoodLatin/00index
-%%DATADIR%%/decsWoodLatin/00indexw
 %%DATADIR%%/decsWoodLatin/arbol-u0021.dcw
 %%DATADIR%%/decsWoodLatin/arbol-u0023.dcw
 %%DATADIR%%/decsWoodLatin/arbol-u0024.dcw
@@ -474,10 +477,8 @@ share/locale/es/LC_MESSAGES/ocre.mo
 %%DATADIR%%/decsWoodLatin/arbol-u201c.dcw
 %%DATADIR%%/decsWoodLatin/arbol-u201d.dcw
 %%DATADIR%%/decsWoodLatin/arbol-u201e.dcw
-%%DATADIR%%/decsWoodLatin/arbol-w0030.dcw
-%%DATADIR%%/decsWoodLatin/arbol-w0031.dcw
-%%DATADIR%%/decsWoodLatin/arbol-w0043.dcw
 %%DATADIR%%/decsWoodLatinW/00index
+%%DATADIR%%/decsWoodLatinW/00indexw
 %%DATADIR%%/decsWoodLatinW/arbol-w0030.dcw
 %%DATADIR%%/decsWoodLatinW/arbol-w0031.dcw
 %%DATADIR%%/decsWoodLatinW/arbol-w0043.dcw