Skip site navigation (1)Skip section navigation (2)
Date:      21 May 2006 18:30:05 -0000
From:      Zak Johnson <zakj@nox.cx>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/97568: [UPDATE PATCH] x11-wm/wmii to version 3
Message-ID:  <20060521183005.51912.qmail@nox.cx>
Resent-Message-ID: <200605211830.k4LIUPCN065650@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         97568
>Category:       ports
>Synopsis:       [UPDATE PATCH] x11-wm/wmii to version 3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 21 18:30:25 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Zak Johnson
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD smash.i.nox.cx 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386
>Description:
	Update to version 3.  (If this PR is accepted, ports/95881 should be
	closed; it updates wmii to version 2.5.2.)
>How-To-Repeat:
>Fix:
--- wmii.patch begins here ---
diff -Nurb /usr/ports/x11-wm/wmii/Makefile ports/x11-wm/wmii/Makefile
--- /usr/ports/x11-wm/wmii/Makefile	Fri May 12 22:00:45 2006
+++ ports/x11-wm/wmii/Makefile	Sun May 21 11:11:32 2006
@@ -6,45 +6,23 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	2
-PORTREVISION=	1
+PORTVERSION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://wmii.de/download/
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	The next generation of WMI window manager
+COMMENT=	A dynamic, minimalist window manager for X11
 
 USE_X_PREFIX=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11DIR="${X11BASE}" CC="${CC}" \
-		MANPREFIX="${PREFIX}/man"
+MAKE_ARGS=	MANPREFIX="${MANPREFIX}/man"
 
-OPTIONS=	CAIRO	"Enable Cairo rendering backend"	off \
-		STRL	"Use strlcpy()/strlcat() functions"	off
-
-MAN1=		wmibar.1 wmifs.1 wmii.1 wmikeys.1 wmimenu.1 wmir.1
-MAN5=		wmii.rc.5
-
-.include <bsd.port.pre.mk>
-
-# The cairo backend is not recommended in production use, because the cairo
-# library is still very buggy and causes crashes often.
-.if defined(WITH_CAIRO)
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
-MAKE_ARGS+=	DRAW=cairo
-.endif
-
-.if defined(WITH_STRL)
-MAKE_ARGS+=	STRLCPY="strlcpy" STRLCAT="strlcat"
-.endif
+MAN1=		wmii.1 wmiimenu.1 wmiir.1 wmiiwm.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
-		-e 's|/usr/lib|${LOCALBASE}/lib|' \
-		-e 's|-O0 -g -Wall -pedantic|${CFLAGS}|; s|-g||' \
+	@${REINPLACE_CMD} -e 's/-O2/${CFLAGS}/' \
+		-e 's|/usr/X11R6|${X11BASE}|' \
+		-e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/config.mk
-.if defined(WITH_CAIRO)
-	@${REINPLACE_CMD} -e 's,^#CAIRO,CAIRO,' ${WRKSRC}/config.mk
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Nurb /usr/ports/x11-wm/wmii/distinfo ports/x11-wm/wmii/distinfo
--- /usr/ports/x11-wm/wmii/distinfo	Wed Nov 16 06:38:26 2005
+++ ports/x11-wm/wmii/distinfo	Fri May 19 16:34:14 2006
@@ -1,3 +1,3 @@
-MD5 (wmii-2.tar.gz) = e03379bb991260f11aab7f7c4d761dd3
-SHA256 (wmii-2.tar.gz) = c8c0b9dca00be16b83d8494559fe605f1ad0570e10158bd59cabc76261ff9d56
-SIZE (wmii-2.tar.gz) = 85475
+MD5 (wmii-3.tar.gz) = 1caba809a6a7bc152a59712e0e0de551
+SHA256 (wmii-3.tar.gz) = 026031e60ee0363534b672ae4c65da22a64439eed3b906f2e98b97d60716ee22
+SIZE (wmii-3.tar.gz) = 64334
diff -Nurb /usr/ports/x11-wm/wmii/pkg-descr ports/x11-wm/wmii/pkg-descr
--- /usr/ports/x11-wm/wmii/pkg-descr	Wed Nov 16 06:38:26 2005
+++ ports/x11-wm/wmii/pkg-descr	Fri May 19 16:33:51 2006
@@ -1,14 +1,9 @@
-Window Manager Improved 2 is the next generation of the WMI project.  Due
-to a complete rewrite it is highly modularized and uses a new configuration
-and inter-process communication interface which is based on the 9p protocol
-from the Plan 9 operating system.  It achieves following goals:
+wmii is a dynamic window manager for X11. It supports classic and dynamic
+window management with extended keyboard, mouse, and filesystem based remote
+control.  It replaces the workspace paradigm with a new tagging approach.
 
-  * Reduction of compile time
-  * Reduction of memory usage
-  * Reduction of lines of code
-  * Performance improvements
-  * Improved rendering capabilities (optional Cairo)
-  * Improved configuration and IPC interface (Libixp)
-  * Modularized components
+Its minimalist philosophy attempts to not exceed 10.000 lines of code
+(including all shipped utilities and libraries), to enforce simplicity and
+clarity. 
 
 WWW: http://wmii.de/
diff -Nurb /usr/ports/x11-wm/wmii/pkg-plist ports/x11-wm/wmii/pkg-plist
--- /usr/ports/x11-wm/wmii/pkg-plist	Thu Sep 15 13:46:47 2005
+++ ports/x11-wm/wmii/pkg-plist	Fri May 19 16:32:21 2006
@@ -1,65 +1,12 @@
-bin/wmibar
-bin/wmifs
 bin/wmii
+bin/wmiimenu
+bin/wmiipsel
+bin/wmiir
+bin/wmiisetsid
+bin/wmiiwarp
 bin/wmiiwm
-bin/wmikeys
-bin/wmimenu
-bin/wmiplumb
-bin/wmir
-bin/wmira
-bin/wmirefcard
-bin/wmiwarp
-etc/wmii/action/actions
-etc/wmii/action/www
-etc/wmii/action/term
-etc/wmii/action/tab
-etc/wmii/action/scr
-etc/wmii/action/quit
-etc/wmii/action/ptoggle
-etc/wmii/action/programs
-etc/wmii/action/presize
-etc/wmii/action/premove
-etc/wmii/action/pprev
-etc/wmii/action/pnext
-etc/wmii/action/pnew
-etc/wmii/action/plumburl
-etc/wmii/action/plumbgoogle
-etc/wmii/action/pageupdate
-etc/wmii/action/pager
-etc/wmii/action/p
-etc/wmii/action/mouse
-etc/wmii/action/max
-etc/wmii/action/lvsplit
-etc/wmii/action/ltiled
-etc/wmii/action/lock
-etc/wmii/action/lmax
-etc/wmii/action/lgrid
-etc/wmii/action/lfloat
-etc/wmii/action/kresize
-etc/wmii/action/knorm
-etc/wmii/action/kmove
-etc/wmii/action/kbare
-etc/wmii/action/icons
-etc/wmii/action/ftoggle
-etc/wmii/action/fresize
-etc/wmii/action/fprev
-etc/wmii/action/fnext
-etc/wmii/action/detach
-etc/wmii/action/cprev
-etc/wmii/action/cnext
-etc/wmii/action/close
-etc/wmii/action/clientupdate
-etc/wmii/action/border
-etc/wmii/action/attach
-etc/wmii/action/zoom
-etc/wmii/bar
-etc/wmii/menu
-etc/wmii/keys
-etc/wmii/rc
-etc/wmii/rc.conf
-etc/wmii/status.sh
-etc/wmii/wm
-@dirrm etc/wmii/action
-@dirrm etc/wmii
-%%DATADIR%%/welcome.txt
-@dirrm %%DATADIR%%
+etc/wmii-3/quit
+etc/wmii-3/status
+etc/wmii-3/welcome
+etc/wmii-3/wmiirc
+@dirrm etc/wmii-3
--- wmii.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060521183005.51912.qmail>