Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Nov 2020 20:48:52 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r556192 - in head/graphics/openjpeg: . files
Message-ID:  <202011242048.0AOKmqhl029669@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Nov 24 20:48:52 2020
New Revision: 556192
URL: https://svnweb.freebsd.org/changeset/ports/556192

Log:
  Convert REINPLACE_CMD to patch file

Added:
  head/graphics/openjpeg/files/
  head/graphics/openjpeg/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/graphics/openjpeg/Makefile

Modified: head/graphics/openjpeg/Makefile
==============================================================================
--- head/graphics/openjpeg/Makefile	Tue Nov 24 20:48:47 2020	(r556191)
+++ head/graphics/openjpeg/Makefile	Tue Nov 24 20:48:52 2020	(r556192)
@@ -26,7 +26,4 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION} VER=${PORTVERSIO
 GH_ACCOUNT=	uclouvain
 USE_GITHUB=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>

Added: head/graphics/openjpeg/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/openjpeg/files/patch-CMakeLists.txt	Tue Nov 24 20:48:52 2020	(r556192)
@@ -0,0 +1,37 @@
+--- CMakeLists.txt.orig	2019-04-02 12:45:15 UTC
++++ CMakeLists.txt
+@@ -363,14 +363,14 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig)
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig)
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -378,7 +378,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig)
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -386,7 +386,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    libdata/pkgconfig)
+   endif()
+ endif()
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011242048.0AOKmqhl029669>