[Midnightbsd-cvs] mports [17299] trunk/graphics/openjpeg: fix installation of openjpeg

[laffer1 at midnightbsd.org]

Revision: 17299
          http://svnweb.midnightbsd.org/mports/?rev=17299
Author:   laffer1
Date:     2014-09-15 01:31:42 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
fix installation of openjpeg

Modified Paths:
--------------
    trunk/graphics/openjpeg/Makefile
    trunk/graphics/openjpeg/pkg-descr

Added Paths:
-----------
    trunk/graphics/openjpeg/files/
    trunk/graphics/openjpeg/files/patch-CMakeLists.txt
    trunk/graphics/openjpeg/pkg-plist

Modified: trunk/graphics/openjpeg/Makefile
===================================================================
--- trunk/graphics/openjpeg/Makefile	2014-09-15 05:30:15 UTC (rev 17298)
+++ trunk/graphics/openjpeg/Makefile	2014-09-15 05:31:42 UTC (rev 17299)
@@ -3,7 +3,8 @@
 PORTNAME=	openjpeg
 PORTVERSION=	2.1.0
 CATEGORIES=	graphics
-MASTER_SITES=	SF/openjpeg.mirror/${PORTVERSION}
+MASTER_SITES=	SF/openjpeg.mirror/${PORTVERSION}/
+#??
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Open-source JPEG 2000 codec
@@ -10,16 +11,13 @@
 
 LICENSE=	bsd2
 
-LIB_DEPENDS=	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpng15.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+		liblcms2.so:${PORTSDIR}/graphics/lcms2
 
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
-USES=		cmake cpe pkgconfig
 
 PLIST_SUB=	VER=${PORTVERSION:R}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>

Added: trunk/graphics/openjpeg/files/patch-CMakeLists.txt
===================================================================
--- trunk/graphics/openjpeg/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/graphics/openjpeg/files/patch-CMakeLists.txt	2014-09-15 05:31:42 UTC (rev 17299)
@@ -0,0 +1,37 @@
+--- CMakeLists.txt.orig	2014-05-23 22:46:07.000000000 +0200
++++ CMakeLists.txt	2014-05-23 22:48:32.000000000 +0200
+@@ -334,14 +334,14 @@
+   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)
+@@ -349,7 +349,7 @@
+   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)
+@@ -357,7 +357,7 @@
+   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()
+ 

Modified: trunk/graphics/openjpeg/pkg-descr
===================================================================
--- trunk/graphics/openjpeg/pkg-descr	2014-09-15 05:30:15 UTC (rev 17298)
+++ trunk/graphics/openjpeg/pkg-descr	2014-09-15 05:31:42 UTC (rev 17299)
@@ -1,16 +1,10 @@
-The OpenJPEG library is an open-source JPEG 2000 library developed in order to
-promote the use of JPEG 2000.
+The OpenJPEG library is an open-source JPEG 2000 codec written in
+C language.  It has been developed in order to promote the use of
+JPEG 2000, the new still-image compression standard from the Joint
+Photographic Experts Group (JPEG).  In addition to the basic codec,
+various other features are under development, among them the JP2
+and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful
+for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer
+for j2k-images, ...
 
-The main part of the project consists in a JPEG 2000 codec compliant with the
-Part 1 of the standard (Class-1 Profile-1 compliance).
-
-Besides this main codec, OpenJPEG integrates several other modules:
-- JP2 (JPEG 2000 standard Part 2 - Handling of JP2 boxes and extended multiple
-  component transforms for multispectral and hyperspectral imagery)
-- MJ2 (JPEG 2000 standard Part 3)
-- JPWL (JPEG 2000 standard Part 11)
-- JPIP (JPEG 2000 standard Part 9)
-- OPJViewer, a GUI viewer for J2K, JP2, JPWL and MJ2 files
-
-WWW: https://code.google.com/p/openjpeg/
-WWW: http://openjpeg.mirror.sourceforge.net/
+WWW: http://code.google.com/p/openjpeg/

Added: trunk/graphics/openjpeg/pkg-plist
===================================================================
--- trunk/graphics/openjpeg/pkg-plist	                        (rev 0)
+++ trunk/graphics/openjpeg/pkg-plist	2014-09-15 05:31:42 UTC (rev 17299)
@@ -0,0 +1,15 @@
+bin/opj_compress
+bin/opj_decompress
+bin/opj_dump
+include/openjpeg-%%VER%%/openjpeg.h
+include/openjpeg-%%VER%%/opj_config.h
+include/openjpeg-%%VER%%/opj_stdint.h
+lib/libopenjp2.so
+lib/libopenjp2.so.2.1.0
+lib/libopenjp2.so.7
+lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
+lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake
+libdata/pkgconfig/libopenjp2.pc
+ at dirrmtry lib/openjpeg-%%VER%%
+ at dirrmtry include/openjpeg-%%VER%%