Update to 0.40. Add a tk option to install an additional

tcl/tk frontend.

 0.40
       update PNM file reader to maxval > 255
       (make rpm) updated
       barcode-patch UPC_addon by Michael van Rooyen
       CAPITAL_LETTER_A_WITH_OGONEK added
       no "(PICTURE)" output for UTF8+ASCII (better for Mobile OCR project)
       smooth_borders() bug fixed and reworked
       5x7 and prop10 font adaptions
       objects now detected by flood-fill algorithm (better?)
       XML-output changed
       changed auto dust detection (not final)

 0.39
       XML output added (subject of change, suggestions are welcome)
       netpbm-link-error fixed in gocr.c and configure.in:
         gocr.c: <config.h> changed to "config.h"
       configure-option --with-netpbm=PATH and --without-netpbm added
       update configure.in according to autoconf 2.57
       wchar_h miss-configuration fixed in pgm2asc.c
       fix compiler warnings
       char filter accepts abbreviations now, like "0-9A-F" (but slow)
       update READMEde.txt
       output barcode tags (also improved recognition)
       fix pnm.c for files like example.eps.pbm
       fix detect.c for barcodes
       fix ocr0n.c 0<->8g

 0.38
       move UTF/HTML/TeX decoding to getTextLine, return (char *) now
       out_format HTML step towards detailed XML output
       correct line detection for footnotes (detect.c)
       "y" now seen as vowel (pgm2asc.c), I<vowel> susbtituted by l<vowel>
       &eacute;-detection, &aacute;-output fixed
       default dust_size is -1 now (auto detection = mean_size/10)
       char filter added
        ex: -C 0123456789ABCDEF    - recognize only hexcodes
       man page updated (hopefully correct syntax)
       database bug fixed (small fonts, example by Chris)
       several bugs fixed by W. Webber (thanks)
       speed improved by 3rd-pass matrix filter in pixel() (pixel.c) (code from W. Webber)
       bug in remove_dust (remove.c) fixed
       for fonts bigger than 20x40 smooth_borders() changed (b/w-scans)
       bug in O0-detection fixed

6 files changed, 57 insertions, 30 deletions

diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index db25686e89e..35e08208be8 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/10/24 15:01:37 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/25 02:06:57 wiz Exp $
 
-DISTNAME=	gocr-0.37
+DISTNAME=	gocr-0.40
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jocr/}
 
@@ -9,8 +9,12 @@ HOMEPAGE=	http://sourceforge.net/projects/jocr
 COMMENT=	GOCR is a set of OCR tools
 
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake
 CONFIGURE_HAS_MANDIR=	no
 CONFIGURE_ARGS+=	--mandir=/${PKGMANDIR}
-USE_TOOLS+=		gmake
+CONFIGURE_ARGS+=	--with-netpbm=${BUILDLINK_PREFIX.netpbm}
+
+.include "options.mk"
 
+.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gocr/PLIST b/graphics/gocr/PLIST
index 211d96f0132..acd9825bc68 100644
--- a/graphics/gocr/PLIST
+++ b/graphics/gocr/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/16 20:20:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/25 02:06:57 wiz Exp $
 bin/gocr
+${TK}bin/gocr.tcl
 include/gocr.h
 lib/libPgm2asc.a
 man/man1/gocr.1
diff --git a/graphics/gocr/distinfo b/graphics/gocr/distinfo
index fc7871dd856..1e6e072545e 100644
--- a/graphics/gocr/distinfo
+++ b/graphics/gocr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/16 20:20:41 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/10/25 02:06:57 wiz Exp $
 
-SHA1 (gocr-0.37.tar.gz) = 41fa2e3f1fc17d27f1f1610441cec4d5f4a6201e
-RMD160 (gocr-0.37.tar.gz) = 99227ad91d497c7c88f8ca86a4fedc766bdaef0b
-Size (gocr-0.37.tar.gz) = 672962 bytes
-SHA1 (patch-aa) = 106daf9fb2bf37f9a11972244b3c4e292178dbe2
-SHA1 (patch-ab) = 56833576531ee62dc96ab6d65e029448eacb88ea
+SHA1 (gocr-0.40.tar.gz) = 6a5097281664ca3ffd01b11756f1dd5b565e673e
+RMD160 (gocr-0.40.tar.gz) = 1e34277b7d923706789d6e5c85996968d8506427
+Size (gocr-0.40.tar.gz) = 780744 bytes
+SHA1 (patch-aa) = c6f235f82d6c53a52547225045808e595a33b810
+SHA1 (patch-ab) = 1f63e8963ec8bf7a672e04331b10c4df6c48dc1b
diff --git a/graphics/gocr/options.mk b/graphics/gocr/options.mk
new file mode 100644
index 00000000000..71fb9929446
--- /dev/null
+++ b/graphics/gocr/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2005/10/25 02:06:57 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gocr
+PKG_SUPPORTED_OPTIONS=	tk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mtk)
+DEPENDS+=		tk>=8.4:../../x11/tk
+PLIST_SUBST+=		TK=""
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/gocr.tcl ${PREFIX}/bin
+.else
+PLIST_SUBST+=		TK="@comment "
+.endif
diff --git a/graphics/gocr/patches/patch-aa b/graphics/gocr/patches/patch-aa
index c2b6e32f2d7..ca5266e1df6 100644
--- a/graphics/gocr/patches/patch-aa
+++ b/graphics/gocr/patches/patch-aa
@@ -1,18 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/16 20:20:41 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/25 02:06:57 wiz Exp $
 
---- configure.orig	2002-08-12 17:18:53.000000000 +0200
+--- configure.orig	2005-03-13 20:23:07.000000000 +0100
 +++ configure
-@@ -946,9 +946,11 @@ else
- fi
- 
- 
--CPPFLAGS=-I/usr/X11R6/include
-+#CPPFLAGS=-I/usr/X11R6/include
-+CPPFLAGS=
- #LDFLAGS="-L/usr/X11R6/lib -lpbm -lpgm -lppm -lpnm"
--LDFLAGS="-L/usr/X11R6/lib -L/usr/local/netpbm/lib"
-+#LDFLAGS="-L/usr/X11R6/lib -L/usr/local/netpbm/lib"
-+LDFLAGS=
- 
- ## pnm can only be found, if LDFLAGS contains -lpgm -lpnm ... etc. 
- ## is there a better solution ?
+@@ -2489,7 +2489,7 @@ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_cv_search_pnm_readpnminit" = no; then
+   for ac_lib in netpbm pnm; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib -lm $ac_func_search_save_LIBS"
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -2525,7 +2525,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_search_pnm_readpnminit="-l$ac_lib"
++  ac_cv_search_pnm_readpnminit="-l$ac_lib -lm"
+ break
+ else
+   echo "$as_me: failed program was:" >&5
diff --git a/graphics/gocr/patches/patch-ab b/graphics/gocr/patches/patch-ab
index ed16937fe86..36289b429f7 100644
--- a/graphics/gocr/patches/patch-ab
+++ b/graphics/gocr/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/16 20:20:41 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/10/25 02:06:57 wiz Exp $
 
---- src/Makefile.in.orig	2003-12-09 13:41:53.060784000 +0000
-+++ src/Makefile.in	2003-12-09 13:42:15.130080000 +0000
-@@ -66,7 +66,6 @@
+--- src/Makefile.in.orig	2005-02-28 15:40:39.000000000 +0100
++++ src/Makefile.in
+@@ -67,9 +67,7 @@ $(LIBOBJS): Makefile
  # PHONY = don't look at file clean, -rm = start rm and ignore errors
  .PHONY : clean proper install
  install: all
 -	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
  	$(INSTALL) ../bin/$(PROGRAM) $(DESTDIR)$(bindir)
+-	$(INSTALL) ../bin/gocr.tcl   $(DESTDIR)$(bindir)  # better X11/bin?
  	$(INSTALL) $(LIBPGMASCLIB) $(DESTDIR)$(libdir)
  	$(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir)
+