From owner-svn-ports-head@FreeBSD.ORG  Fri May 24 19:34:25 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3E4D09C2;
 Fri, 24 May 2013 19:34:25 +0000 (UTC)
 (envelope-from bsam@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 14CEDC3A;
 Fri, 24 May 2013 19:34:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4OJYO3Q058127;
 Fri, 24 May 2013 19:34:24 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4OJYOOm058125;
 Fri, 24 May 2013 19:34:24 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201305241934.r4OJYOOm058125@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Fri, 24 May 2013 19:34:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319011 - head/www/pyweblib
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 19:34:25 -0000

Author: bsam
Date: Fri May 24 19:34:24 2013
New Revision: 319011
URL: http://svnweb.freebsd.org/changeset/ports/319011

Log:
  Rework DOCS installation.

Modified:
  head/www/pyweblib/Makefile
  head/www/pyweblib/pkg-plist

Modified: head/www/pyweblib/Makefile
==============================================================================
--- head/www/pyweblib/Makefile	Fri May 24 19:20:17 2013	(r319010)
+++ head/www/pyweblib/Makefile	Fri May 24 19:34:24 2013	(r319011)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyweblib
 PORTVERSION=	1.3.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.stroeder.com/pylib/PyWebLib/download/
 
@@ -14,23 +15,22 @@ LICENSE=	GPLv2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-DOCS=		pydoc/pyweblib.forms.html \
-		pydoc/pyweblib.helper.html \
-		pydoc/pyweblib.html \
-		pydoc/pyweblib.httphelper.html \
-		pydoc/pyweblib.session.html \
-		pydoc/pyweblib.sslenv.html
+PORTDOCS=	pyweblib.forms.html pyweblib.helper.html \
+		pyweblib.html pyweblib.httphelper.html \
+		pyweblib.session.html pyweblib.sslenv.html
 
 EXAMPLES=	*.py
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
-	${MKDIR} ${EXAMPLESDIR} ${EXAMPLESDIR}/cgi-bin
+	@${MKDIR} ${EXAMPLESDIR} ${EXAMPLESDIR}/cgi-bin
 	${INSTALL_DATA} ${WRKSRC}/cgi-bin/${EXAMPLES} ${EXAMPLESDIR}/cgi-bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/pydoc
-.for file in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/htdocs/${file} ${DOCSDIR}/${file}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/htdocs/pydoc/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/www/pyweblib/pkg-plist
==============================================================================
--- head/www/pyweblib/pkg-plist	Fri May 24 19:20:17 2013	(r319010)
+++ head/www/pyweblib/pkg-plist	Fri May 24 19:34:24 2013	(r319011)
@@ -19,13 +19,12 @@
 @dirrm %%PYTHON_SITELIBDIR%%/pyweblib
 @comment -
 @comment --- HTML documentation ---
-%%PORTDOCS%%%%DOCSDIR%%/pydoc/pyweblib.forms.html
-%%PORTDOCS%%%%DOCSDIR%%/pydoc/pyweblib.helper.html
-%%PORTDOCS%%%%DOCSDIR%%/pydoc/pyweblib.html
-%%PORTDOCS%%%%DOCSDIR%%/pydoc/pyweblib.httphelper.html
-%%PORTDOCS%%%%DOCSDIR%%/pydoc/pyweblib.session.html
-%%PORTDOCS%%%%DOCSDIR%%/pydoc/pyweblib.sslenv.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pydoc
+%%PORTDOCS%%%%DOCSDIR%%/pyweblib.forms.html
+%%PORTDOCS%%%%DOCSDIR%%/pyweblib.helper.html
+%%PORTDOCS%%%%DOCSDIR%%/pyweblib.html
+%%PORTDOCS%%%%DOCSDIR%%/pyweblib.httphelper.html
+%%PORTDOCS%%%%DOCSDIR%%/pyweblib.session.html
+%%PORTDOCS%%%%DOCSDIR%%/pyweblib.sslenv.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @comment -
 @comment --- some examples here ---