From owner-svn-ports-head@freebsd.org Wed Feb 8 09:01:28 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32E8ACD5003; Wed, 8 Feb 2017 09:01:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D3C7101E; Wed, 8 Feb 2017 09:01:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1891R7X064575; Wed, 8 Feb 2017 09:01:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1891QwW064571; Wed, 8 Feb 2017 09:01:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702080901.v1891QwW064571@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 8 Feb 2017 09:01:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433637 - in head/x11-wm/wmii: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2017 09:01:28 -0000 Author: amdmi3 Date: Wed Feb 8 09:01:26 2017 New Revision: 433637 URL: https://svnweb.freebsd.org/changeset/ports/433637 Log: - Fix CONFLICTS on wmii-devel - Silence stripping - Regenerate patches Modified: head/x11-wm/wmii/Makefile head/x11-wm/wmii/files/patch-mk-common.mk head/x11-wm/wmii/files/patch-mk-hdr.mk head/x11-wm/wmii/files/patch-no-utf8 Modified: head/x11-wm/wmii/Makefile ============================================================================== --- head/x11-wm/wmii/Makefile Wed Feb 8 08:20:36 2017 (r433636) +++ head/x11-wm/wmii/Makefile Wed Feb 8 09:01:26 2017 (r433637) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libixp.so:devel/libixp RUN_DEPENDS= dmenu:x11/dmenu -CONFLICTS= wmii-3.9* +CONFLICTS= wmii-devel-[0-9]* USE_XORG= x11 xextproto xt xext @@ -51,7 +51,7 @@ post-patch: .SILENT post-install: .for f in wmii wmii9menu wmiir - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .include Modified: head/x11-wm/wmii/files/patch-mk-common.mk ============================================================================== --- head/x11-wm/wmii/files/patch-mk-common.mk Wed Feb 8 08:20:36 2017 (r433636) +++ head/x11-wm/wmii/files/patch-mk-common.mk Wed Feb 8 09:01:26 2017 (r433637) @@ -1,4 +1,4 @@ ---- mk/common.mk.orig 2007-11-16 21:59:15 +0800 +--- mk/common.mk.orig 2007-11-16 13:59:15 UTC +++ mk/common.mk @@ -4,9 +4,9 @@ install: all Modified: head/x11-wm/wmii/files/patch-mk-hdr.mk ============================================================================== --- head/x11-wm/wmii/files/patch-mk-hdr.mk Wed Feb 8 08:20:36 2017 (r433636) +++ head/x11-wm/wmii/files/patch-mk-hdr.mk Wed Feb 8 09:01:26 2017 (r433637) @@ -1,4 +1,4 @@ ---- mk/hdr.mk.orig 2007-11-16 21:59:15 +0800 +--- mk/hdr.mk.orig 2007-11-16 13:59:15 UTC +++ mk/hdr.mk @@ -26,32 +26,32 @@ all: Modified: head/x11-wm/wmii/files/patch-no-utf8 ============================================================================== --- head/x11-wm/wmii/files/patch-no-utf8 Wed Feb 8 08:20:36 2017 (r433636) +++ head/x11-wm/wmii/files/patch-no-utf8 Wed Feb 8 09:01:26 2017 (r433637) @@ -1,6 +1,6 @@ ---- cmd/wmii/Makefile.orig +--- cmd/wmii/Makefile.orig 2007-11-16 13:59:15 UTC +++ cmd/wmii/Makefile -@@ -8,8 +8,16 @@ +@@ -8,8 +8,16 @@ TARG = wmii HFILES= dat.h fns.h x11.h LIB = ${LIBIXP} @@ -19,7 +19,7 @@ OBJ = area \ bar \ client \ ---- cmd/wmii/utf.c.orig +--- cmd/wmii/utf.c.orig 2007-11-16 13:59:15 UTC +++ cmd/wmii/utf.c @@ -1,12 +1,17 @@ /* Public Domain --Kris Maglione */ @@ -39,7 +39,7 @@ static iconv_t cd; char *buf, *pos; size_t nbuf, bsize; -@@ -30,6 +35,7 @@ +@@ -30,6 +35,7 @@ toutf8n(char *str, size_t nstr) { break; *pos = '\0'; return buf; @@ -47,9 +47,9 @@ } char* ---- cmd/wmii/x11.c.orig +--- cmd/wmii/x11.c.orig 2007-11-16 13:59:15 UTC +++ cmd/wmii/x11.c -@@ -18,6 +18,12 @@ +@@ -18,6 +18,12 @@ static Map wmap, amap; static MapEnt *wbucket[137]; static MapEnt *abucket[137]; @@ -62,7 +62,7 @@ XRectangle XRect(Rectangle r) { XRectangle xr; -@@ -444,7 +450,7 @@ +@@ -444,7 +450,7 @@ drawstring(Image *dst, Font *font, setgccol(dst, col); if(font->set) @@ -71,7 +71,7 @@ font->set, dst->gc, x, y, buf, len); -@@ -552,7 +558,7 @@ +@@ -552,7 +558,7 @@ textwidth_l(Font *font, char *text, uint XRectangle r; if(font->set) { @@ -80,7 +80,7 @@ return r.width; } return XTextWidth(font->xfont, text, len); -@@ -638,7 +644,7 @@ +@@ -638,7 +644,7 @@ gettextlistproperty(Window *w, char *nam XGetTextProperty(display, w->w, &prop, xatom(name)); if(prop.nitems > 0) { @@ -89,7 +89,7 @@ *ret = list; XFree(prop.value); } -@@ -653,9 +659,10 @@ +@@ -653,9 +659,10 @@ gettextproperty(Window *w, char *name) { str = nil; n = gettextlistproperty(w, name, &list);