From owner-svn-ports-all@freebsd.org Wed Dec 14 09:00:51 2016 Return-Path: Delivered-To: svn-ports-all@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 A016DC752D0; Wed, 14 Dec 2016 09:00:51 +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 6123E13D4; Wed, 14 Dec 2016 09:00:51 +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 uBE90oNQ016081; Wed, 14 Dec 2016 09:00:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBE90ovN016077; Wed, 14 Dec 2016 09:00:50 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612140900.uBE90ovN016077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 14 Dec 2016 09:00:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428551 - in head/x11-wm/wmii-devel: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Dec 2016 09:00:51 -0000 Author: amdmi3 Date: Wed Dec 14 09:00:50 2016 New Revision: 428551 URL: https://svnweb.freebsd.org/changeset/ports/428551 Log: - Fix CONFLICTS on wmii - Silence stripping - Regenerate patches Modified: head/x11-wm/wmii-devel/Makefile head/x11-wm/wmii-devel/files/patch-cmd__Makefile head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile Modified: head/x11-wm/wmii-devel/Makefile ============================================================================== --- head/x11-wm/wmii-devel/Makefile Wed Dec 14 08:57:17 2016 (r428550) +++ head/x11-wm/wmii-devel/Makefile Wed Dec 14 09:00:50 2016 (r428551) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libixp.so:devel/libixp -CONFLICTS= wmii-3.6* +CONFLICTS= wmii-[0-9]* USES= pkgconfig tar:tbz USE_XORG= x11 xext xrandr xrender xinerama xft @@ -37,7 +37,7 @@ post-patch: post-install: .for f in bin/wimenu bin/wmii bin/wmii9menu bin/wmiir lib/libwmii_hack.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor .include Modified: head/x11-wm/wmii-devel/files/patch-cmd__Makefile ============================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd__Makefile Wed Dec 14 08:57:17 2016 (r428550) +++ head/x11-wm/wmii-devel/files/patch-cmd__Makefile Wed Dec 14 09:00:50 2016 (r428551) @@ -1,6 +1,6 @@ ---- cmd/Makefile..orig +--- cmd/Makefile.orig 2010-06-10 07:24:01 UTC +++ cmd/Makefile -@@ -20,14 +20,14 @@ +@@ -20,14 +20,14 @@ CFLAGS += $(INCX11) include $(ROOT)/mk/many.mk include $(ROOT)/mk/dir.mk Modified: head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile ============================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile Wed Dec 14 08:57:17 2016 (r428550) +++ head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile Wed Dec 14 09:00:50 2016 (r428551) @@ -1,6 +1,6 @@ ---- cmd/menu/Makefile.orig +--- cmd/menu/Makefile.orig 2010-06-10 07:24:01 UTC +++ cmd/menu/Makefile -@@ -14,8 +14,8 @@ +@@ -14,8 +14,8 @@ HFILES= dat.h fns.h PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama Modified: head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile ============================================================================== --- head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile Wed Dec 14 08:57:17 2016 (r428550) +++ head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile Wed Dec 14 09:00:50 2016 (r428551) @@ -1,6 +1,6 @@ ---- cmd/wmii/Makefile.orig +--- cmd/wmii/Makefile.orig 2010-06-10 07:24:02 UTC +++ cmd/wmii/Makefile -@@ -9,7 +9,7 @@ +@@ -9,7 +9,7 @@ HFILES= dat.h fns.h PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama