rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass CONFDIR to CONFIGURE_ENV, bump PKGREVISION.

This commit is contained in:
Alexander Nasonov 2019-08-19 00:15:50 +01:00
parent b67fde0bc9
commit 8537ff9671
No known key found for this signature in database
GPG Key ID: 66070EA58C2922DF
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tor-dev/Makefile
View File

@ -2,6 +2,7 @@
DISTNAME= tor-0.4.1.4-rc
PKGNAME= ${DISTNAME:S/tor/tordev/:S/-alpha//:S/-rc/rc0/}
PKGREVISION= 1
CATEGORIES= net security
MASTER_SITES= https://dist.torproject.org/
@ -19,6 +20,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --program-suffix=-dev
CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/tordev
CONFIGURE_ENV+= CPP=${CPP:Q}
CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
TEST_TARGET= check

2
tor-dev/distinfo
View File

@ -5,4 +5,4 @@ RMD160 (tor-0.4.1.4-rc.tar.gz) = 5a75e8bee985aa637d76de7cf6db838358346f6f
SHA512 (tor-0.4.1.4-rc.tar.gz) = 851809c5ff80beea8bf4432d702bcb6ce9ffe0b3d137c3c11386f1e4c771140d218d4ed2dc5c3c4994091c13a2e28f85ce125c1b68fe606d16e4e1f5a259937b
Size (tor-0.4.1.4-rc.tar.gz) = 7369948 bytes
SHA1 (patch-Makefile.in) = c190295f4702bd1e69531cab1ac61dbab451e48b
SHA1 (patch-src_app_config_config.c) = f14298e5a33faf25f385cfc91d74bff2862a14c6
SHA1 (patch-src_app_config_config.c) = bac106e382207cdf22c84a52b45c791de2bdf0f8

13
tor-dev/patches/patch-src_app_config_config.c
View File

@ -2,9 +2,9 @@ $NetBSD$
tor -> tordev.
--- src/app/config/config.c.orig 2019-06-11 11:29:32.000000000 +0000
--- src/app/config/config.c.orig 2018-09-21 11:51:54.000000000 +0000
+++ src/app/config/config.c
@@ -460,9 +460,9 @@ static config_var_t option_vars_[] = {
@@ -437,9 +437,9 @@ static config_var_t option_vars_[] = {
V(GeoIPv6File, FILENAME, "<default>"),
#else
V(GeoIPFile, FILENAME,
@ -16,12 +16,3 @@ tor -> tordev.
#endif /* defined(_WIN32) */
OBSOLETE("Group"),
V(GuardLifetime, INTERVAL, "0 minutes"),
@@ -7850,7 +7850,7 @@ get_data_directory(const char *val)
"\"%s\", which is probably not what you want. Using "
"\"%s"PATH_SEPARATOR"tor\" instead", fn, LOCALSTATEDIR);
tor_free(fn);
- fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tor");
+ fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tordev");
}
return fn;
}