From nobody Sat Mar 12 07:16:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 37CC91A12307; Sat, 12 Mar 2022 07:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFvHh48J9z4R4W; Sat, 12 Mar 2022 07:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647069408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7gyKpZwR5jwFpkIJLdoxi57sxGs/eEteMaTTe0nijk=; b=HLQ7F1ZYVMAMCH8SSII5RIGOxA5PuWTaQMsMxAvJE0Mcr1WclNz1Pwa8q0cBw2RrV/upW4 dcYiUfqa5fdRNPCRZNWKXtnnzqi0VNqlPzduf2/Jdm6gXco+B6DyMJ6znsGAIgyXDKvB0W AHCvlmEl4gmJHo7xmzUX249wvhnNNhUi4/09GovlEYbyKdpB18+zOgpnRr9HhhmFLT/SNJ x5jQNgo15Y+DAShMGC0CAQS7MI+b4vE1Te+hZURMll+QFi70tlqLPMPRWNS1UoyjjB3bn6 bgRv0/nBcJFZ4sT94i328v0Un+klOQKhUx8NLFvM4ONDnKu0zDv3it46tOLQDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C64DA289E1; Sat, 12 Mar 2022 07:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22C7GkCY067161; Sat, 12 Mar 2022 07:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22C7Gkmp067160; Sat, 12 Mar 2022 07:16:46 GMT (envelope-from git) Date: Sat, 12 Mar 2022 07:16:46 GMT Message-Id: <202203120716.22C7Gkmp067160@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4979149746a6 - main - graphics/ocrad: Update 0.27 -> 0.28 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4979149746a6e64c1113ec0f7f8863b592278895 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647069408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7gyKpZwR5jwFpkIJLdoxi57sxGs/eEteMaTTe0nijk=; b=ZX3lWFqsYDVD5d46JEbgZxn/XNHM82gSRupaoRQylO1qDHhhg4j+/TWCvlP1sOuwdhCG3z ODOkqwmB2nURhb1aH7zJQr9iYPR44nB7vrcHV4MIHaJxo3mPv3nHcJnOX2m+yFVPBW2jZa s3ZTCS0OB8Rnsoc4QQi9cGiHBtKU4e9JUKu2BMHdmbI+4CLEFH8BdzwaE6SLnSqEA8vOh1 v21fqOQXDBuSdX+rl4fcZMBv4KqNk0ZUZHJED9OXkL1hvJgjuGe8Fzy4dMOoJHJt9KTrOA ysi8JMq10QOwArzmSH7+cKfhaC3Y9KhRgmd7feJnQGL1xHcJnMVE2oMTm+7awQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647069408; a=rsa-sha256; cv=none; b=cSa6jVcIK53b61WmobelhmF37LVz8q9fJWaKbDdllCk1xJ25LrsjHj+VcxJxmEgX51+sP4 th23OR4kZ2NnXD36egoBTAxemYxc6FM5+6PZKBwTnS1gM/qbIF3X3idss6rXPVPTMqkq/6 5ymsxJR9Vzx1ri9Q5xrwNtcgWEXk4mud8Loo+aYmd4HLSICW/WtGrEOF6YAletHiMFszbJ MMqLPuc+VIVFLmCx0mXjV3d32Gzg8gFZ5xmp03+hB76IHLpL8Yeaj0ltrGavnpSMlheeNU zpgejNzjnQnXnWESP5axJVLMxtZxKuiUXzdLrz9UBQVcoDkalX9bjG8/ZLY0Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4979149746a6e64c1113ec0f7f8863b592278895 commit 4979149746a6e64c1113ec0f7f8863b592278895 Author: Yuri Victorovich AuthorDate: 2022-03-12 07:15:59 +0000 Commit: Yuri Victorovich CommitDate: 2022-03-12 07:16:39 +0000 graphics/ocrad: Update 0.27 -> 0.28 Reported by: portscout --- graphics/ocrad/Makefile | 16 +++++++++++++--- graphics/ocrad/distinfo | 6 +++--- graphics/ocrad/files/patch-Makefile.in | 19 ++++++++++--------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile index fb141c516162..761c97378d85 100644 --- a/graphics/ocrad/Makefile +++ b/graphics/ocrad/Makefile @@ -1,7 +1,7 @@ # Created by: Ulrich Spoerlein PORTNAME= ocrad -DISTVERSION= 0.27 +DISTVERSION= 0.28 CATEGORIES= graphics MASTER_SITES= GNU @@ -11,10 +11,15 @@ COMMENT= OCR program implemented as filter LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:lz +LIB_DEPENDS= libpng16.so:graphics/png + +USES= localbase:ldflags tar:lz +USE_LDCONFIG= yes + HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" --mandir=${PREFIX}/man --infodir=${PREFIX}/info -USE_LDCONFIG= yes + +MAKE_ARGS= LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/${PORTNAME} \ include/ocradlib.h \ @@ -27,6 +32,11 @@ OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= AUTHORS ChangeLog NEWS README PORTEXAMPLES= * +post-install: # strip + @${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/bin/ocrad \ + ${STAGEDIR}${PREFIX}/lib/libocrad.so + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/graphics/ocrad/distinfo b/graphics/ocrad/distinfo index 524af5baea55..8f1d3996d9bb 100644 --- a/graphics/ocrad/distinfo +++ b/graphics/ocrad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548483477 -SHA256 (ocrad-0.27.tar.lz) = a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 -SIZE (ocrad-0.27.tar.lz) = 91709 +TIMESTAMP = 1647068311 +SHA256 (ocrad-0.28.tar.lz) = 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e +SIZE (ocrad-0.28.tar.lz) = 95567 diff --git a/graphics/ocrad/files/patch-Makefile.in b/graphics/ocrad/files/patch-Makefile.in index 4daf1543f2e3..bec61c951e6f 100644 --- a/graphics/ocrad/files/patch-Makefile.in +++ b/graphics/ocrad/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2019-01-26 06:20:29 UTC +--- Makefile.in.orig 2022-01-16 01:25:58 UTC +++ Makefile.in -@@ -23,16 +23,16 @@ objs = arg_parser.o main.o +@@ -22,16 +22,16 @@ objs = arg_parser.o main.o uninstall uninstall-bin uninstall-info uninstall-man \ doc info man check dist clean distclean @@ -8,17 +8,18 @@ +all : $(progname) lib$(libname).so -lib$(libname).a: $(ocr_objs) $(lib_objs) -- $(AR) -crs $@ $(ocr_objs) $(lib_objs) +- $(AR) $(ARFLAGS) $@ $(ocr_objs) $(lib_objs) +lib$(libname).so: $(ocr_objs) $(lib_objs) -+ $(CXX) -shared -fPIC -o $@ $(ocr_objs) $(lib_objs) ++ $(CXX) -shared -fPIC -o $@ $(LDFLAGS) $(ocr_objs) $(lib_objs) $(progname) : $(ocr_objs) $(objs) - $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(ocr_objs) $(objs) +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ocr_objs) $(objs) $(LIBS) ++ $(CXX) $(CXXFLAGS) -o $@ $(ocr_objs) $(objs) $(LDFLAGS) $(LIBS) --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 : arg_parser.o ocradcheck.o lib$(libname).a +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ arg_parser.o ocradcheck.o lib$(libname).a $(LIBS) ++ocradcheck : arg_parser.o ocradcheck.o lib$(libname).so ++ $(CXX) $(CXXFLAGS) -o $@ arg_parser.o ocradcheck.o lib$(libname).so $(LDFLAGS) $(LIBS) ocradcheck.o : ocradcheck.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<