Date: Mon, 17 Jan 2005 14:52:59 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76347: [MAINTAINER] graphics/ocrad: update to 0.10 Message-ID: <200501171352.j0HDqxfJ018703@roadrunner.q.local> Resent-Message-ID: <200501171400.j0HE0qfP095224@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76347
>Category: ports
>Synopsis: [MAINTAINER] graphics/ocrad: update to 0.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 17 14:00:51 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.3-STABLE FreeBSD 5.3-STABLE #9: Thu Dec 16 18:33:14 CET 2004
>Description:
- Update to 0.10
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- ocrad-0.10.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/ocrad/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- Makefile 1 Mar 2004 19:20:34 -0000 1.4
+++ Makefile 17 Jan 2005 13:52:03 -0000
@@ -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 @@
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}" \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/ocrad/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- distinfo 1 Mar 2004 19:20:34 -0000 1.3
+++ distinfo 17 Jan 2005 13:52:03 -0000
@@ -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
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/graphics/ocrad/files/patch-Makefile.in,v
retrieving revision 1.3
diff -u -u -r1.3 patch-Makefile.in
--- files/patch-Makefile.in 1 Mar 2004 19:20:34 -0000 1.3
+++ files/patch-Makefile.in 17 Jan 2005 13:52:03 -0000
@@ -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
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/graphics/ocrad/files/patch-configure,v
retrieving revision 1.3
diff -u -u -r1.3 patch-configure
--- files/patch-configure 1 Mar 2004 19:20:34 -0000 1.3
+++ files/patch-configure 17 Jan 2005 13:52:03 -0000
@@ -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}
--- ocrad-0.10.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501171352.j0HDqxfJ018703>