Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Nov 2013 16:06:08 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335191 - head/dns/yadifa
Message-ID:  <201311291606.rATG68SY005284@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Nov 29 16:06:07 2013
New Revision: 335191
URL: http://svnweb.freebsd.org/changeset/ports/335191

Log:
  Always install DOCS so that we don't parse bsd.port.mk twice, fixup stupid make
  makeplist.

Modified:
  head/dns/yadifa/Makefile
  head/dns/yadifa/pkg-plist

Modified: head/dns/yadifa/Makefile
==============================================================================
--- head/dns/yadifa/Makefile	Fri Nov 29 15:58:28 2013	(r335190)
+++ head/dns/yadifa/Makefile	Fri Nov 29 16:06:07 2013	(r335191)
@@ -31,14 +31,10 @@ post-configure:
 	${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile
 	${REINPLACE_CMD} -e 's|/usr/local/var|/var|' -e 's|/var/zones|/var/${PORTNAME}|' ${WRKSRC}/etc/yadifad.conf.example
 
-.include <bsd.port.options.mk>
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/yadifad.conf.example ${STAGEDIR}${PREFIX}/etc/
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.endif
 	@${MV} ${STAGEDIR}/var/zones ${STAGEDIR}/var/${PORTNAME}
 
 .include <bsd.port.mk>

Modified: head/dns/yadifa/pkg-plist
==============================================================================
--- head/dns/yadifa/pkg-plist	Fri Nov 29 15:58:28 2013	(r335190)
+++ head/dns/yadifa/pkg-plist	Fri Nov 29 16:06:07 2013	(r335191)
@@ -152,7 +152,7 @@ sbin/yadifad
 @unexec rmdir >/dev/null 2>&1 /var/yadifa/masters || :
 @unexec rmdir >/dev/null 2>&1 /var/yadifa/keys || :
 @unexec rmdir >/dev/null 2>&1 /var/yadifa || :
-@dirrmtry %%PORTEXAMPLES%%%%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 @dirrmtry include/dnszone
 @dirrmtry include/dnsdb
 @dirrmtry include/dnscore



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