bbapm did not build on -current because g++ now treats "or" as a reserved

word.  Also added a missing #include <stdlib.h>.

4 files changed, 77 insertions, 9 deletions

diff --git a/x11/bbapm/Makefile b/x11/bbapm/Makefile
index 2e425907bb4..cd4ccb344ef 100644
--- a/x11/bbapm/Makefile
+++ b/x11/bbapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:21 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/03 17:41:21 gson Exp $
 # based on
 #    FreeBSD port:
 #    ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp
@@ -6,6 +6,7 @@
 #    http://bbtools.windsofstorm.net/sources/bbapm-0.0.1-openbsd-patch.diff
 
 DISTNAME=	bbapm-0.0.1
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://bbtools.windsofstorm.net/sources/
 
diff --git a/x11/bbapm/distinfo b/x11/bbapm/distinfo
index 8e48ac3cf20..d19b1787b07 100644
--- a/x11/bbapm/distinfo
+++ b/x11/bbapm/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.2 2002/09/08 00:03:57 jschauma Exp $
+$NetBSD: distinfo,v 1.3 2003/12/03 17:41:21 gson Exp $
 
 MD5 (bbapm-0.0.1.tar.gz) = 4d2629959bd907696c7765b7c34bc54f
 MD5 (bbapm-0.0.1-freebsd-patch-2.diff) = 8b9242c0fa6067d9d7c10dcbdc0cb8c7
 SHA1 (patch-aa) = 82be3cca979f6a8ecef1c15f85af44865c998587
 SHA1 (patch-ab) = 147dd5cfebdbbd62440d0303959fbc2e369bb203
-SHA1 (patch-ac) = c13aac44362ea859c04d1357dea8e3f2d1aeb2c6
+SHA1 (patch-ac) = d35c171f83a2eb622804111a2ee34722b796a710
 SHA1 (patch-ad) = efa754eadabb8e7778332aa5b9fba45ba9657ce0
 SHA1 (patch-ae) = d8ab975ead13f9a0e3d6493a1ac4de8ad10baea0
 SHA1 (patch-af) = b17cb4c3a6b12f1e387783bd62b9ef582d9eb2c3
 SHA1 (patch-ag) = e3655cf7fae22b4c5279af2d4cad954f76e17912
 SHA1 (patch-ah) = 4f0d79388e262d3063a1313024d3eb1e885880d4
 SHA1 (patch-ai) = 9cfdfbef21513ac8135b01068f2cc9eb18b99df2
-SHA1 (patch-aj) = ff37280070536b31d54ad9b4da018c8f03eda33e
+SHA1 (patch-aj) = 186a9fb3b3e4c67a22e2f61b6fcb6d6f50a228ab
 SHA1 (patch-ak) = 7087de90b4464bd7f5983b02bd55f4396a2fa692
 SHA1 (patch-al) = 1f6c7f6833f4a79d63f8f53273d670fbc6acfbe6
 SHA1 (patch-am) = 71db1ba7e9caa9c0fd1481a06ee4ba27029bb84b
diff --git a/x11/bbapm/patches/patch-ac b/x11/bbapm/patches/patch-ac
index 86a2e3fe46e..98969287067 100644
--- a/x11/bbapm/patches/patch-ac
+++ b/x11/bbapm/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/07 20:22:54 jschauma Exp $
+$NetBSD: patch-ac,v 1.2 2003/12/03 17:41:21 gson Exp $
 
---- Image.cc.orig	Sun Aug 15 07:43:55 1999
-+++ Image.cc	Sat Aug  4 20:52:40 2001
+--- Image.cc.orig	1999-08-15 07:43:55.000000000 -0700
++++ Image.cc
 @@ -50,6 +50,17 @@
  BImage::BImage(BImageControl *c, unsigned int w, unsigned int h) {
    control = c;
@@ -20,6 +20,72 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/09/07 20:22:54 jschauma Exp $
    width = ((signed) w > 0) ? w : 1;
    height = ((signed) h > 0) ? h : 1;
  
+@@ -225,12 +236,12 @@
+     }
+ 
+   if (control->doDither()) {
+-    short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
++    short er, eg, eb, *oR, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
+     unsigned short *ort, *ogt, *obt;
+     
+-    control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
++    control->getDitherBuffers(width + 2, &oR, &og, &ob, &nor, &nog, &nob,
+ 			      &ort, &ogt, &obt);
+-    if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
++    if ((! oR) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
+ 	(! ort) || (! ogt) || (! obt)) {
+       fprintf(stderr,
+ 	      "BImage::renderXImage: error getting dither information\n");
+@@ -240,7 +251,7 @@
+     
+     x = width;
+ 
+-    por = or;
++    por = oR;
+     pog = og;
+     pob = ob;
+ 
+@@ -271,14 +282,14 @@
+       }
+       
+       for (x = 0; x < width; x++) {
+-	if (*(or + x) > 255) *(or + x) = 255;
+-	else if (*(or + x) < 0) *(or + x) = 0;
++	if (*(oR + x) > 255) *(oR + x) = 255;
++	else if (*(oR + x) < 0) *(oR + x) = 0;
+ 	if (*(og + x) > 255) *(og + x) = 255;
+ 	else if (*(og + x) < 0) *(og + x) = 0;
+ 	if (*(ob + x) > 255) *(ob + x) = 255;
+ 	else if (*(ob + x) < 0) *(ob + x) = 0;
+ 	
+-	r = *(tr + *(or + x));
++	r = *(tr + *(oR + x));
+ 	g = *(tg + *(og + x));
+ 	b = *(tb + *(ob + x));
+ 	
+@@ -340,11 +351,11 @@
+ 	  return 0;
+ 	}
+ 
+-	er = *(or + x) - *(ort + *(or + x));
++	er = *(oR + x) - *(ort + *(oR + x));
+ 	eg = *(og + x) - *(ogt + *(og + x));
+ 	eb = *(ob + x) - *(obt + *(ob + x));
+ 	
+-	*(or + x + 1) += er;
++	*(oR + x + 1) += er;
+ 	*(og + x + 1) += eg;
+ 	*(ob + x + 1) += eb;
+ 	
+@@ -360,7 +371,7 @@
+       off += image->width;
+       idata = (pd += image->bytes_per_line);
+       
+-      por = or; or = nor; nor = por;
++      por = oR; oR = nor; nor = por;
+       pog = og; og = nog; nog = pog;
+       pob = ob; ob = nob; nob = pob;
+     }
 @@ -843,7 +854,14 @@
    window = blackbox->getRootWindow();
    screen_number = blackbox->getScreenNumber();
diff --git a/x11/bbapm/patches/patch-aj b/x11/bbapm/patches/patch-aj
index 500a1cd4927..79860e68887 100644
--- a/x11/bbapm/patches/patch-aj
+++ b/x11/bbapm/patches/patch-aj
@@ -1,9 +1,10 @@
-$NetBSD: patch-aj,v 1.2 2002/09/08 00:03:57 jschauma Exp $
+$NetBSD: patch-aj,v 1.3 2003/12/03 17:41:21 gson Exp $
 
 --- /dev/null	Sat Sep  7 13:47:40 2002
 +++ net_apm.cc	Sat Sep  7 14:08:07 2002
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,24 @@
 +#ifdef __NetBSD__
++#include <stdlib.h>
 +#include "net_apm.h"
 +
 +int apm_desc = -1;