Makefile: Sync with recent changes

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Oct 5 04:35:14 2016 +0200
Changeset:	e835b0f884df940c740b809f90741448aa02c7bf

Modified Files:
	Makefile

Log Message:
Makefile: Sync with recent changes

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

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

diffstat:
 Makefile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 16bb2a0..0219f4e 100644
--- a/Makefile
+++ b/Makefile
@@ -1759,7 +1759,6 @@ SUBDIR+=	man
 SUBDIR+=	man-db
 SUBDIR+=	man2html
 SUBDIR+=	manatee
-SUBDIR+=	map-browse
 SUBDIR+=	mapnik
 SUBDIR+=	marathon-scenarios
 SUBDIR+=	marathon-tempus-irae
@@ -1790,7 +1789,6 @@ SUBDIR+=	meep-openmpi
 SUBDIR+=	megaglest
 SUBDIR+=	memdump
 SUBDIR+=	memgrep
-SUBDIR+=	memo
 SUBDIR+=	menumaker
 SUBDIR+=	meta-tracker
 SUBDIR+=	metalog
@@ -1821,7 +1819,6 @@ SUBDIR+=	mirage
 SUBDIR+=	miro
 SUBDIR+=	mixer.tk
 SUBDIR+=	mixmaster
-SUBDIR+=	mixnet
 SUBDIR+=	mixxx
 #SUBDIR+=	mk 		# not a package
 SUBDIR+=	mk-configure
@@ -1836,14 +1833,11 @@ SUBDIR+=	mnogosearch
 SUBDIR+=	modglue
 SUBDIR+=	modplugplay
 SUBDIR+=	moe
-SUBDIR+=	moeclock
-SUBDIR+=	molmol
 SUBDIR+=	monajat
 SUBDIR+=	monkey-bubble
 SUBDIR+=	mono
 SUBDIR+=	mono-git
 SUBDIR+=	mono-zeroconf
-SUBDIR+=	monotone-cvsimport
 SUBDIR+=	mop
 SUBDIR+=	mopac7
 SUBDIR+=	moregroupware
@@ -2714,6 +2708,7 @@ SUBDIR+=	py-chainer
 SUBDIR+=	py-chaintipy
 SUBDIR+=	py-chaos
 SUBDIR+=	py-chealpy
+SUBDIR+=	py-chebfun
 SUBDIR+=	py-chebpy
 SUBDIR+=	py-checkmate
 SUBDIR+=	py-chemlab
@@ -2721,6 +2716,7 @@ SUBDIR+=	py-chemview
 SUBDIR+=	py-chinup
 SUBDIR+=	py-chm
 SUBDIR+=	py-chompack
+SUBDIR+=	py-christofides
 SUBDIR+=	py-ciabatta
 SUBDIR+=	py-cinfony
 SUBDIR+=	py-cito
@@ -2739,6 +2735,7 @@ SUBDIR+=	py-cloudpickle
 SUBDIR+=	py-cma
 SUBDIR+=	py-cmd2
 SUBDIR+=	py-cmtoolkit
+SUBDIR+=	py-cnfgen
 SUBDIR+=	py-cobra
 SUBDIR+=	py-cocos2d
 SUBDIR+=	py-codepy
@@ -2868,6 +2865,7 @@ SUBDIR+=	py-faker
 SUBDIR+=	py-fanova
 SUBDIR+=	py-fastaudio
 SUBDIR+=	py-fatiando
+SUBDIR+=	py-fcn
 SUBDIR+=	py-fcsparser
 SUBDIR+=	py-fdasrsf
 SUBDIR+=	py-fdm
@@ -2937,6 +2935,7 @@ SUBDIR+=	py-gpkit
 SUBDIR+=	py-grab
 SUBDIR+=	py-graphmin
 SUBDIR+=	py-graphpath
+SUBDIR+=	py-graphs
 SUBDIR+=	py-graphsim
 SUBDIR+=	py-gratelpy
 SUBDIR+=	py-gravipy
@@ -3034,7 +3033,6 @@ SUBDIR+=	py-knnimpute
 SUBDIR+=	py-knockknock
 SUBDIR+=	py-krylov
 SUBDIR+=	py-krypy
-SUBDIR+=	py-kyra
 SUBDIR+=	py-lapack
 SUBDIR+=	py-larlib
 SUBDIR+=	py-larry
@@ -3109,7 +3107,6 @@ SUBDIR+=	py-mochi
 SUBDIR+=	py-mocker
 SUBDIR+=	py-modargs
 SUBDIR+=	py-model-builder
-SUBDIR+=	py-mois
 SUBDIR+=	py-moksha-common
 SUBDIR+=	py-moksha-hub
 SUBDIR+=	py-monad
@@ -3250,6 +3247,7 @@ SUBDIR+=	py-professor
 SUBDIR+=	py-progressbar
 SUBDIR+=	py-progressbar2
 SUBDIR+=	py-proj
+SUBDIR+=	py-propyte
 SUBDIR+=	py-psamm
 SUBDIR+=	py-pseudopy
 SUBDIR+=	py-pseudorandom
@@ -3467,6 +3465,7 @@ SUBDIR+=	py-tardis-sn
 SUBDIR+=	py-tashaphyne
 SUBDIR+=	py-tasphyne
 SUBDIR+=	py-teafiles
+SUBDIR+=	py-technicolor
 SUBDIR+=	py-telepathy
 SUBDIR+=	py-teng
 SUBDIR+=	py-termcolor
@@ -3528,7 +3527,6 @@ SUBDIR+=	py-utilib_excel
 SUBDIR+=	py-utilib_math
 SUBDIR+=	py-utilib_misc
 SUBDIR+=	py-utilib_ply
-SUBDIR+=	py-uuid
 SUBDIR+=	py-validictory
 SUBDIR+=	py-vanity
 SUBDIR+=	py-varify