git: d7c8d0a62a29 - main - sysutils/lttng-tools: Remove expired port

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sun, 31 Dec 2023 00:08:32 UTC
The branch main has been updated by bofh:

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

commit d7c8d0a62a2998966522ece73fb8f8b1f873405b
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-12-30 05:21:53 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-31 00:06:31 +0000

    sysutils/lttng-tools: Remove expired port
    
    2023-12-31 sysutils/lttng-tools: BROKEN on all supported versions after the EOL of 12
---
 MOVED                                              |   1 +
 sysutils/Makefile                                  |   1 -
 sysutils/lttng-tools/Makefile                      |  42 -------
 sysutils/lttng-tools/distinfo                      |   3 -
 sysutils/lttng-tools/files/patch-configure.ac      |  11 --
 .../lttng-tools/files/patch-include_Makefile.am    |  17 ---
 .../files/patch-src_bin_lttng-crash_lttng-crash.c  |  33 ------
 .../files/patch-src_bin_lttng-relayd_stream.c      |  10 --
 .../files/patch-src_bin_lttng-sessiond_consumer.c  |  19 ----
 .../files/patch-src_bin_lttng-sessiond_session.h   |  11 --
 .../patch-src_bin_lttng-sessiond_ust-consumer.c    |  11 --
 .../patch-src_bin_lttng-sessiond_ust-metadata.c    |  36 ------
 .../files/patch-src_bin_lttng-sessiond_utils.h     |  12 --
 .../files/patch-src_bin_lttng_commands_view.c      |  19 ----
 .../lttng-tools/files/patch-src_common_common.h    |  17 ---
 .../files/patch-src_common_compat_compat-epoll.c   |  34 ------
 .../files/patch-src_common_compat_compat-poll.c    |  14 ---
 .../files/patch-src_common_compat_endian.h         |  23 ----
 .../files/patch-src_common_compat_fcntl.h          |  36 ------
 .../lttng-tools/files/patch-src_common_defaults.h  |  12 --
 ...ch-src_common_kernel-consumer_kernel-consumer.h |  11 --
 .../files/patch-src_common_testpoint_Makefile.am   |   8 --
 .../lttng-tools/files/patch-src_common_utils.h     |  10 --
 ...h-tests_regression_kernel_select__poll__epoll.c | 122 ---------------------
 ...ests_regression_ust_baddr-statedump_Makefile.am |  11 --
 .../patch-tests_regression_ust_linking_Makefile.am |  45 --------
 .../patch-tests_regression_ust_ust-dl_Makefile.am  |  11 --
 .../files/patch-tests_regression_ust_ust-dl_prog.c |  14 ---
 sysutils/lttng-tools/pkg-descr                     |   5 -
 sysutils/lttng-tools/pkg-plist                     |  61 -----------
 30 files changed, 1 insertion(+), 659 deletions(-)

diff --git a/MOVED b/MOVED
index 8a40238a419a..579af3505c1e 100644
--- a/MOVED
+++ b/MOVED
@@ -8258,3 +8258,4 @@ sysutils/ffs2recov||2023-12-31|Has expired: BROKEN on supported versions after E
 sysutils/iichid||2023-12-31|Has expired: Merged into base from 13
 devel/varconf||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years.
 multimedia/bsdbktr_tvtune||2023-12-31|Has expired: Requires defunct bktr
+sysutils/lttng-tools||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
diff --git a/sysutils/Makefile b/sysutils/Makefile
index da2e45c47ba4..08663650a918 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -713,7 +713,6 @@
     SUBDIR += lsyncd
     SUBDIR += ltfs
     SUBDIR += ltrace
-    SUBDIR += lttng-tools
     SUBDIR += lttng-ust
     SUBDIR += lua-puremagic
     SUBDIR += luckybackup
diff --git a/sysutils/lttng-tools/Makefile b/sysutils/lttng-tools/Makefile
deleted file mode 100644
index 5b2becb9a210..000000000000
--- a/sysutils/lttng-tools/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-PORTNAME=	lttng-tools
-PORTVERSION=	2.9.3
-PORTREVISION=	8
-CATEGORIES=	sysutils
-MASTER_SITES=	http://lttng.org/files/${PORTNAME}/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Set of tools to control LTTng tracing
-WWW=		https://lttng.org/
-
-LICENSE=		LGPL21 GPLv2
-LICENSE_COMB=		dual
-LICENSE_FILE_GPLv2=	${WRKSRC}/gpl-2.0.txt
-LICENSE_FILE_LGPL21=	${WRKSRC}/lgpl-2.1.txt
-
-DEPRECATED=	BROKEN on all supported versions after the EOL of 12
-EXPIRATION_DATE=	2023-12-31
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: mi_lttng_element_load_override_url
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: mi_lttng_element_load_override_url
-
-LIB_DEPENDS=	libpopt.so:devel/popt \
-		liburcu.so:sysutils/liburcu \
-		liblttng-ust-ctl.so:sysutils/lttng-ust
-
-USES=		autoreconf bison compiler:c11 gnome libtool localbase pathfix \
-		pkgconfig shebangfix tar:bzip2
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=	--with-lttng-ust-prefix=${LOCALBASE} \
-		--disable-maintainer-mode
-INSTALL_TARGET=		install-strip
-
-OPTIONS_DEFINE=	DOCS
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3/
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${MANPREFIX}/man/man8/
-
-.include <bsd.port.mk>
diff --git a/sysutils/lttng-tools/distinfo b/sysutils/lttng-tools/distinfo
deleted file mode 100644
index ee17237fb2b1..000000000000
--- a/sysutils/lttng-tools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486886094
-SHA256 (lttng-tools-2.9.3.tar.bz2) = a6e6baaaa977dcbc9bce6b675881eec664599b86f0d905a7b0b508539407b24e
-SIZE (lttng-tools-2.9.3.tar.bz2) = 1162899
diff --git a/sysutils/lttng-tools/files/patch-configure.ac b/sysutils/lttng-tools/files/patch-configure.ac
deleted file mode 100644
index 6e4f30ec2ae2..000000000000
--- a/sysutils/lttng-tools/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2016-11-29 22:48:37 UTC
-+++ configure.ac
-@@ -443,7 +443,7 @@ AS_IF([test "x$lttng_ust_support" = "xye
- 			lttng_ust_ctl_found=yes
- 		],
- 		[AC_MSG_ERROR([Cannot find LTTng-UST >= 2.2.x. Use --with-lttng-ust-prefix=PREFIX to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])],
--		[-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl]
-+		[-lurcu-common -lurcu-bp -lurcu-cds -lrt]
- 	)
- ])
- AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
diff --git a/sysutils/lttng-tools/files/patch-include_Makefile.am b/sysutils/lttng-tools/files/patch-include_Makefile.am
deleted file mode 100644
index a4227e3fa859..000000000000
--- a/sysutils/lttng-tools/files/patch-include_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- include/Makefile.am.orig	2017-01-12 17:07:16 UTC
-+++ include/Makefile.am
-@@ -1,8 +1,8 @@
--if LTTNG_TOOLS_BUILD_GIT_SOURCE
--GIT_DESCRIBE_CMD = (cd $(top_srcdir); git describe)
--else
--GIT_DESCRIBE_CMD = /bin/true
--endif
-+##if LTTNG_TOOLS_BUILD_GIT_SOURCE
-+##GIT_DESCRIBE_CMD = (cd ${top_srcdir}; git describe)
-+##else
-+GIT_DESCRIBE_CMD = /usr/bin/true
-+##endif
- 
- ##
- ## The version.h file must be verified and generated or updated if the
-
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-crash_lttng-crash.c b/sysutils/lttng-tools/files/patch-src_bin_lttng-crash_lttng-crash.c
deleted file mode 100644
index 762741e35e8f..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-crash_lttng-crash.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/bin/lttng-crash/lttng-crash.c.orig	2016-11-29 22:48:37 UTC
-+++ src/bin/lttng-crash/lttng-crash.c
-@@ -21,17 +21,29 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/wait.h>
- #include <unistd.h>
- #include <ctype.h>
- #include <dirent.h>
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/endian.h>
-+#include <inttypes.h>
-+#define bswap_16 bswap16
-+#define bswap_32 bswap32
-+#define bswap_64 bswap64
-+#define __bswap_16 bswap16
-+#define __bswap_32 bswap32
-+#define __bswap_64 bswap64
-+#define NT_GNU_BUILD_ID 3
-+#else
- #include <byteswap.h>
- #include <inttypes.h>
-+#endif
- #include <stdbool.h>
- 
- #include <version.h>
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-relayd_stream.c b/sysutils/lttng-tools/files/patch-src_bin_lttng-relayd_stream.c
deleted file mode 100644
index f48da8f57613..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-relayd_stream.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/bin/lttng-relayd/stream.c.orig	2016-11-29 22:48:37 UTC
-+++ src/bin/lttng-relayd/stream.c
-@@ -22,6 +22,7 @@
- #include <common/utils.h>
- #include <common/defaults.h>
- #include <urcu/rculist.h>
-+#include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lttng-relayd.h"
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_consumer.c b/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_consumer.c
deleted file mode 100644
index cf2fe604f8a9..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_consumer.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/lttng-sessiond/consumer.c.orig	2017-01-09 19:26:28 UTC
-+++ src/bin/lttng-sessiond/consumer.c
-@@ -17,6 +17,7 @@
- 
- #define _LGPL_SOURCE
- #include <assert.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -635,7 +636,7 @@ int consumer_set_network_uri(struct consumer_output *o
- {
- 	int ret;
- 	char tmp_path[PATH_MAX];
--	char hostname[HOST_NAME_MAX];
-+	char hostname[_POSIX_HOST_NAME_MAX];
- 	struct lttng_uri *dst_uri = NULL;
- 
- 	/* Code flow error safety net. */
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_session.h b/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_session.h
deleted file mode 100644
index 2e98067379cb..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_session.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/lttng-sessiond/session.h.orig	2017-01-09 19:26:28 UTC
-+++ src/bin/lttng-sessiond/session.h
-@@ -60,7 +60,7 @@ struct ltt_session_list {
-  */
- struct ltt_session {
- 	char name[NAME_MAX];
--	char hostname[HOST_NAME_MAX]; /* Local hostname. */
-+	char hostname[_POSIX_HOST_NAME_MAX]; /* Local hostname. */
- 	struct ltt_kernel_session *kernel_session;
- 	struct ltt_ust_session *ust_session;
- 	/*
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_ust-consumer.c b/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_ust-consumer.c
deleted file mode 100644
index fb7df2c2e89e..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_ust-consumer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/lttng-sessiond/ust-consumer.c.orig	2016-11-29 22:48:37 UTC
-+++ src/bin/lttng-sessiond/ust-consumer.c
-@@ -21,6 +21,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <inttypes.h>
- 
- #include <common/common.h>
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_ust-metadata.c b/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_ust-metadata.c
deleted file mode 100644
index e95b52ac1382..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_ust-metadata.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/bin/lttng-sessiond/ust-metadata.c.orig	2017-01-09 19:26:28 UTC
-+++ src/bin/lttng-sessiond/ust-metadata.c
-@@ -50,6 +50,7 @@ int _lttng_field_statedump(struct ust_registry_session
- 		const struct ustctl_field *fields, size_t nr_fields,
- 		size_t *iter_field, size_t nesting);
- 
-+#if !defined(__FreeBSD__)
- static inline
- int fls(unsigned int x)
- {
-@@ -79,6 +80,7 @@ int fls(unsigned int x)
- 	}
- 	return r;
- }
-+#endif
- 
- static inline
- int get_count_order(unsigned int count)
-@@ -879,7 +881,7 @@ int ust_metadata_session_statedump(struct ust_registry
- 	char uuid_s[UUID_STR_LEN],
- 		clock_uuid_s[UUID_STR_LEN];
- 	int ret = 0;
--	char hostname[HOST_NAME_MAX];
-+	char hostname[_POSIX_HOST_NAME_MAX];
- 
- 	assert(session);
- 
-@@ -940,7 +942,7 @@ int ust_metadata_session_statedump(struct ust_registry
- 	hostname[0] = '\0';
- 	ret = gethostname(hostname, sizeof(hostname));
- 	if (ret && errno == ENAMETOOLONG)
--		hostname[HOST_NAME_MAX - 1] = '\0';
-+		hostname[_POSIX_HOST_NAME_MAX - 1] = '\0';
- 	ret = lttng_metadata_printf(session,
- 		"env {\n"
- 		"	hostname = \"%s\";\n"
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_utils.h b/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_utils.h
deleted file mode 100644
index 595f8f84c16a..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng-sessiond_utils.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/lttng-sessiond/utils.h.orig	2016-11-29 22:48:37 UTC
-+++ src/bin/lttng-sessiond/utils.h
-@@ -18,6 +18,9 @@
- #ifndef _LTT_UTILS_H
- #define _LTT_UTILS_H
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- struct lttng_ht;
- 
- const char *get_home_dir(void);
diff --git a/sysutils/lttng-tools/files/patch-src_bin_lttng_commands_view.c b/sysutils/lttng-tools/files/patch-src_bin_lttng_commands_view.c
deleted file mode 100644
index 82f4d46c594a..000000000000
--- a/sysutils/lttng-tools/files/patch-src_bin_lttng_commands_view.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/lttng/commands/view.c.orig	2017-01-09 19:26:28 UTC
-+++ src/bin/lttng/commands/view.c
-@@ -17,6 +17,7 @@
- 
- #define _LGPL_SOURCE
- #include <popt.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -269,7 +270,7 @@ static char *build_live_path(char *session_name)
- {
- 	int ret;
- 	char *path = NULL;
--	char hostname[HOST_NAME_MAX];
-+	char hostname[_POSIX_HOST_NAME_MAX];
- 
- 	ret = gethostname(hostname, sizeof(hostname));
- 	if (ret < 0) {
diff --git a/sysutils/lttng-tools/files/patch-src_common_common.h b/sysutils/lttng-tools/files/patch-src_common_common.h
deleted file mode 100644
index 91f3e474dc7c..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_common.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/common/common.h.orig	2016-11-29 22:48:37 UTC
-+++ src/common/common.h
-@@ -19,6 +19,14 @@
- #ifndef _COMMON_H
- #define _COMMON_H
- 
-+#if defined(__FreeBSD__)
-+
-+#include <sys/endian.h>
-+
-+#define ENODATA ENOATTR
-+
-+#endif
-+
- #include "error.h"
- #include "macros.h"
- #include "runas.h"
diff --git a/sysutils/lttng-tools/files/patch-src_common_compat_compat-epoll.c b/sysutils/lttng-tools/files/patch-src_common_compat_compat-epoll.c
deleted file mode 100644
index 40b4437d529a..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_compat_compat-epoll.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/common/compat/compat-epoll.c.orig	2017-01-13 22:20:45 UTC
-+++ src/common/compat/compat-epoll.c
-@@ -31,7 +31,11 @@
- 
- #include "poll.h"
- 
--unsigned int poll_max_size;
-+unsigned int poll_max_size
-+#if defined(__FreeBSD__)
-+= DEFAULT_POLL_SIZE
-+#endif
-+;
- 
- /*
-  * Resize the epoll events structure of the new size.
-@@ -258,6 +262,7 @@ int compat_epoll_set_max_size(void)
- 	ssize_t size_ret;
- 	char buf[64];
- 
-+#if !defined(__FreeBSD__)
- 	fd = open(COMPAT_EPOLL_PROC_PATH, O_RDONLY);
- 	if (fd < 0) {
- 		retval = -1;
-@@ -282,8 +287,10 @@ end_read:
- 		PERROR("close");
- 	}
- end:
-+#endif
- 	if (!poll_max_size) {
- 		poll_max_size = DEFAULT_POLL_SIZE;
-+		retval = 0;
- 	}
- 	DBG("epoll set max size is %d", poll_max_size);
- 	return retval;
diff --git a/sysutils/lttng-tools/files/patch-src_common_compat_compat-poll.c b/sysutils/lttng-tools/files/patch-src_common_compat_compat-poll.c
deleted file mode 100644
index f3b4e8fd7b14..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_compat_compat-poll.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/common/compat/compat-poll.c.orig	2017-01-13 22:38:05 UTC
-+++ src/common/compat/compat-poll.c
-@@ -112,7 +112,11 @@ int compat_poll_create(struct lttng_poll
- 
- 	if (!poll_max_size) {
- 		ERR("poll_max_size not initialized yet");
-+#if defined(__FreeBSD__)
-+		poll_max_size = DEFAULT_POLL_SIZE;
-+#else
- 		goto error;
-+#endif
- 	}
- 
- 	/* Don't bust the limit here */
diff --git a/sysutils/lttng-tools/files/patch-src_common_compat_endian.h b/sysutils/lttng-tools/files/patch-src_common_compat_endian.h
deleted file mode 100644
index 28b3d6599704..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_compat_endian.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/common/compat/endian.h.orig	2016-11-29 22:48:37 UTC
-+++ src/common/compat/endian.h
-@@ -27,7 +27,19 @@
-  */
- #ifdef __USE_BSD
- /* Conversion interfaces. */
--# include <byteswap.h>
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/endian.h>
-+#define bswap_16 bswap16
-+#define bswap_32 bswap32
-+#define bswap_64 bswap64
-+#define __bswap_16 bswap16
-+#define __bswap_32 bswap32
-+#define __bswap_64 bswap64
-+#define NT_GNU_BUILD_ID 3
-+#else
-+#include <byteswap.h>
-+#endif
- 
- # if __BYTE_ORDER == __LITTLE_ENDIAN
- #  ifndef htobe16
diff --git a/sysutils/lttng-tools/files/patch-src_common_compat_fcntl.h b/sysutils/lttng-tools/files/patch-src_common_compat_fcntl.h
deleted file mode 100644
index 4f886bcf1cad..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_compat_fcntl.h
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/common/compat/fcntl.h.orig	2016-11-29 22:48:37 UTC
-+++ src/common/compat/fcntl.h
-@@ -22,11 +22,15 @@
- #include <errno.h>
- #include <sys/types.h>
- 
--#if (defined(__FreeBSD__) || defined(__CYGWIN__))
-+#if ((defined(__FreeBSD__) && __FreeBSD__ < 11) || defined(__CYGWIN__))
- typedef long long off64_t;
- #endif
- 
--#if (defined(__FreeBSD__) || defined(__sun__))
-+#if defined(__FreeBSD__)
-+typedef off_t loff_t;
-+#endif
-+
-+#if defined(__sun__)
- typedef off64_t loff_t;
- #endif
- 
-@@ -69,15 +73,6 @@ static inline ssize_t splice(int fd_in, 
- }
- #endif
- 
--#ifdef __FreeBSD__
--#define POSIX_FADV_DONTNEED 0
--
--static inline int posix_fadvise(int fd, off_t offset, off_t len, int advice)
--{
--	return -ENOSYS;
--}
--#endif
--
- #if !(defined(__linux__) || defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
- #error "Please add support for your OS."
- #endif /* __linux__ , __FreeBSD__, __CYGWIN__, __sun__, __APPLE__ */
diff --git a/sysutils/lttng-tools/files/patch-src_common_defaults.h b/sysutils/lttng-tools/files/patch-src_common_defaults.h
deleted file mode 100644
index 3be5a3df02c0..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_defaults.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/common/defaults.h.orig	2016-11-29 22:48:37 UTC
-+++ src/common/defaults.h
-@@ -366,6 +366,9 @@ size_t default_get_ust_uid_channel_subbu
-  * pthread_attr_t pointer where the thread stack size is set to the soft stack
-  * size limit.
-  */
-+#if defined(__FreeBSD__)
-+#include <pthread.h>
-+#endif
- LTTNG_HIDDEN
- pthread_attr_t *default_pthread_attr(void);
- 
diff --git a/sysutils/lttng-tools/files/patch-src_common_kernel-consumer_kernel-consumer.h b/sysutils/lttng-tools/files/patch-src_common_kernel-consumer_kernel-consumer.h
deleted file mode 100644
index 761a55aadef7..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_kernel-consumer_kernel-consumer.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/kernel-consumer/kernel-consumer.h.orig	2016-11-29 22:48:37 UTC
-+++ src/common/kernel-consumer/kernel-consumer.h
-@@ -19,6 +19,8 @@
- #ifndef _LTTNG_KCONSUMER_H
- #define _LTTNG_KCONSUMER_H
- 
-+#include <errno.h>
-+
- #include <common/consumer/consumer.h>
- 
- int lttng_kconsumer_take_snapshot(struct lttng_consumer_stream *stream);
diff --git a/sysutils/lttng-tools/files/patch-src_common_testpoint_Makefile.am b/sysutils/lttng-tools/files/patch-src_common_testpoint_Makefile.am
deleted file mode 100644
index 178eccb2558c..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_testpoint_Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/common/testpoint/Makefile.am.orig	2017-01-12 17:07:16 UTC
-+++ src/common/testpoint/Makefile.am
-@@ -3,4 +3,4 @@ AM_CPPFLAGS =
- noinst_LTLIBRARIES = libtestpoint.la
- 
- libtestpoint_la_SOURCES = testpoint.h testpoint.c
--libtestpoint_la_LIBADD = -ldl
-+libtestpoint_la_LIBADD =
diff --git a/sysutils/lttng-tools/files/patch-src_common_utils.h b/sysutils/lttng-tools/files/patch-src_common_utils.h
deleted file mode 100644
index ad070626596e..000000000000
--- a/sysutils/lttng-tools/files/patch-src_common_utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/utils.h.orig	2016-11-29 22:48:37 UTC
-+++ src/common/utils.h
-@@ -19,6 +19,7 @@
- #define _COMMON_UTILS_H
- 
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <stdint.h>
- #include <getopt.h>
diff --git a/sysutils/lttng-tools/files/patch-tests_regression_kernel_select__poll__epoll.c b/sysutils/lttng-tools/files/patch-tests_regression_kernel_select__poll__epoll.c
deleted file mode 100644
index c5d596e6bbf0..000000000000
--- a/sysutils/lttng-tools/files/patch-tests_regression_kernel_select__poll__epoll.c
+++ /dev/null
@@ -1,122 +0,0 @@
---- tests/regression/kernel/select_poll_epoll.c.orig	2016-11-29 22:48:37 UTC
-+++ tests/regression/kernel/select_poll_epoll.c
-@@ -10,7 +10,9 @@
- #include <string.h>
- #include <stddef.h>
- #include <sys/select.h>
-+#if !defined(__FreeBSD__)
- #include <sys/epoll.h>
-+#endif
- #include <popt.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -249,6 +251,7 @@ void test_ppoll_big(void)
- 	return;
- }
- 
-+#if !defined(__FreeBSD__)
- void test_epoll(void)
- {
- 	int ret, epollfd;
-@@ -332,6 +335,7 @@ void test_pepoll(void)
- end:
- 	return;
- }
-+#endif
- 
- void run_working_cases(void)
- {
-@@ -356,8 +360,10 @@ void run_working_cases(void)
- 	test_select_big();
- 	test_poll();
- 	test_ppoll();
-+#if !defined(__FreeBSD__)
- 	test_epoll();
- 	test_pepoll();
-+#endif
- 
- 	if (timeout > 0) {
- 		ret = close(pipe_fds[0]);
-@@ -458,7 +464,11 @@ void pselect_fd_too_big(void)
- 	}
- 
- 	FD_SET(fd2, (fd_set *) &rfds);
-+#if defined(__FreeBSD__)
-+	ret = __syscall(SYS_pselect, fd2 + 1, &rfds, NULL, NULL, NULL, NULL);
-+#else
- 	ret = syscall(SYS_pselect6, fd2 + 1, &rfds, NULL, NULL, NULL, NULL);
-+#endif
- 
- 	if (ret == -1) {
- 		perror("# pselect()");
-@@ -487,9 +497,13 @@ void pselect_invalid_pointer(void)
- 
- 	FD_ZERO(&rfds);
- 	FD_SET(wait_fd, &rfds);
--
-+#if defined(__FreeBSD__)
-+	ret = __syscall(SYS_pselect, 1, &rfds, (fd_set *) invalid, NULL, NULL,
-+			NULL);
-+#else
- 	ret = syscall(SYS_pselect6, 1, &rfds, (fd_set *) invalid, NULL, NULL,
- 			NULL);
-+#endif
- 
- 	if (ret == -1) {
- 		perror("# pselect()");
-@@ -505,6 +519,7 @@ void pselect_invalid_pointer(void)
- 
- }
- 
-+#if !defined(__FreeBSD__)
- /*
-  * Pass an invalid pointer to epoll_pwait, should fail with
-  * "Bad address", the event returns 0 FDs.
-@@ -591,6 +606,7 @@ void epoll_pwait_int_max(void)
- end:
- 	return;
- }
-+#endif
- 
- void *ppoll_writer(void *arg)
- {
-@@ -700,6 +716,7 @@ void ppoll_concurrent_write(void)
- 	return;
- }
- 
-+#if !defined(__FreeBSD__)
- void *epoll_pwait_writer(void *addr)
- {
- 	srand(time(NULL));
-@@ -795,6 +812,7 @@ end_unmap:
- end:
- 	return;
- }
-+#endif
- 
- void usage(poptContext optCon, int exitcode, char *error, char *addl)
- {
-@@ -906,18 +924,20 @@ int main(int argc, const char **argv)
- 	case 7:
- 		ppoll_fds_ulong_max();
- 		break;
-+#if !defined(__FreeBSD__)
- 	case 8:
- 		epoll_pwait_invalid_pointer();
- 		break;
- 	case 9:
- 		epoll_pwait_int_max();
- 		break;
--	case 10:
--		ppoll_concurrent_write();
--		break;
- 	case 11:
- 		epoll_pwait_concurrent_munmap();
- 		break;
-+#endif
-+	case 10:
-+		ppoll_concurrent_write();
-+		break;
- 	default:
- 		poptPrintUsage(optCon, stderr, 0);
- 		ret = -1;
diff --git a/sysutils/lttng-tools/files/patch-tests_regression_ust_baddr-statedump_Makefile.am b/sysutils/lttng-tools/files/patch-tests_regression_ust_baddr-statedump_Makefile.am
deleted file mode 100644
index 69aae0820f12..000000000000
--- a/sysutils/lttng-tools/files/patch-tests_regression_ust_baddr-statedump_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/regression/ust/baddr-statedump/Makefile.am.orig	2017-01-12 17:10:21 UTC
-+++ tests/regression/ust/baddr-statedump/Makefile.am
-@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(srcdir) -g
- 
- noinst_PROGRAMS = prog
- prog_SOURCES = prog.c tp.c tp.h
--prog_LDADD = -llttng-ust -ldl
-+prog_LDADD = -llttng-ust
- 
- noinst_SCRIPTS = test_baddr-statedump test_baddr-statedump.py
- EXTRA_DIST = test_baddr-statedump test_baddr-statedump.py
diff --git a/sysutils/lttng-tools/files/patch-tests_regression_ust_linking_Makefile.am b/sysutils/lttng-tools/files/patch-tests_regression_ust_linking_Makefile.am
deleted file mode 100644
index ca4582d0cea3..000000000000
--- a/sysutils/lttng-tools/files/patch-tests_regression_ust_linking_Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
---- tests/regression/ust/linking/Makefile.am.orig	2017-01-12 17:07:16 UTC
-+++ tests/regression/ust/linking/Makefile.am
-@@ -10,6 +10,8 @@ LIBS =
- demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
- 	ust_tests_demo2.h ust_tests_demo3.h
- demo_builtin_LDADD = -llttng-ust
-+demo_builtin_LDFLAGS = \
-+	-L/usr/local/lib
- demo_builtin_CFLAGS = -Werror=old-style-definition
- 
- # Build a version statically linked to the providers
-@@ -22,12 +24,16 @@ liblttng_ust_provider_ust_tests_demo_sta
- 	tp2.c ust_tests_demo2.h
- liblttng_ust_provider_ust_tests_demo_static_la_LIBADD = \
- 	-llttng-ust
-+liblttng_ust_provider_ust_tests_demo_static_la_LDFLAGS = \
-+	-L/usr/local/lib
- 
- # contains ust_tests_demo3.h provider probes
- liblttng_ust_provider_ust_tests_demo3_static_la_SOURCES = \
- 	tp3.c ust_tests_demo3.h
- liblttng_ust_provider_ust_tests_demo3_static_la_LIBADD = \
- 	-llttng-ust
-+liblttng_ust_provider_ust_tests_demo3_static_la_LDFLAGS = \
-+	-L/usr/local/lib
- 
- demo_static_SOURCES = demo.c
- demo_static_LDADD = liblttng-ust-provider-ust-tests-demo-static.la \
-@@ -68,14 +74,14 @@ liblttng_ust_provider_ust_tests_demo_la_
- 	tp2.c ust_tests_demo2.h
- liblttng_ust_provider_ust_tests_demo_la_LIBADD = -llttng-ust
- liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = \
--	$(FORCE_SHARED_LIB_OPTIONS)
-+	$(FORCE_SHARED_LIB_OPTIONS) -L/usr/local/lib
- 
- #contains ust_tests_demo3.h provider probes
- liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
- 	tp3.c ust_tests_demo3.h
- liblttng_ust_provider_ust_tests_demo3_la_LIBADD = -llttng-ust
- liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
--	$(FORCE_SHARED_LIB_OPTIONS)
-+	$(FORCE_SHARED_LIB_OPTIONS) -L/usr/local/lib
- 
- noinst_PROGRAMS += demo
- demo_SOURCES = demo.c ust_tests_demo.h
diff --git a/sysutils/lttng-tools/files/patch-tests_regression_ust_ust-dl_Makefile.am b/sysutils/lttng-tools/files/patch-tests_regression_ust_ust-dl_Makefile.am
deleted file mode 100644
index 026c925d2dff..000000000000
--- a/sysutils/lttng-tools/files/patch-tests_regression_ust_ust-dl_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/regression/ust/ust-dl/Makefile.am.orig	2017-01-12 17:21:10 UTC
-+++ tests/regression/ust/ust-dl/Makefile.am
-@@ -19,7 +19,7 @@ AM_CPPFLAGS = -I$(srcdir) -g
- 
- noinst_PROGRAMS = prog
- prog_SOURCES = prog.c
--prog_LDADD = -ldl
-+prog_LDADD =
- 
- noinst_LTLIBRARIES = libzzz.la libbar.la libfoo.la libtp.la
- 
diff --git a/sysutils/lttng-tools/files/patch-tests_regression_ust_ust-dl_prog.c b/sysutils/lttng-tools/files/patch-tests_regression_ust_ust-dl_prog.c
deleted file mode 100644
index c880048d6be8..000000000000
--- a/sysutils/lttng-tools/files/patch-tests_regression_ust_ust-dl_prog.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- tests/regression/ust/ust-dl/prog.c.orig	2017-01-12 17:19:54 UTC
-+++ tests/regression/ust/ust-dl/prog.c
-@@ -21,7 +21,11 @@ int main(int argc, char **argv)
- 	if (!h0) {
- 		goto get_error;
- 	}
-+#if defined(__FreeBSD__)
-+	h1 = dlopen("libfoo.so", RTLD_LAZY);
-+#else
- 	h1 = dlmopen(LM_ID_BASE, "libfoo.so", RTLD_LAZY);
-+#endif
- 	if (!h1) {
- 		goto get_error;
- 	}
diff --git a/sysutils/lttng-tools/pkg-descr b/sysutils/lttng-tools/pkg-descr
deleted file mode 100644
index 4bc21eabe22d..000000000000
--- a/sysutils/lttng-tools/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-LTTng-tools is a set of tools to control LTTng tracing.
-The project includes the LTTng session daemon
-consumer daemon and relay daemon, as well as liblttng-ctl,
-a C library used to communicate with the session daemon
-and lttng, a command line interface to liblttng-ctl.
diff --git a/sysutils/lttng-tools/pkg-plist b/sysutils/lttng-tools/pkg-plist
deleted file mode 100644
index 990df16153cd..000000000000
--- a/sysutils/lttng-tools/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/lttng
-bin/lttng-crash
-bin/lttng-relayd
-bin/lttng-sessiond
-include/lttng/channel.h
-include/lttng/constant.h
-include/lttng/domain.h
-include/lttng/event.h
-include/lttng/handle.h
-include/lttng/health.h
-include/lttng/load.h
-include/lttng/lttng-error.h
-include/lttng/lttng.h
-include/lttng/save.h
-include/lttng/session.h
-include/lttng/snapshot.h
-include/lttng/version.h.tmpl
-lib/liblttng-ctl.a
-lib/liblttng-ctl.so
-lib/liblttng-ctl.so.0
-lib/liblttng-ctl.so.0.0.0
-lib/lttng/libexec/lttng-consumerd
-libdata/pkgconfig/lttng-ctl.pc
-man/man1/lttng-add-context.1.gz
-man/man1/lttng-crash.1.gz
-man/man1/lttng-create.1.gz
-man/man1/lttng-destroy.1.gz
-man/man1/lttng-disable-channel.1.gz
-man/man1/lttng-disable-event.1.gz
-man/man1/lttng-enable-channel.1.gz
-man/man1/lttng-enable-event.1.gz
-man/man1/lttng-help.1.gz
-man/man1/lttng-list.1.gz
-man/man1/lttng-load.1.gz
-man/man1/lttng-metadata.1.gz
-man/man1/lttng-regenerate.1.gz
-man/man1/lttng-save.1.gz
-man/man1/lttng-set-session.1.gz
-man/man1/lttng-snapshot.1.gz
-man/man1/lttng-start.1.gz
-man/man1/lttng-status.1.gz
-man/man1/lttng-stop.1.gz
-man/man1/lttng-track.1.gz
-man/man1/lttng-untrack.1.gz
-man/man1/lttng-version.1.gz
-man/man1/lttng-view.1.gz
-man/man1/lttng.1.gz
-man/man3/lttng-health-check.3.gz
-man/man8/lttng-relayd.8.gz
-man/man8/lttng-sessiond.8.gz
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/live-reading-howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/live-reading-protocol.txt
-%%PORTDOCS%%%%DOCSDIR%%/python-howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/quickstart.txt
-%%PORTDOCS%%%%DOCSDIR%%/snapshot-howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/streaming-howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/valgrind-howto.txt
-share/xml/lttng/session.xsd