- Update to 0.25

PR:		204197
Submitted by:	tkato432@yahoo.com

6 files changed, 10 insertions, 52 deletions

diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index ee582e540b96..af0928e37e74 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ocrad
-PORTVERSION=	0.22
+PORTVERSION=	0.25
 CATEGORIES=	graphics
 MASTER_SITES=	GNU
 EXTRACT_SUFX=	.tar.lz
@@ -14,14 +14,11 @@ LICENSE=	GPLv3
 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/${PORTNAME} man/man1/ocrad.1.gz
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -38,12 +35,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/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>
diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo
index 6e9bb8c751fa..e90e97f69796 100644
--- a/graphics/ocrad/distinfo
+++ b/graphics/ocrad/distinfo
@@ -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
diff --git a/graphics/ocrad/files/patch-character_r11.cc b/graphics/ocrad/files/patch-character_r11.cc
deleted file mode 100644
index 0ee4b412ed05..000000000000
--- a/graphics/ocrad/files/patch-character_r11.cc
+++ /dev/null
@@ -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>
- 
diff --git a/graphics/ocrad/files/patch-feats_test0.cc b/graphics/ocrad/files/patch-feats_test0.cc
deleted file mode 100644
index 1868c5922cfd..000000000000
--- a/graphics/ocrad/files/patch-feats_test0.cc
+++ /dev/null
@@ -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>
- 
diff --git a/graphics/ocrad/files/patch-profile.cc b/graphics/ocrad/files/patch-profile.cc
deleted file mode 100644
index 31d8c01aef90..000000000000
--- a/graphics/ocrad/files/patch-profile.cc
+++ /dev/null
@@ -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>
- 
diff --git a/graphics/ocrad/files/patch-track.cc b/graphics/ocrad/files/patch-track.cc
deleted file mode 100644
index 9cc41e7a38fb..000000000000
--- a/graphics/ocrad/files/patch-track.cc
+++ /dev/null
@@ -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"