Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Mar 2024 14:51:40 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: a56952a86763 - main - devel/dwarves: Move man pages to share/man
Message-ID:  <202403051451.425EpeT8037845@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=a56952a86763d0c7d8279aaf328d723b9fa6900e

commit a56952a86763d0c7d8279aaf328d723b9fa6900e
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-03-05 14:34:39 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-03-05 14:51:15 +0000

    devel/dwarves: Move man pages to share/man
    
    Approved by:    portmgr (blanket)
---
 devel/dwarves/Makefile                   |  2 +-
 devel/dwarves/files/patch-CMakeLists.txt | 16 ++++++----------
 devel/dwarves/pkg-plist                  |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/devel/dwarves/Makefile b/devel/dwarves/Makefile
index f107840bed5a..fb9b75911151 100644
--- a/devel/dwarves/Makefile
+++ b/devel/dwarves/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dwarves
 DISTVERSION=	1.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorapeople.org/~acme/dwarves/
 
diff --git a/devel/dwarves/files/patch-CMakeLists.txt b/devel/dwarves/files/patch-CMakeLists.txt
index 099ae478a054..b534bd986665 100644
--- a/devel/dwarves/files/patch-CMakeLists.txt
+++ b/devel/dwarves/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2020-03-13 17:13:35 UTC
+--- CMakeLists.txt.orig	2020-11-23 12:21:38 UTC
 +++ CMakeLists.txt
-@@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMA
+@@ -9,7 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
  # Try to parse this later, Helio just showed me a KDE4 example to support
  # x86-64 builds.
  # the following are directories where stuff will be installed to
@@ -9,7 +9,7 @@
  
  macro(_set_fancy _var _value _comment)
  	if (NOT DEFINED ${_var})
-@@ -76,7 +76,7 @@ endif()
+@@ -81,7 +81,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOU
  
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64")
  
@@ -18,7 +18,7 @@
  add_library(bpf OBJECT ${libbpf_sources})
  set_property(TARGET bpf PROPERTY POSITION_INDEPENDENT_CODE 1)
  target_include_directories(bpf PRIVATE
-@@ -85,13 +85,13 @@ target_include_directories(bpf PRIVATE
+@@ -90,13 +90,13 @@ set(dwarves_LIB_SRCS dwarves.c dwarves_fprintf.c gobuf
  
  set(dwarves_LIB_SRCS dwarves.c dwarves_fprintf.c gobuffer strings
  		     ctf_encoder.c ctf_loader.c libctf.c btf_encoder.c btf_loader.c libbtf.c
@@ -34,12 +34,8 @@
  
  set(dwarves_emit_LIB_SRCS dwarves_emit.c)
  add_library(dwarves_emit SHARED ${dwarves_emit_LIB_SRCS})
-@@ -153,9 +153,10 @@ install(FILES dwarves.h dwarves_emit.h dwarves_reorgan
- 	      btf_encoder.h config.h ctf_encoder.h ctf.h
- 	      elfcreator.h elf_symtab.h hash.h libbtf.h libctf.h
- 	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dwarves/)
--install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/)
-+install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1/)
+@@ -161,6 +161,7 @@ install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAK
+ install(FILES man-pages/pahole.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/)
  install(PROGRAMS ostra/ostra-cg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
  install(PROGRAMS btfdiff fullcircle DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 +install(FILES changes-v1.17 README README.btf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/dwarves)
diff --git a/devel/dwarves/pkg-plist b/devel/dwarves/pkg-plist
index 6e83c0a83fbc..15213ba69553 100644
--- a/devel/dwarves/pkg-plist
+++ b/devel/dwarves/pkg-plist
@@ -45,4 +45,4 @@ lib/libdwarves_reorganize.so.1.0.0
 %%DOCSDIR%%/changes-v1.17
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.btf
-%%MANPAGES%%man/man1/pahole.1.gz
+%%MANPAGES%%share/man/man1/pahole.1.gz



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