diff options
-rw-r--r-- | graphics/gocr/Makefile | 6 | ||||
-rw-r--r-- | graphics/gocr/distinfo | 6 | ||||
-rw-r--r-- | graphics/gocr/files/patch-configure | 11 | ||||
-rw-r--r-- | graphics/gocr/files/patch-link | 44 | ||||
-rw-r--r-- | graphics/gocr/files/patch-segfault | 19 | ||||
-rw-r--r-- | graphics/gocr/files/patch-src_progress.h | 11 |
6 files changed, 16 insertions, 81 deletions
diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile index b20059f7e9bb..a2e82aa5b30c 100644 --- a/graphics/gocr/Makefile +++ b/graphics/gocr/Makefile @@ -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 diff --git a/graphics/gocr/distinfo b/graphics/gocr/distinfo index 6eb6eaa62b61..b55b659d9c49 100644 --- a/graphics/gocr/distinfo +++ b/graphics/gocr/distinfo @@ -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 diff --git a/graphics/gocr/files/patch-configure b/graphics/gocr/files/patch-configure deleted file mode 100644 index 8f7b62a35d35..000000000000 --- a/graphics/gocr/files/patch-configure +++ /dev/null @@ -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; diff --git a/graphics/gocr/files/patch-link b/graphics/gocr/files/patch-link deleted file mode 100644 index 233fda0a64c4..000000000000 --- a/graphics/gocr/files/patch-link +++ /dev/null @@ -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 - - diff --git a/graphics/gocr/files/patch-segfault b/graphics/gocr/files/patch-segfault deleted file mode 100644 index 4d25d8f9ea34..000000000000 --- a/graphics/gocr/files/patch-segfault +++ /dev/null @@ -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' diff --git a/graphics/gocr/files/patch-src_progress.h b/graphics/gocr/files/patch-src_progress.h new file mode 100644 index 000000000000..36be6555bc01 --- /dev/null +++ b/graphics/gocr/files/patch-src_progress.h @@ -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); + |