diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 50fd9bcdffc9..f26109ec2482 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -1,32 +1,29 @@ # Created by: trasz # $FreeBSD$ PORTNAME= openjpeg PORTVERSION= 2.3.1 DISTVERSIONPREFIX= v CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org COMMENT= Open-source JPEG 2000 codec LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake>=3:devel/cmake LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= cmake cpe pkgconfig USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R} GH_ACCOUNT= uclouvain USE_GITHUB= yes -post-patch: - @${REINPLACE_CMD} -e 's|$${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt - .include diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e1bf64d555f2 --- /dev/null +++ b/graphics/openjpeg/files/patch-CMakeLists.txt @@ -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() +