svn commit: r356444 - in head/japanese/nhocr: . files

[Martin Wilke]

Author: miwi
Date: Wed Jun  4 08:09:57 2014
New Revision: 356444
URL: http://svnweb.freebsd.org/changeset/ports/356444
QAT: https://qat.redports.org/buildarchive/r356444/

Log:
  - Update to 0.21
  
  PR:		189452
  Submitted by:	maintainer

Added:
  head/japanese/nhocr/files/patch-makechar__Makefile.in   (contents, props changed)
Deleted:
  head/japanese/nhocr/files/patch-libnhocr__nhrec.cpp
  head/japanese/nhocr/files/patch-libnhocr__ocrbase.cpp
Modified:
  head/japanese/nhocr/Makefile
  head/japanese/nhocr/distinfo
  head/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua
  head/japanese/nhocr/pkg-plist

Modified: head/japanese/nhocr/Makefile
==============================================================================
--- head/japanese/nhocr/Makefile	Wed Jun  4 07:50:30 2014	(r356443)
+++ head/japanese/nhocr/Makefile	Wed Jun  4 08:09:57 2014	(r356444)
@@ -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 at 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>

Modified: head/japanese/nhocr/distinfo
==============================================================================
--- head/japanese/nhocr/distinfo	Wed Jun  4 07:50:30 2014	(r356443)
+++ head/japanese/nhocr/distinfo	Wed Jun  4 08:09:57 2014	(r356444)
@@ -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

Added: head/japanese/nhocr/files/patch-makechar__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/nhocr/files/patch-makechar__Makefile.in	Wed Jun  4 08:09:57 2014	(r356444)
@@ -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:

Modified: head/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua
==============================================================================
--- head/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua	Wed Jun  4 07:50:30 2014	(r356443)
+++ head/japanese/nhocr/files/patch-ocropus__rec-nhocr-0.3.lua	Wed Jun  4 08:09:57 2014	(r356444)
@@ -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)

Modified: head/japanese/nhocr/pkg-plist
==============================================================================
--- head/japanese/nhocr/pkg-plist	Wed Jun  4 07:50:30 2014	(r356443)
+++ head/japanese/nhocr/pkg-plist	Wed Jun  4 08:09:57 2014	(r356444)
@@ -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
- at dirrm %%DATADIR%%
 @dirrmtry share/ocropus/scripts
 @dirrmtry share/ocropus
+ at dirrm %%DATADIR%%