From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 24 18:10:49 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74FD016A8C1 for ; Wed, 24 May 2006 18:10:38 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8D4C43D6D for ; Wed, 24 May 2006 18:10:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4OIAMDV068778 for ; Wed, 24 May 2006 18:10:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4OIAM0T068777; Wed, 24 May 2006 18:10:22 GMT (envelope-from gnats) Resent-Date: Wed, 24 May 2006 18:10:22 GMT Resent-Message-Id: <200605241810.k4OIAM0T068777@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Martin Wilke" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D94616A5A8 for ; Wed, 24 May 2006 18:03:30 +0000 (UTC) (envelope-from freebsd@unixfreunde.de) Received: from unixfreunde.net (unixfreunde.de [85.214.35.254]) by mx1.FreeBSD.org (Postfix) with ESMTP id F062343D45 for ; Wed, 24 May 2006 18:03:29 +0000 (GMT) (envelope-from freebsd@unixfreunde.de) Received: by unixfreunde.net (Postfix, from userid 65534) id CEB355066D; Wed, 24 May 2006 20:03:31 +0200 (CEST) Received: from mwilke.ath.cx (p548D3B0C.dip0.t-ipconnect.de [84.141.59.12]) by unixfreunde.net (Postfix) with ESMTP id 87A2C50666; Wed, 24 May 2006 20:03:29 +0200 (CEST) Message-Id: <1148493807.19039@mwilke.ath.cx> Date: Wed, 24 May 2006 20:03:27 +0200 From: "Martin Wilke" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: bjk@m-net.arbornet.org Subject: ports/97801: [update]sysutils/userinfo X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 18:10:50 -0000 >Number: 97801 >Category: ports >Synopsis: [update]sysutils/userinfo >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 24 18:10:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Martin Wilke >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 7.0-CURRENT #142: Thu May 18 07:57:01 CEST 2006 splash@mwilke.ath.cx:/usr/obj/usr/src/sys/BSDBOX >Description: - update to 2.1 - remove patches - tinderbox checked (6.1/7.1) - maintainer is cc'd - fix http://people.freebsd.org/~fenner/portsurvey/sysutils.html#userinfo >How-To-Repeat: >Fix: --- userinfo.diff begins here --- diff -ruN /usr/ports/sysutils/userinfo/Makefile ports/sysutils/userinfo/Makefile --- /usr/ports/sysutils/userinfo/Makefile Tue Apr 12 05:26:37 2005 +++ ports/sysutils/userinfo/Makefile Wed May 24 19:12:08 2006 @@ -6,7 +6,7 @@ # PORTNAME= userinfo -PORTVERSION= 1.10a +PORTVERSION= 2.1 CATEGORIES= sysutils MASTER_SITES= http://arbornet.org/~bjk/userinfo/ @@ -20,6 +20,6 @@ PLIST_FILES= bin/ui pre-build: - ${MV} ${WRKSRC}/doc/ui.man ${WRKSRC}/doc/ui.1 + ${MV} ${WRKSRC}/doc/ui.1 ${WRKSRC}/doc/ui.1 .include diff -ruN /usr/ports/sysutils/userinfo/distinfo ports/sysutils/userinfo/distinfo --- /usr/ports/sysutils/userinfo/distinfo Tue Jan 24 17:39:48 2006 +++ ports/sysutils/userinfo/distinfo Wed May 24 19:06:43 2006 @@ -1,3 +1,3 @@ -MD5 (userinfo-1.10a.tar.gz) = f6845f0c25a4ce90750a93b39e5e63cc -SHA256 (userinfo-1.10a.tar.gz) = c6c6657484c2506edfcab8050bc0e6f7dcb88fb716780e8a430665c04f5542dc -SIZE (userinfo-1.10a.tar.gz) = 109579 +MD5 (userinfo-2.1.tar.gz) = e3ac891b4e902954747eadc9d74e3408 +SHA256 (userinfo-2.1.tar.gz) = 90420506c67542bcad5b5bf11c2d683f8e7be034be34f8bcc5dcad9d90cdbc83 +SIZE (userinfo-2.1.tar.gz) = 332964 diff -ruN /usr/ports/sysutils/userinfo/files/patch-doc-Makefile.in ports/sysutils/userinfo/files/patch-doc-Makefile.in --- /usr/ports/sysutils/userinfo/files/patch-doc-Makefile.in Mon Mar 31 13:39:27 2003 +++ ports/sysutils/userinfo/files/patch-doc-Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ -+++ doc/Makefile.in Tue Nov 5 15:33:15 2002 -@@ -114,7 +114,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --dist_man1_MANS = ui.man -+dist_man1_MANS = ui.1 - subdir = doc - mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff -ruN /usr/ports/sysutils/userinfo/files/patch-src::common.h ports/sysutils/userinfo/files/patch-src::common.h --- /usr/ports/sysutils/userinfo/files/patch-src::common.h Tue Jul 15 14:49:20 2003 +++ ports/sysutils/userinfo/files/patch-src::common.h Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- src/common.h.orig Sat Jun 14 02:45:40 2003 -+++ src/common.h Sat Jun 14 02:21:13 2003 -@@ -16,6 +16,7 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -+#include - #include - #include "config.h" - diff -ruN /usr/ports/sysutils/userinfo/files/patch-src::process.c ports/sysutils/userinfo/files/patch-src::process.c --- /usr/ports/sysutils/userinfo/files/patch-src::process.c Tue Jul 15 14:49:20 2003 +++ ports/sysutils/userinfo/files/patch-src::process.c Thu Jan 1 01:00:00 1970 @@ -1,27 +0,0 @@ ---- src/process.c.orig Sat Jun 14 02:33:21 2003 -+++ src/process.c Sat Jun 14 02:42:29 2003 -@@ -63,15 +63,24 @@ - } - - for (i = 0; i < cnt; i++) { -+#if __FreeBSD_version < 500000 - if (kp[i].kp_eproc.e_flag & EPROC_SLEADER && kp[i].kp_eproc.e_tdev != - -1) { - pid = kp[i].kp_proc.p_pid; -+#else -+ if (kp[i].ki_kiflag & KI_SLEADER && kp[i].ki_tdev != -1) { -+ pid = kp[i].ki_pid; -+#endif - break; - } - } - - if (!pid) -+#if __FreeBSD_version < 500000 - pid = kp[0].kp_eproc.e_ppid; -+#else -+ pid = kp[0].ki_ppid; -+#endif - - return (pid > 1) ? pid : -1; - } --- userinfo.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: