diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-09-24 02:12:57 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-09-24 02:12:57 +0800 |
| commit | d4b5a4bd6674a4cf362997cd47d3cc7ccb67f966 (patch) | |
| tree | ef9c9a3c40b82e06149a40952660c34d76b41298 /print | |
| parent | 6e2d85ccb2486a6c32bd5058c38d71e19864eb6e (diff) | |
| download | freebsd-ports-gnome-d4b5a4bd6674a4cf362997cd47d3cc7ccb67f966.tar.gz freebsd-ports-gnome-d4b5a4bd6674a4cf362997cd47d3cc7ccb67f966.tar.zst freebsd-ports-gnome-d4b5a4bd6674a4cf362997cd47d3cc7ccb67f966.zip | |
- Switch to options helpers
- Don't install unused files, fixes stage-qa
- Remove CMAKE_ARGS, DEVPAK only works on win32
Approved by: portmgr blanket
Diffstat (limited to 'print')
| -rw-r--r-- | print/libharu/Makefile | 10 | ||||
| -rw-r--r-- | print/libharu/files/patch-CMakeLists.txt | 18 |
2 files changed, 16 insertions, 12 deletions
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 .) |