ports/86128: recent xsysinfo patch breaks xsysinfo on current [patch]

[Ted Faber]

>Number:         86128
>Category:       ports
>Synopsis:       recent xsysinfo patch breaks xsysinfo on current [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 14 16:00:36 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ted Faber
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
ISI
>Environment:
System: FreeBSD pun.isi.edu 7.0-CURRENT FreeBSD 7.0-CURRENT #14: Mon Sep 12 13:07:34 PDT 2005 root at pun.isi.edu:/usr/obj/usr/src/sys/PUN i386

>Description:
	xsysinfo grunges around in the kernel looking for the number of open
	files.  Somewhere between 5.3 and 5.4 the nfiles kernel variable
	changed name to openfiles (and the xsysinfo-1.4a_1 patch went in to fix
	that).  Then before 5.4 release that variable name changed back in 5.4,
	but not in the 6.0+ branch.  Then a patch went into xsysinfo from
	someone tracking -current (5.4) that removed the change to the new
	variable name (openfiles).  This patch puts the openfiles name back in
	for FreeBSDversions > 600000, which seems to be the least breakage.

	I've talked it over with the fellows who patched xsysinfo-1.4_2 and we
	agree this seems like the right patch.

	Patches to this port have been being incorporated due to maintainer
	timeout.  As this problem breaks the code on -CURRENT, it would be nice
	if we could expedite it.

	Let me know if you need more info.
>How-To-Repeat:
	try to run xsysinfo-1.4a_2 on -CURRENT
>Fix:

	Patch follows:

diff -ruN xsysinfo.bak/Makefile xsysinfo/Makefile
--- xsysinfo.bak/Makefile	Wed Sep  7 09:44:55 2005
+++ xsysinfo/Makefile	Wed Sep 14 08:41:28 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsysinfo
 PORTVERSION=	1.4a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/pub/jdli/source/
 
diff -ruN xsysinfo.bak/files/patch-sysinfo.c xsysinfo/files/patch-sysinfo.c
--- xsysinfo.bak/files/patch-sysinfo.c	Wed Sep  7 09:44:55 2005
+++ xsysinfo/files/patch-sysinfo.c	Wed Sep 14 08:41:57 2005
@@ -56,7 +56,7 @@
 +	{ "_numvnodes" },
 +#define	FNL_NFILE	4
 +/* nfiles changes name to openfiles near this FreeBSD version */
-+#if XXX && __FreeBSD_version > 503101
++#if __FreeBSD_version > 600000
 +	{"_openfiles"},
 +#else
 +	{"_nfiles"},
>Release-Note:
>Audit-Trail:
>Unformatted: