 @@ -1,77 +1,77 @@
-# $NetBSD: Makefile.inc,v 1.6 2020/07/02 14:04:00 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.7 2020/10/30 08:41:58 martin Exp $
 .include <bsd.own.mk>
 TOPDIR=		${NETBSDSRCDIR}/external/bsd/kyua-cli
 SRCDIR=		${TOPDIR}/dist
 # Name of the private libraries (without their lib prefix) to depend on.
 KYUA_LIBS?=
 # Layout of installed files.
 KYUA_BINDIR=		/usr/bin
 KYUA_CONFDIR=		/etc/kyua
 KYUA_DOCDIR=		/usr/share/doc/reference/ref1/kyua/kyua-cli
 KYUA_EXAMPLESDIR=	/usr/share/examples/kyua-cli
 KYUA_MISCDIR=		/usr/share/kyua-cli/misc
 KYUA_STOREDIR=		/usr/share/kyua-cli/store
 KYUA_TESTERSDIR=	/usr/libexec
 KYUA_TESTSDIR=		${TESTSBASE}
 KYUA_TARNAME!=	grep 'define PACKAGE_TARNAME' ${TOPDIR}/config.h \
 		| cut -d '"' -f 2
 cookie-tarname: cookie-tarname-2
 	@cmp -s cookie-tarname cookie-tarname-2 \
 	    || cp cookie-tarname-2 cookie-tarname
 cookie-tarname-2: .PHONY
 	@echo "${KYUA_TARNAME}" >cookie-tarname-2
 CLEANFILES+=	cookie-tarname cookie-tarname-2
 KYUA_VERSION!=	grep 'define VERSION' ${TOPDIR}/config.h | cut -d '"' -f 2
 cookie-version: cookie-version-2
 	@cmp -s cookie-version cookie-version-2 \
 	    || cp cookie-version-2 cookie-version
 cookie-version-2: .PHONY
 	@echo "${KYUA_VERSION}" >cookie-version-2
 CLEANFILES+=	cookie-version cookie-version-2
 CPPFLAGS+=	-DHAVE_CONFIG_H
 # Not all source files need these settings, but it's just easier to
 # set them in all cases.
 CPPFLAGS+=	-DKYUA_CONFDIR=\"${KYUA_CONFDIR}\"
 CPPFLAGS+=	-DKYUA_DOCDIR=\"${KYUA_DOCDIR}\"
 CPPFLAGS+=	-DKYUA_EXAMPLESDIR=\"${KYUA_EXAMPLESDIR}\"
 CPPFLAGS+=	-DKYUA_MISCDIR=\"${KYUA_MISCDIR}\"
 CPPFLAGS+=	-DKYUA_STOREDIR=\"${KYUA_STOREDIR}\"
 CPPFLAGS+=	-DKYUA_TESTERSDIR=\"${KYUA_TESTERSDIR}\"
 CPPFLAGS+=	-DKYUA_TESTSDIR=\"${KYUA_TESTSDIR}\"
 CPPFLAGS+=	-I${TOPDIR}		# For config.h.
 CPPFLAGS+=	-I${TOPDIR}/lib		# For utils/defs.hpp.
 CPPFLAGS+=	-I${SRCDIR}
 .for lib in ${KYUA_LIBS}
 LIBOBJDIR_${lib}!=	cd ${TOPDIR}/lib/${lib}; ${PRINTOBJDIR}
 LDADD+=			${LIBOBJDIR_${lib}}/lib${lib}.a
 DPADD+=			${LIBOBJDIR_${lib}}/lib${lib}.a
 .endfor
 .if !empty(KYUA_LIBS:Mutils)
-LDADD+=		-llutok -lsqlite3
+LDADD+=		-llutok -lsqlite3 -lm
-DPADD+=		${LIBLUTOK} ${LIBSQLITE}
+DPADD+=		${LIBLUTOK} ${LIBSQLITE} ${LIBM}
 .endif
 MANPAGE_DEPS = cookie-tarname cookie-version
 BUILD_MANPAGE = \
 	sed -e 's,__CONFDIR__,${KYUA_CONFDIR},g' \
 	    -e 's,__DOCDIR__,${KYUA_DOCDIR},g' \
 	    -e 's,__EGDIR__,${KYUA_EXAMPLESDIR},g' \
 	    -e 's,__MISCDIR__,${KYUA_MISCDIR},g' \
 	    -e 's,__PACKAGE__,${KYUA_TARNAME},g' \
 	    -e 's,__STOREDIR__,${KYUA_STOREDIR},g' \
 	    -e 's,__TESTERSDIR__,${KYUA_TESTERSDIR},g' \
 	    -e 's,__TESTSDIR__,${KYUA_TESTSDIR},g' \
 	    -e 's,__VERSION__,${KYUA_VERSION},g' \
 	    <${SRCDIR}/doc/$${name}.in >$${name}.tmp; \
 	mv $${name}.tmp $${name}

 @@ -1,97 +1,97 @@
-#	$NetBSD: Makefile.inc,v 1.23 2020/04/20 13:04:10 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.24 2020/10/30 08:41:58 martin Exp $
 .include <bsd.own.mk>
 USE_FORT?= yes	# network client and server
 CWARNFLAGS.clang+=	-Wno-empty-body -Wno-format-extra-args \
 			-Wno-string-plus-int -Wno-string-compare
 WARNS?=	0
 PFIX_DISTDIR=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist
 CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
 	-I${DIST} \
 	-I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
 	-I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
 	-I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
 	-I${PFIX_DISTDIR}/src/xsasl \
 	${${ACTIVE_CC} == "clang":?-Wno-comment:}
 CPPFLAGS+= -DUSE_SASL_AUTH
 CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\"
 CPPFLAGS+= -DUSE_SASLC_SASL
 CPPFLAGS+= -DDEF_CLIENT_SASL_TYPE=\"saslc\"
 DPADD+= ${LIBSASCL} ${LIBSSL}
 LDADD+= -lsaslc -lssl
 .if (${MKKERBEROS} != "no")
 DPADD+= ${LIBGSSAPI} ${LIBCRYPTO}
 LDADD+= -lgssapi -lcrypto
 .endif
 .if defined(HAVE_PCC)
 # code uses gcc-specific aggregate dynamic array
 CPPFLAGS+=	-DCANT_USE_SEND_RECV_MSG
 .endif
 # TLS support.
 CPPFLAGS+=	-DUSE_TLS
 # IPv6 support.
 .if ${MKINET6} == "no"
 CPPFLAGS+=	-DNO_IPV6
 .endif
 # SQLite support.
 CPPFLAGS+=	-DHAS_SQLITE
 . if defined(PROG)
-DPADD+=		${LIBSQLITE3}
+DPADD+=		${LIBSQLITE3} ${LIBM}
-LDADD+=		-lsqlite3
+LDADD+=		-lsqlite3 -lm
 .endif
 # LDAP support.
 .if ${USE_LDAP} != "no"
 CPPFLAGS+=	-DHAS_LDAP
 # Automatically link in libldap for a program.
 . if defined(PROG)
 LDADD+=		-lldap -llber
 DPADD+=		${LIBLDAP} ${LIBLBER}
 .  if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
 DPADD+=		${LIBSSL} ${LIBCRYPTO}
 LDADD+=		-lssl -lcrypto
 .  endif
 . endif
 .endif # USE_LDAP != no
 PFIX_SRCDIR=	${NETBSDSRCDIR}/external/ibm-public/postfix
 PFIX_LIBSDIRS=	dns dns masterlib master global global util util \
 		milter milter xsasl xsasl
 PFIX_LIBSDIRS+=	tls tls
 .for _LD _LL in	${PFIX_LIBSDIRS}
 .if !defined(POBJDIR.${_LL})
 POBJDIR.${_LL}!=cd ${PFIX_SRCDIR}/lib/${_LD} && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=POBJDIR.${_LL}
 .endif
 LIBP${_LL:tu}=	${POBJDIR.${_LL}}/lib${_LL}.a
 .endfor
 # Directories to install into.
+#
 PFIX_LIBEXECDIR=/usr/libexec/postfix
 PFIX_ETCDIR=	/etc/postfix
 PFIX_EXAMPLEDIR=/usr/share/examples/postfix
 PFIX_HTMLDIR=	/usr/share/doc/reference/ref8/postfix
 PFIX_SBINDIR=	/usr/sbin
 # override defaults which are otherwise empty and/or so postconf is correct
 CPPFLAGS+=	-DDEF_HTML_DIR=\"${PFIX_HTMLDIR}\" \
 		-DDEF_README_DIR=\"${PFIX_EXAMPLEDIR}\" \
 		-DDEF_SAMPLE_DIR=\"${PFIX_EXAMPLEDIR}\" \
 		-DDEF_MANPAGE_DIR=\"${MANDIR}\"
 # postfix check wants a lot of files to be owned by root
 BINOWN=	root

 @@ -1,690 +1,691 @@
-#	$NetBSD: bsd.prog.mk,v 1.332 2020/10/16 06:55:36 nia Exp $
+#	$NetBSD: bsd.prog.mk,v 1.333 2020/10/30 08:41:58 martin Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 .ifndef HOSTPROG
 .include <bsd.init.mk>
 .include <bsd.shlib.mk>
 .include <bsd.gcc.mk>
 .include <bsd.sanitizer.mk>
 ##### Sanitizer specific flags.
 CFLAGS+=	${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS}
 CXXFLAGS+=	${SANITIZERFLAGS} ${LIBCSANITIZERFLAGS}
 LDFLAGS+=	${SANITIZERFLAGS}
+#
 # Definitions and targets shared among all programs built by a single
 # Makefile.
+#
 ##### Basic targets
 realinstall:	proginstall scriptsinstall
 .gdbinit:
 	rm -f .gdbinit
 .if defined(DESTDIR) && !empty(DESTDIR)
 	echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit
 .else
 	touch .gdbinit
 .endif
 .for __gdbinit in ${GDBINIT}
 	echo "source ${__gdbinit}" >> .gdbinit
 .endfor
 CLEANFILES+= a.out [Ee]rrs mklog core *.core .gdbinit
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings
 .c.o:
 	${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
 	@${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 	@rm -f x.c
 .cc.o .cpp.o .cxx.o .C.o:
 	${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
 	@${MV} x.c x.cc
 	@${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 	@rm -f x.cc
 .endif
 .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=	${PIE_CFLAGS}
 AFLAGS+=	${PIE_AFLAGS}
 LDFLAGS+=	${"${LDSTATIC.${.TARGET}}" == "-static" :? : ${PIE_LDFLAGS}}
 .endif
 CFLAGS+=	${COPTS}
 .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG)
 CFLAGS+=	-g
 .endif
 OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln .d
 # CTF preserve debug symbols
 .if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")
 CTFFLAGS+= -g
 CTFMFLAGS+= -g
 .if defined(HAVE_GCC)
 #CFLAGS+=-gdwarf-2
 .endif
 .endif
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
 .ifndef LIBCRTBEGIN
 LIBCRTBEGIN=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}
 .endif
 .ifndef LIBCRTEND
 LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
 .MADE: ${LIBCRTEND}
 .endif
 _SHLINKER=	${SHLINKDIR}/ld.elf_so
 .ifndef LIBCRT0
 LIBCRT0=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crt0.o
 .MADE: ${LIBCRT0}
 .endif
 .ifndef LIBCRTI
 LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
 .MADE: ${LIBCRTI}
 .endif
 ##### Installed system library definitions
+#
 #	E.g.
 #		LIBC?=${DESTDIR}/usr/lib/libc.a
 #		LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a
 #	etc..
 #	NB:	If you are a library here, add it in bsd.README
 _LIBLIST=\
 	archive \
 	asn1 \
 	atf_c \
 	atf_cxx \
 	bind9 \
 	blocklist \
 	bluetooth \
 	bsdmalloc \
 	bz2 \
 	c \
 	c_pic \
 	cbor \
 	com_err \
 	compat \
 	crypt \
 	crypto \
 	curses \
 	cxx \
 	des \
 	dns \
 	edit \
 	event \
 	event_openssl \
 	event_pthreads \
 	execinfo \
 	expat \
 	fetch \
 	fl \
 	fido2 \
 	form \
 	gcc \
 	gnuctf \
 	gnumalloc \
 	gssapi \
 	hdb \
 	heimbase \
 	heimntlm \
 	hx509 \
 	intl \
 	ipsec \
 	isc \
 	isccc \
 	isccfg \
 	kadm5clnt \
 	kadm5srv \
 	kafs \
 	krb5 \
 	kvm \
 	l \
 	lber \
 	ldap \
 	ldap_r \
 	lua \
 	m \
 	magic \
 	menu \
 	netpgpverify \
 	ns \
 	objc \
 	ossaudio \
 	panel \
 	pam \
 	pcap \
 	pci \
 	posix \
 	pthread \
 	puffs \
 	quota \
 	radius \
 	refuse \
 	resolv \
 	rmt \
 	roken \
 	rpcsvc \
 	rt \
 	rump \
 	rumpfs_cd9660 \
 	rumpfs_efs \
 	rumpfs_ext2fs \
 	rumpfs_ffs \
 	rumpfs_hfs \
 	rumpfs_lfs \
 	rumpfs_msdos \
 	rumpfs_nfs \
 	rumpfs_ntfs \
 	rumpfs_syspuffs \
 	rumpfs_tmpfs \
 	rumpfs_udf \
 	rumpuser \
 	saslc \
 	skey \
 	sl \
 	sqlite3 \
 	ssh \
 	ssl \
 	stdc++ \
 	supc++ \
 	terminfo \
 	tre \
 	unbound \
 	usbhid \
 	util \
 	wind \
 	wrap \
 	y \
+	z
 .for _lib in ${_LIBLIST}
 .ifndef LIB${_lib:tu}
 LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
 .MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
 .endfor
 .if (${MKKERBEROS} != "no")
 # Kerberos5 applications
 LIBKRB5_LDADD+= -lkrb5 -lcom_err \
 	-lhx509 -lcrypto -lasn1 \
 	-lwind -lheimbase -lcom_err -lroken \
-	-lsqlite3 -lcrypt -lutil
+	-lsqlite3 -lm -lcrypt -lutil
 LIBKRB5_DPADD+= ${LIBKRB5} ${LIBCOM_ERR} \
 	${LIBHX509} ${LIBCRYPTO} ${LIBASN1} \
 	${LIBWIND} ${LIBHEIMBASE} ${LIBCOM_ERR} ${LIBROKEN} \
-	${LIBSQLITE3} ${LIBCRYPT}  ${LIBUTIL}
+	${LIBSQLITE3} ${LIBM} ${LIBCRYPT}  ${LIBUTIL}
 .endif
 # PAM applications, if linked statically, need more libraries
 .if (${MKPIC} == "no")
 PAM_STATIC_LDADD+= -lssh
 PAM_STATIC_DPADD+= ${LIBSSH}
 .if (${MKKERBEROS} != "no")
 PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
-	-lroken -lcom_err -lheimbase -lcrypto -lsqlite3
+	-lroken -lcom_err -lheimbase -lcrypto -lsqlite3 -lm
 PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
-	${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3}
+	${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3} \
 	${LIBM}
 .endif
 .if (${MKSKEY} != "no")
 PAM_STATIC_LDADD+= -lskey
 PAM_STATIC_DPADD+= ${LIBSKEY}
 .endif
 PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
 PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
 .else
 PAM_STATIC_LDADD=
 PAM_STATIC_DPADD=
 .endif
 #	NB:	If you are a library here, add it in bsd.README
 #	This list is sorted with -f so that it matches the order in bsd.README
 _X11LIBLIST= dps fntstubs fontcache fontconfig fontenc freetype FS GL GLU \
     ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
     Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
     Xxf86misc Xxf86vm Xcomposite Xdamage Xfixes
 .for _lib in ${_X11LIBLIST}
 .ifndef LIB${_lib:tu}
 LIB${_lib:tu}=	${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
 .MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
 .endfor
 # Ugly one-offs
 LIBX11_XCB=	${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
 LIBXCB=	${DESTDIR}${X11USRLIBDIR}/libxcb.a
 .if defined(RESCUEDIR)
 CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
 .endif
 _PROGLDOPTS=
 .if ${SHLINKDIR} != "/usr/libexec"	# XXX: change or remove if ld.so moves
 _PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
 .endif
 .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=	-Wl,-rpath,${SHLIBDIR} \
 		-L=${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
 		-L=${SHLIBINSTALLDIR}
 .endif
 __proginstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
 __progrumpinstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${RUMPBINOWN} -g ${RUMPBINGRP} -m ${RUMPBINMODE} \
 		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
 __progdebuginstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
 		${.ALLSRC} ${.TARGET}
+#
 # Backwards compatibility with Makefiles that assume that bsd.prog.mk
 # can only build a single binary.
+#
 _APPEND_MANS=yes
 _APPEND_SRCS=yes
 _CCLINKFLAGS=
 .if defined(PROG_CXX)
 PROG=		${PROG_CXX}
 _CCLINK=	${CXX} ${_CCLINKFLAGS}
 .endif
 .if defined(RUMPPRG)
 CPPFLAGS+=	-D_KERNTYPES
 PROG=			${RUMPPRG}
 . ifndef CRUNCHEDPROG
 .  if (${MKRUMP} != "no")
 PROGS=			${RUMPPRG} rump.${RUMPPRG}
 .  else
 PROGS=			${RUMPPRG}
 .  endif
 .  if defined(SRCS)
 .   if (${MKRUMP} != "no")
 SRCS.rump.${PROG}:=	${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
 .   endif
 SRCS+=			${PROG}_hostops.c
 .  else
 SRCS=			${PROG}.c ${PROG}_hostops.c
 .   if (${MKRUMP} != "no")
 SRCS.rump.${PROG}=	${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
 .   endif
 .  endif
 .   if (${MKRUMP} != "no")
 DPSRCS+=		${PROG}_rumpops.c ${RUMPSRCS}
 LDADD.rump.${PROG}+=	${LDADD.rump} -lrumpclient
 DPADD.rump.${PROG}+=	${DPADD.rump} ${LIBRUMPCLIENT}
 MAN.rump.${PROG}=	# defined but feeling empty
 _RUMPINSTALL.rump.${PROG}=# defined
 .   endif
 . else # CRUNCHEDPROG
 PROGS=			${PROG}
 CPPFLAGS+=		-DCRUNCHOPS
 . endif
 .endif
 .if defined(PROG)
 _CCLINK?=	${CC} ${_CCLINKFLAGS}
 .  if defined(MAN)
 MAN.${PROG}=	${MAN}
 _APPEND_MANS=	no
 .  endif
 .  if !defined(OBJS)
 OBJS=		${OBJS.${PROG}}
 .  endif
 .  if defined(PROGNAME)
 PROGNAME.${PROG}=	${PROGNAME}
 .  endif
 .  if defined(SRCS)
 SRCS.${PROG}=	${SRCS}
 _APPEND_SRCS=	no
 .  endif
 .endif
 # Turn the single-program PROG and PROG_CXX variables into their multi-word
 # counterparts, PROGS and PROGS_CXX.
 .if !defined(RUMPPRG)
 .  if defined(PROG_CXX) && !defined(PROGS_CXX)
 PROGS_CXX=	${PROG_CXX}
 .  elif defined(PROG) && !defined(PROGS)
 PROGS=		${PROG}
 .  endif
 .endif
 ##### Libraries that this may depend upon.
 .if defined(PROGDPLIBS) 						# {
 .for _lib _dir in ${PROGDPLIBS}
 .if !defined(BINDO.${_lib})
 PROGDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=PROGDO.${_lib}
 .endif
 LDADD+=		-L${PROGDO.${_lib}} -l${_lib}
 .if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
 DPADD+=		${PROGDO.${_lib}}/lib${_lib}_pic.a
 .elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
 DPADD+=		${PROGDO.${_lib}}/lib${_lib}.so
 .else
 DPADD+=		${PROGDO.${_lib}}/lib${_lib}.a
 .endif
 .endfor
 .endif									# }
+#
 # Per-program definitions and targets.
+#
 _CCLINK.CDEFAULT= ${CC} ${_CCLINKFLAGS}
 # Definitions specific to C programs.
 .for _P in ${PROGS}
 SRCS.${_P}?=	${_P}.c
 _CCLINK.${_P}=	${CC} ${_CCLINKFLAGS}
 _CFLAGS.${_P}=	${CFLAGS} ${CPUFLAGS}
 _CPPFLAGS.${_P}=	${CPPFLAGS}
 _COPTS.${_P}=	${COPTS}
 .endfor
 _CCLINK.CXXDEFAULT= ${CXX} ${_CCLINKFLAGS}
 # Definitions specific to C++ programs.
 .for _P in ${PROGS_CXX}
 SRCS.${_P}?=	${_P}.cc
 _CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
 .endfor
 # Language-independent definitions.
 .for _P in ${PROGS} ${PROGS_CXX}					# {
 BINDIR.${_P}?=		${BINDIR}
 PROGNAME.${_P}?=	${_P}
 .if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P}) && \
     empty(SRCS.${_P}:M*.sh)
 _PROGDEBUG.${_P}:=	${PROGNAME.${_P}}.debug
 .endif
 # paxctl specific arguments
 .if defined(PAXCTL_FLAGS)
 PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
 .endif
 .if ${MKSANITIZER:Uno} == "yes" && \
 	(${USE_SANITIZER} == "address" || ${USE_SANITIZER} == "thread" || \
 	${USE_SANITIZER} == "memory")
 PAXCTL_FLAGS.${_P}= +a
 .endif
 ##### PROG specific flags.
 _DPADD.${_P}=		${DPADD}    ${DPADD.${_P}}
 _LDADD.${_P}=		${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=		${LDFLAGS}  ${LDFLAGS.${_P}}
 .if ${MKSANITIZER} != "yes"
 # Sanitizers don't support static build.
 _LDSTATIC.${_P}=	${LDSTATIC} ${LDSTATIC.${_P}}
 .endif
 ##### Build and install rules
 .if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])
 SRCS+=		${SRCS.${_P}}	# For bsd.dep.mk
 .endif
 _YPSRCS.${_P}=	${SRCS.${_P}:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS.${_P}:M*.y:.y=.h}}
 DPSRCS+=		${_YPSRCS.${_P}}
 CLEANFILES+=		${_YPSRCS.${_P}}
 .if !empty(SRCS.${_P}:N*.h:N*.sh:N*.fth)
 OBJS.${_P}+=	${SRCS.${_P}:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
 LOBJS.${_P}+=	${LSRCS:.c=.ln} ${SRCS.${_P}:M*.c:.c=.ln}
 .endif
 .if defined(OBJS.${_P}) && !empty(OBJS.${_P})			# {
 .NOPATH: ${OBJS.${_P}} ${_P} ${_YPSRCS.${_P}}
 .if (defined(USE_COMBINE) && ${USE_COMBINE} != "no" && !commands(${_P}) \
    && (${_CCLINK.${_P}} == ${_CCLINK.CDEFAULT} \
        || ${_CCLINK.${_P}} == ${_CCLINK.CXXDEFAULT}) \
    && !defined(NOCOMBINE.${_P}) && !defined(NOCOMBINE))
 .for f in ${SRCS.${_P}:N*.h:N*.sh:N*.fth:C/\.[yl]$/.c/g}
 #_XFLAGS.$f := ${CPPFLAGS.$f:D1} ${CPUFLAGS.$f:D2} \
 #     ${COPTS.$f:D3} ${OBJCOPTS.$f:D4} ${CXXFLAGS.$f:D5}
 .if (${CPPFLAGS.$f:D1} == "1" || ${CPUFLAGS.$f:D2} == "2" \
      || ${COPTS.$f:D3} == "3" || ${OBJCOPTS.$f:D4} == "4" \
      || ${CXXFLAGS.$f:D5} == "5") \
     || ("${f:M*.[cyl]}" == "" || commands(${f:R:S/$/.o/}))
 XOBJS.${_P}+=	${f:R:S/$/.o/}
 .else
 XSRCS.${_P}+=	${f}
 NODPSRCS+=	${f}
 .endif
 .endfor
 ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \
     ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
 	${_MKTARGET_LINK}
 .if defined(DESTDIR)
 	${_CCLINK.${_P}} -Wl,-nostdlib \
 	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
 	    -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
 	    -MD --combine ${_CPPFLAGS.${_P}} ${_CFLAGS.${_P}} ${_COPTS.${_P}} \
 	    ${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
 	    ${_LDADD.${_P}} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
 .else
 	${_CCLINK.${_P}} ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
 	    -MD --combine ${_CPPFLAGS.${_P}} ${_COPTS.${_P}}
 	    ${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
 	    ${_LDADD.${_P}}
 .endif	# defined(DESTDIR)
 .if defined(CTFMERGE)
 	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
 .endif
 .if defined(PAXCTL_FLAGS.${_P})
 	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif
 .if ${MKSTRIPIDENT} != "no"
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif
 CLEANFILES+=	${_P}.d
 .if exists(${_P}.d)
 .include "${_P}.d"		# include -MD depend for program.
 .endif
 .else	# USE_COMBINE
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
 ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
     ${LIBCRTEND} ${_DPADD.${_P}}
 .if !commands(${_P})
 	${_MKTARGET_LINK}
 	${_CCLINK.${_P}} \
 	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
 	    ${OBJS.${_P}} ${_PROGLDOPTS} ${_LDADD.${_P}}
 .if defined(CTFMERGE)
 	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
 .endif
 .if defined(PAXCTL_FLAGS.${_P})
 	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif
 .if ${MKSTRIPIDENT} != "no"
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif
 .endif	# !commands(${_P})
 .endif	# USE_COMBINE
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
 	${_MKTARGET_LINK}
 	${CC} ${LDFLAGS:N-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
 .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}
 	${_MKTARGET_CREATE}
 	(  ${OBJCOPY} --only-keep-debug ${_P} ${_PROGDEBUG.${_P}} \
 	&& ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
 		--add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \
 	) || (rm -f ${_PROGDEBUG.${_P}}; false)
 .endif
 .endif	# defined(OBJS.${_P}) && !empty(OBJS.${_P})			# }
 .if !defined(MAN.${_P})
 MAN.${_P}=	${_P}.1
 .endif	# !defined(MAN.${_P})
 .if !empty(_APPEND_MANS:M[Yy][Ee][Ss])
 MAN+=		${MAN.${_P}}
 .endif
 realall: ${_P} ${_PROGDEBUG.${_P}}
 CLEANFILES+= ${_P} ${_PROGDEBUG.${_P}}
 .if defined(OBJS.${_P}) && !empty(OBJS.${_P})
 CLEANFILES+= ${OBJS.${_P}} ${LOBJS.${_P}}
 .endif
 _PROG_INSTALL+=	proginstall-${_P}
 .if !target(proginstall-${_P})						# {
 proginstall-${_P}::	${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}} \
 		${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}}
 .PRECIOUS:	${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}} \
 		${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}}
 .if ${MKUPDATE} == "no"
 .if defined(_RUMPINSTALL.${_P})
 ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __progrumpinstall
 .else
 ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __proginstall
 .endif
 .if !defined(BUILD) && !make(all) && !make(${_P})
 ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! .MADE
 .endif
 .if defined(_PROGDEBUG.${_P})
 ${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}! ${_PROGDEBUG.${_P}} __progdebuginstall
 .if !defined(BUILD) && !make(all) && !make(${_P})
 ${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}! .MADE
 .endif
 .endif	#  define(_PROGDEBUG.${_P})
 .else	# MKUPDATE != no
 .if defined(_RUMPINSTALL.${_P})
 ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __progrumpinstall
 .else
 ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __proginstall
 .endif
 .if !defined(BUILD) && !make(all) && !make(${_P})
 ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: .MADE
 .endif
 .if defined(_PROGDEBUG.${_P})
 ${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}: ${_PROGDEBUG.${_P}} __progdebuginstall
 .if !defined(BUILD) && !make(all) && !make(${_P})
 ${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}: .MADE
 .endif
 .endif	#  defined(_PROGDEBUG.${_P})
 .endif	# MKUPDATE != no
 .endif	# !target(proginstall-${_P})					# }
 lint: lint-${_P}
 lint-${_P}: ${LOBJS.${_P}}
 .if defined(LOBJS.${_P}) && !empty(LOBJS.${_P})
 	${LINT} ${LINTFLAGS} ${_LDFLAGS.${_P}:C/-L[  ]*/-L/Wg:M-L*} ${LOBJS.${_P}} ${_LDADD.${_P}}
 .endif
 .endfor # _P in ${PROGS} ${PROGS_CXX}					# }
 .if defined(OBJS) && !empty(OBJS) && \
     (empty(PROGS) && empty(PROGS_CXX))
 CLEANFILES+= ${OBJS} ${LOBJS}
 .endif
 .if !target(proginstall)
 proginstall:: ${_PROG_INSTALL}
 .endif
 .PHONY:		proginstall
 realall: ${SCRIPTS}
 .if defined(SCRIPTS) && !target(scriptsinstall)				# {
 SCRIPTSDIR?=${BINDIR}
 SCRIPTSOWN?=${BINOWN}
 SCRIPTSGRP?=${BINGRP}
 SCRIPTSMODE?=${BINMODE}
 scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 .PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 __scriptinstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} \
 	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
 	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
 	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
 	    ${.ALLSRC} ${.TARGET}
 .for S in ${SCRIPTS:O:u}
 .if ${MKUPDATE} == "no"
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! ${S} __scriptinstall
 .if !defined(BUILD) && !make(all) && !make(${S})
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! .MADE
 .endif
 .else
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall
 .if !defined(BUILD) && !make(all) && !make(${S})
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
 .endif
 .endif
 .endfor
 .endif									# }
 .if !target(scriptsinstall)
 scriptsinstall::
 .endif
 .PHONY:		scriptsinstall
 ##### Pull in related .mk logic
 LINKSOWN?= ${BINOWN}
 LINKSGRP?= ${BINGRP}
 LINKSMODE?= ${BINMODE}
 .include <bsd.man.mk>
 .include <bsd.nls.mk>
 .include <bsd.files.mk>
 .include <bsd.inc.mk>
 .include <bsd.links.mk>
 .include <bsd.sys.mk>
 .include <bsd.dep.mk>
 .include <bsd.clang-analyze.mk>
 .include <bsd.clean.mk>
 ${TARGETS}:	# ensure existence
 .endif	# HOSTPROG

 @@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2013/02/14 21:07:25 martin Exp $
+# $NetBSD: Makefile,v 1.6 2020/10/30 08:41:58 martin Exp $
 PROG=		sqlite3
 SRCS=		shell.c
-DPADD+=		${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO}
+DPADD+=		${LIBSQLITE3} ${LIBEDIT} ${LIBTERIMINFO} ${LIBM}
-LDADD+=		-lsqlite3 -ledit -lterminfo
+LDADD+=		-lsqlite3 -ledit -lterminfo -lm
 BINDIR=		/usr/bin
 .include <bsd.prog.mk>