Install torrc.sample and geoip files to "tordev" subdirectories.

[Alexander Nasonov <alnsn%yandex.ru@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Alexander Nasonov <alnsn%yandex.ru@localhost>
Pushed By:	alnsn
Date:		Fri Oct 19 19:57:02 2018 +0100
Changeset:	5f2f705ddcb2aff1ab995ee8607ae8e5260110a0

Modified Files:
	tor-dev/Makefile
	tor-dev/PLIST
	tor-dev/distinfo
Added Files:
	tor-dev/patches/patch-Makefile.in
	tor-dev/patches/patch-src_app_config_config.c

Log Message:
Install torrc.sample and geoip files to "tordev" subdirectories.

Now wip/tor-dev doesn't conflict with net/tor anymore.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5f2f705ddcb2aff1ab995ee8607ae8e5260110a0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tor-dev/Makefile                              |  3 ++-
 tor-dev/PLIST                                 |  6 +++---
 tor-dev/distinfo                              |  2 ++
 tor-dev/patches/patch-Makefile.in             | 17 +++++++++++++++++
 tor-dev/patches/patch-src_app_config_config.c | 18 ++++++++++++++++++
 5 files changed, 42 insertions(+), 4 deletions(-)

diffs:
diff --git a/tor-dev/Makefile b/tor-dev/Makefile
index 428d2cdf06..717b26325e 100644
--- a/tor-dev/Makefile
+++ b/tor-dev/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	tor-0.3.5.3-alpha
 PKGNAME=	${DISTNAME:S/tor/tordev/:S/-alpha//:S/-rc/rc0/}
+PKGREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	http://www.torproject.org/dist/
 
@@ -44,7 +45,7 @@ OWN_DIRS_PERMS+=	${PKG_HOME.${TOR_USER}} ${USER_GROUP} 0700
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
-CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample	\
+CONF_FILES+=		${PREFIX}/share/examples/tordev/torrc.sample	\
 			${PKG_SYSCONFDIR}/torrc
 
 PRINT_PLIST_AWK+=	/^man\/man/ { $$0 = "$${PLIST.doc}" $$0 }
diff --git a/tor-dev/PLIST b/tor-dev/PLIST
index 448176e2ef..eb2bbcbd74 100644
--- a/tor-dev/PLIST
+++ b/tor-dev/PLIST
@@ -14,6 +14,6 @@ ${PLIST.doc}share/doc/tordev/tor-print-ed-signing-cert.html
 ${PLIST.doc}share/doc/tordev/tor-resolve.html
 ${PLIST.doc}share/doc/tordev/tor.html
 ${PLIST.doc}share/doc/tordev/torify.html
-share/examples/tor/torrc.sample
-share/tor/geoip
-share/tor/geoip6
+share/examples/tordev/torrc.sample
+share/tordev/geoip
+share/tordev/geoip6
diff --git a/tor-dev/distinfo b/tor-dev/distinfo
index 4fe3fb281f..d71589aee9 100644
--- a/tor-dev/distinfo
+++ b/tor-dev/distinfo
@@ -4,3 +4,5 @@ SHA1 (tor-0.3.5.3-alpha.tar.gz) = a9b2678ce9ff0ef6263d1c8874226e8fa59b1d11
 RMD160 (tor-0.3.5.3-alpha.tar.gz) = cc2ce021d690b95b04b98f8dc3dc75a991b259e5
 SHA512 (tor-0.3.5.3-alpha.tar.gz) = fdbbf5a69f9c0708afa4bb9e4925db4f7384997d7f497f1298d0106b76944c060c858fd061aa292310384e7b35f0ac41570cd89bb8c7e8208c832908fa3288af
 Size (tor-0.3.5.3-alpha.tar.gz) = 6862572 bytes
+SHA1 (patch-Makefile.in) = c190295f4702bd1e69531cab1ac61dbab451e48b
+SHA1 (patch-src_app_config_config.c) = bac106e382207cdf22c84a52b45c791de2bdf0f8
diff --git a/tor-dev/patches/patch-Makefile.in b/tor-dev/patches/patch-Makefile.in
new file mode 100644
index 0000000000..8996b2b373
--- /dev/null
+++ b/tor-dev/patches/patch-Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD$
+
+tor -> tordev.
+
+--- Makefile.in.orig	2018-10-19 17:40:17.567965433 +0000
++++ Makefile.in
+@@ -4626,8 +4626,8 @@ src_tools_tor_print_ed_signing_cert_LDAD
+ @BUILD_LIBTORRUNNER_TRUE@        src/tools/tor_runner.c \
+ @BUILD_LIBTORRUNNER_TRUE@        src/feature/api/tor_api.c
+ 
+-confdir = $(sysconfdir)/tor
+-tordatadir = $(datadir)/tor
++confdir = $(sysconfdir)/tordev
++tordatadir = $(datadir)/tordev
+ conf_DATA = src/config/torrc.sample
+ tordata_DATA = src/config/geoip src/config/geoip6
+ 
diff --git a/tor-dev/patches/patch-src_app_config_config.c b/tor-dev/patches/patch-src_app_config_config.c
new file mode 100644
index 0000000000..e96b01efd3
--- /dev/null
+++ b/tor-dev/patches/patch-src_app_config_config.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+tor -> tordev.
+
+--- src/app/config/config.c.orig	2018-09-21 11:51:54.000000000 +0000
++++ src/app/config/config.c
+@@ -437,9 +437,9 @@ static config_var_t option_vars_[] = {
+   V(GeoIPv6File,                 FILENAME, "<default>"),
+ #else
+   V(GeoIPFile,                   FILENAME,
+-    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
++    SHARE_DATADIR PATH_SEPARATOR "tordev" PATH_SEPARATOR "geoip"),
+   V(GeoIPv6File,                 FILENAME,
+-    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip6"),
++    SHARE_DATADIR PATH_SEPARATOR "tordev" PATH_SEPARATOR "geoip6"),
+ #endif /* defined(_WIN32) */
+   OBSOLETE("Group"),
+   V(GuardLifetime,               INTERVAL, "0 minutes"),