From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 29 16:06:08 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 ESMTPS id C0BCF5EC;
 Fri, 29 Nov 2013 16:06:08 +0000 (UTC)
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 AB9D41ED1;
 Fri, 29 Nov 2013 16:06:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATG68sS005286;
 Fri, 29 Nov 2013 16:06:08 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATG68SY005284;
 Fri, 29 Nov 2013 16:06:08 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201311291606.rATG68SY005284@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 29 Nov 2013 16:06:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335191 - head/dns/yadifa
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.16
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, 29 Nov 2013 16:06:08 -0000

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