Update to gocr v0.47. See the README file for all the changes since v0.40.

6 files changed, 47 insertions, 27 deletions

diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index 79e757c5d73..28b3fddd851 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/21 20:23:55 brook Exp $
 
-DISTNAME=	gocr-0.40
-PKGREVISION=	2
+DISTNAME=	gocr-0.47
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jocr/}
 
diff --git a/graphics/gocr/PLIST b/graphics/gocr/PLIST
index a9c03c56408..5734f60a700 100644
--- a/graphics/gocr/PLIST
+++ b/graphics/gocr/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/07/21 20:23:55 brook Exp $
 bin/gocr
 ${PLIST.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 07322ec2c0b..aa713268feb 100644
--- a/graphics/gocr/distinfo
+++ b/graphics/gocr/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/06/20 01:09:22 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/07/21 20:23:55 brook Exp $
 
-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) = 45286b824b9ff310e0024896cb917db454755b09
+SHA1 (gocr-0.47.tar.gz) = cfea611c6e53d277470796e4fce310e5add7c40b
+RMD160 (gocr-0.47.tar.gz) = 834329eeb9c1708a7df0e79decd751b9eaf9cefb
+Size (gocr-0.47.tar.gz) = 363267 bytes
+SHA1 (patch-aa) = 75cfdf569d04472cf01df4e537320848909184b9
+SHA1 (patch-ab) = 157464742cd6fa0342e4127d5fe9ee8ad8fbe27c
+SHA1 (patch-ac) = b4ff83990ca84580a81abd41f0939ca6926e0920
diff --git a/graphics/gocr/patches/patch-aa b/graphics/gocr/patches/patch-aa
index ca5266e1df6..f794ea08525 100644
--- a/graphics/gocr/patches/patch-aa
+++ b/graphics/gocr/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2005/10/25 02:06:57 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/21 20:23:55 brook Exp $
 
 --- configure.orig	2005-03-13 20:23:07.000000000 +0100
 +++ configure
-@@ -2489,7 +2489,7 @@ fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -2608,7 +2608,7 @@
+       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
+ _ACEOF
+@@ -2653,7 +2653,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/graphics/gocr/patches/patch-ab b/graphics/gocr/patches/patch-ab
index 2c65b69bcb0..85c9150e19c 100644
--- a/graphics/gocr/patches/patch-ab
+++ b/graphics/gocr/patches/patch-ab
@@ -1,23 +1,33 @@
-$NetBSD: patch-ab,v 1.3 2008/06/20 01:09:22 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2009/07/21 20:23:55 brook Exp $
 
 --- src/Makefile.in.orig	2005-02-28 14:40:39.000000000 +0000
 +++ src/Makefile.in
-@@ -30,6 +30,8 @@ LIBOBJS=pgm2asc.o \
+@@ -37,6 +37,8 @@
  # these two lines are for cross-compiling, not tested
  #srcdir = @srcdir@
  #VPATH = @srcdir@
 +prefix = @prefix@
 +exec_prefix = @exec_prefix@
  bindir = @bindir@
- libdir = @libdir@
- includedir = @includedir@
-@@ -67,9 +69,7 @@ $(LIBOBJS): Makefile
+ #  lib removed for simplification
+ #libdir = @libdir@
+@@ -78,7 +80,7 @@
+ $(PROGRAM): $(LIBOBJS) gocr.o
+ 	# make it conform to ld --as-needed
+ 	#$(CC) -o $@ $(LDFLAGS) gocr.o ./lib$(PGMASCLIB).a $(LIBS)
+-	$(CC) -o $@ gocr.o $(LIBOBJS) $(LIBS)
++	$(CC) -o $@ $(LDFLAGS) gocr.o $(LIBOBJS) $(LIBS)
+ 	if test -r $(PROGRAM); then cp $@ ../bin; fi
+ 
+ libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@PACKAGE_VERSION@.so
+@@ -97,10 +99,7 @@
  # PHONY = don't look at file clean, -rm = start rm and ignore errors
- .PHONY : clean proper install
+ .PHONY : clean proper install uninstall
  install: all
--	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+-	#$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+-	$(INSTALL) -d $(DESTDIR)$(bindir)
  	$(INSTALL) ../bin/$(PROGRAM) $(DESTDIR)$(bindir)
 -	$(INSTALL) ../bin/gocr.tcl   $(DESTDIR)$(bindir)  # better X11/bin?
- 	$(INSTALL) $(LIBPGMASCLIB) $(DESTDIR)$(libdir)
- 	$(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir)
- 
+ 	if test -f lib$(PGMASCLIB).a; then\
+ 	 $(INSTALL) lib$(PGMASCLIB).a $(DESTDIR)$(libdir);\
+ 	 $(INSTALL) lib$(PGMASCLIB).@PACKAGE_VERSION@.so $(DESTDIR)$(libdir);\
diff --git a/graphics/gocr/patches/patch-ac b/graphics/gocr/patches/patch-ac
new file mode 100644
index 00000000000..c4f18f391b0
--- /dev/null
+++ b/graphics/gocr/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2009/07/21 20:23:55 brook Exp $
+
+--- man/Makefile.in.orig
++++ man/Makefile.in
+@@ -16,7 +16,6 @@
+ # PHONY = don't look at file clean, -rm = start rm and ignore errors
+ .PHONY : clean proper install uninstall
+ install: all
+-	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) ../man/man1/$(PROGRAM).1 $(DESTDIR)$(mandir)/man1
+ 
+ uninstall: