summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-wm/sapphire/Makefile16
-rw-r--r--x11-wm/sapphire/distinfo6
-rw-r--r--x11-wm/sapphire/files/patch-Makefile15
-rw-r--r--x11-wm/sapphire/files/patch-ab11
-rw-r--r--x11-wm/sapphire/files/patch-image.cc (renamed from x11-wm/sapphire/files/patch-ac)154
-rw-r--r--x11-wm/sapphire/files/patch-linkedlist.cc29
-rw-r--r--x11-wm/sapphire/files/patch-linkedlist.hh29
-rw-r--r--x11-wm/sapphire/files/patch-src_linkedlist.hh13
-rw-r--r--x11-wm/sapphire/pkg-descr2
-rw-r--r--x11-wm/sapphire/pkg-plist4
10 files changed, 160 insertions, 119 deletions
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index a30994b..9289f67 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -6,29 +6,25 @@
#
PORTNAME= sapphire
-PORTVERSION= 0.15.6
-PORTREVISION= 2
+PORTVERSION= 0.15.7
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+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 configure data.inst src/sapphire.hh
+.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
@@ -40,8 +36,8 @@ post-install:
@${MKDIR} ${PREFIX}/share/sapphire/themes
${INSTALL_DATA} ${WRKSRC}/data/themes/*.theme ${PREFIX}/share/sapphire/themes
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/sapphire
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sapphire
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
.endif
.include <bsd.port.mk>
diff --git a/x11-wm/sapphire/distinfo b/x11-wm/sapphire/distinfo
index f3421dd..58a4abb 100644
--- a/x11-wm/sapphire/distinfo
+++ b/x11-wm/sapphire/distinfo
@@ -1,3 +1,3 @@
-MD5 (sapphire-0.15.6.tar.gz) = 00bdddd80e8bd3f1853961d4e9d87b5f
-SHA256 (sapphire-0.15.6.tar.gz) = 1207b248aa203ebdb2e5ada3d80623bc2db5ac31fcc006847e5564feb284c787
-SIZE (sapphire-0.15.6.tar.gz) = 93029
+MD5 (sapphire-0.15.7.tar.gz) = 5c8a34b4c7b6e7c0dd049d7681350949
+SHA256 (sapphire-0.15.7.tar.gz) = dd6faa6205aa5dcd8b39c4d6dee0c6b7c1f3bbd910f52cd461dcf598b8890771
+SIZE (sapphire-0.15.7.tar.gz) = 58611
diff --git a/x11-wm/sapphire/files/patch-Makefile b/x11-wm/sapphire/files/patch-Makefile
new file mode 100644
index 0000000..6c98e94
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig 2001-11-03 10:51:57.000000000 -0500
++++ Makefile 2007-08-13 11:16:04.000000000 -0400
+@@ -3,10 +3,10 @@
+ # frankhale@yahoo.com
+ # 27 Oct 2001
+
+-CC = g++
++CC = ${CXX}
+ CFLAGS = -g -O2 -Wall #-arch=686
+
+-prefix = /usr/X11R6
++prefix = ${PREFIX}
+ XROOT = $(prefix)
+ DESTDIR =
+ INCLUDES = -I$(XROOT)/include
diff --git a/x11-wm/sapphire/files/patch-ab b/x11-wm/sapphire/files/patch-ab
deleted file mode 100644
index 484242c..0000000
--- a/x11-wm/sapphire/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Mon Feb 7 07:57:13 2000
-+++ src/Makefile.in Fri Feb 18 03:26:13 2000
-@@ -66,7 +66,7 @@
- X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
-
--CXX = g++
-+CXX = @CXX@
- LDADD = $(X_LIBS)
- CPPFLAGS = $(X_CFLAGS)
- bin_PROGRAMS = sapphire
diff --git a/x11-wm/sapphire/files/patch-ac b/x11-wm/sapphire/files/patch-image.cc
index faae41d..100d9f4 100644
--- a/x11-wm/sapphire/files/patch-ac
+++ b/x11-wm/sapphire/files/patch-image.cc
@@ -1,80 +1,78 @@
-$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"
-
+--- image.cc.orig 2001-11-03 12:14:22.000000000 -0500
++++ image.cc 2007-08-13 11:25:46.000000000 -0400
+@@ -22,7 +22,9 @@
+
+ #include "sapphire.hh"
+
+#ifndef __STDC__
- #include <malloc.h>
+ #include <malloc.h>
+#endif
-
- #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;
- }
+
+ #ifdef GradientHack
+ # include <math.h>
+@@ -158,12 +160,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");
+@@ -173,7 +175,7 @@
+
+ x = width;
+
+- por = or;
++ por = or_;
+ pog = og;
+ pob = ob;
+
+@@ -204,14 +206,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));
+
+@@ -273,11 +275,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;
+
+@@ -293,7 +295,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-linkedlist.cc b/x11-wm/sapphire/files/patch-linkedlist.cc
new file mode 100644
index 0000000..9ce20a9
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-linkedlist.cc
@@ -0,0 +1,29 @@
+--- 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;
diff --git a/x11-wm/sapphire/files/patch-linkedlist.hh b/x11-wm/sapphire/files/patch-linkedlist.hh
new file mode 100644
index 0000000..8e5dc43
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-linkedlist.hh
@@ -0,0 +1,29 @@
+--- 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
diff --git a/x11-wm/sapphire/files/patch-src_linkedlist.hh b/x11-wm/sapphire/files/patch-src_linkedlist.hh
deleted file mode 100644
index 5afd3dd..0000000
--- a/x11-wm/sapphire/files/patch-src_linkedlist.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-$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:
diff --git a/x11-wm/sapphire/pkg-descr b/x11-wm/sapphire/pkg-descr
index e28c091..78a29ec 100644
--- a/x11-wm/sapphire/pkg-descr
+++ b/x11-wm/sapphire/pkg-descr
@@ -4,5 +4,3 @@ and calendar are built in. Virtual screens are supported.
You may wish to install the x11-wm/sapphire-themes port/package
too.
-
-Trevor Johnson
diff --git a/x11-wm/sapphire/pkg-plist b/x11-wm/sapphire/pkg-plist
index a1f9c0b..a923ce3 100644
--- a/x11-wm/sapphire/pkg-plist
+++ b/x11-wm/sapphire/pkg-plist
@@ -1,6 +1,6 @@
bin/sapphire
bin/sapphire.inst
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/menu/default
%%DATADIR%%/menu/default.orig
%%DATADIR%%/themes/darkblue.theme
@@ -8,7 +8,7 @@ bin/sapphire.inst
%%DATADIR%%/themes/gray.theme
%%DATADIR%%/themes/rose.theme
%%DATADIR%%/themes/slate.theme
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/menu
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%
OpenPOWER on IntegriCloud