Date: Wed, 23 Sep 2015 18:12:57 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397628 - in head/print/libharu: . files Message-ID: <201509231812.t8NICvvI064931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Sep 23 18:12:57 2015 New Revision: 397628 URL: https://svnweb.freebsd.org/changeset/ports/397628 Log: - Switch to options helpers - Don't install unused files, fixes stage-qa - Remove CMAKE_ARGS, DEVPAK only works on win32 Approved by: portmgr blanket Modified: head/print/libharu/Makefile head/print/libharu/files/patch-CMakeLists.txt Modified: head/print/libharu/Makefile ============================================================================== --- head/print/libharu/Makefile Wed Sep 23 18:07:11 2015 (r397627) +++ head/print/libharu/Makefile Wed Sep 23 18:12:57 2015 (r397628) @@ -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} Modified: head/print/libharu/files/patch-CMakeLists.txt ============================================================================== --- head/print/libharu/files/patch-CMakeLists.txt Wed Sep 23 18:07:11 2015 (r397627) +++ head/print/libharu/files/patch-CMakeLists.txt Wed Sep 23 18:12:57 2015 (r397628) @@ -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 .)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509231812.t8NICvvI064931>