Add build stuff.

external/cddl/osnet/lib/libctf/Makefile

@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.7 2015/09/17 01:53:48 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2015/09/24 14:36:54 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
 LIB=		ctf
+MAN=		ctf.5
 
 SRCS=		ctf_create.c \
 		ctf_decl.c \

external/cddl/osnet/lib/libctf/shlib_version

@@ -1,6 +1,6 @@
-#	$NetBSD: shlib_version,v 1.1 2010/02/21 01:46:35 darran Exp $
+#	$NetBSD: shlib_version,v 1.2 2015/09/24 14:36:54 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 
-major=2
+major=3
 minor=0

external/cddl/osnet/lib/libdtrace/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2015/02/07 20:30:03 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2015/09/24 14:36:54 christos Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -37,7 +37,9 @@ SRCS=		dt_aggregate.c \
 		dt_parser.c \
 		dt_pcb.c \
 		dt_pid.c \
+		dt_pq.c \
 		dt_pragma.c \
+		dt_print.c \
 		dt_printf.c \
 		dt_proc.c \
 		dt_program.c \
@@ -59,6 +61,7 @@ DSRCS=		errno.d			\
 .PATH:		${.CURDIR}/../../dist/lib/libdtrace/common
 
 CPPFLAGS+=	-I${.OBJDIR} \
+		-I${.CURDIR} \
 		-I${OSNETDIR}/sys \
 		-I${OSNETDIR}/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
@@ -87,6 +90,9 @@ COPTS.dt_subr.c		+= -Wno-stack-protector
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
+CPPFLAGS+=	-I${.CURDIR}/../../dev/dtrace/i386
+.PATH:		${.CURDIR}/../../dist/lib/libdtrace/i386 ${.CURDIR}/../../dev/dtrace/i386
+SRCS+=	dt_isadep.c # dis_tables.c
 .elif ${MACHINE_ARCH} == "sparc64"
 CPPFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
 .elif ${MACHINE_CPU} == "arm"
@@ -119,4 +125,6 @@ foo:
 #.endfor
 #.endif
 
+LIBDPLIBS=	proc	${NETBSDSRCDIR}/external/bsd/libproc/lib
+
 .include <bsd.lib.mk>

external/cddl/osnet/lib/libdtrace/libproc_compat.h

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010 The FreeBSD Foundation 
+ * All rights reserved. 
+ * 
+ * This software was developed by Rui Paulo under sponsorship from the
+ * FreeBSD Foundation. 
+ *  
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ * $FreeBSD: head/cddl/lib/libdtrace/libproc_compat.h 281257 2015-04-08 02:36:37Z markj $
+ */
+
+/*
+ * Compatibility functions between Solaris libproc and FreeBSD libproc.
+ * Functions sorted alphabetically.
+ */
+#define	PR_LMID_EVERY 0
+#define	Psetrun(p, a1, a2) proc_continue((p))
+#define	Pxlookup_by_addr(p, a, n, s, sym, i) \
+    proc_addr2sym(p, a, n, s, sym)
+#define	Pxlookup_by_name(p, l, s1, s2, sym, a) \
+    proc_name2sym(p, s1, s2, sym, a)
+#define	Paddr_to_map proc_addr2map
+#define	Pcreate_error strerror
+#define	Pdelbkpt proc_bkptdel
+#define	Pgrab_error strerror
+#define	Plmid(p, a, l) (-1)
+#define	Plmid_to_map(p, l, o) proc_obj2map((p), (o))
+#define	Plookup_by_addr proc_addr2sym
+#define	Pname_to_ctf(p, obj) (ctf_file_t *)proc_name2ctf(p, obj)
+#define	Pname_to_map proc_name2map
+#define	Pobject_iter proc_iter_objs
+#define	Pobject_iter_resolved(p, f, arg) proc_iter_objs(p, f, arg)
+#define	Pobjname proc_objname
+#define	Pread proc_read
+#define	Prd_agent proc_rdagent
+#define	Prelease proc_detach
+#define	Psetbkpt proc_bkptset
+#define	Psetflags proc_setflags
+#define	Pstate proc_state
+#define	Psymbol_iter_by_addr proc_iter_symbyaddr
+#define	Punsetflags proc_clearflags
+#define	Pupdate_maps proc_rdagent
+#define	Pupdate_syms proc_updatesyms
+#define	Pxecbkpt proc_bkptexec

external/cddl/osnet/lib/libdtrace/shlib_version

@@ -1,6 +1,6 @@
-#	$NetBSD: shlib_version,v 1.1 2010/02/21 01:46:35 darran Exp $
+#	$NetBSD: shlib_version,v 1.2 2015/09/24 14:36:54 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 
-major=2
+major=3
 minor=0

external/cddl/osnet/usr.sbin/dtrace/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2014/01/12 17:48:25 riz Exp $
+#	$NetBSD: Makefile,v 1.6 2015/09/24 14:36:54 christos Exp $
 
 # $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -33,13 +33,11 @@ COPTS.dtrace.c += -Wno-stack-protector -Wno-format-extra-args
 
 LDFLAGS+=	-pthread
 
-LIBCTF_OBJDIR!=	cd ${.CURDIR}/../../lib/libctf && ${PRINTOBJDIR}
-LDFLAGS+=	-L${LIBDTRACE_OBJDIR} -ldtrace
-
-LIBDTRACE_OBJDIR!= cd ${.CURDIR}/../../lib/libdtrace && ${PRINTOBJDIR}
-LDFLAGS+=	-L${LIBCTF_OBJDIR} -lctf
-
-LDADD+=		-ly -ll -lelf -lz
-
+PROGDPLIBS+=	ctf ${.CURDIR}/../../lib/libctf
+PROGDPLIBS+=	dtrace ${.CURDIR}/../../lib/libdtrace
+PROGDPLIBS+=	elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
+PROGDPLIBS+=	y ${NETBSDSRCDIR}/lib/liby
+PROGDPLIBS+=	l ${NETBSDSRCDIR}/external/bsd/flex/lib
+PROGDPLIBS+=	z ${NETBSDSRCDIR}/lib/libz
 
 .include <bsd.prog.mk>