 @@ -1,14 +1,14 @@
-$NetBSD: TODO,v 1.8271 2009/07/21 20:12:43 abs Exp $
+$NetBSD: TODO,v 1.8272 2009/07/21 20:23:54 brook Exp $
 Suggested new packages
 ======================
 	any unresolved PRs (if you have commit access)
 	http://www.netbsd.org/Gnats/category/pkg.html
 	any complete, polished packages in pkgsrc-wip (ditto)
 	http://pkgsrc-wip.sourceforge.net/
 	bacula-rescue
 	Scripts used to help create rescue boot cd's for bare metal
 	restores with bacula.  Scripts exist for linux, solaris, and
 @@ -669,27 +669,26 @@ For possible perl packages updates, see
 	o gnome-mag-0.15.7
 	o gnome-packagekit-0.4.5
 	o gnome-power-manager-2.26.3 [GNOME 2.26, wants DeviceKit-power]
 	o gnome-subtitles-0.9.1
 	o gnome-user-share-2.26.0 [GNOME 2.26]
 	o gnome-web-photo-0.6 [GNOME 2.26]
 	o gnomeicu-0.99.14
 	o gnopernicus-1.1.2
 	o gnu-crypto-2.1.0
 	o gnugo-3.8
 	o gnupg2-2.0.12
 	o gnustep-base-1.19.1
 	o gobo-eiffel-3.3 [does not work with smarteiffel-2.0; perhaps 2.1?]
 	o gocr-0.43
 	o gogo-3.11p1
 	o golem-0.0.6
 	o gossip-0.31
 	o gourmet-0.13.3
 	o gpaint-0.3.3
 	o gperiodic-2.0.10
 	o gplcver-2.12a
 	o gpredict-0.9.0
 	o gpsdrive-2.09
 	o gramofile-1.6P
 	o gramps3-3.1.1
 	o granulate-0.2
 	o graphviz-2.24.0

 @@ -1,17 +1,16 @@
-# $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
+DISTNAME=	gocr-0.47
 PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jocr/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/jocr
 COMMENT=	GOCR is a set of OCR tools
 PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 CONFIGURE_HAS_MANDIR=	no
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}

 @@ -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
+SHA1 (gocr-0.47.tar.gz) = cfea611c6e53d277470796e4fce310e5add7c40b
-RMD160 (gocr-0.40.tar.gz) = 1e34277b7d923706789d6e5c85996968d8506427
+RMD160 (gocr-0.47.tar.gz) = 834329eeb9c1708a7df0e79decd751b9eaf9cefb
-Size (gocr-0.40.tar.gz) = 780744 bytes
+Size (gocr-0.47.tar.gz) = 363267 bytes
-SHA1 (patch-aa) = c6f235f82d6c53a52547225045808e595a33b810
+SHA1 (patch-aa) = 75cfdf569d04472cf01df4e537320848909184b9
-SHA1 (patch-ab) = 45286b824b9ff310e0024896cb917db454755b09
+SHA1 (patch-ab) = 157464742cd6fa0342e4127d5fe9ee8ad8fbe27c
 SHA1 (patch-ac) = b4ff83990ca84580a81abd41f0939ca6926e0920

 @@ -1,22 +1,22 @@
-$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
+@@ -2608,7 +2608,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       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
 -  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

 @@ -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@
+ #  lib removed for simplification
- includedir = @includedir@
+ #libdir = @libdir@
-@@ -67,9 +69,7 @@ $(LIBOBJS): Makefile
+@@ -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)
+ 	if test -f lib$(PGMASCLIB).a; then\
- 	$(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir)
+ 	 $(INSTALL) lib$(PGMASCLIB).a $(DESTDIR)$(libdir);\
  	 $(INSTALL) lib$(PGMASCLIB).@PACKAGE_VERSION@.so $(DESTDIR)$(libdir);\

 @@ -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