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:		Sun Jun 24 12:00:14 2018 +0200
Changeset:	c1b099a14a1e7b58e88c406388a3be99671676a3

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

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, 13 insertions(+), 4 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 97fe4f940c..61518e896d 100644
--- a/Makefile
+++ b/Makefile
@@ -364,9 +364,12 @@ SUBDIR+=	chrsh
 SUBDIR+=	chruby
 SUBDIR+=	cinelerra
 SUBDIR+=	cinelerra-git
+SUBDIR+=	cinnamon
+SUBDIR+=	cinnamon-control-center
 SUBDIR+=	cinnamon-desktop
 SUBDIR+=	cinnamon-menus
-SUBDIR+=	cinnamon-nemo
+SUBDIR+=	cinnamon-screensaver
+SUBDIR+=	cinnamon-session
 SUBDIR+=	cinnamon-settings-daemon
 SUBDIR+=	ciwiki
 SUBDIR+=	cjs
@@ -668,6 +671,7 @@ SUBDIR+=	emacs-nox11-git
 SUBDIR+=	emacs-pr-el
 SUBDIR+=	emacs-session
 SUBDIR+=	emacs-w3m-cvs
+SUBDIR+=	emacs26
 SUBDIR+=	emboss
 SUBDIR+=	emboss-base
 SUBDIR+=	emboss-domainatrix
@@ -889,6 +893,7 @@ SUBDIR+=	gdb5
 SUBDIR+=	gdb6
 SUBDIR+=	gde
 SUBDIR+=	gdm
+SUBDIR+=	gdsreader
 SUBDIR+=	geant
 SUBDIR+=	gecko-sharp
 SUBDIR+=	gecode
@@ -2084,6 +2089,7 @@ SUBDIR+=	mtrack
 SUBDIR+=	mu
 SUBDIR+=	mu-cite
 SUBDIR+=	mudlet-301
+SUBDIR+=	muffin
 SUBDIR+=	muine
 SUBDIR+=	mule11
 SUBDIR+=	multichoose
@@ -3253,9 +3259,7 @@ SUBDIR+=	py-hidapi-git
 SUBDIR+=	py-hieroglyph
 SUBDIR+=	py-hiredis
 SUBDIR+=	py-hmf
-SUBDIR+=	py-holoviews
 SUBDIR+=	py-honcho
-SUBDIR+=	py-hope
 SUBDIR+=	py-hostlist
 SUBDIR+=	py-html
 SUBDIR+=	py-htmlparser
@@ -3275,7 +3279,6 @@ SUBDIR+=	py-imread
 SUBDIR+=	py-imreg-dft
 SUBDIR+=	py-inspyred
 SUBDIR+=	py-instant
-SUBDIR+=	py-ioflo
 SUBDIR+=	py-ionize
 SUBDIR+=	py-iprogress
 SUBDIR+=	py-ipython-sql
@@ -3295,6 +3298,7 @@ SUBDIR+=	py-jitcode
 SUBDIR+=	py-joblib
 SUBDIR+=	py-jokosher
 SUBDIR+=	py-jsonpath
+SUBDIR+=	py-jsonpickle
 SUBDIR+=	py-jsonrequester
 SUBDIR+=	py-jsonschema
 SUBDIR+=	py-jswebkit
@@ -3493,6 +3497,7 @@ SUBDIR+=	py-p4
 SUBDIR+=	py-paegan
 SUBDIR+=	py-pafy
 SUBDIR+=	py-paida
+SUBDIR+=	py-pam
 SUBDIR+=	py-papy
 SUBDIR+=	py-papyon
 SUBDIR+=	py-papyros
@@ -3833,6 +3838,7 @@ SUBDIR+=	py-ua-parser
 SUBDIR+=	py-ufl
 SUBDIR+=	py-umalqurra
 SUBDIR+=	py-uncertainties
+SUBDIR+=	py-undebt
 SUBDIR+=	py-unidiff
 SUBDIR+=	py-unpaddedbase64
 SUBDIR+=	py-upsilon
@@ -3894,6 +3900,7 @@ SUBDIR+=	py-wqio
 SUBDIR+=	py-wsgi-intercept
 SUBDIR+=	py-wsgiref
 SUBDIR+=	py-wxWidgets-unicode
+SUBDIR+=	py-xapp
 SUBDIR+=	py-xarray
 SUBDIR+=	py-xcal-raman
 SUBDIR+=	py-xcffib
@@ -4322,6 +4329,7 @@ SUBDIR+=	synfig
 SUBDIR+=	synfigstudio
 SUBDIR+=	sysklogd
 SUBDIR+=	sysstat
+SUBDIR+=	system-config-printer
 SUBDIR+=	system-tools-backends
 SUBDIR+=	systemsettings
 SUBDIR+=	sysvinit
@@ -4637,6 +4645,7 @@ SUBDIR+=	wxmaxima-git
 SUBDIR+=	xace
 SUBDIR+=	xalan-c
 SUBDIR+=	xalan-c-1.10
+SUBDIR+=	xapps
 SUBDIR+=	xar
 SUBDIR+=	xaralx-bin
 SUBDIR+=	xbase