From owner-svn-ports-all@freebsd.org Sun Jan 10 22:11:56 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9220DA69E47; Sun, 10 Jan 2016 22:11:56 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48E6615BF; Sun, 10 Jan 2016 22:11:56 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0AMBtns082770; Sun, 10 Jan 2016 22:11:55 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AMBt2o082769; Sun, 10 Jan 2016 22:11:55 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201601102211.u0AMBt2o082769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 10 Jan 2016 22:11:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405754 - head/mail/spambnc 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2016 22:11:56 -0000 Author: thierry Date: Sun Jan 10 22:11:55 2016 New Revision: 405754 URL: https://svnweb.freebsd.org/changeset/ports/405754 Log: Use PORTDATA and convert to options helpers. PR: ports/205884 Submitted by: pawel Modified: head/mail/spambnc/Makefile Modified: head/mail/spambnc/Makefile ============================================================================== --- head/mail/spambnc/Makefile Sun Jan 10 21:51:11 2016 (r405753) +++ head/mail/spambnc/Makefile Sun Jan 10 22:11:55 2016 (r405754) @@ -25,15 +25,13 @@ PLIST= ${WRKDIR}/.pkg-plist PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS +PORTDATA= * +PORTDOCS= documentation.html upgrading.html loglevels.txt -.include +OPTIONS_DEFINE= DOCS -.if ${PORT_OPTIONS:MDOCS} -MASTER_SITES+= http://www.spambouncer.org/configure/:upg -DISTFILES+= upgrading.shtml:upg -PORTDOCS= documentation.html upgrading.html loglevels.txt -.endif +DOCS_MASTER_SITES= http://www.spambouncer.org/configure/:upg +DOCS_DISTFILES= upgrading.shtml:upg pre-extract: ${MKDIR} ${EXTRACT_DIR} @@ -42,23 +40,17 @@ post-extract: ${MV} ${EXTRACT_DIR} ${WRKDIR} ${RM} -rf ${WRKDIRPREFIX}${.CURDIR}/worktmp -pre-install: - (cd ${WRKSRC} && ${FIND} -s . -type f | ${GREP} -v "^\.\/\." | \ - ${GREP} -v docs | ${SED} -e 's,.,%%DATADIR%%,1' > ${PLIST}) - (cd ${WRKSRC} && ${FIND} -s . -type d | ${GREP} -v docs | ${SORT} -r | \ - ${SED} -e 's,.,@dirrm %%DATADIR%%,' >> ${PLIST}) - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) ${RM} -rf ${STAGEDIR}${DATADIR}/docs -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickstart.shtml \ ${STAGEDIR}${DOCSDIR}/documentation.html ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/upgrading.shtml \ ${STAGEDIR}${DOCSDIR}/upgrading.html ${INSTALL_DATA} ${WRKSRC}/docs/loglevels.txt ${STAGEDIR}${DOCSDIR} -.endif .include