Makefile: Sync.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Oct 4 14:48:34 2015 +0200
Changeset:	106f5ad6f2fbe35b05d5f03d69e2f1c6642c869c

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=106f5ad6f2fbe35b05d5f03d69e2f1c6642c869c

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

diffstat:
 Makefile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index d8df376..0f03933 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ SUBDIR+=	389-ds-base
 SUBDIR+=	Bear
 SUBDIR+=	Chinput
 SUBDIR+=	ETL
+SUBDIR+=	FLIF
 SUBDIR+=	FontManager
 SUBDIR+=	GNUMail-pgp
 SUBDIR+=	GSCommander
@@ -287,9 +288,9 @@ SUBDIR+=	castget
 SUBDIR+=	cataclysm-dda
 SUBDIR+=	cb2bib
 SUBDIR+=	ccrypt
-SUBDIR+=	cd-hit
 SUBDIR+=	cddlib
 SUBDIR+=	cde
+SUBDIR+=	cdhit
 SUBDIR+=	cdogs
 SUBDIR+=	cdpr
 SUBDIR+=	cedet
@@ -428,7 +429,6 @@ SUBDIR+=	davical-current
 SUBDIR+=	db1
 SUBDIR+=	dbf
 SUBDIR+=	dbus-explorer
-SUBDIR+=	dcc
 SUBDIR+=	ddate
 SUBDIR+=	deadbeef
 SUBDIR+=	debian_base
@@ -2547,6 +2547,7 @@ SUBDIR+=	py-async
 SUBDIR+=	py-atmark
 SUBDIR+=	py-atmos
 SUBDIR+=	py-atom
+SUBDIR+=	py-atomicfile
 SUBDIR+=	py-atpy
 SUBDIR+=	py-automata
 SUBDIR+=	py-baron
@@ -2624,12 +2625,15 @@ SUBDIR+=	py-colorpy
 SUBDIR+=	py-complexsystems
 SUBDIR+=	py-concepts
 SUBDIR+=	py-conda
+SUBDIR+=	py-conda-env
 SUBDIR+=	py-consensus
 SUBDIR+=	py-constraint
 SUBDIR+=	py-construct
 SUBDIR+=	py-control
 SUBDIR+=	py-cookiecutter
+SUBDIR+=	py-corpus
 SUBDIR+=	py-corrfitter
+SUBDIR+=	py-cosat
 SUBDIR+=	py-cosmolopy
 SUBDIR+=	py-coveralls
 SUBDIR+=	py-cracklib
@@ -2975,6 +2979,8 @@ SUBDIR+=	py-oasa
 SUBDIR+=	py-ocrodjvu
 SUBDIR+=	py-oct2py
 SUBDIR+=	py-ode
+SUBDIR+=	py-odeint
+SUBDIR+=	py-odesys
 SUBDIR+=	py-odeviz
 SUBDIR+=	py-okasha
 SUBDIR+=	py-okpy
@@ -3095,6 +3101,7 @@ SUBDIR+=	py-python-gnutls
 SUBDIR+=	py-pytkgen
 SUBDIR+=	py-pytools
 SUBDIR+=	py-pyvib2
+SUBDIR+=	py-qalsadi
 SUBDIR+=	py-qecalc
 SUBDIR+=	py-qeutil
 SUBDIR+=	py-qit
@@ -3196,7 +3203,7 @@ SUBDIR+=	py-smmap
 SUBDIR+=	py-smop
 SUBDIR+=	py-snappy
 SUBDIR+=	py-snmp
-SUBDIR+=	py-socksipy-branch	
+SUBDIR+=	py-socksipy-branch
 SUBDIR+=	py-sode
 SUBDIR+=	py-sofa
 SUBDIR+=	py-solpy
@@ -3275,6 +3282,7 @@ SUBDIR+=	py-txZMQ
 SUBDIR+=	py-txamqp
 SUBDIR+=	py-txdbus
 SUBDIR+=	py-ufl
+SUBDIR+=	py-umalqurra
 SUBDIR+=	py-uncertainties
 SUBDIR+=	py-uptime
 SUBDIR+=	py-usagestats
@@ -3315,11 +3323,12 @@ SUBDIR+=	py-weberror
 SUBDIR+=	py-webflash
 SUBDIR+=	py-webhelpers
 SUBDIR+=	py-webkit
+SUBDIR+=	py-weboob
 SUBDIR+=	py-websocket
 SUBDIR+=	py-webtest
 SUBDIR+=	py-wheel
-SUBDIR+=	py-whisper
 SUBDIR+=	py-whichcraft
+SUBDIR+=	py-whisper
 SUBDIR+=	py-wifite
 SUBDIR+=	py-willow
 SUBDIR+=	py-workerpool
@@ -3340,6 +3349,7 @@ SUBDIR+=	py-yaprt
 SUBDIR+=	py-yellowhiggs
 SUBDIR+=	py-yenc
 SUBDIR+=	py-yt
+SUBDIR+=	py-z2pack
 SUBDIR+=	py-zeitgeist
 SUBDIR+=	py-zenity
 SUBDIR+=	py-zipline