diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index 63424bd3dcc2..4f38ef391e4a 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -1,171 +1,170 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
 LIB=		lzma
 LZMADIR=	${SRCTOP}/contrib/xz/src/liblzma
 
 .PATH: ${LZMADIR:H}/common
 SRCS+=	tuklib_physmem.c tuklib_cpucores.c
 
 .PATH: ${LZMADIR}/api/lzma
 
 MAININCS=	../lzma.h
 MAININCSDIR=	${INCLUDEDIR}
 
 LZMAINCS+=	base.h \
 		bcj.h \
 		block.h \
 		check.h \
 		container.h \
 		delta.h \
 		filter.h \
 		hardware.h \
 		index.h \
 		index_hash.h \
 		lzma12.h \
 		stream_flags.h \
 		version.h \
 		vli.h
 
 LZMAINCSDIR=	${INCLUDEDIR}/lzma
 
 INCSGROUPS=	MAININCS LZMAINCS
 
 .PATH: ${LZMADIR}/common
 SRCS+=	common.c \
 	block_util.c \
 	easy_preset.c \
 	filter_common.c \
 	hardware_physmem.c \
 	hardware_cputhreads.c \
 	index.c \
 	stream_flags_common.c \
 	vli_size.c \
 	alone_encoder.c \
 	block_buffer_encoder.c \
 	block_encoder.c \
 	block_header_encoder.c \
 	easy_buffer_encoder.c \
 	easy_encoder.c \
 	easy_encoder_memusage.c \
 	filter_buffer_encoder.c \
 	filter_encoder.c \
 	filter_flags_encoder.c \
 	index_encoder.c \
 	stream_buffer_encoder.c \
 	stream_encoder.c \
 	stream_flags_encoder.c \
 	vli_encoder.c \
 	alone_decoder.c \
 	auto_decoder.c \
 	block_buffer_decoder.c \
 	block_decoder.c \
 	block_header_decoder.c \
 	easy_decoder_memusage.c \
 	filter_buffer_decoder.c \
 	filter_decoder.c \
 	filter_flags_decoder.c \
 	index_decoder.c \
 	index_hash.c \
 	stream_buffer_decoder.c \
 	stream_decoder.c \
 	stream_flags_decoder.c \
 	stream_encoder_mt.c \
 	vli_decoder.c \
 	outqueue.c
 
 
 .PATH: ${LZMADIR}/check
 SRCS+=	check.c \
 	crc32_table.c \
 	crc64_table.c
 .if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
 SRCS+=	crc32_x86.S \
 	crc64_x86.S
 ACFLAGS+=	-Wa,--noexecstack
 .else
 SRCS+=	crc32_fast.c \
 	crc64_fast.c
 .endif
 
 .PATH: ${LZMADIR}/lz
 SRCS+=	lz_encoder.c \
 	lz_encoder_mf.c \
 	lz_decoder.c
 
 .PATH: ${LZMADIR}/lzma
 SRCS+=	lzma_encoder.c \
 	lzma_encoder_presets.c \
 	lzma_encoder_optimum_fast.c \
 	lzma_encoder_optimum_normal.c \
 	fastpos_table.c \
 	lzma_decoder.c \
 	lzma2_encoder.c \
 	lzma2_decoder.c
 
 .PATH: ${LZMADIR}/rangecoder
 SRCS+=	price_table.c
 
 .PATH: ${LZMADIR}/delta
 SRCS+=	delta_common.c \
 	delta_encoder.c \
 	delta_decoder.c
 
 .PATH: ${LZMADIR}/simple
 SRCS+=	simple_coder.c \
 	simple_encoder.c \
 	simple_decoder.c \
 	x86.c \
 	powerpc.c \
 	ia64.c \
 	arm.c \
 	armthumb.c \
 	sparc.c
 
 .PATH: ${LZMADIR}
 
 VERSION_MAJOR!=	sed -n '/define.*LZMA_VERSION_MAJOR/{s,[^0-9.],,gp;q;}' \
 			${LZMADIR}/api/lzma/version.h
 VERSION_MINOR!=	sed -n '/define.*LZMA_VERSION_MINOR/{s,[^0-9.],,gp;q;}' \
 			${LZMADIR}/api/lzma/version.h
 VERSION_PATCH!=	sed -n '/define.*LZMA_VERSION_PATCH/{s,[^0-9.],,gp;q;}' \
 			${LZMADIR}/api/lzma/version.h
 
 WARNS?=	3
 
 CFLAGS+=	-DHAVE_CONFIG_H \
 		-DTUKLIB_SYMBOL_PREFIX=lzma_ \
 		-I${.CURDIR} \
 		-I${LZMADIR}/api \
 		-I${LZMADIR}/common \
 		-I${LZMADIR}/check \
 		-I${LZMADIR}/lz \
 		-I${LZMADIR}/rangecoder \
 		-I${LZMADIR}/lzma \
 		-I${LZMADIR}/delta \
 		-I${LZMADIR}/simple \
 		-I${LZMADIR:H}/common
 
 LIBADD+=	md pthread
 
 VERSION_DEF=	${.CURDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 CFLAGS+=	-DSYMBOL_VERSIONING
 
 CLEANFILES+=	liblzma.pc
 
-FILES=		liblzma.pc
-FILESDIR=	${LIBDATADIR}/pkgconfig
+PCFILES=	liblzma.pc
 
 liblzma.pc: liblzma.pc.in
 	sed -e 's,@prefix@,/usr,g ; \
 		s,@exec_prefix@,/usr,g ; \
 		s,@libdir@,/usr/lib,g ; \
 		s,@includedir@,/usr/include,g ; \
 		s,@LIBS@,-pthread -lmd,g ; \
 		s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
 		s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
 		s,@PTHREAD_CFLAGS@,,g ; \
 		s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index e390ff1261c6..5f967102fe02 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,92 +1,91 @@
 # $FreeBSD$
 # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009
 
 PACKAGE=lib${LIB}
 CONTRDIR=	${SRCTOP}/contrib/file
 .PATH: ${CONTRDIR}
 .PATH: ${CONTRDIR}/src
 .PATH: ${CONTRDIR}/doc
 
 LIB=	magic
 SHLIB_MAJOR=	4
 .if !make(build-tools)
 LIBADD=	z
 .endif
 MAN=	libmagic.3 magic.5
 
 SRCS=	apprentice.c apptype.c ascmagic.c buffer.c cdf.c cdf_time.c \
 	compress.c der.c encoding.c fsmagic.c funcs.c is_json.c \
 	is_csv.c \
 	is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c
 INCS=	magic.h
 
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src
 
 WARNS?=		3
 
 CLEANFILES+=	magic magic.mgc
 
 FILES=		magic magic.mgc
 FILESDIR=	${MAGICPATH}
 
 MAGFILES=	${CONTRDIR}/magic/Header \
 		${CONTRDIR}/magic/Localstuff \
 		${CONTRDIR}/magic/Magdir/[a-z]*
 
 
 PACKAGE_VERSION!=	sed -n '/define.*PACKAGE_VERSION/{s,[^0-9.],,gp;q;}' ${.CURDIR}/config.h
 
 libmagic.pc: libmagic.pc.in
 	sed -e 's,@prefix@,/usr,g ; \
 		s,@exec_prefix@,$${prefix},g ; \
 		s,@libdir@,$${exec_prefix}/lib,g ; \
 		s,@sharedlibdir@,$${libdir},g ; \
 		s,@includedir@,$${prefix}/include,g ; \
 		s,@VERSION@,${PACKAGE_VERSION},g ; \
 		s,@LIBS@,,g ;' \
                 ${.ALLSRC} > ${.TARGET}
 
 magic: ${MAGFILES}
 	cat ${.ALLSRC:O} > ${.TARGET}
 
 magic.mgc: magic
 	${BTOOLSPATH:U.}/mkmagic magic
 
 .if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no"
 CLEANFILES+=	mkmagic
 DEPENDOBJS+=	mkmagic
 build-tools: mkmagic
 mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META}
 	${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \
 	    ${.ALLSRC:N*.h:O:u} ${LDADD}
 
 .endif
 .if ${MK_DIRDEPS_BUILD} == "yes"
 BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR}
 .else
 magic.mgc: mkmagic
 .endif
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/config.h
 CLEANFILES+=	${MAN}
 .for mp in ${MAN}
 ${mp}: ${mp:C/[0-9]/man/}
 	sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \
 		-e 's/__VERSION__/${FILEVER}/g' \
 		-e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET}
 .endfor
 
 CLEANFILES+=	${INCS}
 .for inc in ${INCS}
 ${inc}: ${inc}.in
 	sed -e 's,X.YY,${FILEVER:S,",,g:S,.,,g},g' ${.ALLSRC} > ${.TARGET}
 .endfor
 
-FILES+=			libmagic.pc
-FILESDIR_libmagic.pc=	${LIBDATADIR}/pkgconfig
+PCFILES=	libmagic.pc
 
 .include <bsd.lib.mk>
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index cf263b732c35..83c9f1ade075 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -1,274 +1,273 @@
 #
 # $FreeBSD$
 #
 # Makefile for the FreeBSD specific LibUSB 2.0
 #
 
 LIB=		usb
 SHLIB_MAJOR=	3
 SHLIB_MINOR=	0
 SRCS=		libusb20.c
 SRCS+=		libusb20_desc.c
 SRCS+=		libusb20_ugen20.c
 INCS+=		libusb20.h
 INCS+=		libusb20_desc.h
 MAN=		libusb.3 libusb20.3
 MKLINT=		no
 NOGCCERROR=
 PTHREAD_LIBS?=	-lpthread
 
 WARNS?=		2
 
 LIBADD=		pthread
 
 MLINKS+=	libusb.3 usb.3
 
 # libusb 0.1 compat
 INCS+=		usb.h
 SRCS+=		libusb01.c
 
 # libusb 1.0 compat
 INCS+=		libusb.h
 SRCS+=		libusb10.c
 SRCS+=		libusb10_desc.c
 SRCS+=		libusb10_hotplug.c
 SRCS+=		libusb10_io.c
 
 .if defined(COMPAT_32BIT)
 CFLAGS+=	-DCOMPAT_32BIT
 .endif
 
-FILES=		libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
-FILESDIR=	${LIBDATADIR}/pkgconfig
+PCFILES=	libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
 
 #
 # Cross platform support
 #
 # Examples:
 # make LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h
 # make COMPAT_32BIT=YES \
 #   LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h \
 #   DEBUG_FLAGS="-g"
 #
 # From Ubuntu 10.04:
 # freebsd-make LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h \
 #    PTHREAD_LIBS="-lpthread -lrt"
 # freebsd-make COMPAT32_BIT=YES \
 #    LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h \
 #    PTHREAD_LIBS="-lpthread -lrt"
 #
 #
 .if defined(LIBUSB_GLOBAL_INCLUDE_FILE)
 CFLAGS+=	-DLIBUSB_GLOBAL_INCLUDE_FILE=\"${LIBUSB_GLOBAL_INCLUDE_FILE}\"
 CFLAGS+=	-DUSB_GLOBAL_INCLUDE_FILE=\"${LIBUSB_GLOBAL_INCLUDE_FILE}\"
 CFLAGS+=	-I ../../sys
 .endif
 
 # LibUSB v1.0
 MLINKS += libusb.3 libusb_get_version.3
 MLINKS += libusb.3 libusb_init.3
 MLINKS += libusb.3 libusb_exit.3
 MLINKS += libusb.3 libusb_has_capability.3
 MLINKS += libusb.3 libusb_strerror.3
 MLINKS += libusb.3 libusb_error_name.3
 MLINKS += libusb.3 libusb_set_debug.3
 MLINKS += libusb.3 libusb_get_device_list.3
 MLINKS += libusb.3 libusb_free_device_list.3
 MLINKS += libusb.3 libusb_get_bus_number.3
 MLINKS += libusb.3 libusb_get_port_number.3
 MLINKS += libusb.3 libusb_get_device_address.3
 MLINKS += libusb.3 libusb_get_device_speed.3
 MLINKS += libusb.3 libusb_get_max_packet_size.3
 MLINKS += libusb.3 libusb_get_max_iso_packet_size.3
 MLINKS += libusb.3 libusb_ref_device.3
 MLINKS += libusb.3 libusb_unref_device.3
 MLINKS += libusb.3 libusb_open.3
 MLINKS += libusb.3 libusb_open_device_with_vid_pid.3
 MLINKS += libusb.3 libusb_close.3
 MLINKS += libusb.3 libusb_get_device.3
 MLINKS += libusb.3 libusb_get_configuration.3
 MLINKS += libusb.3 libusb_set_configuration.3
 MLINKS += libusb.3 libusb_claim_interface.3
 MLINKS += libusb.3 libusb_release_interface.3
 MLINKS += libusb.3 libusb_set_interface_alt_setting.3
 MLINKS += libusb.3 libusb_clear_halt.3
 MLINKS += libusb.3 libusb_reset_device.3
 MLINKS += libusb.3 libusb_check_connected.3
 MLINKS += libusb.3 libusb_kernel_driver_active.3
 MLINKS += libusb.3 libusb_get_driver.3
 MLINKS += libusb.3 libusb_get_driver_np.3
 MLINKS += libusb.3 libusb_detach_kernel_driver.3
 MLINKS += libusb.3 libusb_detach_kernel_driver_np.3
 MLINKS += libusb.3 libusb_attach_kernel_driver.3
 MLINKS += libusb.3 libusb_set_auto_detach_kernel_driver.3
 MLINKS += libusb.3 libusb_get_device_descriptor.3
 MLINKS += libusb.3 libusb_get_active_config_descriptor.3
 MLINKS += libusb.3 libusb_get_config_descriptor.3
 MLINKS += libusb.3 libusb_get_config_descriptor_by_value.3
 MLINKS += libusb.3 libusb_free_config_descriptor.3
 MLINKS += libusb.3 libusb_get_string_descriptor.3
 MLINKS += libusb.3 libusb_get_string_descriptor_ascii.3
 MLINKS += libusb.3 libusb_parse_ss_endpoint_comp.3
 MLINKS += libusb.3 libusb_free_ss_endpoint_comp.3
 MLINKS += libusb.3 libusb_get_ss_endpoint_companion_descriptor.3
 MLINKS += libusb.3 libusb_free_ss_endpoint_companion_descriptor.3
 MLINKS += libusb.3 libusb_parse_bos_descriptor.3
 MLINKS += libusb.3 libusb_free_bos_descriptor.3
 MLINKS += libusb.3 libusb_get_usb_2_0_extension_descriptor.3
 MLINKS += libusb.3 libusb_free_usb_2_0_extension_descriptor.3
 MLINKS += libusb.3 libusb_get_ss_usb_device_capability_descriptor.3
 MLINKS += libusb.3 libusb_free_ss_usb_device_capability_descriptor.3
 MLINKS += libusb.3 libusb_get_container_id_descriptor.3
 MLINKS += libusb.3 libusb_free_container_id_descriptor.3
 MLINKS += libusb.3 libusb_alloc_streams.3
 MLINKS += libusb.3 libusb_free_streams.3
 MLINKS += libusb.3 libusb_alloc_transfer.3
 MLINKS += libusb.3 libusb_free_transfer.3
 MLINKS += libusb.3 libusb_transfer_set_stream_id.3
 MLINKS += libusb.3 libusb_transfer_get_stream_id.3
 MLINKS += libusb.3 libusb_submit_transfer.3
 MLINKS += libusb.3 libusb_cancel_transfer.3
 MLINKS += libusb.3 libusb_control_transfer.3
 MLINKS += libusb.3 libusb_bulk_transfer.3
 MLINKS += libusb.3 libusb_interrupt_transfer.3
 MLINKS += libusb.3 libusb_try_lock_events.3
 MLINKS += libusb.3 libusb_lock_events.3
 MLINKS += libusb.3 libusb_unlock_events.3
 MLINKS += libusb.3 libusb_event_handling_ok.3
 MLINKS += libusb.3 libusb_event_handler_active.3
 MLINKS += libusb.3 libusb_lock_event_waiters.3
 MLINKS += libusb.3 libusb_unlock_event_waiters.3
 MLINKS += libusb.3 libusb_wait_for_event.3
 MLINKS += libusb.3 libusb_handle_events_timeout_completed.3
 MLINKS += libusb.3 libusb_handle_events_completed.3
 MLINKS += libusb.3 libusb_handle_events_timeout.3
 MLINKS += libusb.3 libusb_handle_events.3
 MLINKS += libusb.3 libusb_handle_events_locked.3
 MLINKS += libusb.3 libusb_get_next_timeout.3
 MLINKS += libusb.3 libusb_set_pollfd_notifiers.3
 MLINKS += libusb.3 libusb_get_pollfds.3
 MLINKS += libusb.3 libusb_hotplug_register_callback.3
 MLINKS += libusb.3 libusb_hotplug_deregister_callback.3
 
 # LibUSB v0.1
 MLINKS += libusb.3 usb_open.3
 MLINKS += libusb.3 usb_close.3
 MLINKS += libusb.3 usb_get_string.3
 MLINKS += libusb.3 usb_get_string_simple.3
 MLINKS += libusb.3 usb_get_descriptor_by_endpoint.3
 MLINKS += libusb.3 usb_get_descriptor.3
 MLINKS += libusb.3 usb_parse_descriptor.3
 MLINKS += libusb.3 usb_parse_configuration.3
 MLINKS += libusb.3 usb_destroy_configuration.3
 MLINKS += libusb.3 usb_fetch_and_parse_descriptors.3
 MLINKS += libusb.3 usb_bulk_write.3
 MLINKS += libusb.3 usb_bulk_read.3
 MLINKS += libusb.3 usb_interrupt_write.3
 MLINKS += libusb.3 usb_interrupt_read.3
 MLINKS += libusb.3 usb_control_msg.3
 MLINKS += libusb.3 usb_set_configuration.3
 MLINKS += libusb.3 usb_claim_interface.3
 MLINKS += libusb.3 usb_release_interface.3
 MLINKS += libusb.3 usb_set_altinterface.3
 MLINKS += libusb.3 usb_resetep.3
 MLINKS += libusb.3 usb_clear_halt.3
 MLINKS += libusb.3 usb_reset.3
 MLINKS += libusb.3 usb_strerror.3
 MLINKS += libusb.3 usb_init.3
 MLINKS += libusb.3 usb_set_debug.3
 MLINKS += libusb.3 usb_find_busses.3
 MLINKS += libusb.3 usb_find_devices.3
 MLINKS += libusb.3 usb_device.3
 MLINKS += libusb.3 usb_get_busses.3
 MLINKS += libusb.3 usb_check_connected.3
 
 # LibUSB v2.0
 MLINKS += libusb20.3 libusb20_tr_close.3
 MLINKS += libusb20.3 libusb20_tr_open.3
 MLINKS += libusb20.3 libusb20_tr_get_pointer.3
 MLINKS += libusb20.3 libusb20_tr_get_time_complete.3
 MLINKS += libusb20.3 libusb20_tr_get_actual_frames.3
 MLINKS += libusb20.3 libusb20_tr_get_actual_length.3
 MLINKS += libusb20.3 libusb20_tr_get_max_frames.3
 MLINKS += libusb20.3 libusb20_tr_get_max_packet_length.3
 MLINKS += libusb20.3 libusb20_tr_get_max_total_length.3
 MLINKS += libusb20.3 libusb20_tr_get_status.3
 MLINKS += libusb20.3 libusb20_tr_pending.3
 MLINKS += libusb20.3 libusb20_tr_callback_wrapper.3
 MLINKS += libusb20.3 libusb20_tr_clear_stall_sync.3
 MLINKS += libusb20.3 libusb20_tr_drain.3
 MLINKS += libusb20.3 libusb20_tr_set_buffer.3
 MLINKS += libusb20.3 libusb20_tr_set_callback.3
 MLINKS += libusb20.3 libusb20_tr_set_flags.3
 MLINKS += libusb20.3 libusb20_tr_get_length.3
 MLINKS += libusb20.3 libusb20_tr_set_length.3
 MLINKS += libusb20.3 libusb20_tr_set_priv_sc0.3
 MLINKS += libusb20.3 libusb20_tr_set_priv_sc1.3
 MLINKS += libusb20.3 libusb20_tr_set_timeout.3
 MLINKS += libusb20.3 libusb20_tr_set_total_frames.3
 MLINKS += libusb20.3 libusb20_tr_setup_bulk.3
 MLINKS += libusb20.3 libusb20_tr_setup_control.3
 MLINKS += libusb20.3 libusb20_tr_setup_intr.3
 MLINKS += libusb20.3 libusb20_tr_setup_isoc.3
 MLINKS += libusb20.3 libusb20_tr_bulk_intr_sync.3
 MLINKS += libusb20.3 libusb20_tr_start.3
 MLINKS += libusb20.3 libusb20_tr_stop.3
 MLINKS += libusb20.3 libusb20_tr_submit.3
 MLINKS += libusb20.3 libusb20_tr_get_priv_sc0.3
 MLINKS += libusb20.3 libusb20_tr_get_priv_sc1.3
 MLINKS += libusb20.3 libusb20_dev_get_backend_name.3
 MLINKS += libusb20.3 libusb20_dev_get_info.3
 MLINKS += libusb20.3 libusb20_dev_get_iface_desc.3
 MLINKS += libusb20.3 libusb20_dev_get_desc.3
 MLINKS += libusb20.3 libusb20_dev_get_stats.3
 MLINKS += libusb20.3 libusb20_dev_close.3
 MLINKS += libusb20.3 libusb20_dev_detach_kernel_driver.3
 MLINKS += libusb20.3 libusb20_dev_set_config_index.3
 MLINKS += libusb20.3 libusb20_dev_get_debug.3
 MLINKS += libusb20.3 libusb20_dev_get_fd.3
 MLINKS += libusb20.3 libusb20_dev_kernel_driver_active.3
 MLINKS += libusb20.3 libusb20_dev_open.3
 MLINKS += libusb20.3 libusb20_dev_process.3
 MLINKS += libusb20.3 libusb20_dev_request_sync.3
 MLINKS += libusb20.3 libusb20_dev_req_string_sync.3
 MLINKS += libusb20.3 libusb20_dev_req_string_simple_sync.3
 MLINKS += libusb20.3 libusb20_dev_reset.3
 MLINKS += libusb20.3 libusb20_dev_check_connected.3
 MLINKS += libusb20.3 libusb20_dev_set_power_mode.3
 MLINKS += libusb20.3 libusb20_dev_get_power_mode.3
 MLINKS += libusb20.3 libusb20_dev_get_port_path.3
 MLINKS += libusb20.3 libusb20_dev_get_power_usage.3
 MLINKS += libusb20.3 libusb20_dev_set_alt_index.3
 MLINKS += libusb20.3 libusb20_dev_get_device_desc.3
 MLINKS += libusb20.3 libusb20_dev_alloc_config.3
 MLINKS += libusb20.3 libusb20_dev_alloc.3
 MLINKS += libusb20.3 libusb20_dev_get_address.3
 MLINKS += libusb20.3 libusb20_dev_get_parent_address.3
 MLINKS += libusb20.3 libusb20_dev_get_parent_port.3
 MLINKS += libusb20.3 libusb20_dev_get_bus_number.3
 MLINKS += libusb20.3 libusb20_dev_get_mode.3
 MLINKS += libusb20.3 libusb20_dev_get_speed.3
 MLINKS += libusb20.3 libusb20_dev_get_config_index.3
 MLINKS += libusb20.3 libusb20_dev_free.3
 MLINKS += libusb20.3 libusb20_dev_set_debug.3
 MLINKS += libusb20.3 libusb20_dev_wait_process.3
 MLINKS += libusb20.3 libusb20_be_get_template.3
 MLINKS += libusb20.3 libusb20_be_set_template.3
 MLINKS += libusb20.3 libusb20_be_get_dev_quirk.3
 MLINKS += libusb20.3 libusb20_be_get_quirk_name.3
 MLINKS += libusb20.3 libusb20_be_add_dev_quirk.3
 MLINKS += libusb20.3 libusb20_be_remove_dev_quirk.3
 MLINKS += libusb20.3 libusb20_be_alloc_default.3
 MLINKS += libusb20.3 libusb20_be_device_foreach.3
 MLINKS += libusb20.3 libusb20_be_dequeue_device.3
 MLINKS += libusb20.3 libusb20_be_enqueue_device.3
 MLINKS += libusb20.3 libusb20_be_free.3
 MLINKS += libusb20.3 libusb20_me_get_1.3
 MLINKS += libusb20.3 libusb20_me_get_2.3
 MLINKS += libusb20.3 libusb20_me_encode.3
 MLINKS += libusb20.3 libusb20_me_decode.3
 MLINKS += libusb20.3 libusb20_desc_foreach.3
 MLINKS += libusb20.3 libusb20_strerror.3
 MLINKS += libusb20.3 libusb20_error_name.3
 
 .include <bsd.lib.mk>
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 48e57ccc2a1a..4ece3e3e059f 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,81 +1,80 @@
 #
 # $FreeBSD$
 #
 
 PACKAGE=	runtime
 LIB=		z
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6
 MAN=		zlib.3 zopen.3
 MLINKS+=	zopen.3 zdopen.3
 
 ZLIBSRC=	${SRCTOP}/sys/contrib/zlib
 
 .PATH:		${ZLIBSRC}
 
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DDEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 #           -Wstrict-prototypes -Wmissing-prototypes
 
 CFLAGS+=	-DHAS_snprintf -DHAS_vsnprintf -I${.CURDIR}
 
 WARNS?=		3
 
 CLEANFILES+=	example.o example foo.gz minigzip.o minigzip
 
 SRCS+=		adler32.c
 SRCS+=		compress.c
 SRCS+=		crc32.c
 SRCS+=		deflate.c
 SRCS+=		gzclose.c
 SRCS+=		gzlib.c
 SRCS+=		gzread.c
 SRCS+=		gzwrite.c
 SRCS+=		infback.c
 SRCS+=		inffast.c
 SRCS+=		inflate.c
 SRCS+=		inftrees.c
 SRCS+=		trees.c
 SRCS+=		uncompr.c
 SRCS+=		zopen.c
 SRCS+=		zutil.c
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-DUNALIGNED_OK
 .endif
 
 VERSION_DEF=	${.CURDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 CFLAGS+=	-DSYMBOL_VERSIONING
 
 INCS=		zconf.h zlib.h
 
 .PATH:		${ZLIBSRC}/test
 
 ZLIB_VERSION!=	sed -n '/define.*ZLIB_VERSION/{s,[^0-9.],,gp;q;}' ${ZLIBSRC}/zlib.h
 
 zlib.pc: zlib.pc.in
 	sed -e 's,@prefix@,/usr,g ; \
 		s,@exec_prefix@,$${prefix},g ; \
 		s,@libdir@,$${exec_prefix}/lib,g ; \
 		s,@sharedlibdir@,$${libdir},g ; \
 		s,@includedir@,$${prefix}/include,g ; \
 		s,@VERSION@,${ZLIB_VERSION},g ;' \
 		${.ALLSRC} > ${.TARGET}
 
 minigzip:	all minigzip.o
 	$(CC) -o minigzip minigzip.o -L. -lz
 
 example:	all example.o
 	$(CC) -o example example.o -L. -lz
 
 test: example minigzip
 	(export LD_LIBRARY_PATH=. ; ./example )
 	(export LD_LIBRARY_PATH=. ; \
 		echo hello world | ./minigzip | ./minigzip -d )
 
-FILES=		zlib.pc
-FILESDIR=	${LIBDATADIR}/pkgconfig
+PCFILES=	zlib.pc
 
 .include <bsd.lib.mk>