From owner-svn-ports-head@FreeBSD.ORG  Thu Oct  3 16:49:13 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BE14F550;
 Thu,  3 Oct 2013 16:49:13 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ABBCA20B1;
 Thu,  3 Oct 2013 16:49:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r93GnD9r087757;
 Thu, 3 Oct 2013 16:49:13 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r93GnDJg087755;
 Thu, 3 Oct 2013 16:49:13 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201310031649.r93GnDJg087755@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 3 Oct 2013 16:49:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329211 - head/net-p2p/btpd
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: Thu, 03 Oct 2013 16:49:13 -0000

Author: bapt
Date: Thu Oct  3 16:49:12 2013
New Revision: 329211
URL: http://svnweb.freebsd.org/changeset/ports/329211

Log:
  Add a DOCS option
  Always install docs in post-install to avoid reading twice bsd.port.mk
  Remove the bsd.port.options.mk/bsd.port.mk dancing
  Define all plist related things into pkg-plist

Modified:
  head/net-p2p/btpd/Makefile
  head/net-p2p/btpd/pkg-plist

Modified: head/net-p2p/btpd/Makefile
==============================================================================
--- head/net-p2p/btpd/Makefile	Thu Oct  3 16:40:17 2013	(r329210)
+++ head/net-p2p/btpd/Makefile	Thu Oct  3 16:49:12 2013	(r329211)
@@ -11,18 +11,14 @@ COMMENT=	Bittorrent client consisting of
 
 LICENSE=	BSD
 
+OPTIONS_DEFINE=	DOCS
+
 USE_AUTOTOOLS=	autoconf aclocal
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
-PORTDOCS=	README
-
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/net-p2p/btpd/pkg-plist
==============================================================================
--- head/net-p2p/btpd/pkg-plist	Thu Oct  3 16:40:17 2013	(r329210)
+++ head/net-p2p/btpd/pkg-plist	Thu Oct  3 16:49:12 2013	(r329211)
@@ -4,3 +4,5 @@ bin/btpd
 man/man1/btcli.1.gz
 man/man1/btinfo.1.gz
 man/man1/btpd.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%