From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 18 20:55:50 2007 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0F3C16A419; Tue, 18 Dec 2007 20:55:50 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from acme.spoerlein.net (acme.spoerlein.net [217.172.44.86]) by mx1.freebsd.org (Postfix) with ESMTP id 06CCE13C459; Tue, 18 Dec 2007 20:55:49 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from roadrunner.spoerlein.net (e180160067.adsl.alicedsl.de [85.180.160.67]) by acme.spoerlein.net (8.14.1/8.14.1) with ESMTP id lBIKbA3M003580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Dec 2007 21:37:11 +0100 (CET) (envelope-from uspoerlein@gmail.com) Received: from roadrunner.spoerlein.net (localhost [127.0.0.1]) by roadrunner.spoerlein.net (8.14.1/8.14.1) with ESMTP id lBIKb8eu015791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 18 Dec 2007 21:37:08 +0100 (CET) (envelope-from uspoerlein@gmail.com) Received: (from q@localhost) by roadrunner.spoerlein.net (8.14.1/8.14.1/Submit) id lBIKb7HL015790; Tue, 18 Dec 2007 21:37:07 +0100 (CET) (envelope-from uspoerlein@gmail.com) Date: Tue, 18 Dec 2007 21:37:07 +0100 From: Ulrich Spoerlein To: araujo@FreeBSD.org, Felippe de Meirelles Motta Message-ID: <20071218203707.GA1510@roadrunner.spoerlein.net> Mail-Followup-To: araujo@FreeBSD.org, Felippe de Meirelles Motta , freebsd-ports-bugs@FreeBSD.org References: <200712181042.lBIAg5QU042684@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="ibTvN161/egqYuK8" Content-Disposition: inline In-Reply-To: <200712181042.lBIAg5QU042684@freefall.freebsd.org> User-Agent: Mutt/1.5.16 (2007-06-09) X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on acme.spoerlein.net Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: 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: Tue, 18 Dec 2007 20:55:50 -0000 --ibTvN161/egqYuK8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello Felippe, there are some problems with your patch. The plist is wrong, it is even more wrong, if NOPORTDOCS or NOPORTEXAMPLES are used. pre and post.mk need to be included only, if ${OSVERSION} is required, since you dropped 4.x support, this is therefore no longer necessary. Also, while the trick with ${PORTDOCS:S,^,${WRKSRC}/,} is nice, it produces output that is completely human unreadable :) @araujo Please commit the attached patch instead. NB: I'm dropping maintainership for this port, as I haven't used it for quite a while ... Cheers, Ulrich Spoerlein --ibTvN161/egqYuK8 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="ocrad.patch" ? work Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/ocrad/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 15 Dec 2006 08:38:14 -0000 1.12 +++ Makefile 18 Dec 2007 20:33:42 -0000 @@ -6,12 +6,12 @@ # PORTNAME= ocrad -PORTVERSION= 0.16 +PORTVERSION= 0.17 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= uspoerlein@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= OCR program implemented as filter USE_BZIP2= yes @@ -20,25 +20,12 @@ USE_GMAKE= yes USE_GETOPT_LONG= yes CONFIGURE_ARGS= --prefix=${PREFIX} -MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - CXX="${CXX}" +CONFIGURE_ARGS+=CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" CPPFLAGS="${CPPFLAGS}" -.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 +PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO INSTALL +PORTEXAMPLES= test.pbm test.txt .if !defined(NOPORTDOCS) INFO= ocrad MAN1= ocrad.1 @@ -47,9 +34,13 @@ MAN1= ocrad.1 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} && cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/ocrad.info ${PREFIX}/${INFO_PATH} +.endif +.if !defined(NOPORTEXAMPLES) + ${MKDIR} ${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR} .endif -.include +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/graphics/ocrad/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 15 Dec 2006 08:38:14 -0000 1.8 +++ distinfo 18 Dec 2007 20:33:42 -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= --ibTvN161/egqYuK8--