diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-04-21 12:26:19 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-04-21 12:26:19 +0000 |
| commit | 77cc777e56382d09a48d0d7797e22a243aa9792e (patch) | |
| tree | 72311639f73cd058e07d9cbbd04b82bf83c121cd | |
| parent | d6c44914fe599e8f94978e21effb0a153a3de22c (diff) | |
| download | pkgsrc-77cc777e56382d09a48d0d7797e22a243aa9792e.tar.gz | |
Add manual CMAKE_INSTALL_MANDIR handling.
| -rw-r--r-- | ham/trustedQSL/Makefile | 5 | ||||
| -rw-r--r-- | ham/trustedQSL/distinfo | 4 | ||||
| -rw-r--r-- | ham/trustedQSL/patches/patch-apps_CMakeLists.txt | 20 |
3 files changed, 21 insertions, 8 deletions
diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile index 43ef9bfd671..4185048ee6f 100644 --- a/ham/trustedQSL/Makefile +++ b/ham/trustedQSL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/03/16 14:22:01 mef Exp $ +# $NetBSD: Makefile,v 1.22 2016/04/21 12:26:19 jperkin Exp $ DISTNAME= tqsl-2.2.1 CATEGORIES= ham @@ -24,7 +24,7 @@ USE_CMAKE= yes # usage in Makefile.am, without matching -R. do-configure: - (cd $(WRKSRC) ; \ + (cd ${WRKSRC} ; \ cmake \ -DBDB_PREFIX=${PREFIX} \ -DBDB_INCLUDE_DIR=${PREFIX}/include \ @@ -32,6 +32,7 @@ do-configure: -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \ + -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR} \ .) post-install: diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo index af3b84fb6c4..c7b17dec819 100644 --- a/ham/trustedQSL/distinfo +++ b/ham/trustedQSL/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2016/03/16 14:22:01 mef Exp $ +$NetBSD: distinfo,v 1.15 2016/04/21 12:26:19 jperkin Exp $ SHA1 (tqsl-2.2.1.tar.gz) = c0bcfc9a7e5a9e53fd9c5e3debb98d1f3b8fb309 RMD160 (tqsl-2.2.1.tar.gz) = 7e2b3f01564e48cfbee48c9e380382bba888b69e SHA512 (tqsl-2.2.1.tar.gz) = 8aa2577f449b20ce0f53cb7725b246ac79e5581ec9694f1189b3469883087b33d9e6262da862e537f63cdf751a77625302a06deedb70b798680aea496c7b3947 Size (tqsl-2.2.1.tar.gz) = 3782449 bytes -SHA1 (patch-apps_CMakeLists.txt) = e2a44d076c2e2804a45d8fc98937543105fb4d0f +SHA1 (patch-apps_CMakeLists.txt) = 5063cf616a65e6d5650e946fd0929759ad04c9c0 SHA1 (patch-apps_tqsl_cpp) = a21e3264051feb8230af7e031688ba98f51db1df SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896 diff --git a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt index 8128ec0298a..67af8116160 100644 --- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt +++ b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-apps_CMakeLists.txt,v 1.5 2016/03/16 14:22:01 mef Exp $ +$NetBSD: patch-apps_CMakeLists.txt,v 1.6 2016/04/21 12:26:19 jperkin Exp $ (1) Avoid ${WRKSRC} included in RPATH. ---- apps/CMakeLists.txt.orig 2016-03-12 14:49:01.000000000 +0900 -+++ apps/CMakeLists.txt 2016-03-16 21:42:51.000000000 +0900 -@@ -120,8 +120,8 @@ +--- apps/CMakeLists.txt.orig 2016-03-12 05:49:01.000000000 +0000 ++++ apps/CMakeLists.txt +@@ -120,8 +120,8 @@ if(APPLE) endif() if(NOT WIN32) #rpath setup @@ -15,3 +15,15 @@ $NetBSD: patch-apps_CMakeLists.txt,v 1.5 2016/03/16 14:22:01 mef Exp $ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif() +@@ -149,9 +149,9 @@ if(NOT APPLE AND NOT WIN32) + install(TARGETS tqsl DESTINATION bin) + install(DIRECTORY help DESTINATION share/TrustedQSL) + if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") +- install(FILES tqsl.5 DESTINATION share/man/man5) ++ install(FILES tqsl.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5) + else() +- install(FILES tqsl.5 DESTINATION man/man5) ++ install(FILES tqsl.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5) + endif() + install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png) + install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES) |