Date: Tue, 22 May 2018 04:46:00 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470593 - in head/graphics/ocrad: . files Message-ID: <201805220446.w4M4k0IK041706@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Tue May 22 04:46:00 2018 New Revision: 470593 URL: https://svnweb.freebsd.org/changeset/ports/470593 Log: graphics/ocrad: Install the header and the library Port changes: * Take maintainership * Remove do-install because project's makefile installs files fine * Adjust CONFIGURE_ARGS for man/info paths * Add USE_LDCONFIG * Remove MKDIR where it is not needed * Unsilence the install command Added: head/graphics/ocrad/files/ head/graphics/ocrad/files/patch-Makefile.in (contents, props changed) Modified: head/graphics/ocrad/Makefile head/graphics/ocrad/pkg-descr Modified: head/graphics/ocrad/Makefile ============================================================================== --- head/graphics/ocrad/Makefile Tue May 22 02:00:34 2018 (r470592) +++ head/graphics/ocrad/Makefile Tue May 22 04:46:00 2018 (r470593) @@ -3,36 +3,37 @@ PORTNAME= ocrad PORTVERSION= 0.26 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNU EXTRACT_SUFX= .tar.lz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yuri@FreeBSD.org COMMENT= OCR program implemented as filter LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" +CONFIGURE_ARGS= --prefix=${PREFIX} CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" --mandir=${PREFIX}/man --infodir=${PREFIX}/info +USE_LDCONFIG= yes -PORTDOCS= AUTHORS ChangeLog NEWS README -PORTEXAMPLES= * -PLIST_FILES= bin/${PORTNAME} man/man1/ocrad.1.gz +PLIST_FILES= bin/${PORTNAME} \ + include/ocradlib.h \ + lib/libocrad.so \ + man/man1/ocrad.1.gz \ + info/ocrad.info OPTIONS_DEFINE= DOCS EXAMPLES -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 +PORTDOCS= AUTHORS ChangeLog NEWS README +PORTEXAMPLES= * post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \ - ${STAGEDIR}${DOCSDIR}) + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Added: head/graphics/ocrad/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ocrad/files/patch-Makefile.in Tue May 22 04:46:00 2018 (r470593) @@ -0,0 +1,33 @@ +--- Makefile.in.orig 2018-05-22 03:44:46 UTC ++++ Makefile.in +@@ -23,16 +23,16 @@ objs = arg_parser.o main.o + uninstall uninstall-bin uninstall-info uninstall-man \ + doc info man check dist clean distclean + +-all : $(progname) lib$(libname).a ++all : $(progname) lib$(libname).so + +-lib$(libname).a: $(ocr_objs) $(lib_objs) +- $(AR) -rcs $@ $(ocr_objs) $(lib_objs) ++lib$(libname).so: $(ocr_objs) $(lib_objs) ++ $(CXX) -shared -fPIC -o $@ $(ocr_objs) $(lib_objs) + + $(progname) : $(ocr_objs) $(objs) + $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(ocr_objs) $(objs) + +-ocradcheck : ocradcheck.o lib$(libname).a +- $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ ocradcheck.o lib$(libname).a ++ocradcheck : ocradcheck.o lib$(libname).so ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ ocradcheck.o lib$(libname).so + + ocradcheck.o : ocradcheck.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $< +@@ -101,7 +101,7 @@ install-bin : all + if [ ! -d "$(DESTDIR)$(libdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(libdir)" ; fi + $(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)" + $(INSTALL_DATA) $(VPATH)/$(libname)lib.h "$(DESTDIR)$(includedir)/$(libname)lib.h" +- $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" ++ $(INSTALL_DATA) ./lib$(libname).so "$(DESTDIR)$(libdir)/lib$(libname).so" + + install-bin-strip : all + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin Modified: head/graphics/ocrad/pkg-descr ============================================================================== --- head/graphics/ocrad/pkg-descr Tue May 22 02:00:34 2018 (r470592) +++ head/graphics/ocrad/pkg-descr Tue May 22 04:46:00 2018 (r470593) @@ -6,4 +6,4 @@ of text normally found on printed pages. It can be used as a stand-alone console application, or as a backend to other programs. -WWW: http://www.gnu.org/software/ocrad/ocrad.html +WWW: https://www.gnu.org/software/ocrad/ocrad.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805220446.w4M4k0IK041706>