- Update to 0.21

PR:		189452
Submitted by:	maintainer

7 files changed, 32 insertions, 33 deletions

diff --git a/japanese/nhocr/Makefile b/japanese/nhocr/Makefile
index 4e112488d725..93fbe509f6c3 100644
--- a/japanese/nhocr/Makefile
+++ b/japanese/nhocr/Makefile
@@ -2,22 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	nhocr
-PORTVERSION=	0.16
+PORTVERSION=	0.21
 CATEGORIES=	japanese graphics
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	OCR engine for Japanese language
 
+LICENSE=	APACHE20
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsip.a:${PORTSDIR}/graphics/O2-tools
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-O2tools=${LOCALBASE} --datadir=${DATADIR}
 
-NO_STAGE=	yes
 post-install:
-	${MKDIR} ${PREFIX}/share/ocropus/scripts
-	${INSTALL_DATA} ${WRKSRC}/ocropus/rec-nhocr-0.3.lua ${PREFIX}/share/ocropus/scripts/rec-nhocr.lua
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/ocropus/scripts
+	${INSTALL_DATA} ${WRKSRC}/ocropus/rec-nhocr-0.3.lua ${STAGEDIR}${PREFIX}/share/ocropus/scripts/rec-nhocr.lua
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/nhocr/distinfo b/japanese/nhocr/distinfo
index 412df6b4b29f..bda3677f39d0 100644
--- a/japanese/nhocr/distinfo
+++ b/japanese/nhocr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nhocr-0.16.tar.gz) = 68369747a0f5989df5a69969f3933e919d70ddd4e8dbdd70629bb06512d459f2
-SIZE (nhocr-0.16.tar.gz) = 5775971
+SHA256 (nhocr-0.21.tar.gz) = b862391deb1d2b0bf54e316cf7037018c370c9c835dcea61a047be2c8ea6e9f8
+SIZE (nhocr-0.21.tar.gz) = 6234716
diff --git a/japanese/nhocr/files/patch-libnhocr__nhrec.cpp b/japanese/nhocr/files/patch-libnhocr__nhrec.cpp
deleted file mode 100644
index 9ac795bb14c2..000000000000
--- a/japanese/nhocr/files/patch-libnhocr__nhrec.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libnhocr/nhrec.cpp.orig	2009-05-10 23:56:11.000000000 +0900
-+++ ./libnhocr/nhrec.cpp	2009-05-19 19:24:48.000000000 +0900
-@@ -45,7 +45,7 @@
- 
- 
- // default file/path names
--static char	*nhocrlibdir0 = "/opt/nhocr/share";
-+static char	*nhocrlibdir0 = "/usr/local/share/nhocr";
- static char	*cctablefile0 = "cctable.utf-8";
- static char	*dicfile0 = "PLM.dic";
- 
diff --git a/japanese/nhocr/files/patch-libnhocr__ocrbase.cpp b/japanese/nhocr/files/patch-libnhocr__ocrbase.cpp
deleted file mode 100644
index 9d1c7599adab..000000000000
--- a/japanese/nhocr/files/patch-libnhocr__ocrbase.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libnhocr/ocrbase.cpp.orig	2009-05-15 15:55:20.000000000 +0900
-+++ ./libnhocr/ocrbase.cpp	2009-05-19 19:24:48.000000000 +0900
-@@ -9,7 +9,7 @@
- #include	<stdlib.h>
- #include	<string.h>
- #include	<math.h>
--#include	<values.h>
-+#include	<float.h>
- 
- #if defined (__SVR4) && defined (__sun)
- #include	<float.h>
diff --git a/japanese/nhocr/files/patch-makechar__Makefile.in b/japanese/nhocr/files/patch-makechar__Makefile.in
new file mode 100644
index 000000000000..8fcb4621f6ec
--- /dev/null
+++ b/japanese/nhocr/files/patch-makechar__Makefile.in
@@ -0,0 +1,13 @@
+--- ./makechar/Makefile.in.orig	2013-05-04 00:52:33.306113000 +0900
++++ ./makechar/Makefile.in	2014-05-07 20:53:43.000000000 +0900
+@@ -178,8 +178,8 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ makechar_SOURCES = makechar.cpp
+-AM_CXXFLAGS = -I/usr/include/freetype2 -I/usr/sfw/include/freetype2 -I../libnhocr
+-makechar_LDADD = -L/usr/sfw/lib -L../libnhocr -lm -lfreetype -lnhocr -lufp -lsip
++AM_CXXFLAGS = -I$(LOCALBASE)/include/freetype2 -I../libnhocr
++makechar_LDADD = -L$(LOCALBASE)/lib -L../libnhocr -lm -lfreetype -lnhocr -lufp -lsip
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua b/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua
index cdcc23383add..4fabadb8d5d4 100644
--- a/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua
+++ b/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua
@@ -1,5 +1,5 @@
 --- ./ocropus/rec-nhocr-0.3.lua.orig	2009-05-15 17:17:07.000000000 +0900
-+++ ./ocropus/rec-nhocr-0.3.lua	2009-05-19 19:34:47.000000000 +0900
++++ ./ocropus/rec-nhocr-0.3.lua	2014-05-07 20:53:43.000000000 +0900
 @@ -41,6 +41,6 @@
     for i = 1,regions:length()-1 do
        regions:extract(line_image,page_image,i,1)
diff --git a/japanese/nhocr/pkg-plist b/japanese/nhocr/pkg-plist
index 4b4d9275764a..d7485543f7f3 100644
--- a/japanese/nhocr/pkg-plist
+++ b/japanese/nhocr/pkg-plist
@@ -1,11 +1,17 @@
 bin/nhocr
-%%DATADIR%%/PLM.dic
-%%DATADIR%%/cctable.utf-8
+include/codelist.h
+include/gramdclient.h
 include/nhocr.h
 include/ocrbase.h
-include/codelist.h
 lib/libnhocr.a
+sbin/makechar
+sbin/makedic
+sbin/makevec
+%%DATADIR%%/PLM-ascii+.dic
+%%DATADIR%%/PLM-jpn.dic
+%%DATADIR%%/cctable-ascii+
+%%DATADIR%%/cctable-jpn
 share/ocropus/scripts/rec-nhocr.lua
-@dirrm %%DATADIR%%
 @dirrmtry share/ocropus/scripts
 @dirrmtry share/ocropus
+@dirrm %%DATADIR%%