Add DragonFly and modular Xorg support.

4 files changed, 69 insertions, 13 deletions

diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile
index 474194f7026..cbbda169c62 100644
--- a/sysutils/bbsload/Makefile
+++ b/sysutils/bbsload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/15 21:46:54 joerg Exp $
 #
 
 DISTNAME=	bbsload-0.2.6
@@ -14,9 +14,18 @@ GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_X11BASE=		YES
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "DragonFly"
+MAKE_ENV+=	LIBS.pkgsrc=-lkinfo
+.endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/${PKGMANDIR}/man1/bbsload.1
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bbsload/distinfo b/sysutils/bbsload/distinfo
index 939ed96c684..a990a8b5f6b 100644
--- a/sysutils/bbsload/distinfo
+++ b/sysutils/bbsload/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:50 agc Exp $
+$NetBSD: distinfo,v 1.5 2007/02/15 21:46:54 joerg Exp $
 
 SHA1 (bbsload-0.2.6.tar.gz) = 20e51d2888e7b62d8c8637d9ea66e71e07dcd18e
 RMD160 (bbsload-0.2.6.tar.gz) = ab6d72a9d872ea60251051d26bf1fb84fc06641e
 Size (bbsload-0.2.6.tar.gz) = 79258 bytes
-SHA1 (patch-aa) = 51a725db6d11831f48bf2896304569a584ce41ef
+SHA1 (patch-aa) = 3edc890ca092db712d2ed1e715aa53b20beeea8b
 SHA1 (patch-ab) = 3a14f1b186939e75a74468f481583d49a2a30b4e
 SHA1 (patch-ac) = 476ca12d419d2057ce256d0dcbcf262883f86bed
+SHA1 (patch-ad) = 509a5fac20d76c84bf506ce457fe69c3ecbf36cb
diff --git a/sysutils/bbsload/patches/patch-aa b/sysutils/bbsload/patches/patch-aa
index 5c5890dc15a..48503a3cee5 100644
--- a/sysutils/bbsload/patches/patch-aa
+++ b/sysutils/bbsload/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2007/02/15 21:46:54 joerg Exp $
 
---- bbsload.cc.orig	Mon May 22 20:53:37 2000
+--- bbsload.cc.orig	2000-05-22 18:53:37.000000000 +0000
 +++ bbsload.cc
-@@ -21,6 +21,12 @@
+@@ -21,6 +21,20 @@
  
  #include "bbsload.hh"
  
@@ -10,12 +10,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <uvm/uvm_param.h>
++#elif defined(__DragonFly__)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/vmmeter.h>
++#define template
++#include <sys/user.h>
++#undef template
++#include <kinfo.h>
 +#endif
 +
  CheckLoad::CheckLoad(ToolWindow *toolwindow) {
    bbtool=toolwindow;
    timer=new BTimer(bbtool->getCurrentScreenInfo()->getBaseDisplay(),this) ;
-@@ -40,97 +46,81 @@
+@@ -40,97 +54,106 @@ void CheckLoad::Reconfigure() {
  
  void CheckLoad::timeout()
  {
@@ -34,9 +42,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
 +    static u_int64_t old_user=0, old_nice=0, old_system=0,
 +	    old_idle=0;
 +    u_int64_t user,nice,system,idle,total;
++#if defined(__DragonFly__)
++    struct kinfo_cputime cpu_time;
++#else
 +    u_int64_t cputimes[5];
++#endif
 +    double lavg[3];
++#if defined(__DragonFly__)
++    size_t vm_stat_size = sizeof(struct vmstats);
++    struct vmstats vm_stat;
++#else
 +    struct uvmexp uvm_stat;
++#endif
 +    int    ctl_name[3];
 +    size_t ctllen;
  
@@ -135,6 +152,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
 +    task.total=ctllen/sizeof(struct kinfo_proc); /* Anybody have an
 +		alternative ? */
 +
++#if defined(__DragonFly__)
++    sysctlbyname("vm.vmstats", &vm_stat, &vm_stat_size, NULL, 0);
++    mem.total = vm_stat.v_page_count;
++    mem.used = mem.total - vm_stat.v_free_count;
++    swap.total = 0; /* XXX fill me in, expensive! */
++    swap.used = 0;
++#else
 +    /* task.running is missing */
 +    /* get memory statistics */
 +    ctllen=sizeof(uvm_stat);
@@ -148,6 +172,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
 +    swap.total=uvm_stat.swpages;
 +    swap.used=uvm_stat.swpgonly; /* Only count pages in swap which are
 +			not also present in memory */
++#endif
 +
 +    norm.total_used=(double)(mem.used+swap.used)/
 +                    (double)(mem.total+swap.total);
@@ -155,6 +180,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
 +    if (swap.total!=0)
 +        norm.swap_used=(double)swap.used/(double)swap.total;
 +
++#if defined(__DragonFly__)
++    kinfo_get_sched_cputime(&cpu_time);
++    user = cpu_time.cp_user;
++    nice = cpu_time.cp_nice;
++    system = cpu_time.cp_sys + cpu_time.cp_intr;
++    idle = cpu_time.cp_idle;
++#else
 +    ctl_name[0]=CTL_KERN;
 +    ctl_name[1]=KERN_CP_TIME;
 +    ctllen=sizeof(cputimes);
@@ -165,6 +197,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
 +    system=cputimes[2]	/*sys*/
 +	  +cputimes[3]/*intr*/;
 +    idle=cputimes[4];
++#endif
 +    total=(user-old_user)+(nice-old_nice)+
 +    (system-old_system)+(idle-old_idle);
 +    if ((total!=0)&(old_user!=0))
@@ -184,7 +217,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
  }
  
  
-@@ -233,15 +223,15 @@
+@@ -233,15 +256,15 @@ void ToolWindow::MakeWindow(bool reconfi
        label_counter++;
      }
      if (resource->show.label_totalused) {
@@ -203,7 +236,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
        label_counter++;
      }
      if (resource->show.label_usercpu) {
-@@ -545,7 +535,7 @@
+@@ -545,7 +568,7 @@ void ToolWindow::RedrawGauge(double leve
    }
  }
  
@@ -212,7 +245,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
  {
    char t[6];
  
-@@ -561,15 +551,14 @@
+@@ -561,15 +584,14 @@ void ToolWindow::RedrawLabel(double leve
      xposition+=label.seperator_width;
    }
   
@@ -230,7 +263,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
  }
  
  void ToolWindow::Redraw()
-@@ -577,12 +566,12 @@
+@@ -577,12 +599,12 @@ void ToolWindow::Redraw()
      int offset=0;
      if (resource->show.load1m)
      {
@@ -245,7 +278,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
        offset++;
      }
      if (resource->show.load15m)
-@@ -678,53 +667,63 @@
+@@ -678,53 +700,63 @@ void ToolWindow::Redraw()
  
          if (resource->show.label_load1m)
          {
diff --git a/sysutils/bbsload/patches/patch-ad b/sysutils/bbsload/patches/patch-ad
new file mode 100644
index 00000000000..35f40b20476
--- /dev/null
+++ b/sysutils/bbsload/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/02/15 21:46:54 joerg Exp $
+
+--- Makefile.in.orig	2007-02-15 21:26:21.000000000 +0000
++++ Makefile.in
+@@ -83,7 +83,7 @@ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) 
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ ${LIBS.pkgsrc}
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@