sysutils/lttng-ust: Update version 2.9.0=>2.13.2

Some of the patches retained here may be out of scope now, such as those
patches still adding a definition for NT_GNU_BUILD_ID.

Changelog:
https://git.lttng.org/?p=lttng-ust.git;a=blob_plain;f=ChangeLog;hb=ac8d9a90b1e9052d2dea77e0b0c92b779bceb4a8

PR:		263112

sysutils/lttng-ust/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	lttng-ust
-PORTVERSION=	2.9.0
-PORTREVISION=	2
+PORTVERSION=	2.13.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://lttng.org/files/${PORTNAME}/
 
@@ -10,24 +9,25 @@ WWW=		https://github.com/lttng/lttng-ust
 
 LICENSE=		LGPL21 MIT GPLv2
 LICENSE_COMB=		dual
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
-LICENSE_FILE_MIT=	${WRKSRC}/COPYING
-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
-
-BROKEN=		fails to configure: Cannot find liburcu-bp lib. Use LDFLAGS=-Ldir to specify its location
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		xmlto:textproc/xmlto
 LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
-USES=		autoreconf gmake libtool localbase pathfix python \
+USES=		autoreconf gmake libtool localbase pathfix pkgconfig python \
 		shebangfix tar:bzip2
 USE_LDCONFIG=	yes
+
+SHEBANG_FILES=	tools/lttng-gen-tp
+
 GNU_CONFIGURE=	yes
 # XXX: build fails if cmake is detected, see PR 253327
 CONFIGURE_ENV=	ac_cv_prog_HAVE_CMAKE=no
+
 INSTALL_TARGET=	install-strip
-SHEBANG_FILES=	tools/lttng-gen-tp
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS

sysutils/lttng-ust/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1483807828
-SHA256 (lttng-ust-2.9.0.tar.bz2) = 4d541a863f42dfc685ca05024027a442c70d03594c154a43e62bc109b1ea5daf
-SIZE (lttng-ust-2.9.0.tar.bz2) = 764027
+TIMESTAMP = 1649309595
+SHA256 (lttng-ust-2.13.2.tar.bz2) = 08679a1dfc2c9428885273861628aa5d828972f389a38bb08fdce39adee589b7
+SIZE (lttng-ust-2.13.2.tar.bz2) = 1327075

sysutils/lttng-ust/files/patch-doc_examples_clock-override_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/clock-override/Makefile.orig	2016-08-25 21:53:05 UTC
+--- doc/examples/clock-override/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/clock-override/Makefile
-@@ -15,12 +15,8 @@
+@@ -8,8 +8,8 @@
  #
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl	# On Linux
 -#LIBS = -lc	# On BSD
 +#LIBS = -ldl	# On Linux
 +LIBS =	# On FreeBSD
  LOCAL_CPPFLAGS += -I.
+ AM_V_P := :
 
- all: lttng-ust-clock-override-example.so

sysutils/lttng-ust/files/patch-doc_examples_cmake-multiple-shared-libraries_cmake_FindLTTngUST.cmake

@@ -0,0 +1,18 @@
+--- doc/examples/cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake.orig	2022-01-27 20:18:46 UTC
++++ doc/examples/cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake
+@@ -97,13 +97,13 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_INCLUDE_DIRS_GEN
+     add_library(LTTng::UST UNKNOWN IMPORTED)
+     set_target_properties(LTTng::UST PROPERTIES
+       INTERFACE_INCLUDE_DIRECTORIES "${LTTNGUST_INCLUDE_DIRS};${LTTNGUST_INCLUDE_DIRS_GENERATED}"
+-      INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS}
++      INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS}"
+       IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+       IMPORTED_LOCATION "${LTTNGUST_LIBRARIES}")
+   endif()
+
+   # add libdl to required libraries
+-  set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} ${CMAKE_DL_LIBS})
++  set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} "${CMAKE_DL_LIBS}")
+ endif()
+
+ # handle the QUIETLY and REQUIRED arguments and set LTTNGUST_FOUND to

sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/demo-tracef/Makefile.orig	2016-08-08 21:25:36 UTC
+--- doc/examples/demo-tracef/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/demo-tracef/Makefile
-@@ -15,12 +15,8 @@
+@@ -8,8 +8,8 @@
  #
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl -llttng-ust	# On Linux
 -#LIBS = -lc	# On BSD
 +#LIBS = -ldl -llttng-ust	# On Linux
 +LIBS = -llttng-ust	# On FreeBSD
  LOCAL_CPPFLAGS += -I.
+ AM_V_P := :
 
- all: demo-tracef

sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/demo-tracelog/Makefile.orig	2016-08-25 21:53:05 UTC
+--- doc/examples/demo-tracelog/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/demo-tracelog/Makefile
-@@ -15,12 +15,8 @@
+@@ -8,8 +8,8 @@
  #
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl -llttng-ust	# On Linux
 -#LIBS = -lc	# On BSD
 +#LIBS = -ldl -llttng-ust	# On Linux
 +LIBS = -llttng-ust	# On FreeBSD
  LOCAL_CPPFLAGS += -I.
+ AM_V_P := :
 
- all: demo-tracelog

sysutils/lttng-ust/files/patch-doc_examples_demo_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/demo/Makefile.orig	2016-08-08 21:25:36 UTC
+--- doc/examples/demo/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/demo/Makefile
-@@ -14,12 +14,8 @@
+@@ -7,8 +7,8 @@
  #
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl	# On Linux
 -#LIBS = -lc	# On BSD
 +#LIBS = -ldl	# On Linux
 +LIBS =	# On FreeBSD
  LOCAL_CPPFLAGS += -I.
+ AM_V_P := :
 
- all: demo lttng-ust-provider-ust-tests-demo.so lttng-ust-provider-ust-tests-demo3.so

sysutils/lttng-ust/files/patch-doc_examples_easy-ust_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/easy-ust/Makefile.orig	2016-08-08 21:25:36 UTC
+--- doc/examples/easy-ust/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/easy-ust/Makefile
-@@ -16,12 +16,8 @@
+@@ -9,8 +9,8 @@
  #
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl -llttng-ust		# On Linux
 -#LIBS = -lc -llttng-ust		# On BSD
 +#LIBS = -ldl -llttng-ust		# On Linux
 +LIBS = -llttng-ust		# On FreeBSD
  LOCAL_CPPFLAGS += -I.
+ AM_V_P := :
 
- all: sample

sysutils/lttng-ust/files/patch-doc_examples_gen-tp_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/gen-tp/Makefile.orig	2016-08-08 21:25:36 UTC
+--- doc/examples/gen-tp/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/gen-tp/Makefile
-@@ -17,12 +17,8 @@
- #
- # This makefile is purposefully kept simple to support GNU and BSD make.
+@@ -12,8 +12,8 @@
+
+ PYTHON := python
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl -llttng-ust		#On Linux
 -#LIBS = -lc -llttng-ust		#On BSD
 +#LIBS = -ldl -llttng-ust		#On Linux
 +LIBS = -llttng-ust		#On FreeBSD
+ AM_V_P := :
 
  all: sample
-

sysutils/lttng-ust/files/patch-doc_examples_getcpu-override_Makefile

@@ -1,17 +1,13 @@
---- doc/examples/getcpu-override/Makefile.orig	2016-08-25 21:53:05 UTC
+--- doc/examples/getcpu-override/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/getcpu-override/Makefile
-@@ -15,12 +15,8 @@
+@@ -8,8 +8,8 @@
  #
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
 -LIBS = -ldl	# On Linux
 -#LIBS = -lc	# On BSD
 +#LIBS = -ldl	# On Linux
 +LIBS =	# On FreeBSD
  LOCAL_CPPFLAGS += -I.
+ AM_V_P := :
 
- all: lttng-ust-getcpu-override-example.so

sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile

@@ -1,18 +1,13 @@
---- doc/examples/hello-static-lib/Makefile.orig	2016-08-08 21:25:36 UTC
+--- doc/examples/hello-static-lib/Makefile.orig	2022-03-25 15:37:17 UTC
 +++ doc/examples/hello-static-lib/Makefile
-@@ -14,13 +14,9 @@
- #
+@@ -8,8 +8,8 @@
  # This makefile is purposefully kept simple to support GNU and BSD make.
 
--ifdef AM_CC
--	CC = $(AM_CC)
--endif
--
  LOCAL_CPPFLAGS += -I.
 -LIBS = -ldl -llttng-ust	# On Linux
 -#LIBS = -lc -llttng-ust	# On BSD
 +#LIBS = -ldl -llttng-ust	# On Linux
 +LIBS = -llttng-ust	# On FreeBSD
-
- all: hello
+ AM_V_P := :
+ AR ?= ar
 

sysutils/lttng-ust/files/patch-doc_man_lttng-ust.3

@@ -1,38 +1,53 @@
---- doc/man/lttng-ust.3.orig	2016-11-29 22:13:51 UTC
+--- doc/man/lttng-ust.3.orig	2022-03-25 17:53:42 UTC
 +++ doc/man/lttng-ust.3
-@@ -88,7 +88,7 @@ lttng-ust \- LTTng user space tracing
- #define \fBtracepoint_enabled\fR(\fIprov_name\fR, \fIt_name\fR)
- .fi
- .sp
--Link with \fB-llttng-ust -ldl\fR, following this man page\&.
-+Link with \fB-llttng-ust\fR, following this man page\&.
- .SH "DESCRIPTION"
+@@ -2,12 +2,12 @@
+ .\"     Title: lttng-ust
+ .\"    Author: [see the "AUTHORS" section]
+ .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+-.\"      Date: 03/25/2022
++.\"      Date: 04/07/2022
+ .\"    Manual: LTTng Manual
+ .\"    Source: LTTng 2.13.2
+ .\"  Language: English
+ .\"
+-.TH "LTTNG\-UST" "3" "03/25/2022" "LTTng 2\&.13\&.2" "LTTng Manual"
++.TH "LTTNG\-UST" "3" "04/07/2022" "LTTng 2\&.13\&.2" "LTTng Manual"
+ .\" -----------------------------------------------------------------
+ .\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+@@ -114,7 +114,7 @@ Link with, following this manual page:
+ .sp -1
+ .IP \(bu 2.3
+ .\}
+-\fB-llttng-ust -ldl\fR
++\fB-llttng-ust\fR
+ .RE
  .sp
- The \fILinux Trace Toolkit: next generation\fR <http://lttng.org/> is an open source software package used for correlated tracing of the Linux kernel, user applications, and user libraries\&.
-@@ -919,7 +919,7 @@ Then, link your application with this ob
+ .RS 4
+@@ -1066,7 +1066,7 @@ Then, link your application with this object file (or 
  .RS 4
  .\}
  .nf
--cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl
-+cc \-o app tp\&.o app\&.o \-llttng\-ust
+-$ cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl
++$ cc \-o app tp\&.o app\&.o \-llttng\-ust
  .fi
  .if n \{\
  .RE
-@@ -1004,7 +1004,7 @@ This tracepoint provider shared object i
+@@ -1151,7 +1151,7 @@ This tracepoint provider shared object isn\(cqt linked
  .RS 4
  .\}
  .nf
--cc \-o app app\&.o tp\-define\&.o \-ldl
-+cc \-o app app\&.o tp\-define\&.o
+-$ cc \-o app app\&.o tp\-define\&.o \-ldl
++$ cc \-o app app\&.o tp\-define\&.o
  .fi
  .if n \{\
  .RE
-@@ -1544,7 +1544,7 @@ You can compile the source files and lin
+@@ -1823,7 +1823,7 @@ You can compile the source files and link them togethe
  .nf
- cc \-c \-I\&. tp\&.c
- cc \-c app\&.c
--cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl
-+cc \-o app tp\&.o app\&.o \-llttng\-ust
+ $ cc \-c \-I\&. tp\&.c
+ $ cc \-c app\&.c
+-$ cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl
++$ cc \-o app tp\&.o app\&.o \-llttng\-ust
  .fi
  .if n \{\
  .RE

sysutils/lttng-ust/files/patch-doc_man_lttng-ust.3.txt

@@ -1,38 +1,38 @@
---- doc/man/lttng-ust.3.txt.orig	2016-11-29 21:06:58 UTC
+--- doc/man/lttng-ust.3.txt.orig	2022-03-25 15:37:17 UTC
 +++ doc/man/lttng-ust.3.txt
-@@ -65,7 +65,7 @@ SYNOPSIS
- #define *tracepoint*('prov_name', 't_name', ...)
- #define *tracepoint_enabled*('prov_name', 't_name')
+@@ -83,7 +83,7 @@ SYNOPSIS
 
--Link with `-llttng-ust -ldl`, following this man page.
-+Link with `-llttng-ust`, following this man page.
+ Link with, following this manual page:
 
+-* `-llttng-ust -ldl`
++* `-llttng-ust`
+ * If you define `_LGPL_SOURCE` before including
+   `<lttng/tracepoint.h>` (directly or indirectly): `-llttng-ust-common`
 
- DESCRIPTION
-@@ -636,7 +636,7 @@ library containing it) and with `liblttn
+@@ -737,7 +737,7 @@ BSD system):
 
  [role="term"]
- -------------------------------------
--cc -o app tp.o app.o -llttng-ust -ldl
-+cc -o app tp.o app.o -llttng-ust
- -------------------------------------
+ ----
+-$ cc -o app tp.o app.o -llttng-ust -ldl
++$ cc -o app tp.o app.o -llttng-ust
+ ----
 
 
-@@ -696,7 +696,7 @@ libdl:
+@@ -797,7 +797,7 @@ libdl:
 
  [role="term"]
- --------------------------------
--cc -o app app.o tp-define.o -ldl
-+cc -o app app.o tp-define.o
- --------------------------------
+ ----
+-$ cc -o app app.o tp-define.o -ldl
++$ cc -o app app.o tp-define.o
+ ----
 
  There are two ways to dynamically load the tracepoint provider shared
-@@ -1036,7 +1036,7 @@ like this:
- -------------------------------------
- cc -c -I. tp.c
- cc -c app.c
--cc -o app tp.o app.o -llttng-ust -ldl
-+cc -o app tp.o app.o -llttng-ust
- -------------------------------------
+@@ -1221,7 +1221,7 @@ like this:
+ ----
+ $ cc -c -I. tp.c
+ $ cc -c app.c
+-$ cc -o app tp.o app.o -llttng-ust -ldl
++$ cc -o app tp.o app.o -llttng-ust
+ ----
 
  Using the man:lttng(1) tool, create an LTTng tracing session, enable