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 Dec 23 20:14:41 2017 +0100
Changeset:	b644a443502de991c818fb0f23bc40da5eeed269

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

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

diffstat:
 Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 302df60560..202aa89c0f 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ SUBDIR+=	arphic-ukai-ttf
 SUBDIR+=	arphic-uming-ttf
 SUBDIR+=	artemis
 SUBDIR+=	ascii2binary
+SUBDIR+=	aslc86k
 SUBDIR+=	aspell-dictionaries
 SUBDIR+=	asql
 SUBDIR+=	assimp
@@ -414,8 +415,8 @@ SUBDIR+=	coldfire
 SUBDIR+=	collectd-CGP
 SUBDIR+=	collectd-haproxy
 SUBDIR+=	collectd-redis
-SUBDIR+=	collectd-web
 SUBDIR+=	collectd-unbound
+SUBDIR+=	collectd-web
 SUBDIR+=	colord
 SUBDIR+=	colord-gtk
 SUBDIR+=	colorfull
@@ -889,6 +890,7 @@ SUBDIR+=	ganglia-monitor-core
 SUBDIR+=	ganglia-monitor-core319
 SUBDIR+=	ganglia-web
 SUBDIR+=	gappa
+SUBDIR+=	garden
 SUBDIR+=	gat
 SUBDIR+=	gauche-dbd-pg
 SUBDIR+=	gauche-fastcgi
@@ -1394,8 +1396,8 @@ SUBDIR+=	hs-xmobar
 SUBDIR+=	hs-yaml
 SUBDIR+=	hs-zip-archive
 SUBDIR+=	ht2html
-SUBDIR+=	html2latex
 SUBDIR+=	html-xml-utils
+SUBDIR+=	html2latex
 SUBDIR+=	htslib
 SUBDIR+=	httrack
 SUBDIR+=	hu-go
@@ -1929,7 +1931,6 @@ SUBDIR+=	mac-icon-standard
 SUBDIR+=	mac-robber
 SUBDIR+=	macaulay2
 SUBDIR+=	mackerel-agent
-SUBDIR+=	macro11
 SUBDIR+=	magit-git
 SUBDIR+=	mago
 SUBDIR+=	mailfilter
@@ -2300,6 +2301,7 @@ SUBDIR+=	osmo
 SUBDIR+=	osmo-sdr-git
 SUBDIR+=	osmose
 SUBDIR+=	osxinfo
+SUBDIR+=	otptool
 SUBDIR+=	otrtool
 SUBDIR+=	ots
 SUBDIR+=	outguess
@@ -2474,6 +2476,7 @@ SUBDIR+=	p5-Plucene
 SUBDIR+=	p5-Plucene-Plugin-Analyzer-SnowballAnalyzer
 SUBDIR+=	p5-PluceneSimple
 SUBDIR+=	p5-Pod-Constants
+SUBDIR+=	p5-Pod-Usage
 SUBDIR+=	p5-Pod-Xhtml
 SUBDIR+=	p5-Proc-Fork
 SUBDIR+=	p5-RPC-PlClient
@@ -4047,6 +4050,7 @@ SUBDIR+=	scr2png
 SUBDIR+=	scratchpad
 SUBDIR+=	scrc
 SUBDIR+=	scsh-install-lib
+SUBDIR+=	scummvm-bass
 SUBDIR+=	scummvm-git
 SUBDIR+=	scx
 SUBDIR+=	scythe
@@ -4302,14 +4306,14 @@ SUBDIR+=	tex-arabxtex-doc
 SUBDIR+=	tex-attachfile-doc
 SUBDIR+=	tex-breqn-doc
 SUBDIR+=	tex-fancyref-doc
+SUBDIR+=	tex-fvextra
+SUBDIR+=	tex-fvextra-doc
 SUBDIR+=	tex-lineno-doc
 SUBDIR+=	tex-mathtools-doc
 SUBDIR+=	tex-pagenote
 SUBDIR+=	tex-pagenote-doc
 SUBDIR+=	tex-relsize-doc
 SUBDIR+=	tex-setspace-doc
-SUBDIR+=	tex-fvextra
-SUBDIR+=	tex-fvextra-doc
 SUBDIR+=	texlive
 SUBDIR+=	texlive-bin
 SUBDIR+=	texlive-texmf-base
@@ -4424,7 +4428,6 @@ SUBDIR+=	ufc
 SUBDIR+=	uffizi
 SUBDIR+=	uget
 SUBDIR+=	uhd-git
-SUBDIR+=	ukncbtl-git
 SUBDIR+=	umix
 SUBDIR+=	umurmur
 SUBDIR+=	unagi