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:		Sat May 23 20:45:41 2020 +0200
Changeset:	a6d998003b151a85f08ee499774581397156c27d

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=a6d998003b151a85f08ee499774581397156c27d

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

diffstat:
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 420966e49c..cb5e618a58 100644
--- a/Makefile
+++ b/Makefile
@@ -842,7 +842,6 @@ SUBDIR+=	fontaine
 SUBDIR+=	fonttosfnt
 SUBDIR+=	foxtrotgps
 SUBDIR+=	fpc
-SUBDIR+=	fplll
 SUBDIR+=	fprobe
 SUBDIR+=	fragrouter
 SUBDIR+=	free42
@@ -1010,7 +1009,6 @@ SUBDIR+=	gauche-dbd-pg
 SUBDIR+=	gauche-fastcgi
 SUBDIR+=	gauche-pib
 SUBDIR+=	gcalcli-git
-SUBDIR+=	gcc10-libatomic
 SUBDIR+=	gcc10snapshot
 SUBDIR+=	gcc42
 SUBDIR+=	gcc43
@@ -1680,6 +1678,7 @@ SUBDIR+=	json2tsv-git
 SUBDIR+=	jsoncpp-git
 SUBDIR+=	judy
 SUBDIR+=	julia
+SUBDIR+=	julius
 SUBDIR+=	junit
 SUBDIR+=	jupp
 SUBDIR+=	jython
@@ -1762,6 +1761,7 @@ SUBDIR+=	ldapuseradd
 SUBDIR+=	ldc
 SUBDIR+=	ldc-git
 SUBDIR+=	ldc017
+SUBDIR+=	ldc120
 SUBDIR+=	lde
 SUBDIR+=	ldtp
 SUBDIR+=	leo
@@ -1957,6 +1957,7 @@ SUBDIR+=	libuna
 SUBDIR+=	libunibilium
 SUBDIR+=	libunwind-git
 SUBDIR+=	libusbmuxd
+SUBDIR+=	libv4l
 SUBDIR+=	libvalhalla
 SUBDIR+=	libvc
 SUBDIR+=	libvg
@@ -2215,7 +2216,6 @@ SUBDIR+=	mp3chop
 SUBDIR+=	mpb
 SUBDIR+=	mpb-openmpi
 SUBDIR+=	mpc-el
-SUBDIR+=	mpfi
 SUBDIR+=	mpg123-jack
 SUBDIR+=	mpg123-svn
 SUBDIR+=	mpgedit
@@ -2263,6 +2263,7 @@ SUBDIR+=	munin-common
 SUBDIR+=	munin-master
 SUBDIR+=	munin-node
 SUBDIR+=	muparser
+SUBDIR+=	mupen64
 SUBDIR+=	mupen64plus
 SUBDIR+=	mupen64plus-extraplugins
 SUBDIR+=	muscle
@@ -2464,7 +2465,6 @@ SUBDIR+=	openfodder
 SUBDIR+=	openfodder-data
 SUBDIR+=	opengrok
 SUBDIR+=	openh264
-SUBDIR+=	openhexagon
 SUBDIR+=	openjazz
 SUBDIR+=	openjdk8-openjfx-hg
 SUBDIR+=	openlogos
@@ -3290,6 +3290,7 @@ SUBDIR+=	py-digraphtools
 SUBDIR+=	py-dill
 SUBDIR+=	py-dimarray
 SUBDIR+=	py-diofant
+SUBDIR+=	py-distlib
 SUBDIR+=	py-distob
 SUBDIR+=	py-distutils-extra
 SUBDIR+=	py-divisi2
@@ -4112,6 +4113,7 @@ SUBDIR+=	py-version-control-tools-hg
 SUBDIR+=	py-vespa
 SUBDIR+=	py-viper
 SUBDIR+=	py-virtualenv-clone
+SUBDIR+=	py-virtualenv20
 SUBDIR+=	py-visionegg
 SUBDIR+=	py-visionegg-contrib
 SUBDIR+=	py-visionegg-demos
@@ -4530,7 +4532,6 @@ SUBDIR+=	softether
 SUBDIR+=	softflowd
 SUBDIR+=	soil
 SUBDIR+=	solarus-zsdx
-SUBDIR+=	sollya
 SUBDIR+=	solvespace-git
 SUBDIR+=	songwrite2
 SUBDIR+=	sonic-visualiser
@@ -4582,6 +4583,7 @@ SUBDIR+=	stmd-git
 SUBDIR+=	stmpclean
 SUBDIR+=	stonx
 SUBDIR+=	stormlib
+SUBDIR+=	stracciatella
 SUBDIR+=	stratagus
 SUBDIR+=	stress
 SUBDIR+=	stress-ng