Update ocrad to 0.18.

Based on patch provided by Uwe Klaus in PR 41617.

2009-05-08  Antonio Diaz  <ant_diaz@teleline.es>

	* Version 0.18 released.
	* Added a layout analyser able to process arbitrary pages.
	* Added new option `--quiet'.
	* The `--layout' option no more accepts an argument.
	* The `--crop' option now accepts negative coordinates.
	* New recognized letter; 'a' with ring above.
	* Fixed recognition on files with a single big character.
	* Fixed bug that didn't write maxval when saving pgm or ppm.
	* Fixed some includes that prevented compilation with GCC 4.3.0.
	* "make install-info" should now work on Debian and OS X.
	* Makefile.in: Man page is now installed by default.
	* New file testsuite/check.sh.
	* Arg_parser updated to 1.2.
	* Verbosity control of messages has been modified.

2007-06-29  Antonio Diaz  <ant_diaz@teleline.es>

	* Version 0.17 released.
	* License updated to GPL version 3 or later.
	* `--scale' no more suppresses ORF output.
	* Improved removal of thick frames.
	* Changed `Textline' to accept more than one big initial.
	* Class `Block' renamed to `Blob'.
	* `configure' and `Makefile.in' have been modified to be more
	  GNU-standards compliant.

2006-10-20  Antonio Diaz  <ant_diaz@teleline.es>

	* Version 0.16 released.
	* Added new option `--filter'.
	* Better algorithm for vertical space detection (blank lines).
	* Some fixes made to `configure' script.
	* Added two new debug levels.
	* Improvements in character recognition.

2006-04-03  Antonio Diaz  <ant_diaz@teleline.es>

	* Version 0.15 released.
	* Added new argument parser that replaces `getopt_long'.
	* Fixed a bug that prevented compilation with GCC 4.1.

2006-02-15  Antonio Diaz  <ant_diaz@teleline.es>

	* Version 0.14 released.
	* Ocrad is now able to read ppm files.
	* Added new class `Page_image' (256-level greymap).
	* Added automatic and adaptive binarization by Otsu's method.
	* Added new option `--crop'.
	* Added two new chapters `Image Format Conversion' and
	  `Algorithm' to the texinfo file.
	* Target `check' added to Makefile.
	* Changed `ocrad.png' icon to color, one line.

7 files changed, 38 insertions, 55 deletions

diff --git a/graphics/ocrad/DESCR b/graphics/ocrad/DESCR
index e473efcc10f..e5dc04e24f9 100644
--- a/graphics/ocrad/DESCR
+++ b/graphics/ocrad/DESCR
@@ -1,6 +1,7 @@
-GNU Ocrad is an OCR (Optical Character Recognition) program based
-on a feature extraction method. It reads a bitmap image in pbm or
-pgm formats and produces text in byte (8-bit) or UTF-8 formats.
+GNU Ocrad is an OCR (Optical Character Recognition) program based on a
+feature extraction method. It reads images in pbm (bitmap), pgm
+(greyscale) or ppm (color) formats and produces text in byte (8-bit) or
+UTF-8 formats.
 
-Ocrad includes a layout analyser able to separate the columns or
-blocks of text normally found on printed pages.
+Also includes a layout analyser able to separate the columns or blocks of
+text normally found on printed pages.
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index f57fcb9aa4b..5c4a5f8e46d 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/11 08:05:06 obache Exp $
 #
 
-DISTNAME=		ocrad-0.13
+DISTNAME=		ocrad-0.18
 CATEGORIES=		graphics
 MASTER_SITES=		http://ftp.gnu.org/gnu/ocrad/
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/ocrad/ocrad.html
 COMMENT=		GNU OCR (Optical Character Recognition) program
+LICENSE=		gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c++
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--infodir=${PREFIX:Q}/${PKGINFODIR:Q}
-CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}
-INFO_FILES=		# PLIST
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+INFO_FILES=		yes
+
+TEST_TARGET=		check
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ocrad/PLIST b/graphics/ocrad/PLIST
index 1aac3109399..c8093e584c8 100644
--- a/graphics/ocrad/PLIST
+++ b/graphics/ocrad/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/20 18:15:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/07/11 08:05:06 obache Exp $
 bin/ocrad
 info/ocrad.info
+man/man1/ocrad.1
diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo
index 1596f3205f7..8063546073c 100644
--- a/graphics/ocrad/distinfo
+++ b/graphics/ocrad/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/01/17 14:50:27 rillig Exp $
+$NetBSD: distinfo,v 1.4 2009/07/11 08:05:06 obache Exp $
 
-SHA1 (ocrad-0.13.tar.bz2) = 24a42271e31531099e76bb6b1f9870029f88b35f
-RMD160 (ocrad-0.13.tar.bz2) = c16f64d725bcfb90d7e387701c7b6d43189313d1
-Size (ocrad-0.13.tar.bz2) = 66654 bytes
-SHA1 (patch-aa) = 723d0568f45a33ce3bb39c889119713f9ed6d39e
-SHA1 (patch-ab) = aeff41ca700419190a2d9d4fa680b9e8086dc8b7
-SHA1 (patch-ac) = 460c9b750c014ee36a7751042ea79de34a649760
+SHA1 (ocrad-0.18.tar.gz) = 6168dd37dd5ee71a1b1814bbccf2b89c1bcf732f
+RMD160 (ocrad-0.18.tar.gz) = 471658e7f50ca1ccf3ff773df3639014c450e028
+Size (ocrad-0.18.tar.gz) = 95043 bytes
+SHA1 (patch-ab) = 8bbfafd788c4fd377f8f8b51cb297b528b9be65c
+SHA1 (patch-ac) = bf7f9c6d5257fc5dd125954ec23754870fc34b8f
diff --git a/graphics/ocrad/patches/patch-aa b/graphics/ocrad/patches/patch-aa
deleted file mode 100644
index 885cad79eb8..00000000000
--- a/graphics/ocrad/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/16 20:17:49 wiz Exp $
-
---- main.cc.orig	2005-10-10 19:04:24.000000000 +0200
-+++ main.cc
-@@ -198,7 +198,7 @@ int process_file( FILE *infile, const ch
- void Ocrad::internal_error( const char * msg ) throw()
-   {
-   char buf[80];
--  std::snprintf( buf, sizeof( buf ), "internal error: %s.\n", msg );
-+  snprintf( buf, sizeof( buf ), "internal error: %s.\n", msg );
-   show_error( buf );
-   exit( 3 );
-   }
diff --git a/graphics/ocrad/patches/patch-ab b/graphics/ocrad/patches/patch-ab
index e70b2b665c3..f97a647943c 100644
--- a/graphics/ocrad/patches/patch-ab
+++ b/graphics/ocrad/patches/patch-ab
@@ -1,15 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2007/01/17 14:45:07 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2009/07/11 08:05:06 obache Exp $
 
---- common.h.orig	2005-10-03 19:47:31.000000000 +0200
-+++ common.h	2007-01-17 15:42:09.612332416 +0100
-@@ -16,6 +16,10 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
+--- common.h.orig	2009-04-26 14:28:37.000000000 +0000
++++ common.h
+@@ -18,6 +18,9 @@
+ 
+ extern int verbosity;
  
 +#if !defined(__GNUC__) && !defined(__attribute__)
 +#  define __attribute__(x) /**/
 +#endif
-+
- namespace Ocrad
-   {
-   void internal_error( const char * msg ) throw() __attribute__ ((noreturn));
+ 
+ namespace Ocrad {
+ 
diff --git a/graphics/ocrad/patches/patch-ac b/graphics/ocrad/patches/patch-ac
index ae99e0fcc07..0979ec8bfd9 100644
--- a/graphics/ocrad/patches/patch-ac
+++ b/graphics/ocrad/patches/patch-ac
@@ -1,23 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2007/01/17 14:50:27 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2009/07/11 08:05:06 obache Exp $
 
 The Solaris install(1) does not know about the -p option.
 
---- Makefile.in.orig	2005-10-10 19:04:43.000000000 +0200
-+++ Makefile.in	2007-01-17 15:46:58.187731432 +0100
-@@ -3,14 +3,10 @@ bindir = $(exec_prefix)/bin
+--- Makefile.in.orig	2009-05-04 18:39:20.000000000 +0000
++++ Makefile.in
+@@ -1,8 +1,8 @@
  
- DISTNAME = ocrad-0.13
- 
--CXX = g++
+ DISTNAME = $(progname)-$(progversion)
  INSTALL = install
 -INSTALL_PROGRAM = $(INSTALL) -p -m 755
 -INSTALL_DATA = $(INSTALL) -p -m 644
 +INSTALL_PROGRAM = $(INSTALL) -m 755
 +INSTALL_DATA = $(INSTALL) -m 644
  SHELL = /bin/sh
--CPPFLAGS =
--CXXFLAGS = -Wall -W -O2
--LDFLAGS =
  
- objs = common.o rational.o rectangle.o track.o ucs.o \
-        bitmap.o bitmap_io.o bitmap_layout.o block.o profile.o \
+ objs = arg_parser.o common.o mask.o rational.o rectangle.o track.o ucs.o \