Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Mar 2018 13:40:19 +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: r465593 - head/dns/dnscrypt-proxy2
Message-ID:  <201803261340.w2QDeJkQ006388@repo.freebsd.org>

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



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