- Update to 0.43

PR:		ports/106815
Submitted by:	Kay Lehmann <kay_lehmann@web.de> (maintainer)
This commit is contained in:
Martin Wilke 2006-12-16 22:03:04 +00:00
parent 47c942cd35
commit ab38b6577c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=179978
6 changed files with 16 additions and 81 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= gocr
PORTVERSION= 0.40
PORTREVISION= 1
PORTVERSION= 0.43
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= jocr
@ -15,12 +14,11 @@ 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}
CONFIGURE_ARGS= --with-netpbm=${LOCALBASE}
.if !defined(WITHOUT_X11)
RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84

View file

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

View file

@ -1,11 +0,0 @@
--- configure.orig Sun Apr 2 00:14:03 2006
+++ configure Sun Apr 2 00:14:37 2006
@@ -2426,7 +2426,7 @@
if test "${with_netpbm+set}" = set; then
withval="$with_netpbm"
if test "$withval" != "no"; then
- LDFLAGS="-L$withval/lib $LDFLAGS";\
+ LDFLAGS="-L$withval/lib -R$withval/lib $LDFLAGS";\
CPPFLAGS="-I$withval/include $CPPFLAGS";\
fi
fi;

View file

@ -1,44 +0,0 @@
--- 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

View file

@ -1,19 +0,0 @@
--- 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'

View file

@ -0,0 +1,11 @@
--- src/progress.h.orig Sat Dec 16 16:12:16 2006
+++ src/progress.h Sat Dec 16 16:12:46 2006
@@ -6,6 +6,8 @@
#ifndef GOCR_PROGRESS_H
#define GOCR_PROGRESS_H "Oct06"
+#include <time.h>
+
/* initialization of progress output, fname="<fileID>","<filename>","-" */
int ini_progress(char *fname);