From nobody Mon Nov 1 13:45:29 2021 X-Original-To: dev-commits-ports-all@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 260811836681; Mon, 1 Nov 2021 13:45:35 +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 4HjZ6k3N7Zz4jxh; Mon, 1 Nov 2021 13:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D3ACD1296F; Mon, 1 Nov 2021 13:45:29 +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 1A1DjTZC048796; Mon, 1 Nov 2021 13:45:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1DjTM4048795; Mon, 1 Nov 2021 13:45:29 GMT (envelope-from git) Date: Mon, 1 Nov 2021 13:45:29 GMT Message-Id: <202111011345.1A1DjTM4048795@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 3e0e341fb573 - main - graphics/podofo: Convert REINPLACE_CMD to patch file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e0e341fb5736b41ce7ca773c6f2e77ca5029fea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e0e341fb5736b41ce7ca773c6f2e77ca5029fea commit 3e0e341fb5736b41ce7ca773c6f2e77ca5029fea Author: Po-Chuan Hsieh AuthorDate: 2021-11-01 13:23:57 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-11-01 13:41:24 +0000 graphics/podofo: Convert REINPLACE_CMD to patch file --- graphics/podofo/Makefile | 4 ---- graphics/podofo/files/patch-src-podofo-CMakeLists.txt | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index 84922505e433..e9e4b050e1dd 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -42,8 +42,4 @@ PNG_LIB_DEPENDS= libpng.so:graphics/png TIFF_CMAKE_BOOL= WANT_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -post-patch: - @${REINPLACE_CMD} -e 's|$${LIBDIRNAME}/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/src/podofo/CMakeLists.txt - @${REINPLACE_CMD} -e '/^Libs: / s|-@PODOFO_VERSION_MAJOR@||' ${WRKSRC}/src/podofo/libpodofo.pc.in - .include diff --git a/graphics/podofo/files/patch-src-podofo-CMakeLists.txt b/graphics/podofo/files/patch-src-podofo-CMakeLists.txt index 305f5cdf6821..8302365d68ee 100644 --- a/graphics/podofo/files/patch-src-podofo-CMakeLists.txt +++ b/graphics/podofo/files/patch-src-podofo-CMakeLists.txt @@ -22,3 +22,12 @@ CLEAN_DIRECT_OUTPUT 1 OUTPUT_NAME "podofo" COMPILE_FLAGS "-DBUILDING_PODOFO" +@@ -320,7 +320,7 @@ IF(PODOFO_BUILD_SHARED) + @ONLY) + INSTALL( + FILES "${PoDoFo_BINARY_DIR}/libpodofo.pc" +- DESTINATION "${LIBDIRNAME}/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") + ELSE(PKG_CONFIG_FOUND) + MESSAGE("Pkg-config not found. No pkg-config file will be created.") + ENDIF(PKG_CONFIG_FOUND)