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 Sep 21 23:50:08 2016 +0200
Changeset:	eff6130c94174486587ef75f0deb5f16b3fa962f

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

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

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

diffs:
diff --git a/Makefile b/Makefile
index a138174..717cc89 100644
--- a/Makefile
+++ b/Makefile
@@ -865,7 +865,7 @@ SUBDIR+=	gfeedline
 SUBDIR+=	gflags
 SUBDIR+=	gfontview
 SUBDIR+=	gforge
-SUBDIR+=	gforth
+SUBDIR+=	gforth-git
 SUBDIR+=	gfsview-snapshot
 SUBDIR+=	ggz-gtk-client
 SUBDIR+=	ggz-gtk-games
@@ -1727,7 +1727,7 @@ SUBDIR+=	llvm-git
 SUBDIR+=	llvm-rtlib
 SUBDIR+=	lmdbg-current
 SUBDIR+=	lmod
-SUBDIR+=	logfmon-devel
+SUBDIR+=	logfmon-git
 SUBDIR+=	logrotate-git
 SUBDIR+=	logwatch
 SUBDIR+=	lorder
@@ -1893,9 +1893,7 @@ SUBDIR+=	mpgedit
 SUBDIR+=	mpi-ch
 SUBDIR+=	mpibzip2
 SUBDIR+=	mplabs
-SUBDIR+=	mplayer
 SUBDIR+=	mplayer-mt
-SUBDIR+=	mplayer-share
 SUBDIR+=	mplayer-snapshot
 SUBDIR+=	mplayer-snapshot-share
 SUBDIR+=	mppdec
@@ -2109,7 +2107,7 @@ SUBDIR+=	openscep
 SUBDIR+=	opensips
 SUBDIR+=	openssh
 SUBDIR+=	opentomb
-SUBDIR+=	opentracker-current
+SUBDIR+=	opentracker-cvs
 SUBDIR+=	openttd-opengfx
 SUBDIR+=	openttd-openmsx
 SUBDIR+=	openttd-opensfx
@@ -4383,7 +4381,6 @@ SUBDIR+=	xxdiff
 SUBDIR+=	yabar
 SUBDIR+=	yafray
 SUBDIR+=	yakuake
-SUBDIR+=	yaml-cpp0.3
 SUBDIR+=	yaml-mode
 SUBDIR+=	yateclient
 SUBDIR+=	yauap