From owner-svn-ports-all@freebsd.org  Mon Mar 26 13:40:20 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06B8AF6DE4F;
 Mon, 26 Mar 2018 13:40:20 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D20C77E40B;
 Mon, 26 Mar 2018 13:40:19 +0000 (UTC) (envelope-from mat@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCF93599C;
 Mon, 26 Mar 2018 13:40:19 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QDeJMh006390;
 Mon, 26 Mar 2018 13:40:19 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QDeJkQ006388;
 Mon, 26 Mar 2018 13:40:19 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201803261340.w2QDeJkQ006388@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 26 Mar 2018 13:40:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r465593 - head/dns/dnscrypt-proxy2
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/dns/dnscrypt-proxy2
X-SVN-Commit-Revision: 465593
X-SVN-Commit-Repository: ports
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Mar 2018 13:40:20 -0000

Author: mat
Date: Mon Mar 26 13:40:19 2018
New Revision: 465593
URL: https://svnweb.freebsd.org/changeset/ports/465593

Log:
  Correctly use PORTDOCS and PORTEXAMPLES.
  
  Sponsored by:	Absolight

Modified:
  head/dns/dnscrypt-proxy2/Makefile   (contents, props changed)
  head/dns/dnscrypt-proxy2/pkg-plist   (contents, props changed)

Modified: head/dns/dnscrypt-proxy2/Makefile
==============================================================================
--- head/dns/dnscrypt-proxy2/Makefile	Mon Mar 26 13:40:16 2018	(r465592)
+++ head/dns/dnscrypt-proxy2/Makefile	Mon Mar 26 13:40:19 2018	(r465593)
@@ -22,8 +22,8 @@ GH_ACCOUNT=	jedisct1
 USERS=		_dnscrypt-proxy
 GROUPS=		_dnscrypt-proxy
 
-PORTDOCS=	${WRKSRC}/README.*
-PORTEXAMPLES=	${WRKSRC}/${PORTNAME}/example*
+PORTDOCS=	README.*
+PORTEXAMPLES=	example*
 
 CONFLICTS_INSTALL=	dnscrypt-proxy
 
@@ -40,11 +40,11 @@ do-install:
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/${PORTNAME} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
 	# After install examples because of the priv drop issue with Go

Modified: head/dns/dnscrypt-proxy2/pkg-plist
==============================================================================
--- head/dns/dnscrypt-proxy2/pkg-plist	Mon Mar 26 13:40:16 2018	(r465592)
+++ head/dns/dnscrypt-proxy2/pkg-plist	Mon Mar 26 13:40:19 2018	(r465593)
@@ -1,7 +1,2 @@
 @sample etc/dnscrypt-proxy.toml.sample
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-blacklist.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-cloaking-rules.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-dnscrypt-proxy.toml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-forwarding-rules.txt
 sbin/dnscrypt-proxy