Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Mar 2024 12:04:59 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 247141854f2e - main - math/qhull7: Move man pages to share/man
Message-ID:  <202403121204.42CC4xCE014347@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=247141854f2e9c1101bc3477e1d14450d18f389d

commit 247141854f2e9c1101bc3477e1d14450d18f389d
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-03-12 11:43:32 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-03-12 12:04:30 +0000

    math/qhull7: Move man pages to share/man
    
    Approved by:    portmgr (blanket)
---
 math/qhull7/Makefile                   |  2 +-
 math/qhull7/files/patch-CMakeLists.txt | 17 ++++-------------
 math/qhull7/pkg-plist                  |  4 ++--
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/math/qhull7/Makefile b/math/qhull7/Makefile
index 73646de0ad6b..0be87401347a 100644
--- a/math/qhull7/Makefile
+++ b/math/qhull7/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	qhull
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	math
 PKGNAMESUFFIX=	7
diff --git a/math/qhull7/files/patch-CMakeLists.txt b/math/qhull7/files/patch-CMakeLists.txt
index d68bcf84d8bc..55cd47008d5f 100644
--- a/math/qhull7/files/patch-CMakeLists.txt
+++ b/math/qhull7/files/patch-CMakeLists.txt
@@ -1,17 +1,8 @@
 Install docs into share/doc/ rather than include/
 
---- CMakeLists.txt.orig	2018-12-28 23:33:58 UTC
+--- CMakeLists.txt.orig	2019-06-29 00:30:15 UTC
 +++ CMakeLists.txt
-@@ -91,7 +91,7 @@ else()
-     if(WIN32)
-         set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
-     else()
--        set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-+        set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
-     endif()
- endif()
- if(DOC_INSTALL_DIR)
-@@ -330,7 +330,7 @@ set(
+@@ -335,7 +335,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
  
  include_directories(${CMAKE_SOURCE_DIR}/src)
  
@@ -20,8 +11,8 @@ Install docs into share/doc/ rather than include/
      set(qhull_CPP qhullcpp_d)
      set(qhull_SHARED qhull_d) 
      set(qhull_SHAREDP qhull_pd)
-@@ -616,9 +616,9 @@ install(TARGETS ${qhull_TARGETS_INSTALL}
-         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+@@ -661,9 +661,9 @@ install(FILES ${libqhull_HEADERS}    DESTINATION ${INC
+ )
  
  install(FILES ${libqhull_HEADERS}    DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
 -install(FILES ${libqhull_DOC}        DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
diff --git a/math/qhull7/pkg-plist b/math/qhull7/pkg-plist
index 65982b42341c..8dce0507e28a 100644
--- a/math/qhull7/pkg-plist
+++ b/math/qhull7/pkg-plist
@@ -66,5 +66,5 @@ lib/libqhull_r.so.7.3.2
 lib/libqhullcpp.a
 lib/libqhullstatic.a
 lib/libqhullstatic_r.a
-man/man1/qhull.1.gz
-man/man1/rbox.1.gz
+share/man/man1/qhull.1.gz
+share/man/man1/rbox.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403121204.42CC4xCE014347>