Attachment #73724 for bug #106815

View | Details | Raw Unified | Return to bug 106815
Collapse All | Expand All




#

PORTNAME=	gocr
PORTVERSION=	0.43
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	jocr

MAINTAINER=	kay_lehmann@web.de
COMMENT=	GOCR/JOCR is an OCR (Optical Character Recognition) program

BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm

USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-netpbm=${LOCALBASE}

.if !defined(WITHOUT_X11)
RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84

Lines 1-3 Link Here

(-)gocr/distinfo (-3 / +3 lines)
1	MD5 (gocr-0.40.tar.gz) = 13cc0d008747f5bb56d8b17be9b61859	1	MD5 (gocr-0.43.tar.gz) = f989fe8e24f82d19c8ce55df15784e15
2	SHA256 (gocr-0.40.tar.gz) = bab419672bedbc00fc7fe1395d0eb4f9b5841c248245a8457dfd4ee1d19a6f4c	2	SHA256 (gocr-0.43.tar.gz) = 36e88624511dd8f366fa679beaf14afa7d11e71c2dd6947a43eab31c8bc27fe9
3	SIZE (gocr-0.40.tar.gz) = 780744	3	SIZE (gocr-0.43.tar.gz) = 820923

Lines 1-11 Link Here

(-)gocr/files/patch-configure (-11 lines)
1	--- configure.orig Sun Apr 2 00:14:03 2006
2	+++ configure Sun Apr 2 00:14:37 2006
3	@@ -2426,7 +2426,7 @@
4	if test "${with_netpbm+set}" = set; then
5	withval="$with_netpbm"
6	if test "$withval" != "no"; then
7	- LDFLAGS="-L$withval/lib $LDFLAGS";\
8	+ LDFLAGS="-L$withval/lib -R$withval/lib $LDFLAGS";\
9	CPPFLAGS="-I$withval/include $CPPFLAGS";\
10	fi
11	fi;




--- src/Makefile.in	Mon Feb 28 15:40:39 2005
+++ src/Makefile.in	Wed Apr 12 09:20:51 2006
@@ -4,8 +4,8 @@
 
 EXEEXT = 
 PROGRAM = gocr$(EXEEXT)
-PGMASCLIB = Pgm2asc
-LIBPGMASCLIB = lib$(PGMASCLIB).a
+PGMASCLIB = ./libPgm2asc.a
+LIBPGMASCLIB = $(PGMASCLIB)
 INCLUDEFILES = gocr.h
 
 LIBOBJS=pgm2asc.o \
@@ -53,7 +53,7 @@
 all: $(PROGRAM) $(LIBPGMASCLIB)
 
 $(PROGRAM): $(LIBPGMASCLIB) gocr.o
-	$(CC) -o $@ gocr.o $(LDFLAGS) -l$(PGMASCLIB)
+	$(CC) -o $@ gocr.o $(LDFLAGS) $(PGMASCLIB)
 	if test -r $(PROGRAM); then cp $@ ../bin; fi
 
 
--- src/Makefile	Mon Feb 28 15:40:39 2005
+++ src/Makefile	Wed Apr 12 09:20:51 2006
@@ -4,8 +4,8 @@
 
 EXEEXT = 
 PROGRAM = gocr$(EXEEXT)
-PGMASCLIB = Pgm2asc
-LIBPGMASCLIB = lib$(PGMASCLIB).a
+PGMASCLIB = ./libPgm2asc.a
+LIBPGMASCLIB = $(PGMASCLIB)
 INCLUDEFILES = gocr.h
 
 LIBOBJS=pgm2asc.o \
@@ -53,7 +53,7 @@
 all: $(PROGRAM) $(LIBPGMASCLIB)
 
 $(PROGRAM): $(LIBPGMASCLIB) gocr.o
-	$(CC) -o $@ gocr.o $(LDFLAGS) -l$(PGMASCLIB)
+	$(CC) -o $@ gocr.o $(LDFLAGS) $(PGMASCLIB)
 	if test -r $(PROGRAM); then cp $@ ../bin; fi
 
 




--- src/pgm2asc.c	Fri Apr 14 11:07:42 2006
+++ src/pgm2asc.c	Fri Apr 14 11:06:15 2006
@@ -1200,6 +1200,7 @@
         } end_for_each(&(JOB->res.boxlist));
 	box4=box5;
       	{
+          if (box2 != NULL && box4 != NULL){
           if( /* umlaut "a "o "u, ij; box2 is the dot, box4 the body */
             ( y1<=box2->m2
               &&   box4->x1>=3*x0-2*x1  /* test if box4 is around box2 */
@@ -1252,7 +1253,7 @@
 	    list_del(&(JOB->res.boxlist), box4); /* ret&1: error-message ??? */
 	    free(box4);
           }
-	}
+	  }}
       }
 // continue;
       // horizontally broken w' K'

Line 0 Link Here

(-)gocr/files/patch-src_progress.h (+11 lines)
	1	--- src/progress.h.orig Sat Dec 16 16:12:16 2006
	2	+++ src/progress.h Sat Dec 16 16:12:46 2006
	3	@@ -6,6 +6,8 @@
	4	#ifndef GOCR_PROGRESS_H
	5	#define GOCR_PROGRESS_H "Oct06"
	6
	7	+#include <time.h>
	8	+
	9	/* initialization of progress output, fname="<fileID>","<filename>","-" */
	10	int ini_progress(char *fname);
	11

Return to bug 106815

Lines 6-13 Link Here

(-)gocr/Makefile (-4 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= gocr	8	PORTNAME= gocr
9	PORTVERSION= 0.40	9	PORTVERSION= 0.43
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= jocr	12	MASTER_SITE_SUBDIR= jocr
Lines 15-26 Link Here
15	MAINTAINER= kay_lehmann@web.de	14	MAINTAINER= kay_lehmann@web.de
16	COMMENT= GOCR/JOCR is an OCR (Optical Character Recognition) program	15	COMMENT= GOCR/JOCR is an OCR (Optical Character Recognition) program
17		16
18	BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
19	LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm	17	LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm
20		18
21	USE_GMAKE= yes	19	USE_GMAKE= yes
22	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS+= --with-netpbm=${LOCALBASE}	21	CONFIGURE_ARGS= --with-netpbm=${LOCALBASE}
24		22
25	.if !defined(WITHOUT_X11)	23	.if !defined(WITHOUT_X11)
26	RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84	24	RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84

Lines 1-44 Link Here

(-)gocr/files/patch-link (-44 lines)
1	--- src/Makefile.in Mon Feb 28 15:40:39 2005
2	+++ src/Makefile.in Wed Apr 12 09:20:51 2006
3	@@ -4,8 +4,8 @@
4
5	EXEEXT =
6	PROGRAM = gocr$(EXEEXT)
7	-PGMASCLIB = Pgm2asc
8	-LIBPGMASCLIB = lib$(PGMASCLIB).a
9	+PGMASCLIB = ./libPgm2asc.a
10	+LIBPGMASCLIB = $(PGMASCLIB)
11	INCLUDEFILES = gocr.h
12
13	LIBOBJS=pgm2asc.o \
14	@@ -53,7 +53,7 @@
15	all: $(PROGRAM) $(LIBPGMASCLIB)
16
17	$(PROGRAM): $(LIBPGMASCLIB) gocr.o
18	- $(CC) -o $@ gocr.o $(LDFLAGS) -l$(PGMASCLIB)
19	+ $(CC) -o $@ gocr.o $(LDFLAGS) $(PGMASCLIB)
20	if test -r $(PROGRAM); then cp $@ ../bin; fi
21
22
23	--- src/Makefile Mon Feb 28 15:40:39 2005
24	+++ src/Makefile Wed Apr 12 09:20:51 2006
25	@@ -4,8 +4,8 @@
26
27	EXEEXT =
28	PROGRAM = gocr$(EXEEXT)
29	-PGMASCLIB = Pgm2asc
30	-LIBPGMASCLIB = lib$(PGMASCLIB).a
31	+PGMASCLIB = ./libPgm2asc.a
32	+LIBPGMASCLIB = $(PGMASCLIB)
33	INCLUDEFILES = gocr.h
34
35	LIBOBJS=pgm2asc.o \
36	@@ -53,7 +53,7 @@
37	all: $(PROGRAM) $(LIBPGMASCLIB)
38
39	$(PROGRAM): $(LIBPGMASCLIB) gocr.o
40	- $(CC) -o $@ gocr.o $(LDFLAGS) -l$(PGMASCLIB)
41	+ $(CC) -o $@ gocr.o $(LDFLAGS) $(PGMASCLIB)
42	if test -r $(PROGRAM); then cp $@ ../bin; fi
43
44

Lines 1-19 Link Here

(-)gocr/files/patch-segfault (-19 lines)
1	--- src/pgm2asc.c Fri Apr 14 11:07:42 2006
2	+++ src/pgm2asc.c Fri Apr 14 11:06:15 2006
3	@@ -1200,6 +1200,7 @@
4	} end_for_each(&(JOB->res.boxlist));
5	box4=box5;
6	{
7	+ if (box2 != NULL && box4 != NULL){
8	if( /* umlaut "a "o "u, ij; box2 is the dot, box4 the body */
9	( y1<=box2->m2
10	&& box4->x1>=3x0-2x1 /* test if box4 is around box2 */
11	@@ -1252,7 +1253,7 @@
12	list_del(&(JOB->res.boxlist), box4); /* ret&1: error-message ??? */
13	free(box4);
14	}
15	- }
16	+ }}
17	}
18	// continue;
19	// horizontally broken w' K'