From owner-svn-ports-head@FreeBSD.ORG Wed Dec 17 18:45:08 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D97A0C56; Wed, 17 Dec 2014 18:45:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 AB6568DC; Wed, 17 Dec 2014 18:45:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBHIj8Mc040150; Wed, 17 Dec 2014 18:45:08 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBHIj8fS040149; Wed, 17 Dec 2014 18:45:08 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412171845.sBHIj8fS040149@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 17 Dec 2014 18:45:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374868 - head/net-mgmt/seafile/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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2014 18:45:09 -0000 Author: antoine Date: Wed Dec 17 18:45:07 2014 New Revision: 374868 URL: https://svnweb.freebsd.org/changeset/ports/374868 QAT: https://qat.redports.org/buildarchive/r374868/ Log: Fix make patch Reported by: pkg-fallout Modified: head/net-mgmt/seafile/files/patch-lib_utils.c Modified: head/net-mgmt/seafile/files/patch-lib_utils.c ============================================================================== --- head/net-mgmt/seafile/files/patch-lib_utils.c Wed Dec 17 18:33:27 2014 (r374867) +++ head/net-mgmt/seafile/files/patch-lib_utils.c Wed Dec 17 18:45:07 2014 (r374868) @@ -1,5 +1,5 @@ ---- lib/utils.c.orig 2014-08-05 01:28:35.000000000 -0400 -+++ lib/utils.c 2014-11-22 20:17:13.543784891 -0500 +--- lib/utils.c.orig 2014-08-05 05:28:35 UTC ++++ lib/utils.c @@ -46,6 +46,15 @@ #include @@ -16,7 +16,7 @@ extern int inet_pton(int af, const char *src, void *dst); -@@ -1756,14 +1765,19 @@ +@@ -1756,14 +1765,19 @@ wchar_from_utf8 (const char *utf8) #endif /* ifdef WIN32 */ @@ -37,7 +37,7 @@ return -1; } -@@ -1787,7 +1801,8 @@ +@@ -1787,7 +1801,8 @@ find_process_in_dirent(struct dirent *di } /* read the /proc fs to determine whether some process is running */ @@ -47,7 +47,7 @@ { DIR *proc_dir = opendir("/proc"); if (!proc_dir) { -@@ -1812,7 +1827,8 @@ +@@ -1812,7 +1827,8 @@ gboolean process_is_running (const char return FALSE; } @@ -57,7 +57,7 @@ { int count = 0; DIR *proc_dir = opendir("/proc"); -@@ -1836,6 +1852,14 @@ +@@ -1836,6 +1852,14 @@ int count_process(const char *process_na return count; } @@ -72,7 +72,7 @@ #endif #ifdef __APPLE__ -@@ -1846,6 +1870,120 @@ +@@ -1846,6 +1870,120 @@ gboolean process_is_running (const char } #endif @@ -90,7 +90,8 @@ + (!kthreads && ((kp)->kp_flags & P_SYSTEM) != 0)) +#define KVM_OPENFILES(exec, coref, buf) \ + kvm_openfiles(exec, coref, NULL, O_RDONLY, buf) -+#define KVM_GETPROCS(kd, plist, nproc) \+ kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc) ++#define KVM_GETPROCS(kd, plist, nproc) \ ++ kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc) + +#elif defined(__NetBSD__) +#define PSKIP(kp) ((kp)->kp_pid == mypid || \