aboutsummaryrefslogtreecommitdiff
path: root/graphics/claraocr/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/claraocr/files')
-rw-r--r--graphics/claraocr/files/patch-Makefile73
-rw-r--r--graphics/claraocr/files/patch-debian-ubuntu95
-rw-r--r--graphics/claraocr/files/patch-openmode24
-rw-r--r--graphics/claraocr/files/patch-pbm2cl20
4 files changed, 0 insertions, 212 deletions
diff --git a/graphics/claraocr/files/patch-Makefile b/graphics/claraocr/files/patch-Makefile
deleted file mode 100644
index ae85c2e34bb2..000000000000
--- a/graphics/claraocr/files/patch-Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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:
- #
- #BINDIR=/usr/local/bin
--BINDIR=/usr/bin
-+BINDIR=${PREFIX}/bin
-
- #MANDIR=/usr/local/man/man1
--MANDIR=/usr/man/man1
-+MANDIR=${PREFIX}/man/man1
-
- #DOCDIR=/usr/local/doc/clara
- #DOCDIR=/usr/doc/clara
- #DOCDIR=/usr/doc/clara-$(VERSION)
--DOCDIR=/usr/share/doc/clara
-+DOCDIR=${PREFIX}/share/doc/clara
-
- #
- # Configure these variables accordingly to your system:
- #
--INCLUDE = -I/usr/X11R6/include
--LIBPATH = -L/usr/X11R6/lib
--CC = gcc
-+INCLUDE = -I${LOCALBASE}/include
-+LIBPATH = -L${LOCALBASE}/lib
-+CC ?= gcc
-
- #
- # Now choose the Clara OCR compilation options:
-@@ -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)
-@@ -97,7 +97,7 @@
- #
- # Add or remove flags if necessary:
- #
--LDFLAGS = -g
-+LDFLAGS =
-
- #
- # If your system requires additional libs, please add them:
-@@ -179,13 +179,16 @@
- ./clara -p 2
-
- install: all
-- install -d $(BINDIR)
-- install clara $(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 $(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-debian-ubuntu b/graphics/claraocr/files/patch-debian-ubuntu
deleted file mode 100644
index e8700020d76a..000000000000
--- a/graphics/claraocr/files/patch-debian-ubuntu
+++ /dev/null
@@ -1,95 +0,0 @@
-This set of fixes/improvements was downloaded from Ubuntu.
-Many thanks.
-
- -mi
-
---- clara.c
-+++ clara.c
-@@ -751,11 +751,12 @@
- s[128] = 0;
- logmsg(s);
-
-- if (!trace)
-- return;
-- va_start(args,m);
-- vfprintf(stderr,m,args);
-- fprintf(stderr,"\n");
-+ if (trace) {
-+ vfprintf(stderr,m,args);
-+ fprintf(stderr,"\n");
-+ }
-+
-+ va_end(args);
- }
-
- /*
-@@ -775,10 +776,12 @@
- logmsg(s);
-
- /* send to stderr if requested */
-- if (!debug)
-- return;
-- vfprintf(stderr,m,args);
-- fprintf(stderr,"\n");
-+ if (debug) {
-+ vfprintf(stderr,m,args);
-+ fprintf(stderr,"\n");
-+ }
-+
-+ va_end(args);
- }
-
- /*
-@@ -797,9 +800,10 @@
- s[128] = 0;
- logmsg(s);
-
-- va_start(args,m);
- vfprintf(stderr,m,args);
- fprintf(stderr,"\n");
-+
-+ va_end(args);
- }
-
- /* (devel)
---- event.c
-+++ event.c
-@@ -638,6 +638,8 @@
- }
- }
-
-+ va_end(args);
-+
- /*
- printf("request (priority %d, mclip=%d, redraw=%d) to draw the message \"%s\"\n",f,mclip,redraw_stline,s);
- */
---- html.c
-+++ html.c
-@@ -1548,11 +1548,12 @@
- va_list args;
- int n=0,f;
-
-- va_start(args, fmt);
- for (f=0; f==0; ) {
-
- /* try to write */
-+ va_start(args, fmt);
- n = vsnprintf(*t+*top+1,*sz-*top-1,fmt,args);
-+ va_end(args);
-
- /*
- Some implementations of vsnprintf return -1 when
-@@ -1589,11 +1590,12 @@
- va_list args;
- int n=0,f;
-
-- va_start(args, fmt);
- for (f=0; f==0; ) {
-
- /* try to write */
-+ va_start(args, fmt);
- n = vsnprintf(text+topt+1,textsz-topt-1,fmt,args);
-+ va_end(args);
-
- /*
- Some implementations of vsnprintf return -1 when
diff --git a/graphics/claraocr/files/patch-openmode b/graphics/claraocr/files/patch-openmode
deleted file mode 100644
index 505e7ce62598..000000000000
--- a/graphics/claraocr/files/patch-openmode
+++ /dev/null
@@ -1,24 +0,0 @@
-Obtained from Gentoo:
-
- http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/clara/files/
-
---- pgmblock.c 2002-04-29 14:26:13.000000000 +0000
-+++ pgmblock.c 2009-03-05 02:51:43.000000000 +0000
-@@ -161,7 +161,7 @@
-
- printf("%d rare pixels (%1.4f)\n",t,((float)t)/(w*h));
-
-- F = open("map",O_WRONLY|O_CREAT);
-+ F = open("map",O_WRONLY|O_CREAT, 0644);
- write(F,m,h*bpl);
- write(F,map,256);
- close(F);
-@@ -197,7 +197,7 @@
- {
- int i,j,F;
-
-- F = open("map",O_RDONLY|O_CREAT);
-+ F = open("map",O_RDONLY|O_CREAT, 0644);
- read(F,m,h*bpl);
- read(F,map,256);
- close(F);
diff --git a/graphics/claraocr/files/patch-pbm2cl b/graphics/claraocr/files/patch-pbm2cl
deleted file mode 100644
index cb6862da6b30..000000000000
--- a/graphics/claraocr/files/patch-pbm2cl
+++ /dev/null
@@ -1,20 +0,0 @@
-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
-
---- 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;
- }