From owner-svn-ports-head@freebsd.org Tue Feb 9 08:04:01 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D4F465356BE; Tue, 9 Feb 2021 08:04:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZb4x5lPRz4dbX; Tue, 9 Feb 2021 08:04:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B834826ED7; Tue, 9 Feb 2021 08:04:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 119841hP037965; Tue, 9 Feb 2021 08:04:01 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 119840NS037960; Tue, 9 Feb 2021 08:04:00 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102090804.119840NS037960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 9 Feb 2021 08:04:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564772 - in head/sysutils/lttng-ust: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/sysutils/lttng-ust: . files X-SVN-Commit-Revision: 564772 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2021 08:04:01 -0000 Author: danfe Date: Tue Feb 9 08:04:00 2021 New Revision: 564772 URL: https://svnweb.freebsd.org/changeset/ports/564772 Log: Address some problems with this port: - Install more complete set of manual pages - Do not patch+sed(1) the script, just put in on SHEBANG_FILES - Remove patches which apparently were to avoid dependency on GNU make, but they are incomplete and did not do the job well (e.g., tests were broken due to circular dependencies) - Unbreak the tests by calling /bin/sh rather than /bin/bash Deleted: head/sysutils/lttng-ust/files/patch-tests_gcc-weak-hidden_Makefile.am head/sysutils/lttng-ust/files/patch-tests_ust-elf_Makefile.am head/sysutils/lttng-ust/files/patch-tools_lttng-gen-tp Modified: head/sysutils/lttng-ust/Makefile head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile head/sysutils/lttng-ust/pkg-plist Modified: head/sysutils/lttng-ust/Makefile ============================================================================== --- head/sysutils/lttng-ust/Makefile Tue Feb 9 07:12:47 2021 (r564771) +++ head/sysutils/lttng-ust/Makefile Tue Feb 9 08:04:00 2021 (r564772) @@ -16,21 +16,24 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING LICENSE_FILE_MIT= ${WRKSRC}/COPYING LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING +BUILD_DEPENDS= asciidoc:textproc/asciidoc \ + xmlto:textproc/xmlto LIB_DEPENDS= liburcu.so:sysutils/liburcu -USES= autoreconf libtool localbase pathfix python \ - shebangfix tar:bzip2 +USES= autoreconf gmake libtool localbase pathfix python \ + shebangfix tar:bzip2 USE_LDCONFIG= yes 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 post-patch: - @${REINPLACE_CMD} -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g' \ - ${PATCH_WRKSRC}/tools/lttng-gen-tp + @${GREP} -Rl --null '#!/bin/bash' ${WRKSRC}/tests | ${XARGS} -0 \ + ${REINPLACE_CMD} -e '/#!/s,bash,sh,' .include Modified: head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile ============================================================================== --- head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile Tue Feb 9 07:12:47 2021 (r564771) +++ head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile Tue Feb 9 08:04:00 2021 (r564772) @@ -15,12 +15,3 @@ LOCAL_CPPFLAGS += -I. all: demo-tracef -@@ -31,7 +27,7 @@ demo-tracef.o: demo-tracef.c - - demo-tracef: demo-tracef.o - $(CC) $(LDFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(AM_CFLAGS) \ -- -o $@ $< $(LIBS) -+ -o $@ demo-tracef.o $(LIBS) - - .PHONY: clean - clean: Modified: head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile ============================================================================== --- head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile Tue Feb 9 07:12:47 2021 (r564771) +++ head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile Tue Feb 9 08:04:00 2021 (r564772) @@ -15,12 +15,3 @@ LOCAL_CPPFLAGS += -I. all: demo-tracelog -@@ -31,7 +27,7 @@ demo-tracelog.o: demo-tracelog.c - - demo-tracelog: demo-tracelog.o - $(CC) $(LDFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(AM_CFLAGS) \ -- -o $@ $< $(LIBS) -+ -o $@ demo-tracelog.o $(LIBS) - - .PHONY: clean - clean: Modified: head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile ============================================================================== --- head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile Tue Feb 9 07:12:47 2021 (r564771) +++ head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile Tue Feb 9 08:04:00 2021 (r564772) @@ -1,6 +1,6 @@ --- doc/examples/hello-static-lib/Makefile.orig 2016-08-08 21:25:36 UTC +++ doc/examples/hello-static-lib/Makefile -@@ -14,19 +14,15 @@ +@@ -14,13 +14,9 @@ # # This makefile is purposefully kept simple to support GNU and BSD make. @@ -16,10 +16,3 @@ all: hello - lttng-ust-provider-hello.o: tp.c ust_tests_hello.h - $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) \ -- $(AM_CFLAGS) -c -o $@ $< -+ $(AM_CFLAGS) -c -o $@ tp.c - - lttng-ust-provider-hello.a: lttng-ust-provider-hello.o - ar -rc $@ lttng-ust-provider-hello.o Modified: head/sysutils/lttng-ust/pkg-plist ============================================================================== --- head/sysutils/lttng-ust/pkg-plist Tue Feb 9 07:12:47 2021 (r564771) +++ head/sysutils/lttng-ust/pkg-plist Tue Feb 9 08:04:00 2021 (r564772) @@ -69,7 +69,13 @@ lib/liblttng-ust.so lib/liblttng-ust.so.0 lib/liblttng-ust.so.0.0.0 libdata/pkgconfig/lttng-ust.pc +man/man1/lttng-gen-tp.1.gz man/man3/do_tracepoint.3.gz +man/man3/lttng-ust-cyg-profile.3.gz +man/man3/lttng-ust-dl.3.gz +man/man3/lttng-ust.3.gz +man/man3/tracef.3.gz +man/man3/tracelog.3.gz man/man3/tracepoint.3.gz man/man3/tracepoint_enabled.3.gz %%PORTDOCS%%%%DOCSDIR%%/ChangeLog