Changes 0.19:

* A library interface has been added.
* The option "--crop" has been replaced with the similar but different
  option "--cut", which can accept coordinates taken from the ORF file.
* Recognition of files with a single character and without white space at
  the edges has been fixed.
* Lintian warnings in Debian about man pages have been fixed.

5 files changed, 40 insertions, 23 deletions

diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index 5c4a5f8e46d..1641cb0eeba 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2009/07/11 08:05:06 obache Exp $
-#
+# $NetBSD: Makefile,v 1.7 2010/03/08 12:35:54 adam Exp $
 
-DISTNAME=		ocrad-0.18
-CATEGORIES=		graphics
-MASTER_SITES=		http://ftp.gnu.org/gnu/ocrad/
+DISTNAME=	ocrad-0.19
+CATEGORIES=	graphics
+MASTER_SITES=	http://ftp.gnu.org/gnu/ocrad/
 
-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
+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
 
@@ -18,6 +18,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ENV+=		CXXFLAGS=${CXXFLAGS:Q}
 INFO_FILES=		yes
 
 TEST_TARGET=		check
diff --git a/graphics/ocrad/PLIST b/graphics/ocrad/PLIST
index c8093e584c8..dfa8e2c1038 100644
--- a/graphics/ocrad/PLIST
+++ b/graphics/ocrad/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/07/11 08:05:06 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/03/08 12:35:54 adam Exp $
 bin/ocrad
+include/ocradlib.h
 info/ocrad.info
+lib/libocrad.a
 man/man1/ocrad.1
diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo
index 8063546073c..a4bec6adda6 100644
--- a/graphics/ocrad/distinfo
+++ b/graphics/ocrad/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/07/11 08:05:06 obache Exp $
+$NetBSD: distinfo,v 1.5 2010/03/08 12:35:54 adam Exp $
 
-SHA1 (ocrad-0.18.tar.gz) = 6168dd37dd5ee71a1b1814bbccf2b89c1bcf732f
-RMD160 (ocrad-0.18.tar.gz) = 471658e7f50ca1ccf3ff773df3639014c450e028
-Size (ocrad-0.18.tar.gz) = 95043 bytes
+SHA1 (ocrad-0.19.tar.gz) = af8e190ca59f3376976fa7d953021c6bb6b68422
+RMD160 (ocrad-0.19.tar.gz) = c13735aa80db28df7c3ba4081d2456a123843370
+Size (ocrad-0.19.tar.gz) = 102451 bytes
+SHA1 (patch-aa) = 39729c825c1b9591c7dda23597f7d8f900b42b2c
 SHA1 (patch-ab) = 8bbfafd788c4fd377f8f8b51cb297b528b9be65c
-SHA1 (patch-ac) = bf7f9c6d5257fc5dd125954ec23754870fc34b8f
+SHA1 (patch-ac) = 952531f89f29a93c20dd4af8050b8e6fa8a5a6a4
diff --git a/graphics/ocrad/patches/patch-aa b/graphics/ocrad/patches/patch-aa
new file mode 100644
index 00000000000..c042d24662d
--- /dev/null
+++ b/graphics/ocrad/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2010/03/08 12:35:54 adam Exp $
+
+--- configure.orig	2010-03-08 12:32:58.000000000 +0000
++++ configure
+@@ -29,10 +29,6 @@ infodir='$(datadir)/info'
+ libdir='${exec_prefix}/lib'
+ mandir='$(datadir)/man'
+ sysconfdir='$(prefix)/etc'
+-CXX=
+-CPPFLAGS=
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
+ 
+ # Loop over all args
+ while [ -n "$1" ] ; do
diff --git a/graphics/ocrad/patches/patch-ac b/graphics/ocrad/patches/patch-ac
index 0979ec8bfd9..7ffd642c5b5 100644
--- a/graphics/ocrad/patches/patch-ac
+++ b/graphics/ocrad/patches/patch-ac
@@ -1,17 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2009/07/11 08:05:06 obache Exp $
+$NetBSD: patch-ac,v 1.3 2010/03/08 12:35:54 adam Exp $
 
-The Solaris install(1) does not know about the -p option.
-
---- Makefile.in.orig	2009-05-04 18:39:20.000000000 +0000
+--- Makefile.in.orig	2010-01-27 12:02:48.000000000 +0000
 +++ Makefile.in
-@@ -1,8 +1,8 @@
- 
- DISTNAME = $(progname)-$(progversion)
+@@ -2,8 +2,8 @@
+ DISTNAME = $(pkgname)-$(pkgversion)
+ AR = ar
  INSTALL = install
 -INSTALL_PROGRAM = $(INSTALL) -p -m 755
 -INSTALL_DATA = $(INSTALL) -p -m 644
 +INSTALL_PROGRAM = $(INSTALL) -m 755
 +INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_DIR = $(INSTALL) -d -m 755
  SHELL = /bin/sh
  
- objs = arg_parser.o common.o mask.o rational.o rectangle.o track.o ucs.o \