126 files changed, 110 insertions, 106 deletions

diff --git a/MOVED b/MOVED
index a99e0668f51..731db470655 100644
--- a/MOVED
+++ b/MOVED
@@ -7644,3 +7644,25 @@ security/py-backports.ssl_match_hostname||2015-06-23|This functionality was back
 dns/maradns1|dns/maradns|2015-06-23|Has expired: MaraDNS 1 end-of-life: June 21, 2015, use dns/maradns
 net/py-soappy-devel||2015-06-25|Please use net/py-soappy instead. It's fresher than -devel
 devel/armv6-freebsd10.0-xdev||2015-06-27|Not usable for the purpose it has been intended for
+devel/bear|devel/erlang-bear|2015-06-27|Renamed with erlang- prefix
+devel/common_lib|devel/erlang-common_lib|2015-06-27|Renamed with erlang- prefix
+devel/cowlib|devel/erlang-cowlib|2015-06-27|Renamed with erlang- prefix
+devel/cuttlefish|devel/erlang-cuttlefish|2015-06-27|Renamed with erlang- prefix
+devel/esdl|devel/erlang-esdl|2015-06-27|Renamed with erlang- prefix
+devel/folsom|devel/erlang-folsom|2015-06-27|Renamed with erlang- prefix
+devel/goldrush|devel/erlang-goldrush|2015-06-27|Renamed with erlang- prefix
+devel/lager_syslog|devel/erlang-lager_syslog|2015-06-27|Renamed with erlang- prefix
+devel/lager|devel/erlang-lager|2015-06-27|Renamed with erlang- prefix
+devel/meck|devel/erlang-meck|2015-06-27|Renamed with erlang- prefix
+devel/neotoma|devel/erlang-neotoma|2015-06-27|Renamed with erlang- prefix
+devel/oserl|devel/erlang-oserl|2015-06-27|Renamed with erlang- prefix
+devel/poolboy|devel/erlang-poolboy|2015-06-27|Renamed with erlang- prefix
+net/erlang_xmlrpc|net/erlang-xmlrpc|2015-06-27|Renamed with erlang- prefix
+net/ranch|net/erlang-ranch|2015-06-27|Renamed with erlang- prefix
+www/cowboy|www/erlang-cowboy|2015-06-27|Renamed with erlang- prefix
+www/mochiweb-basho|www/erlang-mochiweb-basho|2015-06-27|Renamed with erlang- prefix
+www/mochiweb|www/erlang-mochiweb|2015-06-27|Renamed with erlang- prefix
+www/webmachine|www/erlang-webmachine|2015-06-27|Renamed with erlang- prefix
+textproc/exmpp|devel/erlang-exmpp|2015-06-27|Moved to devel category, with erlang- prefix
+databases/eredis|databases/erlang-eredis|2015-06-27|Renamed with erlang- prefix
+databases/epgsql|databases/erlang-epgsql|2015-06-27|Renamed with erlang- prefix
diff --git a/databases/Makefile b/databases/Makefile
index 1045e8754f5..154ec5117dc 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -53,8 +53,8 @@
     SUBDIR += dbtool
     SUBDIR += dbview
     SUBDIR += emma
-    SUBDIR += epgsql
-    SUBDIR += eredis
+    SUBDIR += erlang-epgsql
+    SUBDIR += erlang-eredis
     SUBDIR += erlang-mysql
     SUBDIR += evolution-data-server
     SUBDIR += fastdb
diff --git a/databases/epgsql/Makefile b/databases/erlang-epgsql/Makefile
index 621759cbdc7..d5adfc180c1 100644
--- a/databases/epgsql/Makefile
+++ b/databases/erlang-epgsql/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	epgsql
 PORTVERSION=	3.1.0
 PORTREVISION=	2
 CATEGORIES=	databases
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang PostgreSQL Database Client
@@ -18,15 +19,9 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
diff --git a/databases/epgsql/distinfo b/databases/erlang-epgsql/distinfo
index 008b9153615..008b9153615 100644
--- a/databases/epgsql/distinfo
+++ b/databases/erlang-epgsql/distinfo
diff --git a/databases/epgsql/pkg-descr b/databases/erlang-epgsql/pkg-descr
index b0ee9081eef..b0ee9081eef 100644
--- a/databases/epgsql/pkg-descr
+++ b/databases/erlang-epgsql/pkg-descr
diff --git a/databases/epgsql/pkg-plist b/databases/erlang-epgsql/pkg-plist
index c3e372f91df..c3e372f91df 100644
--- a/databases/epgsql/pkg-plist
+++ b/databases/erlang-epgsql/pkg-plist
diff --git a/databases/eredis/Makefile b/databases/erlang-eredis/Makefile
index 25081ec3a69..dff4bf75dab 100644
--- a/databases/eredis/Makefile
+++ b/databases/erlang-eredis/Makefile
@@ -5,6 +5,7 @@ PORTVERSION=	1.0.8
 PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	databases
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Non-blocking Redis client for Erlang
@@ -12,7 +13,7 @@ COMMENT=	Non-blocking Redis client for Erlang
 LICENSE=	MIT
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/databases/eredis/distinfo b/databases/erlang-eredis/distinfo
index ced1c7c34a4..ced1c7c34a4 100644
--- a/databases/eredis/distinfo
+++ b/databases/erlang-eredis/distinfo
diff --git a/databases/eredis/files/patch-include_eredis.hrl b/databases/erlang-eredis/files/patch-include_eredis.hrl
index 6a31593f9c8..6a31593f9c8 100644
--- a/databases/eredis/files/patch-include_eredis.hrl
+++ b/databases/erlang-eredis/files/patch-include_eredis.hrl
diff --git a/databases/eredis/pkg-descr b/databases/erlang-eredis/pkg-descr
index 74335b50267..74335b50267 100644
--- a/databases/eredis/pkg-descr
+++ b/databases/erlang-eredis/pkg-descr
diff --git a/databases/eredis/pkg-plist b/databases/erlang-eredis/pkg-plist
index 1dde4c42e9b..1dde4c42e9b 100644
--- a/databases/eredis/pkg-plist
+++ b/databases/erlang-eredis/pkg-plist
diff --git a/devel/Makefile b/devel/Makefile
index 140b80168be..33430f04586 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -128,7 +128,6 @@
     SUBDIR += bbfreeze-loader
     SUBDIR += bcc
     SUBDIR += bcpp
-    SUBDIR += bear
     SUBDIR += beautifyphp
     SUBDIR += bennugd-core
     SUBDIR += bennugd-modules
@@ -265,7 +264,6 @@
     SUBDIR += colorgcc
     SUBDIR += colormake
     SUBDIR += commit-patch
-    SUBDIR += common_lib
     SUBDIR += commoncpp
     SUBDIR += compiler-rt
     SUBDIR += compiz-bcop
@@ -276,7 +274,6 @@
     SUBDIR += cook
     SUBDIR += courier-unicode
     SUBDIR += covtool
-    SUBDIR += cowlib
     SUBDIR += cpan-upload
     SUBDIR += cpan-upload-http
     SUBDIR += cpp-netlib
@@ -298,7 +295,6 @@
     SUBDIR += cut
     SUBDIR += cutils
     SUBDIR += cutter
-    SUBDIR += cuttlefish
     SUBDIR += cvs
     SUBDIR += cvs+ipv6
     SUBDIR += cvs-devel
@@ -417,16 +413,29 @@
     SUBDIR += eric6
     SUBDIR += eris
     SUBDIR += erlang-bbmustache
+    SUBDIR += erlang-bear
+    SUBDIR += erlang-common_lib
+    SUBDIR += erlang-cowlib
+    SUBDIR += erlang-cuttlefish
+    SUBDIR += erlang-esdl
+    SUBDIR += erlang-exmpp
+    SUBDIR += erlang-folsom
     SUBDIR += erlang-gen_leader
     SUBDIR += erlang-gen_smtp
     SUBDIR += erlang-getopt
+    SUBDIR += erlang-goldrush
     SUBDIR += erlang-gproc
     SUBDIR += erlang-ibrowse
+    SUBDIR += erlang-lager
+    SUBDIR += erlang-lager_syslog
+    SUBDIR += erlang-meck
     SUBDIR += erlang-msgpack
+    SUBDIR += erlang-neotoma
+    SUBDIR += erlang-oserl
+    SUBDIR += erlang-poolboy
     SUBDIR += erlang-protobuffs
     SUBDIR += erlang-recon
     SUBDIR += erlang-syslog
-    SUBDIR += esdl
     SUBDIR += etcd
     SUBDIR += etcdctl
     SUBDIR += etl
@@ -456,7 +465,6 @@
     SUBDIR += fmake
     SUBDIR += fnccheck
     SUBDIR += fnorb
-    SUBDIR += folsom
     SUBDIR += fortran-utils
     SUBDIR += fortytwo-encore
     SUBDIR += fossil
@@ -634,7 +642,6 @@
     SUBDIR += godot
     SUBDIR += goffice
     SUBDIR += goffice010
-    SUBDIR += goldrush
     SUBDIR += google-gdata
     SUBDIR += google-perftools
     SUBDIR += google-sparsehash
@@ -987,8 +994,6 @@
     SUBDIR += kimwitu
     SUBDIR += kyra
     SUBDIR += kyua
-    SUBDIR += lager
-    SUBDIR += lager_syslog
     SUBDIR += lasi
     SUBDIR += lcov
     SUBDIR += leaktracer
@@ -1340,7 +1345,6 @@
     SUBDIR += maven31
     SUBDIR += mcpp
     SUBDIR += mdds
-    SUBDIR += meck
     SUBDIR += memcheck
     SUBDIR += menhir
     SUBDIR += mercator
@@ -1400,7 +1404,6 @@
     SUBDIR += ndesk-dbus
     SUBDIR += ndesk-dbus-glib
     SUBDIR += ndesk-options
-    SUBDIR += neotoma
     SUBDIR += netscape-java40
     SUBDIR += newfile
     SUBDIR += newt
@@ -1475,7 +1478,6 @@
     SUBDIR += openzz
     SUBDIR += orc
     SUBDIR += osc
-    SUBDIR += oserl
     SUBDIR += ossp-al
     SUBDIR += ossp-cfg
     SUBDIR += ossp-ex
@@ -3649,7 +3651,6 @@
     SUBDIR += poco-devel
     SUBDIR += poco-ssl
     SUBDIR += ponscripter-sekai
-    SUBDIR += poolboy
     SUBDIR += popt
     SUBDIR += poslib
     SUBDIR += powerpc64-binutils
diff --git a/devel/cuttlefish/distinfo b/devel/cuttlefish/distinfo
deleted file mode 100644
index f6a8cc3e955..00000000000
--- a/devel/cuttlefish/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (basho-cuttlefish-2.0.2_GH0.tar.gz) = 53907881390656624e2c7e4948252bf16c0ad6d0787e097ddee7498c32ffebdb
-SIZE (basho-cuttlefish-2.0.2_GH0.tar.gz) = 231044
diff --git a/devel/bear/Makefile b/devel/erlang-bear/Makefile
index 4c2cfe33594..2d091b71410 100644
--- a/devel/bear/Makefile
+++ b/devel/erlang-bear/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	bear
 PORTVERSION=	0.8.2
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Set of statistics functions for Erlang
diff --git a/devel/bear/distinfo b/devel/erlang-bear/distinfo
index 4f11f1aecb0..4f11f1aecb0 100644
--- a/devel/bear/distinfo
+++ b/devel/erlang-bear/distinfo
diff --git a/devel/bear/files/patch-src_bear.app.src b/devel/erlang-bear/files/patch-src_bear.app.src
index a61bf803c59..a61bf803c59 100644
--- a/devel/bear/files/patch-src_bear.app.src
+++ b/devel/erlang-bear/files/patch-src_bear.app.src
diff --git a/devel/bear/pkg-descr b/devel/erlang-bear/pkg-descr
index 1d56b4087b5..1d56b4087b5 100644
--- a/devel/bear/pkg-descr
+++ b/devel/erlang-bear/pkg-descr
diff --git a/devel/bear/pkg-plist b/devel/erlang-bear/pkg-plist
index 3e1300775dc..3e1300775dc 100644
--- a/devel/bear/pkg-plist
+++ b/devel/erlang-bear/pkg-plist
diff --git a/devel/common_lib/Makefile b/devel/erlang-common_lib/Makefile
index df5b48271da..6fb752c3426 100644
--- a/devel/common_lib/Makefile
+++ b/devel/erlang-common_lib/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	common_lib
 PORTVERSION=	3.3.4
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library of commonly used Erlang functions
diff --git a/devel/common_lib/distinfo b/devel/erlang-common_lib/distinfo
index ee6a16d75d5..ee6a16d75d5 100644
--- a/devel/common_lib/distinfo
+++ b/devel/erlang-common_lib/distinfo
diff --git a/devel/common_lib/files/patch-Makefile b/devel/erlang-common_lib/files/patch-Makefile
index ba909f3be2b..ba909f3be2b 100644
--- a/devel/common_lib/files/patch-Makefile
+++ b/devel/erlang-common_lib/files/patch-Makefile
diff --git a/devel/common_lib/files/patch-app.mk b/devel/erlang-common_lib/files/patch-app.mk
index 55fb45130e4..55fb45130e4 100644
--- a/devel/common_lib/files/patch-app.mk
+++ b/devel/erlang-common_lib/files/patch-app.mk
diff --git a/devel/common_lib/files/patch-rebar.config b/devel/erlang-common_lib/files/patch-rebar.config
index b01de95653b..b01de95653b 100644
--- a/devel/common_lib/files/patch-rebar.config
+++ b/devel/erlang-common_lib/files/patch-rebar.config
diff --git a/devel/common_lib/pkg-descr b/devel/erlang-common_lib/pkg-descr
index 0de7b1c79f3..0de7b1c79f3 100644
--- a/devel/common_lib/pkg-descr
+++ b/devel/erlang-common_lib/pkg-descr
diff --git a/devel/common_lib/pkg-plist b/devel/erlang-common_lib/pkg-plist
index bccf0b2f815..bccf0b2f815 100644
--- a/devel/common_lib/pkg-plist
+++ b/devel/erlang-common_lib/pkg-plist
diff --git a/devel/cowlib/Makefile b/devel/erlang-cowlib/Makefile
index ee1a6ebbc90..7bf544fc935 100644
--- a/devel/cowlib/Makefile
+++ b/devel/erlang-cowlib/Makefile
@@ -3,14 +3,15 @@
 PORTNAME=	cowlib
 PORTVERSION=	1.0.0
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang support library for manipulating Web protocols
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/cowlib/distinfo b/devel/erlang-cowlib/distinfo
index 68541132a49..68541132a49 100644
--- a/devel/cowlib/distinfo
+++ b/devel/erlang-cowlib/distinfo
diff --git a/devel/cowlib/pkg-descr b/devel/erlang-cowlib/pkg-descr
index a732025b0df..a732025b0df 100644
--- a/devel/cowlib/pkg-descr
+++ b/devel/erlang-cowlib/pkg-descr
diff --git a/devel/cowlib/pkg-plist b/devel/erlang-cowlib/pkg-plist
index b09068e468f..b09068e468f 100644
--- a/devel/cowlib/pkg-plist
+++ b/devel/erlang-cowlib/pkg-plist
diff --git a/devel/cuttlefish/Makefile b/devel/erlang-cuttlefish/Makefile
index 6d6470428a3..50c0a07dc65 100644
--- a/devel/cuttlefish/Makefile
+++ b/devel/erlang-cuttlefish/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cuttlefish
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	erlang-
 
@@ -11,9 +11,9 @@ COMMENT=	Configuration library for Erlang
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		lager>=2.1.1:${PORTSDIR}/devel/lager \
+		erlang-lager>=2.1.1:${PORTSDIR}/devel/erlang-lager \
 		erlang-getopt>=0.8.2:${PORTSDIR}/devel/erlang-getopt \
-		neotoma>=1.7.2:${PORTSDIR}/devel/neotoma
+		erlang-neotoma>=1.7.2:${PORTSDIR}/devel/erlang-neotoma
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/devel/erlang-cuttlefish/distinfo b/devel/erlang-cuttlefish/distinfo
new file mode 100644
index 00000000000..193c6759dac
--- /dev/null
+++ b/devel/erlang-cuttlefish/distinfo
@@ -0,0 +1,2 @@
+SHA256 (basho-cuttlefish-2.0.3_GH0.tar.gz) = 666c11a9b15a9d301d5facd2fe8ebbe66013c0f4289e565a92ab429f444fa845
+SIZE (basho-cuttlefish-2.0.3_GH0.tar.gz) = 231038
diff --git a/devel/cuttlefish/files/patch-rebar.config b/devel/erlang-cuttlefish/files/patch-rebar.config
index 2c63d99806c..2c63d99806c 100644
--- a/devel/cuttlefish/files/patch-rebar.config
+++ b/devel/erlang-cuttlefish/files/patch-rebar.config
diff --git a/devel/cuttlefish/files/patch-src_cuttlefish.app.src b/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
index 26452a072b0..26452a072b0 100644
--- a/devel/cuttlefish/files/patch-src_cuttlefish.app.src
+++ b/devel/erlang-cuttlefish/files/patch-src_cuttlefish.app.src
diff --git a/devel/cuttlefish/files/patch-src_cuttlefish__escript.erl b/devel/erlang-cuttlefish/files/patch-src_cuttlefish__escript.erl
index 12607b25496..12607b25496 100644
--- a/devel/cuttlefish/files/patch-src_cuttlefish__escript.erl
+++ b/devel/erlang-cuttlefish/files/patch-src_cuttlefish__escript.erl
diff --git a/devel/cuttlefish/pkg-descr b/devel/erlang-cuttlefish/pkg-descr
index 68ed090c133..68ed090c133 100644
--- a/devel/cuttlefish/pkg-descr
+++ b/devel/erlang-cuttlefish/pkg-descr
diff --git a/devel/cuttlefish/pkg-plist b/devel/erlang-cuttlefish/pkg-plist
index dc99dd2e5bf..dc99dd2e5bf 100644
--- a/devel/cuttlefish/pkg-plist
+++ b/devel/erlang-cuttlefish/pkg-plist
diff --git a/devel/esdl/Makefile b/devel/erlang-esdl/Makefile
index f4b5d7f3c84..a9c33c33407 100644
--- a/devel/esdl/Makefile
+++ b/devel/erlang-esdl/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	esdl
 PORTVERSION=	1.0.1
 PORTREVISION=	12
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 DIST_SUBDIR=	erlang
@@ -11,8 +12,8 @@ DIST_SUBDIR=	erlang
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library for accessing SDL and OpenGL through Erlang
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/esdl/distinfo b/devel/erlang-esdl/distinfo
index 03bd0cf319f..03bd0cf319f 100644
--- a/devel/esdl/distinfo
+++ b/devel/erlang-esdl/distinfo
diff --git a/devel/esdl/files/patch-Makefile b/devel/erlang-esdl/files/patch-Makefile
index 32a753ec33c..32a753ec33c 100644
--- a/devel/esdl/files/patch-Makefile
+++ b/devel/erlang-esdl/files/patch-Makefile
diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/erlang-esdl/files/patch-c__src_Makefile
index 90710643cef..90710643cef 100644
--- a/devel/esdl/files/patch-c__src_Makefile
+++ b/devel/erlang-esdl/files/patch-c__src_Makefile
diff --git a/devel/esdl/files/patch-c__src_esdl__driver.c b/devel/erlang-esdl/files/patch-c__src_esdl__driver.c
index 15ef5659199..15ef5659199 100644
--- a/devel/esdl/files/patch-c__src_esdl__driver.c
+++ b/devel/erlang-esdl/files/patch-c__src_esdl__driver.c
diff --git a/devel/esdl/pkg-descr b/devel/erlang-esdl/pkg-descr
index 6af5fa5883f..6af5fa5883f 100644
--- a/devel/esdl/pkg-descr
+++ b/devel/erlang-esdl/pkg-descr
diff --git a/devel/esdl/pkg-plist b/devel/erlang-esdl/pkg-plist
index 61145451909..61145451909 100644
--- a/devel/esdl/pkg-plist
+++ b/devel/erlang-esdl/pkg-plist
diff --git a/textproc/exmpp/Makefile b/devel/erlang-exmpp/Makefile
index fd579e05f1c..cb7c695af4b 100644
--- a/textproc/exmpp/Makefile
+++ b/devel/erlang-exmpp/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	exmpp
 PORTVERSION=	0.9.9
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
-CATEGORIES=	textproc net-im
+CATEGORIES=	devel net-im
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Fast and scalable library for XMPP written in Erlang/OTP
diff --git a/textproc/exmpp/distinfo b/devel/erlang-exmpp/distinfo
index d1a45f0f42d..d1a45f0f42d 100644
--- a/textproc/exmpp/distinfo
+++ b/devel/erlang-exmpp/distinfo
diff --git a/textproc/exmpp/files/patch-doc_Makefile.am b/devel/erlang-exmpp/files/patch-doc_Makefile.am
index 1ec702e0d23..1ec702e0d23 100644
--- a/textproc/exmpp/files/patch-doc_Makefile.am
+++ b/devel/erlang-exmpp/files/patch-doc_Makefile.am
diff --git a/textproc/exmpp/pkg-descr b/devel/erlang-exmpp/pkg-descr
index 84c21309f5f..84c21309f5f 100644
--- a/textproc/exmpp/pkg-descr
+++ b/devel/erlang-exmpp/pkg-descr
diff --git a/textproc/exmpp/pkg-plist b/devel/erlang-exmpp/pkg-plist
index bf44dd7c58d..bf44dd7c58d 100644
--- a/textproc/exmpp/pkg-plist
+++ b/devel/erlang-exmpp/pkg-plist
diff --git a/devel/folsom/Makefile b/devel/erlang-folsom/Makefile
index cac2ee17fab..6cdafa10dce 100644
--- a/devel/folsom/Makefile
+++ b/devel/erlang-folsom/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	folsom
 PORTVERSION=	0.8.2
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang based metrics system inspired by Coda Hale's metrics
@@ -10,7 +11,7 @@ COMMENT=	Erlang based metrics system inspired by Coda Hale's metrics
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		bear>=0.8.2:${PORTSDIR}/devel/bear
+		erlang-bear>=0.8.2:${PORTSDIR}/devel/erlang-bear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/devel/folsom/distinfo b/devel/erlang-folsom/distinfo
index 072a4030ccd..072a4030ccd 100644
--- a/devel/folsom/distinfo
+++ b/devel/erlang-folsom/distinfo
diff --git a/devel/folsom/files/patch-rebar.config b/devel/erlang-folsom/files/patch-rebar.config
index c02c286e4fe..c02c286e4fe 100644
--- a/devel/folsom/files/patch-rebar.config
+++ b/devel/erlang-folsom/files/patch-rebar.config
diff --git a/devel/folsom/files/patch-src_folsom.app.src b/devel/erlang-folsom/files/patch-src_folsom.app.src
index dddcc2cd2f6..dddcc2cd2f6 100644
--- a/devel/folsom/files/patch-src_folsom.app.src
+++ b/devel/erlang-folsom/files/patch-src_folsom.app.src
diff --git a/devel/folsom/pkg-descr b/devel/erlang-folsom/pkg-descr
index 577c1bccc03..577c1bccc03 100644
--- a/devel/folsom/pkg-descr
+++ b/devel/erlang-folsom/pkg-descr
diff --git a/devel/folsom/pkg-plist b/devel/erlang-folsom/pkg-plist
index 193d2d78f47..193d2d78f47 100644
--- a/devel/folsom/pkg-plist
+++ b/devel/erlang-folsom/pkg-plist
diff --git a/devel/goldrush/Makefile b/devel/erlang-goldrush/Makefile
index 6d80a160bd5..fac41d7aea1 100644
--- a/devel/goldrush/Makefile
+++ b/devel/erlang-goldrush/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	goldrush
 PORTVERSION=	0.1.7
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Fast event stream processing library for Erlang
diff --git a/devel/goldrush/distinfo b/devel/erlang-goldrush/distinfo
index 788fac67076..788fac67076 100644
--- a/devel/goldrush/distinfo
+++ b/devel/erlang-goldrush/distinfo
diff --git a/devel/goldrush/pkg-descr b/devel/erlang-goldrush/pkg-descr
index 3de7dc9fd71..3de7dc9fd71 100644
--- a/devel/goldrush/pkg-descr
+++ b/devel/erlang-goldrush/pkg-descr
diff --git a/devel/goldrush/pkg-plist b/devel/erlang-goldrush/pkg-plist
index c2eaa3afc85..c2eaa3afc85 100644
--- a/devel/goldrush/pkg-plist
+++ b/devel/erlang-goldrush/pkg-plist
diff --git a/devel/lager/Makefile b/devel/erlang-lager/Makefile
index b017cb5995c..07a6af9c5e4 100644
--- a/devel/lager/Makefile
+++ b/devel/erlang-lager/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	lager
 PORTVERSION=	2.1.1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Logging framework for Erlang
@@ -10,8 +11,8 @@ COMMENT=	Logging framework for Erlang
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
-RUN_DEPENDS:=	erl:${PORTSDIR}/lang/erlang \
-		goldrush>=0.1.6:${PORTSDIR}/devel/goldrush
+RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
+		erlang-goldrush>=0.1.6:${PORTSDIR}/devel/erlang-goldrush
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/lager/distinfo b/devel/erlang-lager/distinfo
index f508bd57ba2..f508bd57ba2 100644
--- a/devel/lager/distinfo
+++ b/devel/erlang-lager/distinfo
diff --git a/devel/lager/files/patch-rebar.config b/devel/erlang-lager/files/patch-rebar.config
index 28dc32dc75b..28dc32dc75b 100644
--- a/devel/lager/files/patch-rebar.config
+++ b/devel/erlang-lager/files/patch-rebar.config
diff --git a/devel/lager/pkg-descr b/devel/erlang-lager/pkg-descr
index 31810826913..31810826913 100644
--- a/devel/lager/pkg-descr
+++ b/devel/erlang-lager/pkg-descr
diff --git a/devel/lager/pkg-plist b/devel/erlang-lager/pkg-plist
index e5072603b93..e5072603b93 100644
--- a/devel/lager/pkg-plist
+++ b/devel/erlang-lager/pkg-plist
diff --git a/devel/lager_syslog/Makefile b/devel/erlang-lager_syslog/Makefile
index c08a7bd55d2..96719d0b2bf 100644
--- a/devel/lager_syslog/Makefile
+++ b/devel/erlang-lager_syslog/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	lager_syslog
 PORTVERSION=	2.1.1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Syslog backend for Lager
@@ -10,7 +11,7 @@ COMMENT=	Syslog backend for Lager
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		lager>=2.1.1:${PORTSDIR}/devel/lager \
+		erlang-lager>=2.1.1:${PORTSDIR}/devel/erlang-lager \
 		erlang-syslog>=1.0.3:${PORTSDIR}/devel/erlang-syslog
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/lager_syslog/distinfo b/devel/erlang-lager_syslog/distinfo
index 921dd450d41..921dd450d41 100644
--- a/devel/lager_syslog/distinfo
+++ b/devel/erlang-lager_syslog/distinfo
diff --git a/devel/lager_syslog/files/patch-rebar.config b/devel/erlang-lager_syslog/files/patch-rebar.config
index 0503c093963..0503c093963 100644
--- a/devel/lager_syslog/files/patch-rebar.config
+++ b/devel/erlang-lager_syslog/files/patch-rebar.config
diff --git a/devel/lager_syslog/pkg-descr b/devel/erlang-lager_syslog/pkg-descr
index a56ab173bb1..a56ab173bb1 100644
--- a/devel/lager_syslog/pkg-descr
+++ b/devel/erlang-lager_syslog/pkg-descr
diff --git a/devel/lager_syslog/pkg-plist b/devel/erlang-lager_syslog/pkg-plist
index 1548acd6c00..1548acd6c00 100644
--- a/devel/lager_syslog/pkg-plist
+++ b/devel/erlang-lager_syslog/pkg-plist
diff --git a/devel/meck/Makefile b/devel/erlang-meck/Makefile
index 8df1c7052c9..085622bbaae 100644
--- a/devel/meck/Makefile
+++ b/devel/erlang-meck/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	meck
 PORTVERSION=	0.8.3
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang library for building mock modules
@@ -18,8 +19,6 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	eproxus
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
diff --git a/devel/meck/distinfo b/devel/erlang-meck/distinfo
index cd69782b189..cd69782b189 100644
--- a/devel/meck/distinfo
+++ b/devel/erlang-meck/distinfo
diff --git a/devel/meck/files/patch-Makefile b/devel/erlang-meck/files/patch-Makefile
index abeaa709af9..abeaa709af9 100644
--- a/devel/meck/files/patch-Makefile
+++ b/devel/erlang-meck/files/patch-Makefile
diff --git a/devel/meck/files/patch-test.config b/devel/erlang-meck/files/patch-test.config
index 2806ecf4af9..2806ecf4af9 100644
--- a/devel/meck/files/patch-test.config
+++ b/devel/erlang-meck/files/patch-test.config
diff --git a/devel/meck/pkg-descr b/devel/erlang-meck/pkg-descr
index a0d433cedf8..a0d433cedf8 100644
--- a/devel/meck/pkg-descr
+++ b/devel/erlang-meck/pkg-descr
diff --git a/devel/meck/pkg-plist b/devel/erlang-meck/pkg-plist
index 6cf6d92a1ab..6cf6d92a1ab 100644
--- a/devel/meck/pkg-plist
+++ b/devel/erlang-meck/pkg-plist
diff --git a/devel/neotoma/Makefile b/devel/erlang-neotoma/Makefile
index afa8002c341..c318486211e 100644
--- a/devel/neotoma/Makefile
+++ b/devel/erlang-neotoma/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	neotoma
 PORTVERSION=	1.7.2
 PORTREVISION=	1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang library and packrat parser-generator
@@ -22,17 +23,13 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GITHUB=	yes
 GH_ACCOUNT=	seancribbs
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/neotoma.app.src
 	@${RM} ${WRKSRC}/src/*.bak ${WRKSRC}/src/*.orig
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.textile ${STAGEDIR}${DOCSDIR}
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/priv
diff --git a/devel/neotoma/distinfo b/devel/erlang-neotoma/distinfo
index 12ab3f31157..12ab3f31157 100644
--- a/devel/neotoma/distinfo
+++ b/devel/erlang-neotoma/distinfo
diff --git a/devel/neotoma/files/neotoma.in b/devel/erlang-neotoma/files/neotoma.in
index e73a3bc484d..e73a3bc484d 100644
--- a/devel/neotoma/files/neotoma.in
+++ b/devel/erlang-neotoma/files/neotoma.in
diff --git a/devel/neotoma/files/patch-Makefile b/devel/erlang-neotoma/files/patch-Makefile
index 06c9615bdb8..06c9615bdb8 100644
--- a/devel/neotoma/files/patch-Makefile
+++ b/devel/erlang-neotoma/files/patch-Makefile
diff --git a/devel/neotoma/files/patch-src_neotoma.app.src b/devel/erlang-neotoma/files/patch-src_neotoma.app.src
index ea30402da88..ea30402da88 100644
--- a/devel/neotoma/files/patch-src_neotoma.app.src
+++ b/devel/erlang-neotoma/files/patch-src_neotoma.app.src
diff --git a/devel/neotoma/pkg-descr b/devel/erlang-neotoma/pkg-descr
index 8b907d83b70..8b907d83b70 100644
--- a/devel/neotoma/pkg-descr
+++ b/devel/erlang-neotoma/pkg-descr
diff --git a/devel/neotoma/pkg-plist b/devel/erlang-neotoma/pkg-plist
index bac7254ead2..bac7254ead2 100644
--- a/devel/neotoma/pkg-plist
+++ b/devel/erlang-neotoma/pkg-plist
diff --git a/devel/oserl/Makefile b/devel/erlang-oserl/Makefile
index 4bcdb51527c..b9e38546646 100644
--- a/devel/oserl/Makefile
+++ b/devel/erlang-oserl/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	oserl
 PORTVERSION=	3.2.4
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	SMPP library for Erlang
@@ -10,7 +11,7 @@ COMMENT=	SMPP library for Erlang
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
 		txt2tags:${PORTSDIR}/textproc/txt2tags
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		common_lib>=3.3.4:${PORTSDIR}/devel/common_lib
+		erlang-common_lib>=3.3.4:${PORTSDIR}/devel/erlang-common_lib
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/oserl/distinfo b/devel/erlang-oserl/distinfo
index 926ba0c134e..926ba0c134e 100644
--- a/devel/oserl/distinfo
+++ b/devel/erlang-oserl/distinfo
diff --git a/devel/oserl/files/patch-Makefile b/devel/erlang-oserl/files/patch-Makefile
index 98bbce213d7..98bbce213d7 100644
--- a/devel/oserl/files/patch-Makefile
+++ b/devel/erlang-oserl/files/patch-Makefile
diff --git a/devel/oserl/files/patch-rebar.config b/devel/erlang-oserl/files/patch-rebar.config
index 561bd751d7a..830bf812914 100644
--- a/devel/oserl/files/patch-rebar.config
+++ b/devel/erlang-oserl/files/patch-rebar.config
@@ -1,14 +1,14 @@
 --- rebar.config.orig	2013-05-10 18:52:27 UTC
 +++ rebar.config
-@@ -1,10 +1,7 @@
+@@ -1,9 +1,6 @@
 -{lib_dirs, ["deps"]}.
+-
+-{erl_opts, [warnings_as_errors, debug_info]}.
 +{lib_dirs, ["deps", ".."]}.
  
- {erl_opts, [warnings_as_errors, debug_info]}.
- 
 -{deps, [{common_lib, "3.3.4",
 -         {git, "git://github.com/iamaleksey/common_lib.git", {tag, "3.3.4"}}}]}.
--
++{erl_opts, [debug_info]}.
+ 
  {erl_first_files, ["src/gen_esme_session.erl",
                     "src/gen_mc_session.erl",
-                    "src/gen_esme.erl",
diff --git a/devel/oserl/files/patch-src_smpp__param.hrl b/devel/erlang-oserl/files/patch-src_smpp__param.hrl
index 1ffbadbb1c7..1ffbadbb1c7 100644
--- a/devel/oserl/files/patch-src_smpp__param.hrl
+++ b/devel/erlang-oserl/files/patch-src_smpp__param.hrl
diff --git a/devel/oserl/pkg-descr b/devel/erlang-oserl/pkg-descr
index c9d69aab2dc..c9d69aab2dc 100644
--- a/devel/oserl/pkg-descr
+++ b/devel/erlang-oserl/pkg-descr
diff --git a/devel/oserl/pkg-plist b/devel/erlang-oserl/pkg-plist
index 357021a774f..357021a774f 100644
--- a/devel/oserl/pkg-plist
+++ b/devel/erlang-oserl/pkg-plist
diff --git a/devel/poolboy/Makefile b/devel/erlang-poolboy/Makefile
index f5925d4406a..57ec6866408 100644
--- a/devel/poolboy/Makefile
+++ b/devel/erlang-poolboy/Makefile
@@ -4,14 +4,15 @@ PORTNAME=	poolboy
 PORTVERSION=	1.5.1
 PORTREVISION=	1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Pooling library for Erlang
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
@@ -19,15 +20,9 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	devinus
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/src
diff --git a/devel/poolboy/distinfo b/devel/erlang-poolboy/distinfo
index 603c6cb5989..603c6cb5989 100644
--- a/devel/poolboy/distinfo
+++ b/devel/erlang-poolboy/distinfo
diff --git a/devel/poolboy/pkg-descr b/devel/erlang-poolboy/pkg-descr
index bc7e0d5acc2..bc7e0d5acc2 100644
--- a/devel/poolboy/pkg-descr
+++ b/devel/erlang-poolboy/pkg-descr
diff --git a/devel/poolboy/pkg-plist b/devel/erlang-poolboy/pkg-plist
index e3c24897adb..e3c24897adb 100644
--- a/devel/poolboy/pkg-plist
+++ b/devel/erlang-poolboy/pkg-plist
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index e2fbb112b88..a2eb4ba597f 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -16,10 +16,9 @@ LICENSE_NAME=	Wings 3D License # similar to TclTk license
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		esdl>0:${PORTSDIR}/devel/esdl
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		esdl>0:${PORTSDIR}/devel/esdl
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
+		erlang-esdl>0:${PORTSDIR}/devel/erlang-esdl
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_ENV=	ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/net/Makefile b/net/Makefile
index a0438719f32..68a4459ad7b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -117,7 +117,8 @@
     SUBDIR += echoping
     SUBDIR += empty
     SUBDIR += enet
-    SUBDIR += erlang_xmlrpc
+    SUBDIR += erlang-ranch
+    SUBDIR += erlang-xmlrpc
     SUBDIR += etrace
     SUBDIR += exabgp
     SUBDIR += exaddos
@@ -997,7 +998,6 @@
     SUBDIR += radsecproxy
     SUBDIR += radvd
     SUBDIR += raggle
-    SUBDIR += ranch
     SUBDIR += rdapper
     SUBDIR += rdesktop
     SUBDIR += rdist6
diff --git a/net/ranch/Makefile b/net/erlang-ranch/Makefile
index 1ce769ade8e..bc0d0c2b5e6 100644
--- a/net/ranch/Makefile
+++ b/net/erlang-ranch/Makefile
@@ -4,14 +4,15 @@ PORTNAME=	ranch
 PORTVERSION=	1.0.0
 PORTREVISION=	1
 CATEGORIES=	net
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang socket acceptor pool for TCP protocols
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/net/ranch/distinfo b/net/erlang-ranch/distinfo
index 38685b67048..38685b67048 100644
--- a/net/ranch/distinfo
+++ b/net/erlang-ranch/distinfo
diff --git a/net/ranch/pkg-descr b/net/erlang-ranch/pkg-descr
index 3c9215a4642..3c9215a4642 100644
--- a/net/ranch/pkg-descr
+++ b/net/erlang-ranch/pkg-descr
diff --git a/net/ranch/pkg-plist b/net/erlang-ranch/pkg-plist
index 970b5061918..970b5061918 100644
--- a/net/ranch/pkg-plist
+++ b/net/erlang-ranch/pkg-plist
diff --git a/net/erlang_xmlrpc/Makefile b/net/erlang-xmlrpc/Makefile
index 957b82a73b8..50a164f17dc 100644
--- a/net/erlang_xmlrpc/Makefile
+++ b/net/erlang-xmlrpc/Makefile
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
-PORTNAME=	erlang_xmlrpc
+PORTNAME=	xmlrpc
 PORTVERSION=	1.13
 PORTREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	http://www.erlang.org/contrib/
-DISTNAME=	xmlrpc-${PORTVERSION}
+PKGNAMEPREFIX=	erlang-
 DIST_SUBDIR=	erlang
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library for XMLRPC support in Erlang
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=      VERSION="${PORTVERSION}"
 
@@ -21,8 +21,6 @@ WRKSRC=		${WRKDIR}/xmlrpc-${PORTVERSION}
 
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|XMERL_PATH=.*|XMERL_PATH=${LOCALBASE}/lib/erlang/lib/xmerl|g' ${WRKSRC}/src/Makefile
 	@${RM} ${WRKSRC}/src/Makefile.bak ${WRKSRC}/src/*.orig
diff --git a/net/erlang_xmlrpc/distinfo b/net/erlang-xmlrpc/distinfo
index 932a4af4f55..932a4af4f55 100644
--- a/net/erlang_xmlrpc/distinfo
+++ b/net/erlang-xmlrpc/distinfo
diff --git a/net/erlang_xmlrpc/files/patch-src_xmlrpc.erl b/net/erlang-xmlrpc/files/patch-src_xmlrpc.erl
index 939ccd7981d..6e2ee005302 100644
--- a/net/erlang_xmlrpc/files/patch-src_xmlrpc.erl
+++ b/net/erlang-xmlrpc/files/patch-src_xmlrpc.erl
@@ -1,6 +1,6 @@
---- src/xmlrpc.erl.orig	Fri May 23 10:47:55 2003
-+++ src/xmlrpc.erl	Fri May 23 10:47:57 2003
-@@ -164,7 +164,14 @@
+--- src/xmlrpc.erl.orig	2003-04-23 19:06:45 UTC
++++ src/xmlrpc.erl
+@@ -164,7 +164,14 @@ handle_payload(Socket, KeepAlive, Timeou
  
  get_payload(Socket, Timeout, ContentLength) ->
      inet:setopts(Socket, [{packet, raw}]),
@@ -15,3 +15,4 @@
 +    get_payload(Socket, Timeout, ContentLength - length(Bin), [Bin|Payload]).
  
  %% Exported: start_link/{1,5,6}
+ 
diff --git a/net/erlang_xmlrpc/files/patch-src_xmlrpc__decode.erl b/net/erlang-xmlrpc/files/patch-src_xmlrpc__decode.erl
index 177661f56bf..6186d57c8f2 100644
--- a/net/erlang_xmlrpc/files/patch-src_xmlrpc__decode.erl
+++ b/net/erlang-xmlrpc/files/patch-src_xmlrpc__decode.erl
@@ -1,5 +1,5 @@
---- src/xmlrpc_decode.erl.orig	Tue Oct 12 21:02:55 2004
-+++ src/xmlrpc_decode.erl	Tue Oct 12 21:03:43 2004
+--- src/xmlrpc_decode.erl.orig	2003-04-23 19:06:45 UTC
++++ src/xmlrpc_decode.erl
 @@ -28,7 +28,7 @@
  -author('jocke@gleipnir.com').
  -export([payload/1]).
diff --git a/net/erlang_xmlrpc/files/patch-src_xmlrpc__http.erl b/net/erlang-xmlrpc/files/patch-src_xmlrpc__http.erl
index ef0cf997c52..417a03305e6 100644
--- a/net/erlang_xmlrpc/files/patch-src_xmlrpc__http.erl
+++ b/net/erlang-xmlrpc/files/patch-src_xmlrpc__http.erl
@@ -1,6 +1,6 @@
---- src/xmlrpc_http.erl.orig	Wed Apr 23 21:06:45 2003
-+++ src/xmlrpc_http.erl	Fri May 23 11:59:38 2003
-@@ -142,7 +142,14 @@
+--- src/xmlrpc_http.erl.orig	2003-04-23 19:06:45 UTC
++++ src/xmlrpc_http.erl
+@@ -142,7 +142,14 @@ handle_payload(Socket, Timeout, Handler,
  
  get_payload(Socket, Timeout, ContentLength) ->
      inet:setopts(Socket, [{packet, raw}]),
@@ -16,7 +16,7 @@
  
  eval_payload(Socket, Timeout, {M, F} = Handler, State, Connection, Payload) ->
      case catch M:F(State, Payload) of
-@@ -190,6 +197,7 @@
+@@ -190,6 +197,7 @@ send(Socket, StatusCode, ExtraHeader, Pa
      Response =
  	["HTTP/1.1 ", integer_to_list(StatusCode), " ",
  	 reason_phrase(StatusCode), "\r\n",
diff --git a/net/erlang_xmlrpc/pkg-descr b/net/erlang-xmlrpc/pkg-descr
index 1bf83ba0a66..1bf83ba0a66 100644
--- a/net/erlang_xmlrpc/pkg-descr
+++ b/net/erlang-xmlrpc/pkg-descr
diff --git a/net/erlang_xmlrpc/pkg-plist b/net/erlang-xmlrpc/pkg-plist
index 6d021240c9a..6d021240c9a 100644
--- a/net/erlang_xmlrpc/pkg-plist
+++ b/net/erlang-xmlrpc/pkg-plist
diff --git a/textproc/Makefile b/textproc/Makefile
index d5a4d5e3fbc..a8426f60f32 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -162,7 +162,6 @@
     SUBDIR += estraier
     SUBDIR += et-aspell
     SUBDIR += exempi
-    SUBDIR += exmpp
     SUBDIR += expat2
     SUBDIR += exslt
     SUBDIR += extract_url
diff --git a/www/Makefile b/www/Makefile
index 8ab3af52f7b..e4bde93dc94 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -94,7 +94,6 @@
     SUBDIR += cocoon
     SUBDIR += codeigniter
     SUBDIR += coppermine
-    SUBDIR += cowboy
     SUBDIR += cplanet
     SUBDIR += cppcms
     SUBDIR += crawl
@@ -167,6 +166,10 @@
     SUBDIR += entrans
     SUBDIR += ephemera
     SUBDIR += epiphany
+    SUBDIR += erlang-cowboy
+    SUBDIR += erlang-mochiweb
+    SUBDIR += erlang-mochiweb-basho
+    SUBDIR += erlang-webmachine
     SUBDIR += erwn
     SUBDIR += eventum
     SUBDIR += extjs
@@ -417,8 +420,6 @@
     SUBDIR += mkapachepw
     SUBDIR += mknmz-wwwoffle
     SUBDIR += mnogosearch
-    SUBDIR += mochiweb
-    SUBDIR += mochiweb-basho
     SUBDIR += mod_amazon_proxy
     SUBDIR += mod_antiloris
     SUBDIR += mod_asn
@@ -2196,7 +2197,6 @@
     SUBDIR += webkit2-gtk3
     SUBDIR += weblint
     SUBDIR += weblint++
-    SUBDIR += webmachine
     SUBDIR += webpy
     SUBDIR += webreport
     SUBDIR += webresolve
diff --git a/www/cowboy/Makefile b/www/erlang-cowboy/Makefile
index e547887c62f..7389c3aed28 100644
--- a/www/cowboy/Makefile
+++ b/www/erlang-cowboy/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	cowboy
 PORTVERSION=	1.0.1
 CATEGORIES=	www
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Small, fast and modular HTTP server written in Erlang
@@ -10,10 +11,10 @@ COMMENT=	Small, fast and modular HTTP server written in Erlang
 LICENSE=	ISCL
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		cowlib>=1.0.0:${PORTSDIR}/devel/cowlib
+		erlang-cowlib>=1.0.0:${PORTSDIR}/devel/erlang-cowlib
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		cowlib>=1.0.0:${PORTSDIR}/devel/cowlib \
-		ranch>=1.0.0:${PORTSDIR}/net/ranch
+		erlang-cowlib>=1.0.0:${PORTSDIR}/devel/erlang-cowlib \
+		erlang-ranch>=1.0.0:${PORTSDIR}/net/erlang-ranch
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/www/cowboy/distinfo b/www/erlang-cowboy/distinfo
index 2804a652275..2804a652275 100644
--- a/www/cowboy/distinfo
+++ b/www/erlang-cowboy/distinfo
diff --git a/www/cowboy/files/patch-Makefile b/www/erlang-cowboy/files/patch-Makefile
index 4cef4226c79..4cef4226c79 100644
--- a/www/cowboy/files/patch-Makefile
+++ b/www/erlang-cowboy/files/patch-Makefile
diff --git a/www/cowboy/pkg-descr b/www/erlang-cowboy/pkg-descr
index 927858cc626..927858cc626 100644
--- a/www/cowboy/pkg-descr
+++ b/www/erlang-cowboy/pkg-descr
diff --git a/www/cowboy/pkg-plist b/www/erlang-cowboy/pkg-plist
index bc6bdb06281..bc6bdb06281 100644
--- a/www/cowboy/pkg-plist
+++ b/www/erlang-cowboy/pkg-plist
diff --git a/www/mochiweb-basho/Makefile b/www/erlang-mochiweb-basho/Makefile
index 70f448669a6..b58188677c3 100644
--- a/www/mochiweb-basho/Makefile
+++ b/www/erlang-mochiweb-basho/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	mochiweb
 PORTVERSION=	2.9.0p1
 CATEGORIES=	www devel
+PKGNAMEPREFIX=	erlang-
 PKGNAMESUFFIX=	-basho
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -21,19 +22,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	basho
 GH_TAGNAME=	ade2a9b	# required
 
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in CHANGES.md README.md; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
diff --git a/www/mochiweb-basho/distinfo b/www/erlang-mochiweb-basho/distinfo
index 0b1fbab89d2..0b1fbab89d2 100644
--- a/www/mochiweb-basho/distinfo
+++ b/www/erlang-mochiweb-basho/distinfo
diff --git a/www/mochiweb-basho/pkg-descr b/www/erlang-mochiweb-basho/pkg-descr
index 6143fd5821e..6143fd5821e 100644
--- a/www/mochiweb-basho/pkg-descr
+++ b/www/erlang-mochiweb-basho/pkg-descr
diff --git a/www/mochiweb-basho/pkg-plist b/www/erlang-mochiweb-basho/pkg-plist
index 3a7eb6b8f5a..3a7eb6b8f5a 100644
--- a/www/mochiweb-basho/pkg-plist
+++ b/www/erlang-mochiweb-basho/pkg-plist
diff --git a/www/mochiweb/Makefile b/www/erlang-mochiweb/Makefile
index 9b467e7b44a..6b9117b22f3 100644
--- a/www/mochiweb/Makefile
+++ b/www/erlang-mochiweb/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	mochiweb
 PORTVERSION=	2.12.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang library for building lightweight HTTP servers
@@ -23,19 +24,13 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GITHUB=	yes
 GH_ACCOUNT=	mochi
 
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in CHANGES.md README; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
diff --git a/www/mochiweb/distinfo b/www/erlang-mochiweb/distinfo
index 7213a33822e..7213a33822e 100644
--- a/www/mochiweb/distinfo
+++ b/www/erlang-mochiweb/distinfo
diff --git a/www/mochiweb/pkg-descr b/www/erlang-mochiweb/pkg-descr
index 5323a5663f6..5323a5663f6 100644
--- a/www/mochiweb/pkg-descr
+++ b/www/erlang-mochiweb/pkg-descr
diff --git a/www/mochiweb/pkg-plist b/www/erlang-mochiweb/pkg-plist
index 19dc5154a62..19dc5154a62 100644
--- a/www/mochiweb/pkg-plist
+++ b/www/erlang-mochiweb/pkg-plist
diff --git a/www/webmachine/Makefile b/www/erlang-webmachine/Makefile
index ef3ba062b8b..5b806286fa5 100644
--- a/www/webmachine/Makefile
+++ b/www/erlang-webmachine/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	webmachine
 PORTVERSION=	1.10.8
 CATEGORIES=	www devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	HTTP semantic awareness on top mochiweb
@@ -10,7 +11,7 @@ COMMENT=	HTTP semantic awareness on top mochiweb
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		mochiweb-basho>=2.9.0p1:${PORTSDIR}/www/mochiweb-basho
+		erlang-mochiweb-basho>=2.9.0p1:${PORTSDIR}/www/erlang-mochiweb-basho
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=      VERSION="${PORTVERSION}"
@@ -19,24 +20,18 @@ USES=		gmake
 USE_GITHUB=     yes
 GH_ACCOUNT=     basho
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s/{vsn, git}/{vsn,\"${PORTVERSION}\"}/" ${WRKSRC}/src/webmachine.app.src
 	@${RM} ${WRKSRC}/src/*.bak
 	@${RM} ${WRKSRC}/demo/priv/www/uploads/.gitignore
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for FILE in README.org; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}/include
diff --git a/www/webmachine/distinfo b/www/erlang-webmachine/distinfo
index ad8f28c01c7..ad8f28c01c7 100644
--- a/www/webmachine/distinfo
+++ b/www/erlang-webmachine/distinfo
diff --git a/www/webmachine/files/patch-Makefile b/www/erlang-webmachine/files/patch-Makefile
index 009e42c6980..009e42c6980 100644
--- a/www/webmachine/files/patch-Makefile
+++ b/www/erlang-webmachine/files/patch-Makefile
diff --git a/www/webmachine/files/patch-rebar.config b/www/erlang-webmachine/files/patch-rebar.config
index 685fc7dd252..685fc7dd252 100644
--- a/www/webmachine/files/patch-rebar.config
+++ b/www/erlang-webmachine/files/patch-rebar.config
diff --git a/www/webmachine/pkg-descr b/www/erlang-webmachine/pkg-descr
index e9c2819609f..e9c2819609f 100644
--- a/www/webmachine/pkg-descr
+++ b/www/erlang-webmachine/pkg-descr
diff --git a/www/webmachine/pkg-plist b/www/erlang-webmachine/pkg-plist
index e561a741dd7..e561a741dd7 100644
--- a/www/webmachine/pkg-plist
+++ b/www/erlang-webmachine/pkg-plist