CVS commit: pkgsrc/net

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Jul  1 22:12:53 UTC 2017

Modified Files:
        pkgsrc/net/openvpn: Makefile.common
        pkgsrc/net/openvpn-acct-wtmpx: distinfo
        pkgsrc/net/openvpn-nagios: distinfo

Log Message:
Use DIST_SUBDIR properly.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/openvpn/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/openvpn-acct-wtmpx/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/openvpn-nagios/distinfo

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

Modified files:

Index: pkgsrc/net/openvpn/Makefile.common
diff -u pkgsrc/net/openvpn/Makefile.common:1.10 pkgsrc/net/openvpn/Makefile.common:1.11
--- pkgsrc/net/openvpn/Makefile.common:1.10     Mon Jun 26 07:21:21 2017
+++ pkgsrc/net/openvpn/Makefile.common  Sat Jul  1 22:12:53 2017
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.10 2017/06/26 07:21:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2017/07/01 22:12:53 joerg Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
 OPENVPN_DISTNAME=      openvpn-2.4.3
-# Remove DIST_SUBDIR on next update
-OPENVPN_DIST_SUBDIR=   openvpn
-OPENVPN_DISTFILE=      ${OPENVPN_DIST_SUBDIR}/${OPENVPN_DISTNAME}.tar.xz
+# Remove DIST_SUBDIR on next update, update distinfo of depending packages
+DIST_SUBDIR=           openvpn
+OPENVPN_DISTFILE=      ${OPENVPN_DISTNAME}.tar.xz
 OPENVPN_MASTER_SITES=  http://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=     ${OPENVPN_MASTER_SITES}
 

Index: pkgsrc/net/openvpn-acct-wtmpx/distinfo
diff -u pkgsrc/net/openvpn-acct-wtmpx/distinfo:1.15 pkgsrc/net/openvpn-acct-wtmpx/distinfo:1.16
--- pkgsrc/net/openvpn-acct-wtmpx/distinfo:1.15 Mon Jun 26 07:21:21 2017
+++ pkgsrc/net/openvpn-acct-wtmpx/distinfo      Sat Jul  1 22:12:53 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2017/06/26 07:21:21 adam Exp $
+$NetBSD: distinfo,v 1.16 2017/07/01 22:12:53 joerg Exp $
 
-SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33
-RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea
-SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf
-Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
+SHA1 (openvpn/openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33
+RMD160 (openvpn/openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea
+SHA512 (openvpn/openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf
+Size (openvpn/openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
 SHA1 (openvpn/openvpn-2.4.3.tar.xz) = b3adaf06225c13ab55b88a0edd3df71278860c20
 RMD160 (openvpn/openvpn-2.4.3.tar.xz) = 110f2879222c6a0a076af10fbce4deff2a0ff4b0
 SHA512 (openvpn/openvpn-2.4.3.tar.xz) = b92ec769f672fa7c7a70985535754c566891f94774e4bc3aeb2141b3c168783aebeb82341635d3708978dd3254708221e2ddaae9919d4cf398318fff7d01c926

Index: pkgsrc/net/openvpn-nagios/distinfo
diff -u pkgsrc/net/openvpn-nagios/distinfo:1.12 pkgsrc/net/openvpn-nagios/distinfo:1.13
--- pkgsrc/net/openvpn-nagios/distinfo:1.12     Mon Jun 26 07:21:21 2017
+++ pkgsrc/net/openvpn-nagios/distinfo  Sat Jul  1 22:12:53 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2017/06/26 07:21:21 adam Exp $
+$NetBSD: distinfo,v 1.13 2017/07/01 22:12:53 joerg Exp $
 
-SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2
-RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4
-SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358
-Size (openvpn-nagios-20130210.tgz) = 3034 bytes
+SHA1 (openvpn/openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2
+RMD160 (openvpn/openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4
+SHA512 (openvpn/openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358
+Size (openvpn/openvpn-nagios-20130210.tgz) = 3034 bytes
 SHA1 (openvpn/openvpn-2.4.3.tar.xz) = b3adaf06225c13ab55b88a0edd3df71278860c20
 RMD160 (openvpn/openvpn-2.4.3.tar.xz) = 110f2879222c6a0a076af10fbce4deff2a0ff4b0
 SHA512 (openvpn/openvpn-2.4.3.tar.xz) = b92ec769f672fa7c7a70985535754c566891f94774e4bc3aeb2141b3c168783aebeb82341635d3708978dd3254708221e2ddaae9919d4cf398318fff7d01c926