- Update to 0.22.

- Stage Support
- Fix build on current

6 files changed, 59 insertions, 14 deletions

diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index baf4fc9f11b8..1eaa25eb4d2e 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	ocrad
-PORTVERSION=	0.21
-PORTREVISION=	1
+PORTVERSION=	0.22
 CATEGORIES=	graphics
 MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}
+EXTRACT_SUFX=	.tar.lz
 
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	OCR program implemented as filter
@@ -18,27 +18,32 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} CXXFLAGS="${CXXFLAGS}" CXX="${CXX}"
 CXXFLAGS+=	-Wall -W
 MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/ocrad.1.gz
 
-MAN1=		ocrad.1
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+PORTDOCS=	AUTHORS ChangeLog NEWS README
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 1000024
+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} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo
index 5fa071749297..6e9bb8c751fa 100644
--- a/graphics/ocrad/distinfo
+++ b/graphics/ocrad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ocrad-0.21.tar.gz) = 4ec711239d6b667bac015ef9908cab3ea9f8fd73f098ae355498810c8e82a8cc
-SIZE (ocrad-0.21.tar.gz) = 103962
+SHA256 (ocrad-0.22.tar.lz) = d6c9dcbcf4c9cc643edfe5a03cb6125d6c39abe59e83719effb056d63c5198fd
+SIZE (ocrad-0.22.tar.lz) = 87698
diff --git a/graphics/ocrad/files/patch-character_r11.cc b/graphics/ocrad/files/patch-character_r11.cc
new file mode 100644
index 000000000000..0ee4b412ed05
--- /dev/null
+++ b/graphics/ocrad/files/patch-character_r11.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..1868c5922cfd
--- /dev/null
+++ b/graphics/ocrad/files/patch-feats_test0.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..31d8c01aef90
--- /dev/null
+++ b/graphics/ocrad/files/patch-profile.cc
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..9cc41e7a38fb
--- /dev/null
+++ b/graphics/ocrad/files/patch-track.cc
@@ -0,0 +1,10 @@
+--- 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"