graphics/openjpeg15: resolve build conflicts with openjpeg2 for consumers (+)

Includes must be installed into own project subdir as intended by authors.

Pointyhat to:	sunpoet
With hat:	office
Sponsored by:	Netzkommune GmbH

3 files changed, 17 insertions, 33 deletions

diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
index a00fda35a9a7..149887a1a1ae 100644
--- a/graphics/openjpeg15/Makefile
+++ b/graphics/openjpeg15/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	openjpeg
 PORTVERSION=	1.5.2
 DISTVERSIONPREFIX=	version.
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	15
 
@@ -24,6 +24,8 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	CHANGES LICENSE
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R}
+
 GH_ACCOUNT=	uclouvain
 USE_GITHUB=	yes
 
diff --git a/graphics/openjpeg15/files/patch-CMakeLists.txt b/graphics/openjpeg15/files/patch-CMakeLists.txt
index 02b9fd8fa31c..4c7246a15f2b 100644
--- a/graphics/openjpeg15/files/patch-CMakeLists.txt
+++ b/graphics/openjpeg15/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-03-27 11:58:08.000000000 +0100
-+++ CMakeLists.txt	2014-05-24 11:24:37.000000000 +0200
-@@ -54,7 +54,7 @@
+--- CMakeLists.txt.orig	2014-03-28 08:20:25 UTC
++++ CMakeLists.txt
+@@ -54,7 +54,7 @@ if(NOT OPENJPEG_SOVERSION)
  endif(NOT OPENJPEG_SOVERSION)
  SET(OPENJPEG_LIBRARY_PROPERTIES
    VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
@@ -9,21 +9,7 @@
  )
  
  # --------------------------------------------------------------------------
-@@ -94,7 +94,7 @@
- # Install directories
- 
- STRING(TOLOWER ${PROJECT_NAME} projectname)
--SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
-+SET(OPENJPEG_INSTALL_SUBDIR "${projectname}")
- 
- IF(NOT OPENJPEG_INSTALL_BIN_DIR)
-   SET(OPENJPEG_INSTALL_BIN_DIR "bin")
-@@ -125,11 +125,11 @@
- ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
- 
- IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
-+  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
+@@ -129,11 +129,11 @@ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
  ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
  
  IF(NOT OPENJPEG_INSTALL_MAN_DIR)
@@ -32,16 +18,12 @@
  ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
  
  IF(NOT OPENJPEG_INSTALL_DOC_DIR)
-@@ -148,7 +148,7 @@
-   # We could install *.cmake files in share/ however those files contains
-   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
-   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
- ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
++  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${projectname}")
+ ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
  
- #-----------------------------------------------------------------------------
-@@ -188,10 +188,10 @@
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+@@ -188,10 +188,10 @@ IF(UNIX)
    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
      ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
    INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
@@ -54,7 +36,7 @@
  ENDIF(UNIX)
  
  #-----------------------------------------------------------------------------
-@@ -288,6 +288,7 @@
+@@ -288,6 +288,7 @@ ENDIF(BUILD_TESTING)
  #-----------------------------------------------------------------------------
  # install all targets referenced as OPENJPEGTargets
  INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
diff --git a/graphics/openjpeg15/pkg-plist b/graphics/openjpeg15/pkg-plist
index eef129fa5824..aa513fabf73a 100644
--- a/graphics/openjpeg15/pkg-plist
+++ b/graphics/openjpeg15/pkg-plist
@@ -1,7 +1,10 @@
 bin/image_to_j2k
 bin/j2k_dump
 bin/j2k_to_image
-include/openjpeg.h
+include/openjpeg-%%VER%%/openjpeg.h
+lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
+lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake
 lib/libopenjpeg.so
 lib/libopenjpeg.so.1.5.2
 lib/libopenjpeg.so.2
@@ -9,8 +12,5 @@ man/man1/image_to_j2k.1.gz
 man/man1/j2k_dump.1.gz
 man/man1/j2k_to_image.1.gz
 man/man3/libopenjpeg.3.gz
-%%DATADIR%%/OpenJPEGConfig.cmake
-%%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATADIR%%/OpenJPEGTargets.cmake
 libdata/pkgconfig/libopenjpeg.pc
 libdata/pkgconfig/libopenjpeg1.pc