Attachment 83121 Details for Bug 118790 – ocrad.txt

ocrad.txt

ocrad.txt (text/plain), 4.30 KB, created by Felippe de Meirelles Motta on 2007-12-17 20:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felippe de Meirelles Motta

Created: 2007-12-17 20:40:01 UTC

Size: 4.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/graphics/ocrad/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- Makefile	15 Dec 2006 08:38:14 -0000	1.12
>+++ Makefile	17 Dec 2007 20:35:13 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	ocrad
>-PORTVERSION=	0.16
>+PORTVERSION=	0.17
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -23,33 +23,26 @@
> MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
> 		CXX="${CXX}"
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} < 500035
>-USE_GCC=	3.4+
>-post-patch:
>-. for f in main.cc rational.cc
>-	@${REINPLACE_CMD} 's/std::snprintf/snprintf/g' ${WRKSRC}/$f
>-. endfor
>-.endif
>-
>-.if ${OSVERSION} < 500041
>-MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} -DHAVE_DECL_GETOPT"
>-.endif
>-
>-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
>-PLIST_FILES=	bin/ocrad
>-.if !defined(NOPORTDOCS)
>+PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO INSTALL
>+EXAMPLES=	test.pbm test.txt
> INFO=		ocrad
> MAN1=		ocrad.1
>-.endif
>+
>+PLIST_FILES=	bin/ocrad
>+
>+.include <bsd.port.pre.mk>
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/ocrad ${PREFIX}/bin
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>-	@${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${PREFIX}/man/man1
>-	@${INSTALL_DATA} ${WRKSRC}/doc/ocrad.info ${PREFIX}/info
>+	@${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/ocrad.info ${PREFIX}/info
>+	${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${PREFIX}/man/man1
> .endif
>+.if !defined(NOPORTEXAMPLES)
>+	@${MKDIR} ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/examples/,} ${EXAMPLESDIR}
>+.endif
>+	${INSTALL_PROGRAM} ${WRKSRC}/ocrad ${PREFIX}/bin
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/graphics/ocrad/distinfo,v
>retrieving revision 1.8
>diff -u -r1.8 distinfo
>--- distinfo	15 Dec 2006 08:38:14 -0000	1.8
>+++ distinfo	17 Dec 2007 20:35:13 -0000
>@@ -1,3 +1,3 @@
>-MD5 (ocrad-0.16.tar.bz2) = 11436dd04e65a1e15ea62c2e2f26a4fa
>-SHA256 (ocrad-0.16.tar.bz2) = e3f98047f53bc19f6ff9d40de7b55ddf5e52d9b41453ab7f39f3bdf1ee974de6
>-SIZE (ocrad-0.16.tar.bz2) = 75532
>+MD5 (ocrad-0.17.tar.bz2) = 687c213b3334d5a6c2dcef97805c5882
>+SHA256 (ocrad-0.17.tar.bz2) = eba6cf9bae61dfe7b2633ecb05c282682c2ac998edaa57a13bcb04c0542070ae
>+SIZE (ocrad-0.17.tar.bz2) = 81287
>Index: files/patch-Makefile.in
>===================================================================
>RCS file: files/patch-Makefile.in
>diff -N files/patch-Makefile.in
>--- files/patch-Makefile.in	26 Jan 2005 05:42:46 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,25 +0,0 @@
>---- Makefile.in.orig	Mon Feb  9 12:08:00 2004
>-+++ Makefile.in	Mon Mar  1 12:42:34 2004
>-@@ -6,9 +6,1 @@
>--CXX = g++
>--INSTALL = install
>--INSTALL_PROGRAM = $(INSTALL) -p -m 755
>--INSTALL_DATA = $(INSTALL) -p -m 644
>--SHELL = /bin/sh
>--CPPFLAGS =
>--CXXFLAGS = -Wall -W -O2
>--LDFLAGS =
>- 
>-@@ -24,10 +24,10 @@
>- all : ocrad
>- 
>- ocrad : $(objs)
>--	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o ocrad $(objs)
>-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -o ocrad $(objs)
>- 
>- ocradp : $(objs)
>--	$(CXX) $(LDFLAGS) $(CXXFLAGS) -pg -o ocradp $(objs)
>-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -pg -o ocradp $(objs)
>- 
>- %.o : %.cc
>- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
>Index: files/patch-configure
>===================================================================
>RCS file: files/patch-configure
>diff -N files/patch-configure
>--- files/patch-configure	15 Dec 2006 08:38:14 -0000	1.5
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,30 +0,0 @@
>---- configure.orig	Fri Jan 23 22:55:38 2004
>-+++ configure	Mon Mar  1 11:34:35 2004
>-@@ -19,15 +19,6 @@
>- progname=$0
>- srctrigger=ocrad.png
>- 
>--# clear some things potentially inherited from environment.
>--srcdir=
>--prefix=/usr/local
>--exec_prefix='$(prefix)'
>--bindir='$(exec_prefix)/bin'
>--datadir='$(prefix)/share'
>--infodir='$(datadir)/info'
>--mandir='$(datadir)/man'
>--
>- # Loop over all args
>- while [ x$1 != x ] ; do
>- 
>-@@ -78,6 +72,11 @@
>- 		exit 1 ;;
>- 	esac
>- done
>-+
>-+prefix=${prefix:-/usr/local}
>-+datadir=${datadir:-${prefix}/share}
>-+infodir=${infodir:-${prefix}/share/info}
>-+mandir=${mandir:-${prefix}/share/man}
>- 
>- # Find the source files, if location was not specified.
>- srcdirtext=

Actions: View

Attachments on bug 118790: 83121