ports/97801: [update]sysutils/userinfo

[Martin Wilke]

>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 at 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 <bsd.port.mk>
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 <sys/types.h>
- #include <pwd.h>
- #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: