Makefile: Sync entries 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:		Thu Sep 22 00:40:51 2016 +0200
Changeset:	01a5384ab4db8e4e0ba95c1cb6a0a6c91ae62c6d

Modified Files:
	Makefile

Log Message:
Makefile: Sync entries 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=01a5384ab4db8e4e0ba95c1cb6a0a6c91ae62c6d

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

diffstat:
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 717cc89..d8f8207 100644
--- a/Makefile
+++ b/Makefile
@@ -629,13 +629,13 @@ SUBDIR+=	elinks-snapshot
 SUBDIR+=	elixir
 SUBDIR+=	elk
 SUBDIR+=	elscreen-current
+SUBDIR+=	emacs-ditz
 SUBDIR+=	emacs-git
 SUBDIR+=	emacs-git-nox11
-SUBDIR+=	emacs-ditz
 SUBDIR+=	emacs-pr-el
 SUBDIR+=	emacs-session
 SUBDIR+=	emacs-snapshot
-SUBDIR+=	emacs-w3m-current
+SUBDIR+=	emacs-w3m-cvs
 SUBDIR+=	emboss
 SUBDIR+=	emboss-base
 SUBDIR+=	emboss-domainatrix
@@ -666,7 +666,7 @@ SUBDIR+=	epsilon
 SUBDIR+=	erc
 SUBDIR+=	erlang-basho
 SUBDIR+=	erlang15
-SUBDIR+=	es40
+SUBDIR+=	es40-cvs
 SUBDIR+=	es40-firmware
 SUBDIR+=	esdl
 SUBDIR+=	esmart
@@ -939,7 +939,7 @@ SUBDIR+=	gnome3
 SUBDIR+=	gnomebaker
 SUBDIR+=	gnomeradio
 SUBDIR+=	gnormalize
-SUBDIR+=	gnubg
+SUBDIR+=	gnubg-cvs
 SUBDIR+=	gnujump
 SUBDIR+=	gnump3d
 SUBDIR+=	gnunet
@@ -1528,7 +1528,7 @@ SUBDIR+=	lde
 SUBDIR+=	ldtp
 SUBDIR+=	le
 SUBDIR+=	ledger
-SUBDIR+=	leim-current
+SUBDIR+=	leim-cvs
 SUBDIR+=	leo
 SUBDIR+=	leveldb
 SUBDIR+=	lgogdownloader-git