Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  6 Jun 2005 15:18:23 +0400 (MSD)
From:      Alex Kapranoff <kappa@rambler-co.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/81949: [new port] x11-wm/wmii -- Window Manager Improved 2
Message-ID:  <20050606111823.C5BF4409E@capella.park.rambler.ru>
Resent-Message-ID: <200506061120.j56BK1Qh072625@freefall.freebsd.org>

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

>Number:         81949
>Category:       ports
>Synopsis:       [new port] x11-wm/wmii -- Window Manager Improved 2
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 06 11:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Alex Kapranoff
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Inner Mongolia
>Environment:
FreeBSD capella.park.rambler.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Jun 15 17:17:42 MSD 2004     root@capella.rambler.stack.net:/usr/obj/usr/src/sys/CAPELLA  i386

	
>Description:
	

snprintf patch for libwmii/util.c taken from OpenBSD port by
Julian Leyh.
	
>How-To-Repeat:
	
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	wmii
#	wmii/Makefile
#	wmii/distinfo
#	wmii/pkg-descr
#	wmii/pkg-plist
#	wmii/files
#	wmii/files/patch-config.mk
#	wmii/files/patch-libwmii::util.c
#	wmii/files/patch-Makefile
#
echo c - wmii
mkdir -p wmii > /dev/null 2>&1
echo x - wmii/Makefile
sed 's/^X//' >wmii/Makefile << 'END-of-wmii/Makefile'
X# New ports collection makefile for:   WMII
X# Date created:        2 June 2005
X# Whom:                Alex Kapranoff <kappa@freebsd.org.ua>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	wmii
XPORTVERSION=	1
XCATEGORIES=	x11-wm
XMASTER_SITES=	http://wmi.modprobe.de/download/
X
XMAINTAINER=	kappa@freebsd.org.ua
XCOMMENT=	Next generation of WMI window manager
X
XUSE_X_PREFIX=	yes
XUSE_BZIP2=	yes
X
XMAN1=	wmii.1 wmibar.1 wmifs.1 wmiinput.1 wmikeys.1 wmiplumb.1 wmir.1 wmiwarp.1
XMAN5=	wmii.rc.5
X
X.include <bsd.port.mk>
END-of-wmii/Makefile
echo x - wmii/distinfo
sed 's/^X//' >wmii/distinfo << 'END-of-wmii/distinfo'
XMD5 (wmii-1.tar.bz2) = 160f0f59138df262a9ea9764dfa5655e
XSIZE (wmii-1.tar.bz2) = 71003
END-of-wmii/distinfo
echo x - wmii/pkg-descr
sed 's/^X//' >wmii/pkg-descr << 'END-of-wmii/pkg-descr'
Xwindow manager improved 2 - is the next generation of the WMI project.
XDue to a complete rewrite it is highly modularized and uses a new
Xconfiguration and inter-process communication interface which is based
Xon the 9p protocol from the Plan 9 operating system.
X
XWWW: http://wmi.modprobe.de/index.php/WMII/Overview
END-of-wmii/pkg-descr
echo x - wmii/pkg-plist
sed 's/^X//' >wmii/pkg-plist << 'END-of-wmii/pkg-plist'
Xbin/wmibar
Xbin/wmifs
Xbin/wmii
Xbin/wmiinput
Xbin/wmikeys
Xbin/wmiplumb
Xbin/wmir
Xbin/wmiwarp
X%%EXAMPLESDIR%%/actions
X%%EXAMPLESDIR%%/bar
X%%EXAMPLESDIR%%/input
X%%EXAMPLESDIR%%/keys
X%%EXAMPLESDIR%%/rc
X%%EXAMPLESDIR%%/rc.conf
X%%EXAMPLESDIR%%/status.sh
X%%EXAMPLESDIR%%/wmii
X%%DOCSDIR%%/welcome.txt
X@dirrm %%EXAMPLESDIR%%
X@dirrm %%DOCSDIR%%
END-of-wmii/pkg-plist
echo c - wmii/files
mkdir -p wmii/files > /dev/null 2>&1
echo x - wmii/files/patch-config.mk
sed 's/^X//' >wmii/files/patch-config.mk << 'END-of-wmii/files/patch-config.mk'
X--- config.mk.orig	Thu Jun  2 02:44:48 2005
X+++ config.mk	Mon Jun  6 14:58:23 2005
X@@ -1,10 +1,11 @@
X # Customize to fit your system
X 
X # paths
X-PREFIX      = /usr/local
X+#PREFIX      = /usr/local
X CONFPREFIX  = ${PREFIX}/etc
X-MANPREFIX   = ${PREFIX}/share/man
X-SHAREPREFIX = ${PREFIX}/share
X+MANPREFIX   = ${PREFIX}/man
X+SHAREPREFIX = ${PREFIX}/share/doc
X+SAMPLEPREFIX= ${PREFIX}/share/examples
X 
X INCDIR      = ${PREFIX}/include
X LIBDIR      = ${PREFIX}/lib
X@@ -21,24 +22,24 @@
X #CAIROINC    = -I/usr/include/cairo -I${INCDIR}/cairo
X 
X # str{l,n}{cat,cpy} support, if you have OpenBSD you can use strl*
X-STRLCPY     = strncpy
X-STRLCAT     = strncat
X+STRLCPY     = strlcpy
X+STRLCAT     = strlcat
X STRLFLAGS   = -DSTRLCPY=${STRLCPY} -DSTRLCAT=${STRLCAT}
X 
X # compiler
X # Note: under Solaris add -D__EXTENSIONS__ to CFLAGS
X-CFLAGS      = -O0 -g -Wall -pedantic ${INCLUDES} ${STRLFLAGS} -DDRAW=\"${DRAW}\"
X-LDFLAGS     = -g ${LIBS}
X+CFLAGS      += ${INCLUDES} ${STRLFLAGS} -DDRAW=\"${DRAW}\"
X+LDFLAGS     += ${LIBS}
X #CFLAGS      = -Os ${INCLUDES} ${STRLFLAGS} -DDRAW=\"${DRAW}\"
X #LDFLAGS     = ${LIBS}
X 
X # userland
X AR          = ar cr
X-CC          = cc
X+#CC          = cc
X CP          = cp -f
X COMPRESS    = bzip2
X-INSTBIN     = ${CP}
X-INSTDATA    = ${CP}
X+INSTBIN     = ${INSTALL}
X+INSTDATA    = ${INSTALL}
X MODBIN      = chmod 755
X MODDATA     = chmod 444
X #INSTBIN     = install -d -c -o root -g wheel -m 755
END-of-wmii/files/patch-config.mk
echo x - wmii/files/patch-libwmii::util.c
sed 's/^X//' >wmii/files/patch-libwmii::util.c << 'END-of-wmii/files/patch-libwmii::util.c'
X--- libwmii/util.c.orig	Thu Jun  2 00:44:48 2005
X+++ libwmii/util.c	Thu Jun  2 17:09:42 2005
X@@ -421,6 +421,7 @@ void spawn_expanded(Display *dpy, char *
X                     char *actlocation, char *cmd) {
X 
X     char *shell = getenv("SHELL");
X+	size_t len;
X 
X     if (!shell) shell = "/bin/sh";
X     if (fork() == 0) {
X@@ -436,8 +437,9 @@ void spawn_expanded(Display *dpy, char *
X             if (ds) putenv(ds);
X 
X             /*setenv("WMIR_SOCKET", sfile, 1);*/
X-            tmp = malloc(strlen(sfile) + 13);
X-            sprintf(tmp, "WMIR_SOCKET=%s", sfile);
X+			len = strlen(sfile)+13;
X+            tmp = malloc(len);
X+            snprintf(tmp, len, "WMIR_SOCKET=%s", sfile);
X             putenv(tmp);
X 
X             tmp = expand_action(sfile, prefix, cmd, 0);
END-of-wmii/files/patch-libwmii::util.c
echo x - wmii/files/patch-Makefile
sed 's/^X//' >wmii/files/patch-Makefile << 'END-of-wmii/files/patch-Makefile'
X--- Makefile.orig	Thu Jun  2 02:44:48 2005
X+++ Makefile	Mon Jun  6 15:09:56 2005
X@@ -113,12 +113,12 @@
X 
X install: all
X 	@echo -------------------------------------------------------
X-	@echo Installing configuration files to ${DESTDIR}${CONFPREFIX}/wmii
X-	@${MKDIR} -p ${DESTDIR}${CONFPREFIX}/wmii
X-	@${INSTDATA} ${RC} ${DESTDIR}${CONFPREFIX}/wmii
X-	@${SED} 's|CONFPREFIX|${CONFPREFIX}|;s|SHAREPREFIX|${SHAREPREFIX}|' < rc/rc > ${DESTDIR}${CONFPREFIX}/wmii/rc
X-	@${MODBIN} ${DESTDIR}${CONFPREFIX}/wmii/rc
X-	@${MODBIN} ${DESTDIR}${CONFPREFIX}/wmii/status.sh
X+	@echo Installing sample configuration files to ${DESTDIR}${SAMPLEPREFIX}/wmii
X+	@${MKDIR} -p ${DESTDIR}${SAMPLEPREFIX}/wmii
X+	@${INSTDATA} ${RC} ${DESTDIR}${SAMPLEPREFIX}/wmii
X+	@${SED} 's|CONFPREFIX|${CONFPREFIX}|;s|SHAREPREFIX|${SHAREPREFIX}|' < rc/rc > ${DESTDIR}${SAMPLEPREFIX}/wmii/rc
X+	@${MODBIN} ${DESTDIR}${SAMPLEPREFIX}/wmii/rc
X+	@${MODBIN} ${DESTDIR}${SAMPLEPREFIX}/wmii/status.sh
X 	@echo Installing docs to ${DESTDIR}${SHAREPREFIX}/wmii
X 	@${MKDIR} -p ${DESTDIR}${SHAREPREFIX}/wmii
X 	@${INSTDATA} ${SHARE} ${DESTDIR}${SHAREPREFIX}/wmii
END-of-wmii/files/patch-Makefile
exit

>Release-Note:
>Audit-Trail:
>Unformatted:



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