svn commit: r390698 - in head: . databases databases/epgsql databases/eredis databases/erlang-epgsql databases/erlang-eredis devel devel/bear devel/common_lib devel/cowlib devel/cuttlefish devel/er...

Sat Jun 27 12:54:22 UTC 2015

Author: olgeni
Date: Sat Jun 27 12:54:11 2015
New Revision: 390698
URL: https://svnweb.freebsd.org/changeset/ports/390698

Log:
  Sorting out some Erlang stuff:
  
  - Rename a few Erlang-related ports using the erlang- prefix; it will avoid
    confusion with elixir- ports.
  - Remove DOCS and EXAMPLES where not actually useful.
  - Simplify RUN_DEPENDS where possible.
  - Move textproc/exmpp to devel/erlang-exmpp.
  - Add missing R18 compatibility fix for devel/erlang-oserl.
  - Upgrade erlang-cuttlefish to 2.0.3.
  
  The idea is that libraries ("deps") have the "erlang-" prefix, while larger
  projects (rabbitmq, yaws, couchdb, etc) keep their usual names.

Added:
  head/databases/erlang-epgsql/
     - copied from r390697, head/databases/epgsql/
  head/databases/erlang-eredis/
     - copied from r390667, head/databases/eredis/
  head/devel/erlang-bear/
     - copied from r390667, head/devel/bear/
  head/devel/erlang-common_lib/
     - copied from r390664, head/devel/common_lib/
  head/devel/erlang-cowlib/
     - copied from r390664, head/devel/cowlib/
  head/devel/erlang-cuttlefish/
     - copied from r390664, head/devel/cuttlefish/
  head/devel/erlang-esdl/
     - copied from r390664, head/devel/esdl/
  head/devel/erlang-exmpp/
     - copied from r390664, head/textproc/exmpp/
  head/devel/erlang-folsom/
     - copied from r390664, head/devel/folsom/
  head/devel/erlang-goldrush/
     - copied from r390664, head/devel/goldrush/
  head/devel/erlang-lager/
     - copied from r390664, head/devel/lager/
  head/devel/erlang-lager_syslog/
     - copied from r390664, head/devel/lager_syslog/
  head/devel/erlang-meck/
     - copied from r390664, head/devel/meck/
  head/devel/erlang-neotoma/
     - copied from r390664, head/devel/neotoma/
  head/devel/erlang-oserl/
     - copied from r390664, head/devel/oserl/
  head/devel/erlang-poolboy/
     - copied from r390664, head/devel/poolboy/
  head/net/erlang-ranch/
     - copied from r390664, head/net/ranch/
  head/net/erlang-xmlrpc/
     - copied from r390664, head/net/erlang_xmlrpc/
  head/www/erlang-cowboy/
     - copied from r390664, head/www/cowboy/
  head/www/erlang-mochiweb/
     - copied from r390664, head/www/mochiweb/
  head/www/erlang-mochiweb-basho/
     - copied from r390664, head/www/mochiweb-basho/
  head/www/erlang-webmachine/
     - copied from r390664, head/www/webmachine/
Deleted:
  head/databases/epgsql/
  head/databases/eredis/
  head/devel/bear/
  head/devel/common_lib/
  head/devel/cowlib/
  head/devel/cuttlefish/
  head/devel/esdl/
  head/devel/folsom/
  head/devel/goldrush/
  head/devel/lager/
  head/devel/lager_syslog/
  head/devel/meck/
  head/devel/neotoma/
  head/devel/oserl/
  head/devel/poolboy/
  head/net/erlang_xmlrpc/
  head/net/ranch/
  head/textproc/exmpp/
  head/www/cowboy/
  head/www/mochiweb/
  head/www/mochiweb-basho/
  head/www/webmachine/
Modified:
  head/MOVED
  head/databases/Makefile
  head/databases/erlang-epgsql/Makefile
  head/databases/erlang-eredis/Makefile
  head/devel/Makefile
  head/devel/erlang-bear/Makefile
  head/devel/erlang-common_lib/Makefile
  head/devel/erlang-cowlib/Makefile
  head/devel/erlang-cuttlefish/Makefile
  head/devel/erlang-cuttlefish/distinfo
  head/devel/erlang-esdl/Makefile
  head/devel/erlang-exmpp/Makefile
  head/devel/erlang-folsom/Makefile
  head/devel/erlang-goldrush/Makefile
  head/devel/erlang-lager/Makefile
  head/devel/erlang-lager_syslog/Makefile
  head/devel/erlang-meck/Makefile
  head/devel/erlang-neotoma/Makefile
  head/devel/erlang-oserl/Makefile
  head/devel/erlang-oserl/files/patch-rebar.config
  head/devel/erlang-poolboy/Makefile
  head/graphics/wings/Makefile
  head/net/Makefile
  head/net/erlang-ranch/Makefile
  head/net/erlang-xmlrpc/Makefile
  head/net/erlang-xmlrpc/files/patch-src_xmlrpc.erl
  head/net/erlang-xmlrpc/files/patch-src_xmlrpc__decode.erl
  head/net/erlang-xmlrpc/files/patch-src_xmlrpc__http.erl
  head/textproc/Makefile
  head/www/Makefile
  head/www/erlang-cowboy/Makefile
  head/www/erlang-mochiweb-basho/Makefile
  head/www/erlang-mochiweb/Makefile
  head/www/erlang-webmachine/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/MOVED	Sat Jun 27 12:54:11 2015	(r390698)
@@ -7644,3 +7644,25 @@ security/py-backports.ssl_match_hostname
 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

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/databases/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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

Modified: head/databases/erlang-epgsql/Makefile
==============================================================================
--- head/databases/epgsql/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/databases/erlang-epgsql/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -4,6 +4,7 @@ PORTNAME=	epgsql
 PORTVERSION=	3.1.0
 PORTREVISION=	2
 CATEGORIES=	databases
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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

Modified: head/databases/erlang-eredis/Makefile
==============================================================================
--- head/databases/eredis/Makefile	Fri Jun 26 20:18:38 2015	(r390667)
+++ head/databases/erlang-eredis/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -5,6 +5,7 @@ PORTVERSION=	1.0.8
 PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	databases
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Non-blocking Redis client for Erlang
@@ -12,7 +13,7 @@ COMMENT=	Non-blocking Redis client for E
 LICENSE=	MIT
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/devel/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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

Modified: head/devel/erlang-bear/Makefile
==============================================================================
--- head/devel/bear/Makefile	Fri Jun 26 20:18:38 2015	(r390667)
+++ head/devel/erlang-bear/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	bear
 PORTVERSION=	0.8.2
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Set of statistics functions for Erlang

Modified: head/devel/erlang-common_lib/Makefile
==============================================================================
--- head/devel/common_lib/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-common_lib/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	common_lib
 PORTVERSION=	3.3.4
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Library of commonly used Erlang functions

Modified: head/devel/erlang-cowlib/Makefile
==============================================================================
--- head/devel/cowlib/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-cowlib/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,14 +3,15 @@
 PORTNAME=	cowlib
 PORTVERSION=	1.0.0
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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}"
 

Modified: head/devel/erlang-cuttlefish/Makefile
==============================================================================
--- head/devel/cuttlefish/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-cuttlefish/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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 Erlan
 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}"

Modified: head/devel/erlang-cuttlefish/distinfo
==============================================================================
--- head/devel/cuttlefish/distinfo	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-cuttlefish/distinfo	Sat Jun 27 12:54:11 2015	(r390698)
@@ -1,2 +1,2 @@
-SHA256 (basho-cuttlefish-2.0.2_GH0.tar.gz) = 53907881390656624e2c7e4948252bf16c0ad6d0787e097ddee7498c32ffebdb
-SIZE (basho-cuttlefish-2.0.2_GH0.tar.gz) = 231044
+SHA256 (basho-cuttlefish-2.0.3_GH0.tar.gz) = 666c11a9b15a9d301d5facd2fe8ebbe66013c0f4289e565a92ab429f444fa845
+SIZE (basho-cuttlefish-2.0.3_GH0.tar.gz) = 231038

Modified: head/devel/erlang-esdl/Makefile
==============================================================================
--- head/devel/esdl/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-esdl/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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 at 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}
 

Modified: head/devel/erlang-exmpp/Makefile
==============================================================================
--- head/textproc/exmpp/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-exmpp/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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 at FreeBSD.org
 COMMENT=	Fast and scalable library for XMPP written in Erlang/OTP

Modified: head/devel/erlang-folsom/Makefile
==============================================================================
--- head/devel/folsom/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-folsom/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	folsom
 PORTVERSION=	0.8.2
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Erlang based metrics system inspired by Coda Hale's metrics
@@ -10,7 +11,7 @@ COMMENT=	Erlang based metrics system ins
 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}"

Modified: head/devel/erlang-goldrush/Makefile
==============================================================================
--- head/devel/goldrush/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-goldrush/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	goldrush
 PORTVERSION=	0.1.7
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Fast event stream processing library for Erlang

Modified: head/devel/erlang-lager/Makefile
==============================================================================
--- head/devel/lager/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-lager/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	lager
 PORTVERSION=	2.1.1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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}"
 

Modified: head/devel/erlang-lager_syslog/Makefile
==============================================================================
--- head/devel/lager_syslog/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-lager_syslog/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	lager_syslog
 PORTVERSION=	2.1.1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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}
 

Modified: head/devel/erlang-meck/Makefile
==============================================================================
--- head/devel/meck/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-meck/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	meck
 PORTVERSION=	0.8.3
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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}

Modified: head/devel/erlang-neotoma/Makefile
==============================================================================
--- head/devel/neotoma/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-neotoma/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -4,6 +4,7 @@ PORTNAME=	neotoma
 PORTVERSION=	1.7.2
 PORTREVISION=	1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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

Modified: head/devel/erlang-oserl/Makefile
==============================================================================
--- head/devel/oserl/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-oserl/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	oserl
 PORTVERSION=	3.2.4
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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}"
 

Modified: head/devel/erlang-oserl/files/patch-rebar.config
==============================================================================
--- head/devel/oserl/files/patch-rebar.config	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-oserl/files/patch-rebar.config	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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",

Modified: head/devel/erlang-poolboy/Makefile
==============================================================================
--- head/devel/poolboy/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/devel/erlang-poolboy/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -4,14 +4,15 @@ PORTNAME=	poolboy
 PORTVERSION=	1.5.1
 PORTREVISION=	1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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

Modified: head/graphics/wings/Makefile
==============================================================================
--- head/graphics/wings/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/graphics/wings/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -16,10 +16,9 @@ LICENSE_NAME=	Wings 3D License # similar
 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}"

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/net/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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

Modified: head/net/erlang-ranch/Makefile
==============================================================================
--- head/net/ranch/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/net/erlang-ranch/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -4,14 +4,15 @@ PORTNAME=	ranch
 PORTVERSION=	1.0.0
 PORTREVISION=	1
 CATEGORIES=	net
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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}"
 

Modified: head/net/erlang-xmlrpc/Makefile
==============================================================================
--- head/net/erlang_xmlrpc/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/net/erlang-xmlrpc/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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 at 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

Modified: head/net/erlang-xmlrpc/files/patch-src_xmlrpc.erl
==============================================================================
--- head/net/erlang_xmlrpc/files/patch-src_xmlrpc.erl	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/net/erlang-xmlrpc/files/patch-src_xmlrpc.erl	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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}
+ 

Modified: head/net/erlang-xmlrpc/files/patch-src_xmlrpc__decode.erl
==============================================================================
--- head/net/erlang_xmlrpc/files/patch-src_xmlrpc__decode.erl	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/net/erlang-xmlrpc/files/patch-src_xmlrpc__decode.erl	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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 at gleipnir.com').
  -export([payload/1]).

Modified: head/net/erlang-xmlrpc/files/patch-src_xmlrpc__http.erl
==============================================================================
--- head/net/erlang_xmlrpc/files/patch-src_xmlrpc__http.erl	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/net/erlang-xmlrpc/files/patch-src_xmlrpc__http.erl	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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",

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/textproc/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -162,7 +162,6 @@
     SUBDIR += estraier
     SUBDIR += et-aspell
     SUBDIR += exempi
-    SUBDIR += exmpp
     SUBDIR += expat2
     SUBDIR += exslt
     SUBDIR += extract_url

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Sat Jun 27 12:37:17 2015	(r390697)
+++ head/www/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -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

Modified: head/www/erlang-cowboy/Makefile
==============================================================================
--- head/www/cowboy/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/www/erlang-cowboy/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	cowboy
 PORTVERSION=	1.0.1
 CATEGORIES=	www
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	Small, fast and modular HTTP server written in Erlang
@@ -10,10 +11,10 @@ COMMENT=	Small, fast and modular HTTP se
 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}"
 

Modified: head/www/erlang-mochiweb-basho/Makefile
==============================================================================
--- head/www/mochiweb-basho/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/www/erlang-mochiweb-basho/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	mochiweb
 PORTVERSION=	2.9.0p1
 CATEGORIES=	www devel
+PKGNAMEPREFIX=	erlang-
 PKGNAMESUFFIX=	-basho
 
 MAINTAINER=	olgeni at 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

Modified: head/www/erlang-mochiweb/Makefile
==============================================================================
--- head/www/mochiweb/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/www/erlang-mochiweb/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -4,6 +4,7 @@ PORTNAME=	mochiweb
 PORTVERSION=	2.12.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at 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

Modified: head/www/erlang-webmachine/Makefile
==============================================================================
--- head/www/webmachine/Makefile	Fri Jun 26 19:14:41 2015	(r390664)
+++ head/www/erlang-webmachine/Makefile	Sat Jun 27 12:54:11 2015	(r390698)
@@ -3,6 +3,7 @@
 PORTNAME=	webmachine
 PORTVERSION=	1.10.8
 CATEGORIES=	www devel
+PKGNAMEPREFIX=	erlang-
 
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	HTTP semantic awareness on top mochiweb
@@ -10,7 +11,7 @@ COMMENT=	HTTP semantic awareness on top 
 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
