From 2375b57452e140394641fb7ee783a388e6141130 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 23 Sep 2015 18:12:57 +0000
Subject: - Switch to options helpers - Don't install unused files, fixes
 stage-qa - Remove CMAKE_ARGS, DEVPAK only works on win32

Approved by:	portmgr blanket
---
 print/libharu/Makefile                   | 10 ++--------
 print/libharu/files/patch-CMakeLists.txt | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'print')

diff --git a/print/libharu/Makefile b/print/libharu/Makefile
index 9f2d424088eb..2aa51fa4c883 100644
--- a/print/libharu/Makefile
+++ b/print/libharu/Makefile
@@ -16,7 +16,6 @@ OPTIONS_DEFINE=	EXAMPLES
 
 USE_LDCONFIG=	yes
 USES+=		cmake:outsource
-CMAKE_ARGS+=	-DDEVPAK:BOOL=ON
 
 USE_GITHUB=	yes
 
@@ -24,13 +23,8 @@ SOVERSION=	2
 PLIST_SUB+=	SOVERSION=${SOVERSION}
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-CMAKE_ARGS+=	-DLIBHPDF_EXAMPLES:BOOL=ON  \
-    		-DEXAMPLESDIR:STRING=share/examples/${PORTNAME}
-.endif
-
+EXAMPLES_CMAKE_ON=	-DLIBHPDF_EXAMPLES:BOOL=ON  \
+			-DEXAMPLESDIR:STRING=share/examples/${PORTNAME}
 post-install:
 	${LN} -s libhpdf.so ${STAGEDIR}${PREFIX}/lib/libhpdf.so.${SOVERSION}
 
diff --git a/print/libharu/files/patch-CMakeLists.txt b/print/libharu/files/patch-CMakeLists.txt
index c50acedd07c7..e2a943474d1e 100644
--- a/print/libharu/files/patch-CMakeLists.txt
+++ b/print/libharu/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-02-17 11:28:46.000000000 +0100
-+++ CMakeLists.txt	2014-02-17 11:29:06.000000000 +0100
-@@ -78,6 +78,8 @@
+--- CMakeLists.txt.orig	2013-10-30 13:11:59 UTC
++++ CMakeLists.txt
+@@ -78,6 +78,8 @@ if(BUILD_SHARED_LIBS)
    set(LIBHPDF_SHARED ON)
  endif(BUILD_SHARED_LIBS)
  
@@ -9,7 +9,7 @@
  # =======================================================================
  # look for headers and libraries
  # =======================================================================
-@@ -110,7 +112,6 @@
+@@ -110,7 +112,6 @@ endif(PNG_FOUND)
  if(MSVC_VERSION GREATER 1399)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE)
  endif(MSVC_VERSION GREATER 1399)
@@ -17,3 +17,13 @@
  
  
  # these are options
+@@ -210,9 +211,7 @@ set(
+ install(FILES ${haru_HDRS} DESTINATION include)
+ 
+ # install various files
+-install(FILES README CHANGES INSTALL DESTINATION .)
+ if(NOT DEVPAK)
+-  install(DIRECTORY if DESTINATION .)
+ endif(NOT DEVPAK)
+ if(DEVPAK)
+   install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
-- 
cgit v1.2.3