6 files changed, 45 insertions, 18 deletions

diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile
index da19af439ad0..c8590c43f6aa 100644
--- a/graphics/claraocr/Makefile
+++ b/graphics/claraocr/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	claraocr
-PORTVERSION=	0.9.9
-PORTREVISION?=	3
+PORTVERSION=	20031214
 CATEGORIES=	graphics accessibility
-MASTER_SITES=	${MASTER_SITE_NETBSD}
+MASTER_SITES=	http://www.geocities.com/claraocr/
 DISTNAME=	clara-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,12 +19,12 @@ RUN_DEPENDS=	pnmenlarge:${PORTSDIR}/graphics/netpbm
 USE_XORG=	x11
 USE_PERL5=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
+MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
 
 MAN1=	clara-adv.1 clara-dev.1 clara.1
 
 post-patch:
-.for file in clara.pl mkdoc.pl selthresh.pl
-	@${PERL} -pi -e 's|^#!/usr/bin/perl|#!${PERL}|g' ${WRKSRC}/${file}
-.endfor
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|g' \
+		clara.pl mkdoc.pl selthresh
 
 .include <bsd.port.mk>
diff --git a/graphics/claraocr/distinfo b/graphics/claraocr/distinfo
index 5cd389e127d4..9f70388a907a 100644
--- a/graphics/claraocr/distinfo
+++ b/graphics/claraocr/distinfo
@@ -1,3 +1,6 @@
-MD5 (clara-0.9.9.tar.gz) = 00d92f2caeb0a4759638c5e808307529
-SHA256 (clara-0.9.9.tar.gz) = 07227a5a6ac07446fb3f242fcbb4d9b2a3f0eb99269f374e45dd8a80a66c6724
-SIZE (clara-0.9.9.tar.gz) = 419529
+MD5 (clara-20031214.tar.gz) = 3cd4eb76355d874f57058b19132e91d6
+SHA256 (clara-20031214.tar.gz) = baae846923004ac1b5b91f73057d5faf042eb499434e163b7ab6db88410bbce1
+SIZE (clara-20031214.tar.gz) = 451539
+MD5 (patch_20080429.html) = 91947464b35190e487ec02cc3e60e6bf
+SHA256 (patch_20080429.html) = 060c2fc65952d621f2eda30132de509452d8db7810fcf1fa73bec811b8946143
+SIZE (patch_20080429.html) = 2043
diff --git a/graphics/claraocr/files/patch-Makefile b/graphics/claraocr/files/patch-Makefile
index 9cb923df07c7..ae85c2e34bb2 100644
--- a/graphics/claraocr/files/patch-Makefile
+++ b/graphics/claraocr/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat May  4 10:45:07 2002
-+++ Makefile	Wed May  8 00:58:04 2002
+--- Makefile	2003-12-14 20:59:59.000000000 -0500
++++ Makefile	2008-06-26 15:37:29.000000000 -0400
 @@ -29,22 +29,22 @@
  # Configure the destination directories:
  #
@@ -29,16 +29,16 @@
  
  #
  # Now choose the Clara OCR compilation options:
-@@ -85,7 +85,7 @@
+@@ -88,7 +88,7 @@
  #
  # Add or remove flags if necessary:
  #
 -CFLAGS = $(INCLUDE) -g -Wall $(COPTS)
 +CFLAGS += $(INCLUDE) $(COPTS)
+ #CFLAGS = $(INCLUDE) -g -Wall -pedantic $(COPTS)
  #CFLAGS = $(INCLUDE) -g -O2 -Wall $(COPTS)
  #CFLAGS = $(INCLUDE) -g -O2 -pedantic $(COPTS)
- #CFLAGS = $(INCLUDE) -g -O2 $(COPTS)
-@@ -93,7 +93,7 @@
+@@ -97,7 +97,7 @@
  #
  # Add or remove flags if necessary:
  #
@@ -47,26 +47,27 @@
  
  #
  # If your system requires additional libs, please add them:
-@@ -175,13 +175,15 @@
+@@ -179,13 +179,16 @@
  	./clara -p 2
  
  install: all
 -	install -d $(BINDIR)
 -	install clara $(BINDIR)
--	install selthresh.pl $(BINDIR)
+-	install selthresh $(BINDIR)
 -	install -d $(MANDIR)
 -	install doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
 -	install -d $(DOCDIR)
 -	install ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
 +	${MKDIR} $(BINDIR)
 +	${BSD_INSTALL_PROGRAM} clara $(BINDIR)
-+	${BSD_INSTALL_SCRIPT} selthresh.pl $(BINDIR)
++	${BSD_INSTALL_SCRIPT} selthresh $(BINDIR)
 +	${MKDIR} $(MANDIR)
 +	${BSD_INSTALL_MAN} doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
 +.ifndef NOPORTDOCS
 +	${MKDIR} $(DOCDIR)
 +	${BSD_INSTALL_DATA} ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
 +.endif
++
  
  clean:
  	rm -f clara sclara $(OBJS) doc/clara*.1 doc/clara*.html doc/FAQ
diff --git a/graphics/claraocr/files/patch-pbm2cl b/graphics/claraocr/files/patch-pbm2cl
new file mode 100644
index 000000000000..7f8677014944
--- /dev/null
+++ b/graphics/claraocr/files/patch-pbm2cl
@@ -0,0 +1,22 @@
+In some cases only one bitmap is found when pbm2bm builds the list
+of free bitmaps.  Unfortunately the next bitmap pointer doesn't
+get initialized in that case causing a crash.  This patch ensures
+that the next free bitmap pointer is always initialized.
+
+-- John Wehle
+
+	http://www.geocities.com/claraocr/patch_20080429.html
+
+--- pbm2cl.c	2003-01-29 07:53:04.000000000 -0500
++++ pbm2cl.c	2008-06-26 15:41:18.000000000 -0400
+@@ -1048,9 +1048,9 @@
+         for (i=j=0, la=-1; i<abs; ++i) {
+             if (ab[i].x < 0) {
++                ab[i].y = -1;
+                 if (la < 0)
+                     la = j = i;
+                 else {
+                     ab[j].y = i;
+-                    ab[i].y = -1;
+                     j = i;
+                 }
diff --git a/graphics/claraocr/pkg-descr b/graphics/claraocr/pkg-descr
index c7190ec6dfd5..eec8637f6223 100644
--- a/graphics/claraocr/pkg-descr
+++ b/graphics/claraocr/pkg-descr
@@ -2,3 +2,5 @@ Clara is an OCR program. OCR stands for "Optical Character Recognition".
 An OCR program tries to recognize the characters from the digital image
 of a paper document. The name Clara stands for "Cooperative Lightweight
 chAracter Recognizer".
+
+WWW: http://www.geocities.com/claraocr/
diff --git a/graphics/claraocr/pkg-plist b/graphics/claraocr/pkg-plist
index 6375ee9f68b7..c007acd66c54 100644
--- a/graphics/claraocr/pkg-plist
+++ b/graphics/claraocr/pkg-plist
@@ -1,5 +1,5 @@
 bin/clara
-bin/selthresh.pl
+bin/selthresh
 %%PORTDOCS%%share/doc/clara/ANNOUNCE
 %%PORTDOCS%%share/doc/clara/CHANGELOG
 %%PORTDOCS%%share/doc/clara/FAQ