upgrade to 1.8.0
make it compile on -current (ugly hack for very ugly sources)...
This commit is contained in:
form
parent
af9ec80046
commit
e5debc1dbe
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2001/09/28 06:02:15 pvalchev Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2002/03/18 06:51:24 form Exp $
|
||||
# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:50 agc Exp $
|
||||
|
||||
COMMENT= "graphical performance meter"
|
||||
|
||||
DISTNAME= xosview-1.7.4
|
||||
DISTNAME= xosview-1.8.0
|
||||
CATEGORIES= sysutils
|
||||
NEED_VERSION= 1.402
|
||||
MASTER_SITES= ftp://ftp.openbsd.ru/pub/OpenBSD/distfiles/ \
|
||||
ftp://vell.nsc.ru/pub/OpenBSD/distfiles/ \
|
||||
http://lore.ece.utexas.edu/~bgrayson/xosview/
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= xosview
|
||||
|
||||
HOMEPAGE= http://xosview.sourceforge.net/
|
||||
|
||||
MAINTAINER= Oleg Safiullin <form@openbsd.org>
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (xosview-1.7.4.tar.gz) = 2b54da13e6acdbb8eb27f56d413b321a
|
||||
RMD160 (xosview-1.7.4.tar.gz) = da1a06de5585b4feeeb1da321ca60d2567c3a24f
|
||||
SHA1 (xosview-1.7.4.tar.gz) = a889e09208645e142c159bc39d3e43c7625a7f11
|
||||
MD5 (xosview-1.8.0.tar.gz) = bcbc0f02ac8944222ec677d504024c40
|
||||
RMD160 (xosview-1.8.0.tar.gz) = 1cd55d00e64106d819fa4fe5640302861a1cf905
|
||||
SHA1 (xosview-1.8.0.tar.gz) = 5ac43ff429f231f7c94db5e3d3449ed483c4c7a5
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Xdefaults_in,v 1.1 2001/12/06 04:09:54 form Exp $
|
||||
--- Xdefaults.in.orig Thu Jul 6 11:44:36 2000
|
||||
+++ Xdefaults.in Thu Dec 6 09:59:45 2001
|
||||
$OpenBSD: patch-Xdefaults_in,v 1.2 2002/03/18 06:51:24 form Exp $
|
||||
--- Xdefaults.in.orig Mon Feb 25 04:00:47 2002
|
||||
+++ Xdefaults.in Mon Mar 18 12:20:41 2002
|
||||
@@ -44,7 +44,7 @@ xosview*usedlabels: True
|
||||
xosview*usedLabelColor: wheat
|
||||
xosview*borderwidth: 0
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-Xdefaults_in,v 1.1 2001/12/06 04:09:54 form Exp $
|
||||
xosview*foreground: wheat
|
||||
xosview*enableStipple: False ! Change to true to try beta stipple support.
|
||||
xosview*samplesPerSec: 10 ! not yet supported
|
||||
@@ -175,7 +175,7 @@ xosview*intPriority: 1
|
||||
@@ -191,7 +191,7 @@ xosview*intPriority: 1
|
||||
! Interrupt Rate Meter Resources
|
||||
xosview*irqrate: True
|
||||
xosview*irqrateUsedColor: red
|
||||
|
||||
15
sysutils/xosview/patches/patch-bsd_swapinternal_cc
Normal file
15
sysutils/xosview/patches/patch-bsd_swapinternal_cc
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-bsd_swapinternal_cc,v 1.1 2002/03/18 06:51:24 form Exp $
|
||||
--- bsd/swapinternal.cc.orig Mon Mar 18 12:27:08 2002
|
||||
+++ bsd/swapinternal.cc Mon Mar 18 12:28:03 2002
|
||||
@@ -1,3 +1,5 @@
|
||||
+#if !(defined(XOSVIEW_OPENBSD) && defined(HAVE_SWAPCTL))
|
||||
+
|
||||
// Copyright (c) 1995 by Brian Grayson (bgrayson@ece.utexas.edu)
|
||||
//
|
||||
// This code is borrowed HEAVILY from the vmstat source code in the
|
||||
@@ -499,3 +501,5 @@ BSDGetSwapInfo(int* total, int* free)
|
||||
*free = 512*(avail-used);
|
||||
#endif /* USE_KVM_GETSWAPINFO */
|
||||
}
|
||||
+
|
||||
+#endif
|
||||
18
sysutils/xosview/patches/patch-bsd_swapinternal_h
Normal file
18
sysutils/xosview/patches/patch-bsd_swapinternal_h
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-bsd_swapinternal_h,v 1.1 2002/03/18 06:51:24 form Exp $
|
||||
--- bsd/swapinternal.h.orig Mon Mar 18 12:26:20 2002
|
||||
+++ bsd/swapinternal.h Mon Mar 18 12:27:00 2002
|
||||
@@ -8,11 +8,14 @@
|
||||
|
||||
// Header file for the swap internal/NetBSD-specific code.
|
||||
|
||||
+#if defined(XOSVIEW_OPENBSD) && defined(HAVE_SWAPCTL)
|
||||
+#else
|
||||
int
|
||||
BSDInitSwapInfo();
|
||||
|
||||
void
|
||||
BSDGetSwapInfo(int* total, int* free);
|
||||
+#endif
|
||||
|
||||
void
|
||||
BSDGetSwapCtlInfo(int* total, int* free);
|
||||
25
sysutils/xosview/patches/patch-bsd_swapmeter_cc
Normal file
25
sysutils/xosview/patches/patch-bsd_swapmeter_cc
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-bsd_swapmeter_cc,v 1.1 2002/03/18 06:51:24 form Exp $
|
||||
--- bsd/swapmeter.cc.orig Mon Mar 18 12:29:21 2002
|
||||
+++ bsd/swapmeter.cc Mon Mar 18 12:35:22 2002
|
||||
@@ -34,7 +34,9 @@ SwapMeter::SwapMeter( XOSView *parent )
|
||||
useSwapCtl = 0;
|
||||
#endif
|
||||
BSDSwapInit(); // In kernel.cc
|
||||
+#if !(defined(XOSVIEW_OPENBSD) && defined(HAVE_SWAPCTL))
|
||||
if (!BSDInitSwapInfo())
|
||||
+#endif
|
||||
{
|
||||
#ifdef HAVE_SWAPCTL
|
||||
// Set up to use new swap code instead.
|
||||
@@ -82,7 +84,11 @@ void SwapMeter::getswapinfo( void ){
|
||||
BSDGetSwapCtlInfo(&total_int, &free_int);
|
||||
else
|
||||
#endif
|
||||
+#if defined(XOSVIEW_OPENBSD) && defined(HAVE_SWAPCTL)
|
||||
+ ;
|
||||
+#else
|
||||
BSDGetSwapInfo (&total_int, &free_int);
|
||||
+#endif
|
||||
}
|
||||
else {
|
||||
total_int = 1; /* So the meter looks blank. */
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2001/08/17 12:28:37 form Exp $
|
||||
--- configure.orig Tue Jul 18 01:54:42 2000
|
||||
+++ configure Fri Aug 17 19:19:47 2001
|
||||
@@ -1676,6 +1676,18 @@ fi
|
||||
|
||||
host_dir=linux
|
||||
host_os=linux ;;
|
||||
$OpenBSD: patch-configure,v 1.3 2002/03/18 06:51:24 form Exp $
|
||||
--- configure.orig Fri Mar 15 08:28:14 2002
|
||||
+++ configure Fri Mar 15 08:32:59 2002
|
||||
@@ -1869,20 +1869,63 @@ EOF
|
||||
|
||||
host_dir=bsd
|
||||
host_os=freebsd ;;
|
||||
+
|
||||
+## Check for OpenBSD 2.0-2.5
|
||||
+openbsd2.[012345]*)
|
||||
@ -17,22 +17,12 @@ $OpenBSD: patch-configure,v 1.2 2001/08/17 12:28:37 form Exp $
|
||||
+ host_dir=bsd
|
||||
+ host_os=openbsd ;;
|
||||
+
|
||||
## Check for known versions of NetBSD...
|
||||
netbsd1.[012345]*)
|
||||
host_os_full=$host_os
|
||||
@@ -1813,16 +1825,48 @@ EOF
|
||||
|
||||
host_dir=bsd
|
||||
host_os=freebsd ;;
|
||||
-openbsd*)
|
||||
- EXTRALIBS="-lkvm $XPMLIB"
|
||||
- INSTALL_ARGS='-s -g kmem -m 02555'
|
||||
+openbsd2.[6-9]*)
|
||||
+ EXTRALIBS="-lkvm $XPMLIB"
|
||||
+ INSTALL_ARGS='-s -g kmem -m 02555'
|
||||
NetMeter_Default_Setting=True
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define XOSVIEW_OPENBSD 1
|
||||
+ NetMeter_Default_Setting=True
|
||||
+ cat >> confdefs.h <<\EOF
|
||||
+#define XOSVIEW_OPENBSD 1
|
||||
+#define HAVE_SWAPCTL 1
|
||||
+EOF
|
||||
+ ## Also check for the existence of UVM. This is a nasty,
|
||||
@ -51,25 +41,30 @@ $OpenBSD: patch-configure,v 1.2 2001/08/17 12:28:37 form Exp $
|
||||
+ if test x$uvmstring != x ; then
|
||||
+ cat >> confdefs.h <<\EOF
|
||||
+#define UVM 1
|
||||
EOF
|
||||
+EOF
|
||||
+ fi
|
||||
|
||||
+
|
||||
+ host_dir=bsd
|
||||
+ host_os=openbsd ;;
|
||||
+openbsd*)
|
||||
+ EXTRALIBS="-lkvm $XPMLIB"
|
||||
+ INSTALL_ARGS='-s -g kmem -m 02555'
|
||||
+ NetMeter_Default_Setting=True
|
||||
+ cat >> confdefs.h <<\EOF
|
||||
+#define XOSVIEW_OPENBSD 1
|
||||
+
|
||||
openbsd*)
|
||||
EXTRALIBS="-lkvm $XPMLIB"
|
||||
INSTALL_ARGS='-s -g kmem -m 02555'
|
||||
NetMeter_Default_Setting=True
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define XOSVIEW_OPENBSD 1
|
||||
+#define HAVE_SWAPCTL 1
|
||||
+EOF
|
||||
+#define UVM 1
|
||||
EOF
|
||||
-
|
||||
-
|
||||
|
||||
EXTRA_CXXFLAGS="-Wall -O4 -pipe"
|
||||
|
||||
- host_dir=bsd
|
||||
+ cat >> confdefs.h <<\EOF
|
||||
+#define UVM 1
|
||||
+EOF
|
||||
+ host_dir=bsd
|
||||
host_os=openbsd ;;
|
||||
+
|
||||
bsdi*)
|
||||
EXTRALIBS="-lkvm $XPMLIB"
|
||||
INSTALL_ARGS='-s -g kmem -m 02555'
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-xosview_1,v 1.1 2000/07/17 16:24:47 form Exp $
|
||||
--- xosview.1.orig Mon Jul 17 23:10:20 2000
|
||||
+++ xosview.1 Mon Jul 17 23:10:35 2000
|
||||
@@ -843,7 +843,7 @@ David W. Talmage (talmage@jefferson.cmf.
|
||||
$OpenBSD: patch-xosview_1,v 1.2 2002/03/18 06:51:24 form Exp $
|
||||
--- xosview.1.orig Mon Feb 25 04:55:19 2002
|
||||
+++ xosview.1 Mon Mar 18 12:20:41 2002
|
||||
@@ -959,7 +959,7 @@ David W. Talmage (talmage@jefferson.cmf.
|
||||
Added battery-meter support to NetBSD.
|
||||
.RE
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user