2012-11-05 textproc/xerces-c: No more supported upstream, consider using xerces-c2 or xerces-c3

2012-11-05 x11-wm/wampager: Development ceased
2012-11-05 x11-wm/waimea: Development ceased
2012-11-05 x11-wm/waimea-devel: Development ceased

Feature safe:	yes

17 files changed, 0 insertions, 798 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 3156039b6d5e..c39212bf0f93 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -154,9 +154,6 @@
     SUBDIR += twm
     SUBDIR += vtwm
     SUBDIR += w9wm
-    SUBDIR += waimea
-    SUBDIR += waimea-devel
-    SUBDIR += wampager
     SUBDIR += weewm
     SUBDIR += windowlab
     SUBDIR += windowmaker
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
deleted file mode 100644
index 0a48ceb4a834..000000000000
--- a/x11-wm/waimea-devel/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	waimea
-PORTVERSION=	0.5.1
-PORTREVISION=	6
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://dev.gentoo.org/~nixphoeni/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	danfe
-
-MAINTAINER=	c.petrik.sosa@gmail.com
-COMMENT=	An X11 window manager designed for maximum efficiency
-
-DEPRECATED=	Development ceased
-EXPIRATION_DATE=	2012-11-05
-
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		cairo.2:${PORTSDIR}/graphics/cairo
-
-LATEST_LINK=	${PORTNAME}-devel
-
-USE_AUTOTOOLS=	automake:env
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_XORG=	x11
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-OPTIONS_DEFINE=	PNG SVG THREADS
-OPTIONS_DEFAULT=	PNG SVG
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-.else
-CONFIGURE_ARGS+=	--disable-png
-.endif
-
-.if ${PORT_OPTIONS:MSVG}
-LIB_DEPENDS+=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
-.else
-CONFIGURE_ARGS+=	--disable-svg
-MAKE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=	--enable-thread
-.endif
-
-MAN1=		waimea.1
-
-post-extract:
-.for f in config.guess config.sub depcomp install-sh mkinstalldirs missing
-	@${LN} -fs ${AUTOMAKE_DIR}/${f} ${WRKSRC}/config/${f}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/x11-wm/waimea-devel/distinfo b/x11-wm/waimea-devel/distinfo
deleted file mode 100644
index a746d46a8995..000000000000
--- a/x11-wm/waimea-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (waimea-0.5.1.tar.gz) = 96538cd90a8bd18bbaff8609ba037370df90802eae18ac1f41addaed0ccc6c0d
-SIZE (waimea-0.5.1.tar.gz) = 328641
diff --git a/x11-wm/waimea-devel/files/patch-cairo-fix b/x11-wm/waimea-devel/files/patch-cairo-fix
deleted file mode 100644
index f8617f00438a..000000000000
--- a/x11-wm/waimea-devel/files/patch-cairo-fix
+++ /dev/null
@@ -1,505 +0,0 @@
---- src/Event.cc.orig	2005-01-25 22:15:21.000000000 +0000
-+++ src/Event.cc	2006-05-13 13:34:39.000000000 +0000
-@@ -149,11 +149,15 @@
-             
-             static cairo_t *cr = NULL;
-             if (cr == NULL) {
--                cr = cairo_create();
-                 /* XXX: cairo need a call to this function for text
-                    support to be initialized, will probably dissapear soon. */
--                cairo_set_target_drawable(cr, waimea->display,
--                                          DefaultRootWindow(waimea->display));
-+                cairo_surface_t *surface = 
-+                    cairo_xlib_surface_create(waimea->display,
-+                        DefaultRootWindow(waimea->display),
-+                        DefaultVisual(waimea->display, DefaultScreen(waimea->display)),
-+                        DisplayWidth(waimea->display, DefaultScreen(waimea->display)),
-+                        DisplayHeight(waimea->display, DefaultScreen(waimea->display)));
-+                cr = cairo_create(surface);
-             }
- 
-             dw->renderWindow(cr);
---- src/Render.cc.orig	2005-01-25 22:15:21.000000000 +0000
-+++ src/Render.cc	2006-05-15 05:20:47.000000000 +0000
-@@ -359,19 +359,19 @@
-         if (crsurface) {
-             groupsurface =
-                 cairo_surface_create_similar(crsurface,
--                                             CAIRO_FORMAT_ARGB32,
-+                                             CAIRO_CONTENT_COLOR_ALPHA,
-                                              width, height);
-         } else if (parent_surface) {
-           groupsurface =
-                 cairo_surface_create_similar(parent_surface,
--                                             CAIRO_FORMAT_ARGB32,
-+                                             CAIRO_CONTENT_COLOR_ALPHA,
-                                              width, height);
-         } else {
-             if (ws->waimea->client_side_rendering) {
-                 data = new unsigned char[width * height * sizeof(WaPixel)];
-                 memset (data, 0, width * height * sizeof(WaPixel));
-                 groupsurface =
--                    cairo_surface_create_for_image((char *) data,
-+                    cairo_image_surface_create_for_data(data,
-                                                    CAIRO_FORMAT_ARGB32,
-                                                    width, height, width * 4);
-             } else {
-@@ -412,8 +412,9 @@
-             }
-         }
-         
--        cairo_set_target_surface(cr, groupsurface);
--        cairo_default_matrix(cr);
-+        cairo_destroy(cr);
-+        cr = cairo_create(groupsurface);
-+        cairo_identity_matrix(cr);
-         cairo_set_operator(cr, RENDER_OPERATOR_DEFAULT);
-         list<RenderOp *>::iterator oit = operations.begin();
-         for (; oit != operations.end(); oit++) {
-@@ -431,13 +432,18 @@
-     }
- 
-     if (crsurface) {
--        cairo_set_target_surface(cr, crsurface);
-+        cairo_destroy(cr);
-+        cr = cairo_create(crsurface);
-         cairo_set_operator(cr, RENDER_OPERATOR_DEFAULT);
-         if (xrop_set) cairo_set_operator(cr, xrop);
-         cairo_translate(cr, x, y);
-         cairo_rotate(cr, rotation);
--        cairo_set_alpha(cr, opacity);
--        cairo_show_surface(cr, cache_surface->crsurface, width, height);
-+        // XXX: I think I may've screwed this up, at least as to whether there
-+        // should be any clipping. -mjmt
-+        cairo_set_source_surface(cr, cache_surface->crsurface, 0., 0.);
-+        cairo_rectangle(cr, 0., 0., width, height);
-+        cairo_clip(cr);
-+        cairo_paint_with_alpha(cr, opacity);
-     }
- 
-     if (return_surface)
-@@ -832,13 +838,9 @@
-       pattern = cairo_pattern_create_radial (cx, cy, 0.0, cx, cy, ry);
- 
-       if (rx != ry) {
--        cairo_matrix_t *matrix;
--
--        matrix = cairo_matrix_create ();
--        cairo_matrix_scale (matrix, ry / rx, 1.0);
--        cairo_pattern_set_matrix (pattern, matrix);
--        
--        cairo_matrix_destroy (matrix);
-+        cairo_matrix_t matrix;
-+        cairo_matrix_init_scale (&matrix, ry / rx, 1.0);
-+        cairo_pattern_set_matrix (pattern, &matrix);
-       }
-     } break;
-     case GroupPatternType: {
-@@ -854,13 +856,13 @@
-         group->return_surface = NULL;
-         group->parent_surface = NULL;
- 
--        cairo_default_matrix(cr);
-+        cairo_identity_matrix(cr);
-         cairo_move_to(cr, 0.0, 0.0);
-         pattern = cairo_pattern_create_for_surface(subsurface->crsurface);
-         subsurface->unref();
-         cairo_restore(cr);
-       } else {
--        cairo_set_rgb_color (cr, 1.0, 1.0, 1.0);
-+        cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-         return;
-       }
-     } break;
-@@ -869,7 +871,7 @@
-   int stops = 0;
-   list<WaColorStop *>::iterator it = color_stops.begin();
-   for (; it != color_stops.end(); ++it) {
--    cairo_pattern_add_color_stop (pattern, (*it)->offset,
-+    cairo_pattern_add_color_stop_rgba (pattern, (*it)->offset,
-                                   (*it)->color->red,
-                                   (*it)->color->green,
-                                   (*it)->color->blue,
-@@ -878,14 +880,14 @@
-   }
- 
-   if (stops == 0) {
--    cairo_pattern_add_color_stop (pattern, 0.0, 0.0, 0.0, 0.0, 1.0);
--    cairo_pattern_add_color_stop (pattern, 1.0, 1.0, 1.0, 1.0, 1.0);
-+    cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0.0, 0.0, 1.0);
-+    cairo_pattern_add_color_stop_rgba (pattern, 1.0, 1.0, 1.0, 1.0, 1.0);
-   }
-       
-   cairo_pattern_set_filter (pattern, filter);
-   cairo_pattern_set_extend (pattern, extend);
- 
--  cairo_set_pattern (cr, pattern);
-+  cairo_set_source (cr, pattern);
- 
-   cairo_pattern_destroy (pattern);
- }
-@@ -1110,7 +1112,12 @@
-           fill_color.setcairo_color(cr);
-           if (fill_pattern)
-             fill_pattern->setcairo_pattern(dwo, cr, NULL, w, h);
--          cairo_set_alpha(cr, fill_color.alpha);
-+          //cairo_set_alpha(cr, fill_color.alpha);
-+          cairo_set_source_rgba(cr,
-+                                fill_color.red,
-+                                fill_color.green,
-+                                fill_color.blue,
-+                                fill_color.alpha);
-           cairo_fill(cr);
-           cairo_restore(cr);
-         }
-@@ -1429,7 +1436,7 @@
-     if (name) delete [] name;
-     if (bg_group) bg_group->unref();
-     clear();
--    if (font) cairo_font_destroy(font);
-+    if (font) cairo_font_face_destroy(font);
- }
- 
- void RenderOpText::clear(void) {
-@@ -1604,10 +1611,10 @@
-     calc_length(bottom_spacing, bottom_spacing_u, dwo->ws->vdpi, h,
-                 &bottom_space);
- 
--    cairo_default_matrix(cr);
-+    cairo_identity_matrix(cr);
- 
-     if (!font) {
--        cairo_select_font(cr, family, slant, weight);
-+        cairo_select_font_face (cr, family, slant, weight);
-         /* font = cairo_current_font(cr);
-         if (!font)
-           return;
-@@ -1615,9 +1622,9 @@
-         cairo_font_reference (font);
-         */
-     } else
--      cairo_set_font (cr, font);
-+        cairo_set_font_face (cr, font);
-     
--    cairo_scale_font (cr, font_size);    
-+    cairo_set_font_size (cr, font_size);    
-     
-     if (is_static)
-         text = utf8;
-@@ -1657,7 +1664,7 @@
-             str[end_offset] = '\0';
-             sinfo->text = str;
-             
--            cairo_text_extents(cr, (unsigned char *) sinfo->text, &extents);
-+            cairo_text_extents(cr, sinfo->text, &extents);
-             str_y_pos = extents.height - extents.y_bearing;
-             str_width = extents.width;
-             str_height = extents.height;
-@@ -1670,9 +1677,9 @@
-             if (textptr[end_offset] == '\t') {
-                 double tab, with_space;
-                 if (space_width < 0.0) {
--                    cairo_text_extents(cr, (unsigned char *) "1 1", &extents);
-+                    cairo_text_extents(cr, "1 1", &extents);
-                     with_space = extents.width;
--                    cairo_text_extents(cr, (unsigned char *) "11", &extents);
-+                    cairo_text_extents(cr, "11", &extents);
-                     space_width = with_space - extents.width;
-                 }
-                 tab = ceil((linfo->width + space_width) / tab_space);
-@@ -1743,13 +1750,14 @@
-     cairo_save(cr);
- 
-     text_region = cairo_surface_create_similar(
--        cairo_current_target_surface(cr), CAIRO_FORMAT_ARGB32,
-+        cairo_get_target(cr), CAIRO_CONTENT_COLOR_ALPHA,
-         (unsigned int) ceil(width), (unsigned int) ceil(height));
- 
--    cairo_set_target_surface(cr, text_region);
-+    cairo_destroy(cr);
-+    cr = cairo_create(crsurface);
-     
-     if (bg_group) {
--        bg_group->parent_surface = cairo_current_target_surface(cr);
-+        bg_group->parent_surface = cairo_get_target(cr);
-         bg_group->return_surface = &subsurface;
-         cairo_save(cr);
-         bg_group->render(dwo, cr, NULL, (unsigned int) ceil(width),
-@@ -1762,9 +1770,9 @@
-             cairo_pattern_t *pattern;
-             
-             cairo_save(cr);
--            cairo_surface_set_repeat(subsurface->crsurface, true);
-             pattern = cairo_pattern_create_for_surface(subsurface->crsurface);
--            cairo_set_pattern(cr, pattern);
-+            cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
-+            cairo_set_source(cr, pattern);
-             cairo_pattern_destroy(pattern);
-             cairo_rectangle(cr, 0.0, 0.0, ceil(width), ceil(height));
-             cairo_fill(cr);
-@@ -1789,7 +1797,7 @@
-             if (stroke || fill_pattern) {
-               cairo_move_to(cr, (int) (left_space + (*sit)->x + pos_x),
-                             (int) (y_off + y_pos));
--              cairo_text_path(cr, (unsigned char *) (*sit)->text);
-+              cairo_text_path(cr, (*sit)->text);
-               cairo_move_to(cr, 0.0, 0.0);
-               draw(dwo, cr, crsurface, WA_ROUND_U(width),
-                    WA_ROUND_U(height));
-@@ -1799,12 +1807,12 @@
-                 cairo_move_to(cr, (int) (left_space + (*sit)->x + pos_x +
-                                          shadow_x_offset),
-                               (int) (y_off + y_pos + shadow_y_offset));
--                cairo_show_text(cr, (unsigned char *) (*sit)->text);
-+                cairo_show_text(cr, (*sit)->text);
-               }
-               fill_color.setcairo_color(cr);
-               cairo_move_to(cr, (int) (left_space + (*sit)->x + pos_x),
-                             (int) (y_off + y_pos));
--              cairo_show_text(cr, (unsigned char *) (*sit)->text);
-+              cairo_show_text(cr, (*sit)->text);
-             }
-         }
-             
-@@ -1816,8 +1824,10 @@
-     if (x || y) cairo_translate(cr, x, y);
-     if (xrop_set) cairo_set_operator(cr, xrop);
-     if (rotation) cairo_rotate(cr, rotation);
--    cairo_show_surface(cr, text_region, (unsigned int) ceil(width),
--                       (unsigned int) ceil(height));
-+    cairo_set_source_surface(cr, text_region, 0., 0.);
-+    cairo_rectangle(cr, 0., 0., ceil(width), ceil(height));
-+    cairo_clip(cr);
-+    cairo_paint(cr);
-     
-     cairo_surface_destroy(text_region);
- 
-@@ -1860,7 +1870,7 @@
-     calcPositionAndSize(w, h, dwo->ws->hdpi, dwo->ws->vdpi, &x, &y,
-                         &width, &height);
-     
--    if (color.alpha == 1.0) cairo_set_operator(cr, CAIRO_OPERATOR_SRC);
-+    if (color.alpha == 1.0) cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-     if (xrop_set) cairo_set_operator(cr, xrop);
-     color.setcairo_color(cr);
-     cairo_rectangle(cr, x, y, width, height);
-@@ -1946,54 +1956,63 @@
-     
-     switch (scale) {
-         case ImageNormalScaleType:
--            cairo_default_matrix(cr);
-+            cairo_identity_matrix(cr);
-             
-             if (width != img->width || height != img->height) {
-                 if (xrop_set) cairo_set_operator(cr, xrop);
--                cairo_operator_t op = cairo_current_operator(cr);
-+                cairo_operator_t op = cairo_get_operator(cr);
-             
--                cairo_surface_t *target = cairo_current_target_surface(cr);
-+                cairo_surface_t *target = cairo_get_target(cr);
-                 cairo_surface_t *scaled =
--                    cairo_surface_create_similar(target, CAIRO_FORMAT_ARGB32,
-+                    cairo_surface_create_similar(target, CAIRO_CONTENT_COLOR_ALPHA,
-                                                  (int) width + 2,
-                                                  (int) height + 2);
--                cairo_set_target_surface(cr, scaled);
-+                cairo_destroy(cr);
-+                cr = cairo_create(scaled);
-                 cairo_scale(cr, (double) width / (img->width -
-                                                   ((img->width > 1)? 1: 0)),
-                             (double) height / (img->height -
-                                                ((img->height > 1)? 1: 0)));
--                cairo_surface_set_filter(img->crsurface, filter);
--                cairo_set_operator(cr, CAIRO_OPERATOR_SRC);
--                cairo_show_surface(cr, img->crsurface,
--                                   img->width + 1, img->height + 1);
--                cairo_set_target_surface(cr, target);
--                cairo_default_matrix(cr);
-+                cairo_pattern_t *img_pattern =
-+                    cairo_pattern_create_for_surface(img->crsurface);
-+                cairo_pattern_set_filter(img_pattern, filter);
-+                cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-+                cairo_set_source(cr, img_pattern);
-+                cairo_rectangle(cr, 0., 0., img->width + 1, img->height + 1);
-+                cairo_fill(cr);
-+                cairo_identity_matrix(cr);
-+                cairo_pattern_destroy(img_pattern);
-+
-+                cairo_destroy(cr);
-+                cr = cairo_create(target);
-                 cairo_translate(cr, x, y);
-                 cairo_set_operator(cr, op);
--                cairo_show_surface(cr, scaled, (int) width + 2,
--                                   (int) height + 2);
-+                cairo_set_source_surface(cr, scaled, 0., 0.);
-+                cairo_rectangle(cr, 0., 0., width + 2., height + 2.);
-+                cairo_fill(cr);                
-                 cairo_surface_destroy(scaled);
-             } else {
-                 if (xrop_set) cairo_set_operator(cr, xrop);
-                 cairo_translate(cr, x, y);
-                 cairo_rotate(cr, rotation);
--                cairo_show_surface(cr, img->crsurface,
--                                   img->width + 1, img->height + 1);
-+                cairo_set_source_surface(cr, img->crsurface, 0., 0.);
-+                cairo_rectangle(cr, 0., 0., img->width + 1., img->height + 1.);
-+                cairo_fill(cr);
-             }
-             break;
-         case ImageTileScaleType: {
--            cairo_default_matrix(cr);
--            cairo_surface_set_repeat(img->crsurface, true);
-+            cairo_identity_matrix(cr);
-             cairo_translate(cr, x, y);
-             cairo_rectangle(cr, 0, 0, width, height);
-             cairo_move_to(cr, 0.0, 0.0);
--            cairo_default_matrix(cr);
-+            cairo_identity_matrix(cr);
-             pattern = cairo_pattern_create_for_surface(img->crsurface);
--            cairo_set_pattern(cr, pattern);
-+            cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
-+            cairo_set_source(cr, pattern);
-             cairo_pattern_destroy(pattern);
-             if (xrop_set) cairo_set_operator(cr, xrop);
-             cairo_fill(cr);
--            cairo_surface_set_repeat(img->crsurface, false);
-+            //cairo_surface_set_repeat(img->crsurface, false);
-         } break;
-     }
-     
-@@ -2047,7 +2066,7 @@
-                          cairo_surface_t *,
-                          unsigned int w, unsigned int h) {
-     double x, y, width, height;
--    int svg_w, svg_h;
-+    unsigned int svg_w, svg_h;
-     
-     calcPositionAndSize(w, h, dwo->ws->hdpi, dwo->ws->vdpi,
-                         &x, &y, &width, &height);
-@@ -2287,16 +2306,16 @@
-     cairo_operator_t crop;
- } operator_map[] = {
-     { "clear", CAIRO_OPERATOR_CLEAR },
--    { "src", CAIRO_OPERATOR_SRC },
--    { "dst", CAIRO_OPERATOR_DST },
-+    { "src", CAIRO_OPERATOR_SOURCE },
-+    { "dst", CAIRO_OPERATOR_DEST },
-+    { "dst_over", CAIRO_OPERATOR_DEST_OVER },
-+    { "dst_in", CAIRO_OPERATOR_DEST_IN },
-+    { "dst_out", CAIRO_OPERATOR_DEST_OUT },
-+    { "dst_atop", CAIRO_OPERATOR_DEST_ATOP },
-     { "over", CAIRO_OPERATOR_OVER },
--    { "overreverse", CAIRO_OPERATOR_OVER_REVERSE },
-     { "in", CAIRO_OPERATOR_IN },
--    { "inreverse", CAIRO_OPERATOR_IN_REVERSE },
-     { "out", CAIRO_OPERATOR_OUT },
--    { "outreverse", CAIRO_OPERATOR_OUT_REVERSE },
-     { "atop", CAIRO_OPERATOR_ATOP },
--    { "atopreverse", CAIRO_OPERATOR_ATOP_REVERSE },
-     { "xor", CAIRO_OPERATOR_XOR },
-     { "add", CAIRO_OPERATOR_ADD },
-     { "saturate", CAIRO_OPERATOR_SATURATE }
---- src/Render.hh.orig	2005-01-25 22:15:21.000000000 +0000
-+++ src/Render.hh	2006-04-28 18:13:34.000000000 +0000
-@@ -246,8 +246,7 @@
-     double getOpacity(void) { return alpha; }
- 
-     inline void setcairo_color(cairo_t *cr) {
--        cairo_set_rgb_color(cr, red, green, blue);
--        cairo_set_alpha(cr, alpha);
-+        cairo_set_source_rgba(cr, red, green, blue, alpha);
-     }    
- 
-     double red, green, blue, alpha;
-@@ -502,7 +501,7 @@
-     HorizontalAlignment text_halign;
-     WaColor shadow_color;
-     char *family;
--    cairo_font_t *font;
-+    cairo_font_face_t *font;
-     RenderGroup *bg_group;
-     cairo_font_weight_t weight;
-     cairo_font_slant_t slant;
---- src/Screen.cc.orig	2005-01-25 22:15:21.000000000 +0000
-+++ src/Screen.cc	2006-05-13 13:34:39.000000000 +0000
-@@ -1549,7 +1549,7 @@
- 
-     if (waimea->client_side_rendering) {
-         data = rgba;
--        surface = cairo_surface_create_for_image((char *) rgba,
-+        surface = cairo_image_surface_create_for_data(rgba,
-                                                  CAIRO_FORMAT_ARGB32,
-                                                  width, height,
-                                                  width * sizeof(WaPixel));
---- src/Style.cc.orig	2005-01-25 22:15:21.000000000 +0000
-+++ src/Style.cc	2006-05-13 13:34:39.000000000 +0000
-@@ -656,7 +656,7 @@
-                   (bgsurface)? bgsurface->height: 0,
-                   p_x, p_y, w, h);
-                 root_surface =
--                  cairo_surface_create_for_image((char *) root_data,
-+                  cairo_image_surface_create_for_data(root_data,
-                                                  CAIRO_FORMAT_ARGB32,
-                                                  w, h, w * sizeof(WaPixel));
-               } else {
-@@ -688,13 +688,17 @@
-         sb->style->parent_surface = NULL;
-         
-         if (alpha || shape) {
--            cairo_set_target_surface(cr, root_surface);
-+            cairo_destroy(cr);
-+            cr = cairo_create(root_surface);
-             cairo_set_operator(cr, RENDER_OPERATOR_DEFAULT);
-             if (sb->style->xrop_set)
-                 cairo_set_operator(cr, sb->style->xrop);
--            cairo_set_alpha(cr, sb->style->opacity);
--            cairo_default_matrix(cr);
--            cairo_show_surface(cr, return_surface->crsurface, w, h);
-+            cairo_identity_matrix(cr);
-+            cairo_set_source_surface(cr, return_surface->crsurface, 0., 0.);
-+            cairo_rectangle(cr, 0., 0., w, h);
-+            cairo_clip(cr);
-+            cairo_paint_with_alpha(cr, sb->style->opacity);
-+            cairo_reset_clip(cr);
-         }
-         
-         if (shape) {
-@@ -704,7 +708,7 @@
-                 shape_data = new unsigned char[w * h * sizeof(WaPixel)];
-                 memset (shape_data, 0, w * h * sizeof(WaPixel));
-                 alpha_surface =
--                    cairo_surface_create_for_image((char *) shape_data,
-+                    cairo_image_surface_create_for_data(shape_data,
-                                                    CAIRO_FORMAT_ARGB32,
-                                                    w, h, w * sizeof(WaPixel));
-             } else {
-@@ -724,15 +728,26 @@
-                                               ws->colormap);
-             }
- 
--            cairo_set_target_surface(cr, alpha_surface);
-+            cairo_destroy(cr);
-+            cr = cairo_create(alpha_surface);
-+            cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-+            cairo_set_source_surface(cr, return_surface->crsurface, 0., 0.);
-+            cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
-+            cairo_rectangle(cr, 0, 0, w, h);
-+            cairo_clip(cr);
-+            cairo_paint_with_alpha(cr, sb->style->opacity);
-+            cairo_reset_clip(cr);
-             
-             if (sb->style->shapemask) {
-                 cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-                 sb->style->shapemask->render(this, cr, alpha_surface, w, h);
-             } else {
-                 cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
--                cairo_set_alpha(cr, sb->style->opacity);
--                cairo_show_surface(cr, return_surface->crsurface, w, h);
-+                cairo_set_source_surface(cr, return_surface->crsurface, 0., 0.);
-+                cairo_rectangle(cr, 0.0, 0.0, w, h);
-+                cairo_clip(cr);
-+                cairo_paint_with_alpha(cr, sb->style->opacity);
-+                cairo_reset_clip(cr);
-             }
-             
-             if (ws->waimea->client_side_rendering) {
diff --git a/x11-wm/waimea-devel/files/patch-src_Render.hh b/x11-wm/waimea-devel/files/patch-src_Render.hh
deleted file mode 100644
index 93805dad784f..000000000000
--- a/x11-wm/waimea-devel/files/patch-src_Render.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Render.hh.orig	Thu Nov  4 06:22:46 2004
-+++ src/Render.hh	Thu Mar  3 18:19:13 2005
-@@ -28,6 +28,8 @@
- #ifdef    SVG
- #include <svg-cairo.h>
- #endif // SVG  
-+
-+#include <X11/Xlib.h>
- }
- 
- #include "RefCounted.hh"
diff --git a/x11-wm/waimea-devel/files/patch-src_Resources.cc b/x11-wm/waimea-devel/files/patch-src_Resources.cc
deleted file mode 100644
index bfbd18b0e169..000000000000
--- a/x11-wm/waimea-devel/files/patch-src_Resources.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Resources.cc.orig	Wed May 12 15:55:06 2004
-+++ src/Resources.cc	Thu Mar  3 19:21:58 2005
-@@ -171,7 +171,7 @@
- 
-     __render_thread_count = 0;
-     
--    if (value_str) {
-+    if (value_str)
-       if (! strcasecmp("true", value_str))
-         __render_thread_count = 1;      
- 
diff --git a/x11-wm/waimea-devel/files/patch-src_Screen.hh b/x11-wm/waimea-devel/files/patch-src_Screen.hh
deleted file mode 100644
index d2d33e7b0e9c..000000000000
--- a/x11-wm/waimea-devel/files/patch-src_Screen.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Screen.hh.orig	Wed May 12 15:55:06 2004
-+++ src/Screen.hh	Wed Mar  2 19:58:43 2005
-@@ -25,6 +25,8 @@
- extern "C" {
- #include <X11/Xlib.h>
- 
-+#include <cairo-xlib.h>
-+
- #ifdef    XINERAMA
- #  include <X11/extensions/Xinerama.h>
- #endif // XINERAMA
diff --git a/x11-wm/waimea-devel/files/patch-src_Waimea.cc b/x11-wm/waimea-devel/files/patch-src_Waimea.cc
deleted file mode 100644
index 14c249418399..000000000000
--- a/x11-wm/waimea-devel/files/patch-src_Waimea.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Waimea.cc.orig	Thu Nov  4 06:22:46 2004
-+++ src/Waimea.cc	Thu Mar  3 19:21:22 2005
-@@ -1151,7 +1151,7 @@
- #ifdef    THREAD
- void *render_thread_func(void *) {
-     sigset_t sigset;
--    cairo_state_t *cr = cairo_create();
-+    cairo_t *cr = cairo_create();
- 
-     /* XXX: cairo need a call to this function for text support to be
-        initialized, will probably dissapear soon. */
diff --git a/x11-wm/waimea-devel/pkg-descr b/x11-wm/waimea-devel/pkg-descr
deleted file mode 100644
index f93f95ac68e0..000000000000
--- a/x11-wm/waimea-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Waimea is a highly customizable window manager for the X Window system
-conforming to the latest EWMH specification.  Waimea supports multiple
-virtual desktops and by using the Cairo graphics library for all rendering,
-Waimea provides a modern vector-based style engine that takes advantage of
-display hardware acceleration when available (through the X Render
-Extension).
diff --git a/x11-wm/waimea-devel/pkg-plist b/x11-wm/waimea-devel/pkg-plist
deleted file mode 100644
index abe35ab5cd85..000000000000
--- a/x11-wm/waimea-devel/pkg-plist
+++ /dev/null
@@ -1,60 +0,0 @@
-bin/waimea
-bin/waimeactl
-%%DATADIR%%/actions/sloppyfocusopaque/action.conf
-%%DATADIR%%/actions/sloppyfocusnonopaque/action.conf
-%%DATADIR%%/actions/clicktofocusopaque/action.conf
-%%DATADIR%%/actions/clicktofocusnonopaque/action.conf
-%%DATADIR%%/actions/key-bindings.conf
-%%DATADIR%%/actions/button-mappings.conf
-%%DATADIR%%/actions/common.conf
-%%DATADIR%%/styles/freedesktop/style.conf
-%%DATADIR%%/styles/freedesktop/window.conf
-%%DATADIR%%/styles/freedesktop/menu.conf
-%%DATADIR%%/styles/freedesktop/dockapp.conf
-%%DATADIR%%/styles/freedesktop/root.conf
-%%DATADIR%%/styles/freedesktop/freedesktop.png
-%%DATADIR%%/styles/freedesktop/freedesktop.svg
-%%DATADIR%%/styles/logo.conf
-%%DATADIR%%/menus/icons/actions.png
-%%DATADIR%%/menus/icons/desktops.png
-%%DATADIR%%/menus/icons/editors.png
-%%DATADIR%%/menus/icons/emacs.png
-%%DATADIR%%/menus/icons/evolution.png
-%%DATADIR%%/menus/icons/exit.png
-%%DATADIR%%/menus/icons/galeon.png
-%%DATADIR%%/menus/icons/gimp.png
-%%DATADIR%%/menus/icons/graphics.png
-%%DATADIR%%/menus/icons/gvim.png
-%%DATADIR%%/menus/icons/info.png
-%%DATADIR%%/menus/icons/lock.png
-%%DATADIR%%/menus/icons/mozilla.png
-%%DATADIR%%/menus/icons/multimedia.png
-%%DATADIR%%/menus/icons/network.png
-%%DATADIR%%/menus/icons/restart.png
-%%DATADIR%%/menus/icons/rootmenu.png
-%%DATADIR%%/menus/icons/settings.png
-%%DATADIR%%/menus/icons/styles.png
-%%DATADIR%%/menus/icons/window-list.png
-%%DATADIR%%/menus/icons/window.png
-%%DATADIR%%/menus/icons/xmms.png
-%%DATADIR%%/menus/icons/xterm.png
-%%DATADIR%%/menus/menu.conf
-%%DATADIR%%/scripts/icons/styles.png
-%%DATADIR%%/scripts/icons/actions.png
-%%DATADIR%%/scripts/actioncfgmenu.pl
-%%DATADIR%%/scripts/stylecfgmenu.pl
-%%DATADIR%%/scripts/file2textop.pl
-%%DATADIR%%/waimearc
-%%DATADIR%%/waimea.dtd
-@dirrm %%DATADIR%%/styles/freedesktop
-@dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%/scripts/icons
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/menus/icons
-@dirrm %%DATADIR%%/menus
-@dirrm %%DATADIR%%/actions/sloppyfocusopaque
-@dirrm %%DATADIR%%/actions/sloppyfocusnonopaque
-@dirrm %%DATADIR%%/actions/clicktofocusopaque
-@dirrm %%DATADIR%%/actions/clicktofocusnonopaque
-@dirrm %%DATADIR%%/actions
-@dirrm %%DATADIR%%
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
deleted file mode 100644
index e8bd5c087d55..000000000000
--- a/x11-wm/waimea/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@regency.nsu.ru>
-# $FreeBSD$
-
-PORTNAME=	waimea
-PORTVERSION=	0.4.0
-PORTREVISION=	10
-CATEGORIES=	x11-wm
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
-
-MAINTAINER=	c.petrik.sosa@gmail.com
-COMMENT=	An X11 window manager designed for maximum efficiency
-
-RUN_DEPENDS=	${LOCALBASE}/bin/Esetroot:${PORTSDIR}/x11/eterm
-
-DEPRECATED=	Development ceased
-EXPIRATION_DATE=	2012-11-05
-
-USE_BZIP2=	yes
-USE_XORG=	xft
-USE_PERL5_RUN=	yes
-
-GNU_CONFIGURE=	yes
-
-MAN1=		waimea.1
-
-OPTIONS_DEFINE= PIXMAP DITHER
-OPTIONS_DEFAULT=	PIXMAP
-PIXMAP_DESC=	Build with pixmap textures support
-DITHER_DESC=	=Enable ordered pseudocolor dithering
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPIXMAP}
-USE_EFL+=	imlib2
-.endif
-
-.if ${PORT_OPTIONS:MDITHER}
-CONFIGURE_ARGS+=	--enable-ordered-pseudo
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11-wm/waimea/distinfo b/x11-wm/waimea/distinfo
deleted file mode 100644
index 23e2bf42c5c3..000000000000
--- a/x11-wm/waimea/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (waimea-0.4.0.tar.bz2) = 410e749bb05589004600c92a36e9e5da1aa2b2789fff1a46cdb8895e04b5598c
-SIZE (waimea-0.4.0.tar.bz2) = 206805
diff --git a/x11-wm/waimea/pkg-descr b/x11-wm/waimea/pkg-descr
deleted file mode 100644
index e952294a4230..000000000000
--- a/x11-wm/waimea/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The design goal for waimea is to create the most efficient desktop
-working environment available, being fast and highly customizable
-virtual desktop window manager.  It uses blackbox image rendering engine
-and can use Xft library for font rendering (anti-aliased font support).
-It also features a very advanced configuration system with which it's
-possible to make waimea behave as almost any other window manager.
-
-Features already included are:
-
-    * Blackbox image rendering engine (blackbox style support)
-    * Virtual desktops
-    * Action configuration system
-    * Advanced menu system, dynamic menus
-    * Standard X core fonts
-    * Xft fonts (anti-aliased fonts, optional Xft2 support)
-    * Transparent textures and text, text shadow support
-    * Configurable titlebar buttons
-    * Dockapp handler system
-    * Task switcher
-    * Multiple screen support
-    * KDE3 and GNOME2 support
-    * Xinerama and RandR extension support
-
-WWW: http://waimea.sourceforge.net/
diff --git a/x11-wm/waimea/pkg-plist b/x11-wm/waimea/pkg-plist
deleted file mode 100644
index aa8e533319f7..000000000000
--- a/x11-wm/waimea/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/waimea
-%%DATADIR%%/actions/action
-%%DATADIR%%/actions/action.click-to-focus
-%%DATADIR%%/actions/action.no-mouse
-%%DATADIR%%/actions/action.non-opaque
-%%DATADIR%%/actions/action.sloppy-focus
-%%DATADIR%%/backgrounds/waimea.png
-%%DATADIR%%/config
-%%DATADIR%%/menu
-%%DATADIR%%/scripts/filelist.pl
-%%DATADIR%%/scripts/procinfo.pl
-%%DATADIR%%/scripts/stylesdir.pl
-%%DATADIR%%/styles/Default.style
-@dirrm %%DATADIR%%/actions
-@dirrm %%DATADIR%%/backgrounds
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%
diff --git a/x11-wm/wampager/Makefile b/x11-wm/wampager/Makefile
deleted file mode 100644
index 22ddac7fbdf7..000000000000
--- a/x11-wm/wampager/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	wampager
-# Date created:				11 Jan 2003
-# Whom:					Alexey Dokuchaev <danfe@regency.nsu.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wampager
-PORTVERSION=	0.9.3.20041204
-PORTREVISION=	2
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.ijs.si/~lesi/waimea/ \
-		http://www.daemon.li/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A mini pager for the waimea window manager
-
-DEPRECATED=	Development ceased
-EXPIRATION_DATE=	2012-11-05
-
-USE_XORG=	x11 xext xpm ice
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-
-PLIST_FILES=	bin/wampager
-
-.include <bsd.port.mk>
diff --git a/x11-wm/wampager/distinfo b/x11-wm/wampager/distinfo
deleted file mode 100644
index 4df5c4689150..000000000000
--- a/x11-wm/wampager/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (wampager-0.9.3.20041204.tar.bz2) = ec69a4ab9931a580b0e8e6235baa51568d237a961bc802dc890d9e1d699720d6
-SIZE (wampager-0.9.3.20041204.tar.bz2) = 97186
diff --git a/x11-wm/wampager/pkg-descr b/x11-wm/wampager/pkg-descr
deleted file mode 100644
index 529d2a7b38d8..000000000000
--- a/x11-wm/wampager/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-wampager is a pager tool for waimea, with support of RandR extension.
-
-WWW: http://waimea.sourceforge.net/