4 files changed, 14 insertions, 34 deletions

diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index 6bbefc71e791..d181544f0dcb 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ocrad
-PORTVERSION=	0.7
+PORTVERSION=	0.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,7 @@ COMMENT=	OCR program implemented as filter
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_GETOPT_LONG=	yes
-USE_REINPLACE=	yes
-USE_GCC=	3.2
+USE_GCC=	3.4
 
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo
index 0f9d31d40fe8..46d1d566b026 100644
--- a/graphics/ocrad/distinfo
+++ b/graphics/ocrad/distinfo
@@ -1,2 +1,2 @@
-MD5 (ocrad-0.7.tar.bz2) = 1893a8b8c3b6848392160e47be2b1de6
-SIZE (ocrad-0.7.tar.bz2) = 52718
+MD5 (ocrad-0.10.tar.bz2) = 84e0cc009bff0572a10772fbcd7101de
+SIZE (ocrad-0.10.tar.bz2) = 58565
diff --git a/graphics/ocrad/files/patch-Makefile.in b/graphics/ocrad/files/patch-Makefile.in
index 5c6f2fb7e0b9..31f0882fe8fc 100644
--- a/graphics/ocrad/files/patch-Makefile.in
+++ b/graphics/ocrad/files/patch-Makefile.in
@@ -1,29 +1,16 @@
 --- Makefile.in.orig	Mon Feb  9 12:08:00 2004
 +++ Makefile.in	Mon Mar  1 12:42:34 2004
-@@ -3,14 +3,14 @@
- 
- DISTNAME = ocrad-0.7
- 
+@@ -6,9 +6,1 @@
 -CXX = g++
 -INSTALL = install
--INSTALL_PROGRAM = $(INSTALL)
--INSTALL_DATA = $(INSTALL) -m 644
+-INSTALL_PROGRAM = $(INSTALL) -p -m 755
+-INSTALL_DATA = $(INSTALL) -p -m 644
 -SHELL = /bin/sh
 -CPPFLAGS =
 -CXXFLAGS = -Wall -W -O2
 -LDFLAGS =
-+CXX?= g++
-+INSTALL?= install
-+INSTALL_PROGRAM?= $(INSTALL)
-+INSTALL_DATA?= $(INSTALL) -m 644
-+SHELL?= /bin/sh
-+CPPFLAGS?=
-+CXXFLAGS?= -Wall -W -O2
-+LDFLAGS?=
  
- objs = common.o rectangle.o ucs.o bitmap.o block.o blockmap.o \
-        profile.o feats.o character.o character_r11.o character_r12.o \
-@@ -23,10 +23,10 @@
+@@ -24,10 +24,10 @@
  all : ocrad
  
  ocrad : $(objs)
@@ -36,11 +23,3 @@
  
  %.o : %.cc
  	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
-@@ -41,6 +41,7 @@
- character_r13.o : ucs.h block.h blockmap.h character.h profile.h feats.h
- feats.o         : ucs.h block.h blockmap.h profile.h feats.h
- main.o          : bitmap.h block.h blockmap.h character.h textline.h textblock.h
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c main.cc
- profile.o       : block.h blockmap.h profile.h
- textblock.o     : block.h character.h textline.h textblock.h
- textline.o      : ucs.h block.h character.h textline.h
diff --git a/graphics/ocrad/files/patch-configure b/graphics/ocrad/files/patch-configure
index 32502d238db9..d46b75ca4a26 100644
--- a/graphics/ocrad/files/patch-configure
+++ b/graphics/ocrad/files/patch-configure
@@ -1,24 +1,26 @@
 --- configure.orig	Fri Jan 23 22:55:38 2004
 +++ configure	Mon Mar  1 11:34:35 2004
-@@ -19,12 +19,6 @@
+@@ -19,13 +19,6 @@
  progname=$0
  srctrigger=ocrad.png
  
 -# clear some things potentially inherited from environment.
 -srcdir=
 -prefix=/usr/local
--infodir=${prefix}/share/info
--mandir=${prefix}/share/man
+-datadir='$(prefix)/share'
+-infodir='$(datadir)/info'
+-mandir='$(datadir)/man'
 -
  # Loop over all args
  while [ x$1 != x ] ; do
  
-@@ -64,6 +58,10 @@
+@@ -68,6 +62,11 @@
  		exit 1 ;;
  	esac
  done
 +
 +prefix=${prefix:-/usr/local}
++datadir=${datadir:-${prefix}/share}
 +infodir=${infodir:-${prefix}/share/info}
 +mandir=${mandir:-${prefix}/share/man}