From owner-svn-ports-head@freebsd.org  Thu Jun 22 23:55:04 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E755D97703;
 Thu, 22 Jun 2017 23:55:04 +0000 (UTC)
 (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id E1BE06FBDE;
 Thu, 22 Jun 2017 23:55:03 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5MNt3lI098667;
 Thu, 22 Jun 2017 23:55:03 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5MNt2W6098665;
 Thu, 22 Jun 2017 23:55:02 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201706222355.v5MNt2W6098665@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 22 Jun 2017 23:55:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r444161 - in head/devel: android-tools-adb-devel/files
 android-tools-fastboot-devel/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2017 23:55:04 -0000

Author: jbeich
Date: Thu Jun 22 23:55:02 2017
New Revision: 444161
URL: https://svnweb.freebsd.org/changeset/ports/444161

Log:
  devel/android-tools-{adb,fastboot}-devel: adjust KERN_PROC_PATHNAME after r444135

Modified:
  head/devel/android-tools-adb-devel/files/patch-base_file.cpp   (contents, props changed)
  head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp   (contents, props changed)

Modified: head/devel/android-tools-adb-devel/files/patch-base_file.cpp
==============================================================================
--- head/devel/android-tools-adb-devel/files/patch-base_file.cpp	Thu Jun 22 23:43:08 2017	(r444160)
+++ head/devel/android-tools-adb-devel/files/patch-base_file.cpp	Thu Jun 22 23:55:02 2017	(r444161)
@@ -21,7 +21,7 @@
  #if defined(_WIN32)
  #include <windows.h>
  #define O_CLOEXEC O_NOINHERIT
-@@ -251,6 +257,17 @@ std::string GetExecutablePath() {
+@@ -251,6 +258,23 @@ std::string GetExecutablePath() {
    if (result == 0 || result == sizeof(path) - 1) return "";
    path[PATH_MAX - 1] = 0;
    return path;
@@ -30,9 +30,15 @@
 +  size_t path_len = sizeof(path);
 +  int mib[] = {
 +    CTL_KERN,
++#if defined(__NetBSD__)
++    KERN_PROC_ARGS,
++    -1,
++    KERN_PROC_PATHNAME,
++#else
 +    KERN_PROC,
 +    KERN_PROC_PATHNAME,
-+    getpid()
++    -1,
++#endif
 +  };
 +  int rc = sysctl(mib, arraysize(mib), path, &path_len, NULL, 0);
 +  return rc ? "" : path;

Modified: head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
==============================================================================
--- head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp	Thu Jun 22 23:43:08 2017	(r444160)
+++ head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp	Thu Jun 22 23:55:02 2017	(r444161)
@@ -21,7 +21,7 @@
  #if defined(_WIN32)
  #include <windows.h>
  #define O_CLOEXEC O_NOINHERIT
-@@ -251,6 +257,17 @@ std::string GetExecutablePath() {
+@@ -251,6 +258,23 @@ std::string GetExecutablePath() {
    if (result == 0 || result == sizeof(path) - 1) return "";
    path[PATH_MAX - 1] = 0;
    return path;
@@ -30,9 +30,15 @@
 +  size_t path_len = sizeof(path);
 +  int mib[] = {
 +    CTL_KERN,
++#if defined(__NetBSD__)
++    KERN_PROC_ARGS,
++    -1,
++    KERN_PROC_PATHNAME,
++#else
 +    KERN_PROC,
 +    KERN_PROC_PATHNAME,
-+    getpid()
++    -1,
++#endif
 +  };
 +  int rc = sysctl(mib, arraysize(mib), path, &path_len, NULL, 0);
 +  return rc ? "" : path;