Index: head/sysutils/lttng-ust/Makefile =================================================================== --- head/sysutils/lttng-ust/Makefile (revision 564771) +++ head/sysutils/lttng-ust/Makefile (revision 564772) @@ -1,36 +1,39 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME= lttng-ust PORTVERSION= 2.9.0 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://lttng.org/files/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= Libraries to instrument and trace user applications LICENSE= LGPL21 MIT GPLv2 LICENSE_COMB= dual 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 Index: head/sysutils/lttng-ust/files/patch-tests_gcc-weak-hidden_Makefile.am =================================================================== --- head/sysutils/lttng-ust/files/patch-tests_gcc-weak-hidden_Makefile.am (revision 564771) +++ head/sysutils/lttng-ust/files/patch-tests_gcc-weak-hidden_Makefile.am (nonexistent) @@ -1,22 +0,0 @@ ---- tests/gcc-weak-hidden/Makefile.am.orig 2016-10-18 22:44:06 UTC -+++ tests/gcc-weak-hidden/Makefile.am -@@ -1,17 +1,9 @@ - AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils - --noinst_LTLIBRARIES = libgcc-wh.la --libgcc_wh_la_SOURCES = c.c d.c -- --noinst_PROGRAMS = test-gcc-wh --test_gcc_wh_SOURCES = main.c b.c --test_gcc_wh_LDADD = $(top_builddir)/tests/utils/libtap.a \ -- $(builddir)/libgcc-wh.la -- - noinst_SCRIPTS = test_gcc_weak_hidden - CLEANFILES = $(noinst_SCRIPTS) - EXTRA_DIST = test_gcc_weak_hidden.in - --$(noinst_SCRIPTS): %: %.in -- sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@ -+$(noinst_SCRIPTS): $(noinst_SCRIPTS).in * -+ sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $(noinst_SCRIPTS).in > $@ - chmod +x $@ Property changes on: head/sysutils/lttng-ust/files/patch-tests_gcc-weak-hidden_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/lttng-ust/files/patch-tests_ust-elf_Makefile.am =================================================================== --- head/sysutils/lttng-ust/files/patch-tests_ust-elf_Makefile.am (revision 564771) +++ head/sysutils/lttng-ust/files/patch-tests_ust-elf_Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- tests/ust-elf/Makefile.am.orig 2016-10-18 22:44:06 UTC -+++ tests/ust-elf/Makefile.am -@@ -23,6 +23,6 @@ EXTRA_DIST = test_ust_elf.in \ - $(srcdir)/data/pic/hello.c \ - $(srcdir)/data/pic/libhello.c - --$(noinst_SCRIPTS): %: %.in -- sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@ -+$(noinst_SCRIPTS): $(noinst_SCRIPTS).in * -+ sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $(noinst_SCRIPTS).in > $@ - chmod +x $@ Property changes on: head/sysutils/lttng-ust/files/patch-tests_ust-elf_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/lttng-ust/files/patch-tools_lttng-gen-tp =================================================================== --- head/sysutils/lttng-ust/files/patch-tools_lttng-gen-tp (revision 564771) +++ head/sysutils/lttng-ust/files/patch-tools_lttng-gen-tp (nonexistent) @@ -1,8 +0,0 @@ ---- tools/lttng-gen-tp.orig 2017-01-08 00:38:50 UTC -+++ tools/lttng-gen-tp -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env %%PYTHON_VERSION%% - # - # Copyright (c) 2012 Yannick Brosseau - # Property changes on: head/sysutils/lttng-ust/files/patch-tools_lttng-gen-tp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile =================================================================== --- head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile (revision 564771) +++ head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile (revision 564772) @@ -1,26 +1,17 @@ --- doc/examples/demo-tracef/Makefile.orig 2016-08-08 21:25:36 UTC +++ doc/examples/demo-tracef/Makefile @@ -15,12 +15,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. 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: Index: head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile =================================================================== --- head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile (revision 564771) +++ head/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile (revision 564772) @@ -1,26 +1,17 @@ --- doc/examples/demo-tracelog/Makefile.orig 2016-08-25 21:53:05 UTC +++ doc/examples/demo-tracelog/Makefile @@ -15,12 +15,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. 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: Index: head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile =================================================================== --- head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile (revision 564771) +++ head/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile (revision 564772) @@ -1,25 +1,18 @@ --- 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. -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 - 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 Index: head/sysutils/lttng-ust/pkg-plist =================================================================== --- head/sysutils/lttng-ust/pkg-plist (revision 564771) +++ head/sysutils/lttng-ust/pkg-plist (revision 564772) @@ -1,126 +1,132 @@ bin/lttng-gen-tp include/lttng/align.h include/lttng/bug.h include/lttng/lttng-ust-tracef.h include/lttng/lttng-ust-tracelog.h include/lttng/ringbuffer-abi.h include/lttng/ringbuffer-config.h include/lttng/tracef.h include/lttng/tracelog.h include/lttng/tracepoint-event.h include/lttng/tracepoint-rcu.h include/lttng/tracepoint-types.h include/lttng/tracepoint.h include/lttng/ust-abi.h include/lttng/ust-clock.h include/lttng/ust-compiler.h include/lttng/ust-config.h include/lttng/ust-ctl.h include/lttng/ust-elf.h include/lttng/ust-endian.h include/lttng/ust-error.h include/lttng/ust-events.h include/lttng/ust-getcpu.h include/lttng/ust-tracepoint-event-nowrite.h include/lttng/ust-tracepoint-event-reset.h include/lttng/ust-tracepoint-event-write.h include/lttng/ust-tracepoint-event.h include/lttng/ust-tracer.h include/lttng/ust-version.h include/lttng/ust.h lib/liblttng-ust-ctl.a lib/liblttng-ust-ctl.so lib/liblttng-ust-ctl.so.2 lib/liblttng-ust-ctl.so.2.0.0 lib/liblttng-ust-cyg-profile-fast.a lib/liblttng-ust-cyg-profile-fast.so lib/liblttng-ust-cyg-profile-fast.so.0 lib/liblttng-ust-cyg-profile-fast.so.0.0.0 lib/liblttng-ust-cyg-profile.a lib/liblttng-ust-cyg-profile.so lib/liblttng-ust-cyg-profile.so.0 lib/liblttng-ust-cyg-profile.so.0.0.0 lib/liblttng-ust-dl.a lib/liblttng-ust-dl.so lib/liblttng-ust-dl.so.0 lib/liblttng-ust-dl.so.0.0.0 lib/liblttng-ust-fd.a lib/liblttng-ust-fd.so lib/liblttng-ust-fd.so.0 lib/liblttng-ust-fd.so.0.0.0 lib/liblttng-ust-fork.a lib/liblttng-ust-fork.so lib/liblttng-ust-fork.so.0 lib/liblttng-ust-fork.so.0.0.0 lib/liblttng-ust-libc-wrapper.a lib/liblttng-ust-libc-wrapper.so lib/liblttng-ust-libc-wrapper.so.0 lib/liblttng-ust-libc-wrapper.so.0.0.0 lib/liblttng-ust-pthread-wrapper.a lib/liblttng-ust-pthread-wrapper.so lib/liblttng-ust-pthread-wrapper.so.0 lib/liblttng-ust-pthread-wrapper.so.0.0.0 lib/liblttng-ust-tracepoint.a lib/liblttng-ust-tracepoint.so lib/liblttng-ust-tracepoint.so.0 lib/liblttng-ust-tracepoint.so.0.0.0 lib/liblttng-ust.a 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 %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/examples/README %%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/README %%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/lttng-ust-clock-override-example.c %%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/run-clock-override %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/CMakeLists.txt %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/FindLTTngUST.cmake %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/README.md %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/aligner-lib.cpp %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/aligner-lib.h %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/aligner.cpp %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/tester-lib.cpp %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/tester-lib.h %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/tester.cpp %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/trace.sh %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp %%PORTDOCS%%%%DOCSDIR%%/examples/cmake-multiple-shared-libraries/tracepoint-provider.h %%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/README %%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/demo-tracef.c %%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/README %%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/demo-tracelog.c %%PORTDOCS%%%%DOCSDIR%%/examples/demo/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/demo/README %%PORTDOCS%%%%DOCSDIR%%/examples/demo/demo-trace %%PORTDOCS%%%%DOCSDIR%%/examples/demo/demo.c %%PORTDOCS%%%%DOCSDIR%%/examples/demo/tp.c %%PORTDOCS%%%%DOCSDIR%%/examples/demo/tp2.c %%PORTDOCS%%%%DOCSDIR%%/examples/demo/tp3.c %%PORTDOCS%%%%DOCSDIR%%/examples/demo/ust_tests_demo.h %%PORTDOCS%%%%DOCSDIR%%/examples/demo/ust_tests_demo2.h %%PORTDOCS%%%%DOCSDIR%%/examples/demo/ust_tests_demo3.h %%PORTDOCS%%%%DOCSDIR%%/examples/easy-ust/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/easy-ust/sample.c %%PORTDOCS%%%%DOCSDIR%%/examples/easy-ust/sample_component_provider.h %%PORTDOCS%%%%DOCSDIR%%/examples/easy-ust/tp.c %%PORTDOCS%%%%DOCSDIR%%/examples/gen-tp/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/gen-tp/sample.c %%PORTDOCS%%%%DOCSDIR%%/examples/gen-tp/sample_tracepoint.tp %%PORTDOCS%%%%DOCSDIR%%/examples/getcpu-override/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/getcpu-override/README %%PORTDOCS%%%%DOCSDIR%%/examples/getcpu-override/lttng-ust-getcpu-override-example.c %%PORTDOCS%%%%DOCSDIR%%/examples/getcpu-override/run-getcpu-override %%PORTDOCS%%%%DOCSDIR%%/examples/hello-static-lib/Makefile %%PORTDOCS%%%%DOCSDIR%%/examples/hello-static-lib/README %%PORTDOCS%%%%DOCSDIR%%/examples/hello-static-lib/hello.c %%PORTDOCS%%%%DOCSDIR%%/examples/hello-static-lib/tp.c %%PORTDOCS%%%%DOCSDIR%%/examples/hello-static-lib/ust_tests_hello.h %%PORTDOCS%%%%DOCSDIR%%/java-agent.txt