Attachment #80520 for bug #115470

View | Details | Raw Unified | Return to bug 115470
Collapse All | Expand All




#

PORTNAME=	sapphire
PORTVERSION=	0.15.7
PORTREVISION=	2
CATEGORIES=	x11-wm
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	thomas@goodking.ca
COMMENT=	Small window manager

USE_GMAKE=	yes
REINPLACE_ARGS=	-i'' -E
USE_X_PREFIX=	yes
GNU_CONFIGURE=	yes

post-extract:

post-patch:
	${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/data.inst
.for ii in data/menu/default data.inst sapphire.hh
	${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${ii}
.endfor
	${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
	${REINPLACE_CMD} "s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/configure

post-install:
	${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin

Lines 1-3 Link Here

(-)/home/ports/x11-wm/sapphire/distinfo (-3 / +3 lines)
1	MD5 (sapphire-0.15.6.tar.gz) = 00bdddd80e8bd3f1853961d4e9d87b5f	1	MD5 (sapphire-0.15.7.tar.gz) = 5c8a34b4c7b6e7c0dd049d7681350949
2	SHA256 (sapphire-0.15.6.tar.gz) = 1207b248aa203ebdb2e5ada3d80623bc2db5ac31fcc006847e5564feb284c787	2	SHA256 (sapphire-0.15.7.tar.gz) = dd6faa6205aa5dcd8b39c4d6dee0c6b7c1f3bbd910f52cd461dcf598b8890771
3	SIZE (sapphire-0.15.6.tar.gz) = 93029	3	SIZE (sapphire-0.15.7.tar.gz) = 58611

Line 0 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-Makefile (+15 lines)
	1	--- Makefile.orig 2001-11-03 10:51:57.000000000 -0500
	2	+++ Makefile 2007-08-13 11:16:04.000000000 -0400
	3	@@ -3,10 +3,10 @@
	4	# frankhale@yahoo.com
	5	# 27 Oct 2001
	6
	7	-CC = g++
	8	+CC = ${CXX}
	9	CFLAGS = -g -O2 -Wall #-arch=686
	10
	11	-prefix = /usr/X11R6
	12	+prefix = ${PREFIX}
	13	XROOT = $(prefix)
	14	DESTDIR =
	15	INCLUDES = -I$(XROOT)/include

Lines 1-11 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-ab (-11 lines)
1	--- src/Makefile.in.orig Mon Feb 7 07:57:13 2000
2	+++ src/Makefile.in Fri Feb 18 03:26:13 2000
3	@@ -66,7 +66,7 @@
4	X_CFLAGS = @X_CFLAGS@
5	X_LIBS = @X_LIBS@
6
7	-CXX = g++
8	+CXX = @CXX@
9	LDADD = $(X_LIBS)
10	CPPFLAGS = $(X_CFLAGS)
11	bin_PROGRAMS = sapphire

Lines 1-80 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-ac (-80 lines)
1	$FreeBSD: ports/x11-wm/sapphire/files/patch-ac,v 1.2 2002/09/25 15:38:06 trevor Exp $
2
3	--- src/image.cc.orig Mon Nov 6 04:05:06 2000
4	+++ src/image.cc Wed Sep 25 15:27:57 2002
5	@@ -28,7 +28,9 @@
6
7	#include "sapphire.hh"
8
9	+#ifndef __STDC__
10	#include <malloc.h>
11	+#endif
12
13	#ifdef GradientHack
14	# include <math.h>
15	@@ -164,12 +166,12 @@
16	}
17
18	if (control->dither()) {
19	- short er, eg, eb, or, og, ob, nor, nog, nob, por, pog, *pob;
20	+ short er, eg, eb, or_, og, ob, nor, nog, nob, por, pog, *pob;
21	unsigned short ort, ogt, *obt;
22
23	- control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
24	+ control->getDitherBuffers(width + 2, &or_, &og, &ob, &nor, &nog, &nob,
25	&ort, &ogt, &obt);
26	- if ((! or) \|\| (! og) \|\| (! ob) \|\| (! nor) \|\| (! nog) \|\| (! nob) \|\|
27	+ if ((! or_) \|\| (! og) \|\| (! ob) \|\| (! nor) \|\| (! nog) \|\| (! nob) \|\|
28	(! ort) \|\| (! ogt) \|\| (! obt)) {
29	fprintf(stderr,
30	"BImage::renderXImage: error getting dither information\n");
31	@@ -179,7 +181,7 @@
32
33	x = width;
34
35	- por = or;
36	+ por = or_;
37	pog = og;
38	pob = ob;
39
40	@@ -210,14 +212,14 @@
41	}
42
43	for (x = 0; x < width; x++) {
44	- if ((or + x) > 255) (or + x) = 255;
45	- else if ((or + x) < 0) (or + x) = 0;
46	+ if ((or_ + x) > 255) (or_ + x) = 255;
47	+ else if ((or_ + x) < 0) (or_ + x) = 0;
48	if ((og + x) > 255) (og + x) = 255;
49	else if ((og + x) < 0) (og + x) = 0;
50	if ((ob + x) > 255) (ob + x) = 255;
51	else if ((ob + x) < 0) (ob + x) = 0;
52
53	- r = (tr + (or + x));
54	+ r = (tr + (or_ + x));
55	g = (tg + (og + x));
56	b = (tb + (ob + x));
57
58	@@ -279,11 +281,11 @@
59	return 0;
60	}
61
62	- er = (or + x) - (ort + *(or + x));
63	+ er = (or_ + x) - (ort + *(or_ + x));
64	eg = (og + x) - (ogt + *(og + x));
65	eb = (ob + x) - (obt + *(ob + x));
66
67	- *(or + x + 1) += er;
68	+ *(or_ + x + 1) += er;
69	*(og + x + 1) += eg;
70	*(ob + x + 1) += eb;
71
72	@@ -299,7 +301,7 @@
73	off += image->width;
74	idata = (pd += image->bytes_per_line);
75
76	- por = or; or = nor; nor = por;
77	+ por = or_; or_ = nor; nor = por;
78	pog = og; og = nog; nog = pog;
79	pob = ob; ob = nob; nob = pob;
80	}

Line 0 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-image.cc (+78 lines)
		1	--- image.cc.orig 2001-11-03 12:14:22.000000000 -0500
		2	+++ image.cc 2007-08-13 11:25:46.000000000 -0400
		3	@@ -22,7 +22,9 @@
		4
		5	#include "sapphire.hh"
		6
		7	+#ifndef __STDC__
		8	#include <malloc.h>
		9	+#endif
		10
		11	#ifdef GradientHack
		12	# include <math.h>
		13	@@ -158,12 +160,12 @@
		14	}
		15
		16	if (control->dither()) {
		17	- short er, eg, eb, or, og, ob, nor, nog, nob, por, pog, *pob;
		18	+ short er, eg, eb, or_, og, ob, nor, nog, nob, por, pog, *pob;
		19	unsigned short ort, ogt, *obt;
		20
		21	- control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
		22	+ control->getDitherBuffers(width + 2, &or_, &og, &ob, &nor, &nog, &nob,
		23	&ort, &ogt, &obt);
		24	- if ((! or) \|\| (! og) \|\| (! ob) \|\| (! nor) \|\| (! nog) \|\| (! nob) \|\|
		25	+ if ((! or_) \|\| (! og) \|\| (! ob) \|\| (! nor) \|\| (! nog) \|\| (! nob) \|\|
		26	(! ort) \|\| (! ogt) \|\| (! obt)) {
		27	fprintf(stderr,
		28	"BImage::renderXImage: error getting dither information\n");
		29	@@ -173,7 +175,7 @@
		30
		31	x = width;
		32
		33	- por = or;
		34	+ por = or_;
		35	pog = og;
		36	pob = ob;
		37
		38	@@ -204,14 +206,14 @@
		39	}
		40
		41	for (x = 0; x < width; x++) {
		42	- if ((or + x) > 255) (or + x) = 255;
		43	- else if ((or + x) < 0) (or + x) = 0;
		44	+ if ((or_ + x) > 255) (or_ + x) = 255;
		45	+ else if ((or_ + x) < 0) (or_ + x) = 0;
		46	if ((og + x) > 255) (og + x) = 255;
		47	else if ((og + x) < 0) (og + x) = 0;
		48	if ((ob + x) > 255) (ob + x) = 255;
		49	else if ((ob + x) < 0) (ob + x) = 0;
		50
		51	- r = (tr + (or + x));
		52	+ r = (tr + (or_ + x));
		53	g = (tg + (og + x));
		54	b = (tb + (ob + x));
		55
		56	@@ -273,11 +275,11 @@
		57	return 0;
		58	}
		59
		60	- er = (or + x) - (ort + *(or + x));
		61	+ er = (or_ + x) - (ort + *(or_ + x));
		62	eg = (og + x) - (ogt + *(og + x));
		63	eb = (ob + x) - (obt + *(ob + x));
		64
65	- *(or + x + 1) += er;
66	+ *(or_ + x + 1) += er;
67	*(og + x + 1) += eg;
68	*(ob + x + 1) += eb;
69
70	@@ -293,7 +295,7 @@
71	off += image->width;
72	idata = (pd += image->bytes_per_line);
73
74	- por = or; or = nor; nor = por;
75	+ por = or_; or_ = nor; nor = por;
76	pog = og; og = nog; nog = pog;
77	pob = ob; ob = nob; nob = pob;
78	}




--- linkedlist.cc.orig	2001-11-03 12:14:01.000000000 -0500
+++ linkedlist.cc	2007-08-13 11:19:56.000000000 -0400
@@ -131,7 +131,7 @@
 	// looking for.
 	if(temp == NULL) 
 	{
-		cerr << "_LinkedList::remove : element not found" << endl;
+		std::cerr << "_LinkedList::remove : element not found" << std::endl;
 		return;
 	
 	} else {
@@ -172,7 +172,7 @@
 		
 		reset(direction);
 	} else {
-		cerr << "_LinkedListIterator: List is NULL" << endl;
+		std::cerr << "_LinkedListIterator: List is NULL" << std::endl;
 		exit(-1);
 	}
 }	
@@ -192,7 +192,7 @@
 		break;
 			
 		default:
-			cerr << "_LinkedListIterator: Illegal direction for list traversal using FORWARD" << endl;
+			std::cerr << "_LinkedListIterator: Illegal direction for list traversal using FORWARD" << std::endl;
 			list->setForward();
 			element = list->head;
 		break;




--- linkedlist.hh.orig	2001-11-03 12:17:15.000000000 -0500
+++ linkedlist.hh	2007-08-13 10:45:53.000000000 -0400
@@ -42,8 +42,8 @@
 	// I wanna make the next,prev, and data pointers private.
 	// But I still need LinkedList and LinkedListIterator
 	// to access those pointers.
-	friend _LinkedList;
-	friend _LinkedListIterator;
+	friend class _LinkedList;
+	friend class _LinkedListIterator;
 
 private: // Variables 
 	
@@ -67,7 +67,7 @@
 	Element *head, *tail, *iter;
 	int elements;
 
-	friend _LinkedListIterator;
+	friend class _LinkedListIterator;
 
 private: // Member functions 
 	
@@ -160,4 +160,4 @@
 	T* current() { return (T*) _LinkedListIterator::current(); }
 };
 
-#endif
\ No newline at end of file
+#endif




$FreeBSD: ports/x11-wm/sapphire/files/patch-src_linkedlist.hh,v 1.1 2002/09/25 15:38:06 trevor Exp $

--- 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:

Lines 4-8 Link Here

(-)/home/ports/x11-wm/sapphire/pkg-descr (-2 lines)
4		4
5	You may wish to install the x11-wm/sapphire-themes port/package	5	You may wish to install the x11-wm/sapphire-themes port/package
6	too.	6	too.
7
8	Trevor Johnson

Return to bug 115470

Lines 6-34 Link Here

(-)/home/ports/x11-wm/sapphire/Makefile (-8 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= sapphire	8	PORTNAME= sapphire
9	PORTVERSION= 0.15.6	9	PORTVERSION= 0.15.7
10	PORTREVISION= 2
11	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		12
15	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= thomas@goodking.ca
16	COMMENT= Small window manager	14	COMMENT= Small window manager
17		15
18	USE_GMAKE= yes	16	USE_GMAKE= yes
19	REINPLACE_ARGS= -i'' -E	17	REINPLACE_ARGS= -i'' -E
20	USE_X_PREFIX= yes	18	USE_X_PREFIX= yes
21	GNU_CONFIGURE= yes
22		19
23	post-extract:	20	post-extract:
24		21
25	post-patch:	22	post-patch:
26	${REINPLACE_CMD} "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/data.inst	23	${REINPLACE_CMD} "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/data.inst
27	.for ii in data/menu/default configure data.inst src/sapphire.hh	24	.for ii in data/menu/default data.inst sapphire.hh
28	${REINPLACE_CMD} "s\|/usr/local\|${PREFIX}\|g" ${WRKSRC}/${ii}	25	${REINPLACE_CMD} "s\|/usr/local\|${PREFIX}\|g" ${WRKSRC}/${ii}
29	.endfor	26	.endfor
30	${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst	27	${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
31	${REINPLACE_CMD} "s\|/usr/X11R6\|${X11BASE}\|g" ${WRKSRC}/configure
32		28
33	post-install:	29	post-install:
34	${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin	30	${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin

Line 0 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-linkedlist.cc (+29 lines)
	1	--- linkedlist.cc.orig 2001-11-03 12:14:01.000000000 -0500
	2	+++ linkedlist.cc 2007-08-13 11:19:56.000000000 -0400
	3	@@ -131,7 +131,7 @@
	4	// looking for.
	5	if(temp == NULL)
	6	{
	7	- cerr << "_LinkedList::remove : element not found" << endl;
	8	+ std::cerr << "_LinkedList::remove : element not found" << std::endl;
	9	return;
	10
	11	} else {
	12	@@ -172,7 +172,7 @@
	13
	14	reset(direction);
	15	} else {
	16	- cerr << "_LinkedListIterator: List is NULL" << endl;
	17	+ std::cerr << "_LinkedListIterator: List is NULL" << std::endl;
	18	exit(-1);
	19	}
	20	}
	21	@@ -192,7 +192,7 @@
	22	break;
	23
	24	default:
	25	- cerr << "_LinkedListIterator: Illegal direction for list traversal using FORWARD" << endl;
	26	+ std::cerr << "_LinkedListIterator: Illegal direction for list traversal using FORWARD" << std::endl;
	27	list->setForward();
	28	element = list->head;
	29	break;

Line 0 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-linkedlist.hh (+29 lines)
	1	--- linkedlist.hh.orig 2001-11-03 12:17:15.000000000 -0500
	2	+++ linkedlist.hh 2007-08-13 10:45:53.000000000 -0400
	3	@@ -42,8 +42,8 @@
	4	// I wanna make the next,prev, and data pointers private.
	5	// But I still need LinkedList and LinkedListIterator
	6	// to access those pointers.
	7	- friend _LinkedList;
	8	- friend _LinkedListIterator;
	9	+ friend class _LinkedList;
	10	+ friend class _LinkedListIterator;
	11
	12	private: // Variables
	13
	14	@@ -67,7 +67,7 @@
	15	Element head, tail, *iter;
	16	int elements;
	17
	18	- friend _LinkedListIterator;
	19	+ friend class _LinkedListIterator;
	20
	21	private: // Member functions
	22
	23	@@ -160,4 +160,4 @@
	24	T* current() { return (T*) _LinkedListIterator::current(); }
	25	};
	26
	27	-#endif
	28	\ No newline at end of file
	29	+#endif

Lines 1-13 Link Here

(-)/home/ports/x11-wm/sapphire/files/patch-src_linkedlist.hh (-13 lines)
1	$FreeBSD: ports/x11-wm/sapphire/files/patch-src_linkedlist.hh,v 1.1 2002/09/25 15:38:06 trevor Exp $
2
3	--- src/linkedlist.hh.orig Mon Nov 6 03:53:25 2000
4	+++ src/linkedlist.hh Wed Sep 25 15:19:29 2002
5	@@ -72,7 +72,7 @@
6	int elements;
7	__llist_node _first, _last;
8
9	- friend __llist_iterator;
10	+ friend class __llist_iterator;
11
12
13	protected: