Makefile: sync

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Nov 6 16:40:29 2019 +0100
Changeset:	19b0ce2dba6b6c9000850b8a73a6506dad71dbd1

Modified Files:
	Makefile

Log Message:
Makefile: sync

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=19b0ce2dba6b6c9000850b8a73a6506dad71dbd1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 9c1ae69688..f5059e9c70 100644
--- a/Makefile
+++ b/Makefile
@@ -420,7 +420,6 @@ SUBDIR+=	cl-trivial-gray-streams
 SUBDIR+=	cl-unicode
 SUBDIR+=	cl-who
 SUBDIR+=	clamassassin
-SUBDIR+=	clang-netbsd
 SUBDIR+=	clasp
 SUBDIR+=	classgen
 SUBDIR+=	classic-mac-font-pack
@@ -1123,7 +1122,6 @@ SUBDIR+=	gnocchi
 SUBDIR+=	gnochm
 SUBDIR+=	gnokii
 SUBDIR+=	gnomad2
-SUBDIR+=	gnome-activity-journal
 SUBDIR+=	gnome-applets
 SUBDIR+=	gnome-apps
 SUBDIR+=	gnome-backgrounds
@@ -1659,6 +1657,7 @@ SUBDIR+=	itools
 SUBDIR+=	ja-freewnn-cvs
 SUBDIR+=	ja-ptex
 #SUBDIR+=	jabberd			# not a real package
+SUBDIR+=	jabberd14
 SUBDIR+=	jabref
 SUBDIR+=	jabref3
 SUBDIR+=	jacorb-lib
@@ -1875,6 +1874,7 @@ SUBDIR+=	libdoozer
 SUBDIR+=	libdrm-dfbsd
 SUBDIR+=	libdrm-dfbsd-meson
 SUBDIR+=	libdssialsacompat
+SUBDIR+=	libdxfrw
 SUBDIR+=	libecc
 SUBDIR+=	libechonest
 SUBDIR+=	libee
@@ -1964,6 +1964,7 @@ SUBDIR+=	libopenshot-audio
 SUBDIR+=	libopensync-dev
 SUBDIR+=	libopensync-plugin-moto
 SUBDIR+=	libopensync-plugin-palm
+SUBDIR+=	libosinfo
 SUBDIR+=	libosmocore
 SUBDIR+=	libowl-av
 SUBDIR+=	libpafe
@@ -1985,7 +1986,6 @@ SUBDIR+=	libre
 SUBDIR+=	librem
 SUBDIR+=	libreoffice-git
 SUBDIR+=	libretro-4do
-SUBDIR+=	libsoinfo
 SUBDIR+=	libretro-beetle-lynx
 SUBDIR+=	libretro-citra
 SUBDIR+=	libretro-fmsx
@@ -2077,10 +2077,9 @@ SUBDIR+=	litecoin
 SUBDIR+=	litehtml
 SUBDIR+=	lives
 SUBDIR+=	lizardfs
-SUBDIR+=	lld-netbsd
-SUBDIR+=	llgo-git
 SUBDIR+=	llilc-git
 SUBDIR+=	llvm-dfbsd
+SUBDIR+=	llvm-project-netbsd
 SUBDIR+=	lmdbg-current
 SUBDIR+=	lmod
 SUBDIR+=	lnd
@@ -2129,6 +2128,7 @@ SUBDIR+=	lxqt-powermanagement
 SUBDIR+=	lxqt-qtplugin
 SUBDIR+=	lxqt-runner
 SUBDIR+=	lxqt-session
+SUBDIR+=	lzlib
 SUBDIR+=	lzs-lkm
 SUBDIR+=	m4ri
 SUBDIR+=	mac-icon-standard
@@ -2185,7 +2185,7 @@ SUBDIR+=	meka-git
 SUBDIR+=	memdump
 SUBDIR+=	memgrep
 SUBDIR+=	menumaker
-SUBDIR+=	merkaator
+SUBDIR+=	merkaartor
 SUBDIR+=	mes-nyacc
 SUBDIR+=	mescc-tools
 SUBDIR+=	meta-tracker
@@ -3133,6 +3133,7 @@ SUBDIR+=	py-amqpipe
 SUBDIR+=	py-amqplib
 SUBDIR+=	py-ana
 SUBDIR+=	py-anfft
+SUBDIR+=	py-anki2
 SUBDIR+=	py-anki2-devel
 SUBDIR+=	py-annarchy
 SUBDIR+=	py-antlr3
@@ -3187,6 +3188,7 @@ SUBDIR+=	py-biskit
 SUBDIR+=	py-bitarray
 SUBDIR+=	py-bitsets
 SUBDIR+=	py-bitstring
+SUBDIR+=	py-black
 SUBDIR+=	py-blaze
 SUBDIR+=	py-blist
 SUBDIR+=	py-blosc
@@ -3595,6 +3597,7 @@ SUBDIR+=	py-kubernetes
 SUBDIR+=	py-lapack
 SUBDIR+=	py-larlib
 SUBDIR+=	py-larry
+SUBDIR+=	py-launchpadlib
 SUBDIR+=	py-lazr.restfulclient
 SUBDIR+=	py-lazr.uri
 SUBDIR+=	py-lds
@@ -3641,6 +3644,7 @@ SUBDIR+=	py-mahotas
 SUBDIR+=	py-mailcap-fix
 SUBDIR+=	py-mailingstats
 SUBDIR+=	py-mailq
+SUBDIR+=	py-mapcode
 SUBDIR+=	py-mapy-package
 SUBDIR+=	py-mark
 SUBDIR+=	py-markovchain
@@ -4250,7 +4254,6 @@ SUBDIR+=	qt4-gstreamer
 SUBDIR+=	qt4-libqtlua
 SUBDIR+=	qt5-libqtlua
 SUBDIR+=	qt5-qjson
-SUBDIR+=	qt5-qscintilla
 SUBDIR+=	qt5-qtbase-git
 SUBDIR+=	qt5-qtwebengine
 SUBDIR+=	qtaccountsservice