ports/144399: [patch] sysutils/xosview - builds on CURRENT again

[Rainer Hurling]

>Number:         144399
>Category:       ports
>Synopsis:       [patch] sysutils/xosview - builds on CURRENT again
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 01 21:40:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rainer Hurling
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD xxx.xxx.xxx 9.0-CURRENT FreeBSD 9.0-CURRENT #2: Sat Feb 27 09:23:23 CET 2010     xxx at xxx.xxx.xxx:/usr/obj/usr/src/sys/xxx  amd64
>Description:
sysutils/xosview is marked broken on 9.0-CURRENT as 'unsupported FreeBSD version'. There are two reasons for that. 

First reason is easy to solve with an additional digit for version 9 in the accordingly patch file.

The second reason is a little more tricky. xosview core dumps when running on 9.0. This is because xosview is not able to request 'irq' and 'interrupt' values on this version of FreeBSD any more. I took the easy way out and disabled both meters (irq and interrupt) in the ressource file of xosview. Without that all works fine.
>How-To-Repeat:
sysutils/xosview version 1.46 does not build on 9.0-CURRENT because it is marked broken.
>Fix:
The following patch changes three port files. Afterwards xosview should work on all versions and all(?) platforms (could only test i386 and amd64):


Patch attached with submission follows:

diff -ur xosview.orig/Makefile xosview/Makefile
--- xosview.orig/Makefile	2009-12-21 14:05:21.000000000 +0100
+++ xosview/Makefile	2010-03-01 22:28:03.000000000 +0100
@@ -21,10 +21,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 900000
-BROKEN=		unsupported FreeBSD version
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,iostream.h,iostream,' \
 		${WRKSRC}/xwin.h \
diff -ur xosview.orig/files/patch-ae xosview/files/patch-ae
--- xosview.orig/files/patch-ae	2001-08-21 21:32:41.000000000 +0200
+++ xosview/files/patch-ae	2010-03-01 22:29:32.000000000 +0100
@@ -1,8 +1,19 @@
---- Xdefaults.in.orig	Wed Jul  5 21:44:36 2000
-+++ Xdefaults.in	Tue Aug 21 12:15:19 2001
-@@ -175,7 +175,7 @@
+--- Xdefaults.in.orig	2006-02-18 06:45:00.000000000 +0100
++++ Xdefaults.in	2010-02-28 19:58:09.000000000 +0100
+@@ -169,17 +169,17 @@
+ 
+ ! Interrupt Meter Resources
+ 
+-xosview*interrupts:         True
++xosview*interrupts:         False
+ xosview*intOnColor:         red
+ xosview*intOffColor:        aquamarine
+ xosview*intPriority:	    1
+ 
  ! Interrupt Rate Meter Resources
  xosview*irqrate:	True
+-xosview*irqrate:	True
++xosview*irqrate:	False
  xosview*irqrateUsedColor:	red
 -xosview*irqrateIdleColor:	black
 +xosview*irqrateIdleColor:	aquamarine
diff -ur xosview.orig/files/patch-configure xosview/files/patch-configure
--- xosview.orig/files/patch-configure	2007-12-20 16:10:47.000000000 +0100
+++ xosview/files/patch-configure	2010-03-01 22:29:39.000000000 +0100
@@ -5,7 +5,7 @@
  			host_dir=bsd
  	host_os=freebsd ;;
 -freebsd[4]*)
-+freebsd[45678]*)
++freebsd[456789]*)
          EXTRALIBS="-lkvm $XPMLIB $DEVSTATLIB"
          INSTALL_ARGS='-s -g kmem -m 02555'
  	NetMeter_Default_Setting=True


>Release-Note:
>Audit-Trail:
>Unformatted: