6 files changed, 43 insertions, 108 deletions

diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index b8cba7d89579..849c4fce9a0c 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -6,20 +6,27 @@
 #
 
 PORTNAME=	waimea
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	waimea
 
 MAINTAINER=	danfe@regency.nsu.ru
 
-USE_GMAKE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	imlib
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_PERL5_RUN=	yes
 
 GNU_CONFIGURE=	yes
 
 MAN1=		waimea.1
 
+.if !defined(WITHOUT_PIXMAP)
+LIB_DEPENDS+=	Imlib2.1:${PORTSDIR}/graphics/imlib2
+.endif
+
+.if defined(WITH_XFT2)
+LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-wm/waimea/distinfo b/x11-wm/waimea/distinfo
index 7c9c6acfb494..286899e340ef 100644
--- a/x11-wm/waimea/distinfo
+++ b/x11-wm/waimea/distinfo
@@ -1 +1 @@
-MD5 (waimea-0.3.3.tar.gz) = 64c2b9009ead3b95f78a2365bad94cec
+MD5 (waimea-0.4.0.tar.bz2) = 0ce2ce92451e4e757a75c958b6acb87a
diff --git a/x11-wm/waimea/files/patch-src::EventHandler.cc b/x11-wm/waimea/files/patch-src::EventHandler.cc
deleted file mode 100644
index 726d4ec99d81..000000000000
--- a/x11-wm/waimea/files/patch-src::EventHandler.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/EventHandler.cc.orig	Mon Jun 17 19:14:12 2002
-+++ src/EventHandler.cc	Mon Jun 17 19:38:20 2002
-@@ -94,7 +94,7 @@
- void EventHandler::HandleEvent(XEvent *event) {
-     Window w;
-     int i, rx, ry;
--    struct timeb click_time;
-+    struct timeval click_time;
-     
-     EventDetail *ed = new EventDetail;
- 
-@@ -136,36 +136,36 @@
-         case ButtonPress:
-             ed->type = ButtonPress;
-             if (last_click_win == event->xbutton.window) {
--                ftime(&click_time);
--                if (click_time.time <= last_click.time + 1) {
--                    if (click_time.time == last_click.time &&
-+                gettimeofday(&click_time, NULL);
-+                if (click_time.tv_sec <= last_click.tv_sec + 1) {
-+                    if (click_time.tv_sec == last_click.tv_sec &&
-                         (unsigned int)
--                        (click_time.millitm - last_click.millitm) <
--                        waimea->rh->double_click) {
-+                        (click_time.tv_usec - last_click.tv_usec)
-+                        / 1000 < waimea->rh->double_click) {
-                         ed->type = DoubleClick;
-                         last_click_win = (Window) 0;
-                     }
--                    else if ((1000 - last_click.millitm) +
--                             (unsigned int) click_time.millitm <
--                             waimea->rh->double_click) {
-+                    else if (((1000000 - last_click.tv_usec) +
-+                             (unsigned int) click_time.tv_usec)
-+                             / 1000 < waimea->rh->double_click) {
-                         ed->type = DoubleClick;
-                             last_click_win = (Window) 0;
-                     }
-                     else {
-                         last_click_win = event->xbutton.window;
--                        last_click.time = click_time.time;
--                        last_click.millitm = click_time.millitm;
-+                        last_click.tv_sec = click_time.tv_sec;
-+                        last_click.tv_usec = click_time.tv_usec;
-                     }
-                 }
-                 else {
-                     last_click_win = event->xbutton.window;
--                    last_click.time = click_time.time;
--                    last_click.millitm = click_time.millitm;
-+                    last_click.tv_sec = click_time.tv_sec;
-+                    last_click.tv_usec = click_time.tv_usec;
-                 }
-             }
-             else {
-                 last_click_win = event->xbutton.window;
--                ftime(&last_click);
-+                gettimeofday(&last_click, NULL);
-             }
-         case ButtonRelease:
-             if (event->type == ButtonRelease) ed->type = ButtonRelease;
diff --git a/x11-wm/waimea/files/patch-src::EventHandler.hh b/x11-wm/waimea/files/patch-src::EventHandler.hh
deleted file mode 100644
index a46d0f2aa7a8..000000000000
--- a/x11-wm/waimea/files/patch-src::EventHandler.hh
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/EventHandler.hh.orig	Mon Jun 17 19:17:21 2002
-+++ src/EventHandler.hh	Mon Jun 17 19:21:08 2002
-@@ -15,7 +15,7 @@
- #define __EventHandler_hh
- 
- #include <sys/types.h>
--#include <sys/timeb.h>
-+#include <sys/time.h>
- #include <X11/Xlib.h>
- #include <hash_set.h>
- 
-@@ -64,7 +64,7 @@
-     Waimea *waimea;
-     ResourceHandler *rh;
-     Window last_click_win;
--    struct timeb last_click;
-+    struct timeval last_click;
- };
- 
- Bool eventmatch(WaAction *, EventDetail *);
diff --git a/x11-wm/waimea/pkg-descr b/x11-wm/waimea/pkg-descr
index 09cc3cacdb78..e952294a4230 100644
--- a/x11-wm/waimea/pkg-descr
+++ b/x11-wm/waimea/pkg-descr
@@ -1,20 +1,24 @@
 The design goal for waimea is to create the most efficient desktop
-working environment available.  To achieve this waimea is a fast and
-highly customizable virtual desktop window manager.  It uses blackbox
-image rendering engine (blackbox styles support) 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.
+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:
 
-    * Virtual desktop
     * Blackbox image rendering engine (blackbox style support)
-    * Action Configuration System
-    * Advanced Menu System
+    * Virtual desktops
+    * Action configuration system
+    * Advanced menu system, dynamic menus
     * Standard X core fonts
-    * Xft fonts (anti-aliased 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
index 69a9125f5194..db1be19a4fce 100644
--- a/x11-wm/waimea/pkg-plist
+++ b/x11-wm/waimea/pkg-plist
@@ -1,13 +1,18 @@
 bin/waimea
-share/Waimea/actions/action
-share/Waimea/actions/action.click-to-focus
-share/Waimea/actions/action.non-opaque
-share/Waimea/actions/action.no-mouse
-share/Waimea/actions/action.sloppy-focus
-share/Waimea/backgrounds/waimea.png
-share/Waimea/menu
-share/Waimea/styles/Default
-@dirrm share/Waimea/actions
-@dirrm share/Waimea/backgrounds
-@dirrm share/Waimea/styles
-@dirrm share/Waimea
+share/waimea/actions/action
+share/waimea/actions/action.click-to-focus
+share/waimea/actions/action.no-mouse
+share/waimea/actions/action.non-opaque
+share/waimea/actions/action.sloppy-focus
+share/waimea/backgrounds/waimea.png
+share/waimea/config
+share/waimea/menu
+share/waimea/scripts/filelist.pl
+share/waimea/scripts/procinfo.pl
+share/waimea/scripts/stylesdir.pl
+share/waimea/styles/Default.style
+@dirrm share/waimea/actions
+@dirrm share/waimea/backgrounds
+@dirrm share/waimea/scripts
+@dirrm share/waimea/styles
+@dirrm share/waimea