--- graphics/ocrad/Makefile	2015-10-23 00:41:53.710600000 +0900
+++ graphics/ocrad/Makefile	2015-11-01 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@ 
 # $FreeBSD: head/graphics/ocrad/Makefile 399961 2015-10-22 10:35:18Z amdmi3 $
 
 PORTNAME=	ocrad
-PORTVERSION=	0.22
+PORTVERSION=	0.25
 CATEGORIES=	graphics
 MASTER_SITES=	GNU
 EXTRACT_SUFX=	.tar.lz
@@ -14,36 +14,37 @@ 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} CXXFLAGS="${CXXFLAGS}" CXX="${CXX}"
-CXXFLAGS+=	-Wall -W
-MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
-
-PLIST_FILES=	bin/${PORTNAME} man/man1/ocrad.1.gz
+CONFIGURE_ARGS=	--prefix=${PREFIX} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 PORTEXAMPLES=	*
+PLIST_FILES=	bin/ocrad man/man1/ocrad.1.gz
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000024
-EXTRACT_DEPENDS=	lzip:${PORTSDIR}/archivers/lzip
-EXTRACT_CMD=		${LOCALBASE}/bin/lzip
+EXTRACT_DEPENDS=lzip:${PORTSDIR}/archivers/lzip
+EXTRACT_CMD=	${LOCALBASE}/bin/lzip
 EXTRACT_BEFORE_ARGS=	-cd
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ocrad \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ocrad.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
 
-do-install-DOCS-on:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR})
 
-do-install-EXAMPLES-on:
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
+	@(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} "*" \
+		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
--- graphics/ocrad/distinfo	2015-08-24 03:53:38.676315000 +0900
+++ graphics/ocrad/distinfo	2015-11-01 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@ 
-SHA256 (ocrad-0.22.tar.lz) = d6c9dcbcf4c9cc643edfe5a03cb6125d6c39abe59e83719effb056d63c5198fd
-SIZE (ocrad-0.22.tar.lz) = 87698
+SHA256 (ocrad-0.25.tar.lz) = e710be9c030fbcbce2315077326c8268feb422c0bc39fa744644cbbd1f5d4dd4
+SIZE (ocrad-0.25.tar.lz) = 91464
--- graphics/ocrad/files/patch-character_r11.cc	2015-08-24 03:53:38.692651000 +0900
+++ graphics/ocrad/files/patch-character_r11.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@ 
---- character_r11.cc.orig	2013-10-03 17:20:43.000000000 -0300
-+++ character_r11.cc	2013-10-03 17:20:54.000000000 -0300
-@@ -18,6 +18,7 @@
- 
- #include <algorithm>
- #include <cstdio>
-+#include <cstdlib>
- #include <vector>
- #include <stdint.h>
- 
--- graphics/ocrad/files/patch-feats_test0.cc	2015-08-24 03:53:38.705133000 +0900
+++ graphics/ocrad/files/patch-feats_test0.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@ 
---- feats_test0.cc.orig	2013-10-03 17:19:50.000000000 -0300
-+++ feats_test0.cc	2013-10-03 17:20:00.000000000 -0300
-@@ -18,6 +18,7 @@
- 
- #include <algorithm>
- #include <cstdio>
-+#include <cstdlib>
- #include <vector>
- #include <stdint.h>
- 
--- graphics/ocrad/files/patch-profile.cc	2015-08-24 03:53:38.704398000 +0900
+++ graphics/ocrad/files/patch-profile.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@ 
---- profile.cc.orig	2013-10-03 17:16:53.000000000 -0300
-+++ profile.cc	2013-10-03 17:17:01.000000000 -0300
-@@ -18,6 +18,7 @@
- 
- #include <algorithm>
- #include <cstdio>
-+#include <cstdlib>
- #include <vector>
- #include <stdint.h>
- 
--- graphics/ocrad/files/patch-track.cc	2015-08-24 03:53:38.705856000 +0900
+++ graphics/ocrad/files/patch-track.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@ 
---- track.cc.orig	2013-10-03 17:16:32.000000000 -0300
-+++ track.cc	2013-10-03 17:16:46.000000000 -0300
-@@ -18,6 +18,7 @@
- 
- #include <algorithm>
- #include <cstdio>
-+#include <cstdlib>
- #include <vector>
- 
- #include "common.h"