From faf5f409172318aa27ca1914d303ce49271603f1 Mon Sep 17 00:00:00 2001 From: Marcelo Araujo Date: Wed, 19 Dec 2007 01:32:34 +0000 Subject: - Update to 0.17. - Pass maintainership to submitter. PR: ports/118790 Submitted by: Felippe de Meirelles Motta Approved by: Ulrich Spoerlein (maintainer via private mail), stas (mentor, implicit) --- graphics/ocrad/Makefile | 42 ++++++++++++++-------------------- graphics/ocrad/distinfo | 6 ++--- graphics/ocrad/files/patch-Makefile.in | 25 -------------------- graphics/ocrad/files/patch-configure | 30 ------------------------ 4 files changed, 20 insertions(+), 83 deletions(-) delete mode 100644 graphics/ocrad/files/patch-Makefile.in delete mode 100644 graphics/ocrad/files/patch-configure (limited to 'graphics/ocrad') diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile index e482ad161d11..76fcd3899b7e 100644 --- a/graphics/ocrad/Makefile +++ b/graphics/ocrad/Makefile @@ -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= lippemail@gmail.com COMMENT= OCR program implemented as filter USE_BZIP2= yes @@ -23,33 +23,25 @@ CONFIGURE_ARGS= --prefix=${PREFIX} 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 ${EXAMPLES:S,^,%%EXAMPLESDIR%%/,} +PLIST_DIRS= %%EXAMPLESDIR%% do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ocrad ${PREFIX}/bin + ${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 ${MAN1PREFIX}/man/man1/ +.endif +.if !defined(NOPORTEXAMPLES) + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/examples/,} ${EXAMPLESDIR}/ .endif -.include +.include diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo index b48c0457ccbf..29e95a7a3370 100644 --- a/graphics/ocrad/distinfo +++ b/graphics/ocrad/distinfo @@ -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 diff --git a/graphics/ocrad/files/patch-Makefile.in b/graphics/ocrad/files/patch-Makefile.in deleted file mode 100644 index 31f0882fe8fc..000000000000 --- a/graphics/ocrad/files/patch-Makefile.in +++ /dev/null @@ -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 $@ $< diff --git a/graphics/ocrad/files/patch-configure b/graphics/ocrad/files/patch-configure deleted file mode 100644 index 55e32ab3a4fb..000000000000 --- a/graphics/ocrad/files/patch-configure +++ /dev/null @@ -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= -- cgit v1.2.3