Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Oct 2013 16:49:13 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329211 - head/net-p2p/btpd
Message-ID:  <201310031649.r93GnDJg087755@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310031649.r93GnDJg087755>