Fix build on -CURRENT.

3 files changed, 89 insertions, 6 deletions

diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 03fb67b7ecc8..c9cc53b4fa33 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -14,15 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	trevor@FreeBSD.org
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i'' -E
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 post-extract:
 
 post-patch:
-	${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/data.inst
-.for i in data/menu/default configure data.inst src/sapphire.hh
-	${PERL} -pi -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${i}
+	${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/data.inst
+.for ii in data/menu/default configure data.inst src/sapphire.hh
+	${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${ii}
 .endfor
 	${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
 
diff --git a/x11-wm/sapphire/files/patch-ac b/x11-wm/sapphire/files/patch-ac
index 9018003dd4d0..faae41da7193 100644
--- a/x11-wm/sapphire/files/patch-ac
+++ b/x11-wm/sapphire/files/patch-ac
@@ -1,6 +1,8 @@
---- src/image.cc.orig	Thu Feb 10 10:36:20 2000
-+++ src/image.cc	Fri Feb 18 03:26:13 2000
-@@ -29,7 +29,9 @@
+$FreeBSD$
+
+--- src/image.cc.orig	Mon Nov  6 04:05:06 2000
++++ src/image.cc	Wed Sep 25 15:27:57 2002
+@@ -28,7 +28,9 @@
  
  #include "sapphire.hh"
  
@@ -10,3 +12,69 @@
  
  #ifdef GradientHack
  #  include <math.h>
+@@ -164,12 +166,12 @@
+     }
+ 
+   if (control->dither()) {
+-    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");
+@@ -179,7 +181,7 @@
+     
+     x = width;
+ 
+-    por = or;
++    por = or_;
+     pog = og;
+     pob = ob;
+ 
+@@ -210,14 +212,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));
+ 	
+@@ -279,11 +281,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;
+ 	
+@@ -299,7 +301,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;
+     }
diff --git a/x11-wm/sapphire/files/patch-src_linkedlist.hh b/x11-wm/sapphire/files/patch-src_linkedlist.hh
new file mode 100644
index 000000000000..5afd3ddee20b
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-src_linkedlist.hh
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- src/linkedlist.hh.orig	Mon Nov  6 03:53:25 2000
++++ src/linkedlist.hh	Wed Sep 25 15:19:29 2002
+@@ -72,7 +72,7 @@
+   int elements;
+   __llist_node *_first, *_last;
+ 
+-  friend __llist_iterator;
++  friend class __llist_iterator;
+ 
+ 
+ protected: