Initial import of x11-wm/bbapm, an APM meter for Blackbox

PR:		29461
Submitted by:	Adam Weinberger <monkey@crackula.com>, \
		Scott Renfro <scott@renfro.org> (additional patches)

12 files changed, 161 insertions, 0 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index c54a5c244403..0586963fc45c 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -9,6 +9,7 @@
     SUBDIR += afterstep-stable
     SUBDIR += amaterus
     SUBDIR += amiwm
+    SUBDIR += bbapm
     SUBDIR += bbconf
     SUBDIR += bbkeys
     SUBDIR += bbpager
diff --git a/x11-wm/bbapm/Makefile b/x11-wm/bbapm/Makefile
new file mode 100644
index 000000000000..7c812d68d292
--- /dev/null
+++ b/x11-wm/bbapm/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	bbapm
+# Date created:				3 August 2001
+# Whom:				Adam Weinberger <monkey@crackula.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	bbapm
+PORTVERSION=	0.0.1
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://bbtools.windsofstorm.net/sources/
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	bbapm-0.0.1-freebsd-patch-2.diff
+PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=	monkey@crackula.com
+
+RUN_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
+
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
+
+do-install:
+	@${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g operator \
+		-m 2555 ${WRKSRC}/bbapm ${PREFIX}/bin
+.for a in README.bbapm bbapm.conf bbapm.nobb bbapm.style bbtoolsrc.in
+	@${INSTALL_DATA} ${WRKSRC}/data/${a} ${PREFIX}/share/bbtools
+.endfor
+
+.include <bsd.port.mk>
diff --git a/x11-wm/bbapm/distinfo b/x11-wm/bbapm/distinfo
new file mode 100644
index 000000000000..aff65230c815
--- /dev/null
+++ b/x11-wm/bbapm/distinfo
@@ -0,0 +1,2 @@
+MD5 (bbapm-0.0.1.tar.gz) = 4d2629959bd907696c7765b7c34bc54f
+MD5 (bbapm-0.0.1-freebsd-patch-2.diff) = 8b9242c0fa6067d9d7c10dcbdc0cb8c7
diff --git a/x11-wm/bbapm/files/patch-Baseresource.cc b/x11-wm/bbapm/files/patch-Baseresource.cc
new file mode 100644
index 000000000000..d757e836f960
--- /dev/null
+++ b/x11-wm/bbapm/files/patch-Baseresource.cc
@@ -0,0 +1,12 @@
+--- Baseresource.cc.orig	Mon Aug 16 10:40:24 1999
++++ Baseresource.cc	Sat Aug  4 20:52:40 2001
+@@ -27,6 +27,9 @@
+ {
+     bbtool = toolwindow;
+ 
++    style.conf_filename = NULL;
++    style.style_filename = NULL;
++
+     if (bbtool->default_config) {
+ 	ReadDefaultResource();
+ 	ResourceType = DEFAULT;
diff --git a/x11-wm/bbapm/files/patch-Basewindow.cc b/x11-wm/bbapm/files/patch-Basewindow.cc
new file mode 100644
index 000000000000..96fdc2d6d6be
--- /dev/null
+++ b/x11-wm/bbapm/files/patch-Basewindow.cc
@@ -0,0 +1,16 @@
+--- Basewindow.cc.orig	Sun Aug 15 07:43:55 1999
++++ Basewindow.cc	Sat Aug  4 20:52:40 2001
+@@ -23,6 +23,13 @@
+ 
+ Basewindow::Basewindow(int argc,char **argv)
+ {
++	dpy = NULL;
++	v = NULL;
++	image_control = NULL;
++	nobb_filename = NULL;
++	bbconfig_filename = NULL;
++	spooldir = NULL;
++
+ 	display_name=NULL;
+ 	config_filename=NULL;
+ 	position=NULL;
diff --git a/x11-wm/bbapm/files/patch-Image.cc b/x11-wm/bbapm/files/patch-Image.cc
new file mode 100644
index 000000000000..23455a41ff98
--- /dev/null
+++ b/x11-wm/bbapm/files/patch-Image.cc
@@ -0,0 +1,36 @@
+--- Image.cc.orig	Sun Aug 15 07:43:55 1999
++++ Image.cc	Sat Aug  4 20:52:40 2001
+@@ -50,6 +50,17 @@
+ BImage::BImage(BImageControl *c, unsigned int w, unsigned int h) {
+   control = c;
+ 
++  colors = NULL;
++  red    = NULL;
++  green  = NULL;
++  blue   = NULL;
++  tr     = NULL;
++  tg     = NULL;
++  tb     = NULL;
++
++  from.allocated = 0;
++  to.allocated   = 0;
++
+   width = ((signed) w > 0) ? w : 1;
+   height = ((signed) h > 0) ? h : 1;
+ 
+@@ -843,7 +854,14 @@
+   window = blackbox->getRootWindow();
+   screen_number = blackbox->getScreenNumber();
+ 
+-  colors = 0;
++  colors = NULL;
++  red_err = NULL;
++  green_err = NULL;
++  blue_err = NULL;
++  next_red_err = NULL;
++  next_green_err = NULL;
++  next_blue_err = NULL;
++  cache = NULL;
+   colors_per_channel = ncolors = 0;
+   
+   int count;
diff --git a/x11-wm/bbapm/files/patch-Image.hh b/x11-wm/bbapm/files/patch-Image.hh
new file mode 100644
index 000000000000..dec4084d89d4
--- /dev/null
+++ b/x11-wm/bbapm/files/patch-Image.hh
@@ -0,0 +1,24 @@
+--- Image.hh.orig	Sun Aug 15 07:43:55 1999
++++ Image.hh	Sat Aug  4 20:52:40 2001
+@@ -35,11 +35,21 @@
+ class BImage;
+ class BImageControl;
+ 
++#if 0
+ typedef struct BColor {
+   int allocated;
+   unsigned char red, green, blue;
+   unsigned long pixel;
+ };
++#else
++class BColor {
++public:
++  int allocated;
++  unsigned char red, green, blue;
++  unsigned long pixel;
++  BColor::BColor() { allocated = False; }
++};
++#endif
+ 
+ typedef struct BTexture {
+   BColor color, colorTo, hiColor, loColor;
diff --git a/x11-wm/bbapm/files/patch-bbapm.cc b/x11-wm/bbapm/files/patch-bbapm.cc
new file mode 100644
index 000000000000..63c97aee5680
--- /dev/null
+++ b/x11-wm/bbapm/files/patch-bbapm.cc
@@ -0,0 +1,11 @@
+--- bbapm.cc.orig	Fri Dec  7 19:42:46 2001
++++ bbapm.cc	Fri Dec  7 19:42:57 2001
+@@ -28,6 +28,9 @@
+ ToolWindow::ToolWindow(int argc, char **argv):
+ Basewindow(argc, argv)
+ {
++    resource = NULL;
++    load = NULL;
++
+     close_app = False;
+     broken = False; 
diff --git a/x11-wm/bbapm/files/patch-resource.cc b/x11-wm/bbapm/files/patch-resource.cc
new file mode 100644
index 000000000000..07594d3c7832
--- /dev/null
+++ b/x11-wm/bbapm/files/patch-resource.cc
@@ -0,0 +1,11 @@
+--- resource.cc.orig	Fri Dec  7 19:42:46 2001
++++ resource.cc	Fri Dec  7 19:42:57 2001
+@@ -28,6 +28,9 @@
+ Resource::Resource(ToolWindow * toolwindow):
+ BaseResource(toolwindow)
+ {
++    frame.font = NULL;
++    label.font = NULL;
++
+     Load();
+ } 
diff --git a/x11-wm/bbapm/pkg-comment b/x11-wm/bbapm/pkg-comment
new file mode 100644
index 000000000000..d2ac28951ef0
--- /dev/null
+++ b/x11-wm/bbapm/pkg-comment
@@ -0,0 +1 @@
+APM monitor for the Blackbox slit
diff --git a/x11-wm/bbapm/pkg-descr b/x11-wm/bbapm/pkg-descr
new file mode 100644
index 000000000000..b16483c4d990
--- /dev/null
+++ b/x11-wm/bbapm/pkg-descr
@@ -0,0 +1,8 @@
+bbapm is an APM meter for Blackbox, designed to be a part of the
+Blackbox Slit, although it will still function as a stand-alone
+tool.
+
+WWW: http://bbtools.windsofstorm.net/
+
+- Adam Weinberger
+monkey@crackula.com
diff --git a/x11-wm/bbapm/pkg-plist b/x11-wm/bbapm/pkg-plist
new file mode 100644
index 000000000000..feaad7ba06b4
--- /dev/null
+++ b/x11-wm/bbapm/pkg-plist
@@ -0,0 +1,7 @@
+bin/bbapm
+share/bbtools/README.bbapm
+share/bbtools/bbapm.conf
+share/bbtools/bbapm.nobb
+share/bbtools/bbapm.style
+share/bbtools/bbtoolsrc.in
+@unexec rmdir %D/share/bbtools 2>/dev/null || true