From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 24 16:35:53 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4DBCC276;
 Wed, 24 Apr 2013 16:35:53 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 27B211F5F;
 Wed, 24 Apr 2013 16:35:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OGZrk2014861;
 Wed, 24 Apr 2013 16:35:53 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OGZqLb014858;
 Wed, 24 Apr 2013 16:35:52 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201304241635.r3OGZqLb014858@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 24 Apr 2013 16:35:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316450 - in head/www: mochiweb mochiweb-basho webmachine
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Apr 2013 16:35:53 -0000

Author: olgeni
Date: Wed Apr 24 16:35:52 2013
New Revision: 316450
URL: http://svnweb.freebsd.org/changeset/ports/316450

Log:
  - Use bsd.port.options.mk.
  - PORTDOCS should not be conditional.
  
  Noticed by:	jgh

Modified:
  head/www/mochiweb-basho/Makefile
  head/www/mochiweb/Makefile
  head/www/webmachine/Makefile

Modified: head/www/mochiweb-basho/Makefile
==============================================================================
--- head/www/mochiweb-basho/Makefile	Wed Apr 24 16:19:19 2013	(r316449)
+++ head/www/mochiweb-basho/Makefile	Wed Apr 24 16:35:52 2013	(r316450)
@@ -24,11 +24,9 @@ GH_PROJECT=	mochiweb
 GH_COMMIT=	b7c3f8f
 GH_TAGNAME=	${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
+
+.include <bsd.port.options.mk>
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
@@ -49,4 +47,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/include
 	@${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/src
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/mochiweb/Makefile
==============================================================================
--- head/www/mochiweb/Makefile	Wed Apr 24 16:19:19 2013	(r316449)
+++ head/www/mochiweb/Makefile	Wed Apr 24 16:35:52 2013	(r316450)
@@ -23,11 +23,9 @@ GH_PROJECT=	mochiweb
 GH_COMMIT=	92b8f5b
 GH_TAGNAME=	v${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
+
+.include <bsd.port.options.mk>
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
@@ -48,4 +46,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/include
 	@${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/mochiweb-${PORTVERSION}/src
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/webmachine/Makefile
==============================================================================
--- head/www/webmachine/Makefile	Wed Apr 24 16:19:19 2013	(r316449)
+++ head/www/webmachine/Makefile	Wed Apr 24 16:35:52 2013	(r316450)
@@ -23,11 +23,9 @@ GH_PROJECT=     webmachine
 GH_COMMIT=      d600c0e
 GH_TAGNAME=     ${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
+
+.include <bsd.port.options.mk>
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
@@ -50,4 +48,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/src
 	@cd ${WRKSRC}/priv && ${COPYTREE_SHARE} \* ${PREFIX}/lib/erlang/lib/webmachine-${PORTVERSION}/priv
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>