diff --git a/x11/waimea/Makefile b/x11/waimea/Makefile new file mode 100644 index 00000000000..cd3fee1f068 --- /dev/null +++ b/x11/waimea/Makefile @@ -0,0 +1,29 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ + +COMMENT= "Virtual desktop manager for X11" + +VERSION=0.3.3 +DISTNAME= waimea-${VERSION} +CATEGORIES= x11 + +HOMEPAGE= http://waimea.sourceforge.net + +MAINTAINER= Damien Couderc + +# GPL +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=waimea/} + +USE_X11= Yes +USE_GMAKE= Yes +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --disable-pixmap + +post-install: + ${INSTALL_DATA} ${WRKSRC}/data/waimearc.example ${PREFIX}/share/Waimea + +.include diff --git a/x11/waimea/distinfo b/x11/waimea/distinfo new file mode 100644 index 00000000000..38516d28b91 --- /dev/null +++ b/x11/waimea/distinfo @@ -0,0 +1,3 @@ +MD5 (waimea-0.3.3.tar.gz) = 64c2b9009ead3b95f78a2365bad94cec +RMD160 (waimea-0.3.3.tar.gz) = 155940f079a0672cb3b147c6106c6fd0310d98b7 +SHA1 (waimea-0.3.3.tar.gz) = 0bcebb23329321c413f56269c3abeab623d003ee diff --git a/x11/waimea/patches/patch-data_Makefile_in b/x11/waimea/patches/patch-data_Makefile_in new file mode 100644 index 00000000000..0656006a79d --- /dev/null +++ b/x11/waimea/patches/patch-data_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-data_Makefile_in,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ +--- data/Makefile.in.orig Sat Aug 31 14:51:45 2002 ++++ data/Makefile.in Sat Aug 31 14:53:36 2002 +@@ -84,7 +84,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $( + + TAR = tar + GZIP_ENV = --best +-all: all-redirect ++all: waimearc.example all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile diff --git a/x11/waimea/patches/patch-data_actions_Makefile_in b/x11/waimea/patches/patch-data_actions_Makefile_in new file mode 100644 index 00000000000..0d7600589e5 --- /dev/null +++ b/x11/waimea/patches/patch-data_actions_Makefile_in @@ -0,0 +1,17 @@ +$OpenBSD: patch-data_actions_Makefile_in,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ +--- data/actions/Makefile.in.orig Fri Aug 30 11:05:19 2002 ++++ data/actions/Makefile.in Fri Aug 30 11:05:52 2002 +@@ -200,11 +200,11 @@ mostlyclean distclean maintainer-clean + + + install-data-local: +- cd $(pkgdatadir)/actions && \ ++ cd $(DESTDIR)$(pkgdatadir)/actions && \ + ln -sf action.sloppy-focus action + + uninstall-local: +- rm -f $(pkgdatadir)/actions/action ++ rm -f $(DESTDIR)$(pkgdatadir)/actions/action + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/waimea/patches/patch-data_styles_Default_in b/x11/waimea/patches/patch-data_styles_Default_in new file mode 100644 index 00000000000..0f7fde36282 --- /dev/null +++ b/x11/waimea/patches/patch-data_styles_Default_in @@ -0,0 +1,9 @@ +$OpenBSD: patch-data_styles_Default_in,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ +--- data/styles/Default.in.orig Sat Aug 31 13:45:01 2002 ++++ data/styles/Default.in Sat Aug 31 13:45:42 2002 +@@ -105,4 +105,4 @@ handleWidth: 3 + + ! *.font: arial:pixelsize=12 [xft] + +-rootCommand: Esetroot -s @pkgdatadir@/backgrounds/waimea.png ++!rootCommand: Esetroot -s @pkgdatadir@/backgrounds/waimea.png diff --git a/x11/waimea/patches/patch-src_EventHandler_cc b/x11/waimea/patches/patch-src_EventHandler_cc new file mode 100644 index 00000000000..24bf1f2d3d8 --- /dev/null +++ b/x11/waimea/patches/patch-src_EventHandler_cc @@ -0,0 +1,60 @@ +$OpenBSD: patch-src_EventHandler_cc,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ +--- src/EventHandler.cc.orig Fri May 17 16:56:26 2002 ++++ src/EventHandler.cc Fri Aug 30 10:56:57 2002 +@@ -94,7 +94,7 @@ void EventHandler::EventLoop(hash_settype = 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) < ++ ((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 < ++ 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/waimea/patches/patch-src_EventHandler_hh b/x11/waimea/patches/patch-src_EventHandler_hh new file mode 100644 index 00000000000..e314edcc7cd --- /dev/null +++ b/x11/waimea/patches/patch-src_EventHandler_hh @@ -0,0 +1,21 @@ +$OpenBSD: patch-src_EventHandler_hh,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ +--- src/EventHandler.hh.orig Fri Aug 30 10:42:45 2002 ++++ src/EventHandler.hh Fri Aug 30 10:54:49 2002 +@@ -15,7 +15,7 @@ + #define __EventHandler_hh + + #include +-#include ++#include + #include + #include + +@@ -64,7 +64,7 @@ private: + Waimea *waimea; + ResourceHandler *rh; + Window last_click_win; +- struct timeb last_click; ++ struct timeval last_click; + }; + + Bool eventmatch(WaAction *, EventDetail *); diff --git a/x11/waimea/pkg/DESCR b/x11/waimea/pkg/DESCR new file mode 100644 index 00000000000..341e0c29d53 --- /dev/null +++ b/x11/waimea/pkg/DESCR @@ -0,0 +1,6 @@ +Waimea is a virtual desktop window manager for X11 designed to be fast and +highly customizable. +It uses Blackbox image rendering engine (Blackbox styles support) and +can use Xft library for font rendering (anti-aliased font support). + +WWW: ${HOMEPAGE} diff --git a/x11/waimea/pkg/PLIST b/x11/waimea/pkg/PLIST new file mode 100644 index 00000000000..b30577b399d --- /dev/null +++ b/x11/waimea/pkg/PLIST @@ -0,0 +1,16 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $ +bin/waimea +man/man1/waimea.1 +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/menu +share/Waimea/styles/Default +share/Waimea/waimearc.example +@dirrm share/Waimea/styles +@dirrm share/Waimea/backgrounds +@dirrm share/Waimea/actions +@dirrm share/Waimea