From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 17 20:40:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81AD616A41A for ; Mon, 17 Dec 2007 20:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6C06F13C459 for ; Mon, 17 Dec 2007 20:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lBHKe2gZ047403 for ; Mon, 17 Dec 2007 20:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lBHKe2nS047395; Mon, 17 Dec 2007 20:40:02 GMT (envelope-from gnats) Resent-Date: Mon, 17 Dec 2007 20:40:02 GMT Resent-Message-Id: <200712172040.lBHKe2nS047395@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Felippe de Meirelles Motta" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C54EA16A420 for ; Mon, 17 Dec 2007 20:38:53 +0000 (UTC) (envelope-from lippemail@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.234]) by mx1.freebsd.org (Postfix) with ESMTP id 8D7C913C46B for ; Mon, 17 Dec 2007 20:38:53 +0000 (UTC) (envelope-from lippemail@gmail.com) Received: by nz-out-0506.google.com with SMTP id l8so919923nzf.13 for ; Mon, 17 Dec 2007 12:38:52 -0800 (PST) Received: by 10.140.169.4 with SMTP id r4mr1585723rve.131.1197923931253; Mon, 17 Dec 2007 12:38:51 -0800 (PST) Received: from shire.freebsd.org ( [201.8.196.106]) by mx.google.com with ESMTPS id 33sm1996772wra.2007.12.17.12.38.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2007 12:38:50 -0800 (PST) Message-Id: <1197923922.46671@shire.freebsd.org> Date: Mon, 17 Dec 2007 18:38:42 -0200 From: "Felippe de Meirelles Motta" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: Subject: ports/118790: [UPDATE] graphics/ocrad X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2007 20:40:02 -0000 >Number: 118790 >Category: ports >Synopsis: [UPDATE] graphics/ocrad >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Dec 17 20:40:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Felippe de Meirelles Motta >Release: FreeBSD 7.0-BETA3 i386 >Organization: >Environment: System: FreeBSD 7.0-BETA3 #0: Fri Nov 16 22:20:33 UTC 2007 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC >Description: - Updated to 0.17 version; - Various changes in Makefile; - Remove unnecessary patch; - This software is now licensed under GPLv3, if possible, the committer, add this software to wiki page of Ports with GPLv3. Thanks! :) >How-To-Repeat: >Fix: --- ocrad.txt begins here --- 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 - -.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 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 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= --- ocrad.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: