From owner-svn-ports-all@freebsd.org Sat Nov 14 03:55:59 2015 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 8B811A2EFF4; Sat, 14 Nov 2015 03:55:59 +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 3BCC11A42; Sat, 14 Nov 2015 03:55:59 +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 tAE3twBv048820; Sat, 14 Nov 2015 03:55:58 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAE3twHG048817; Sat, 14 Nov 2015 03:55:58 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511140355.tAE3twHG048817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 14 Nov 2015 03:55:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401562 - in head/x11-wm/plwm: . 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.20 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: Sat, 14 Nov 2015 03:55:59 -0000 Author: amdmi3 Date: Sat Nov 14 03:55:57 2015 New Revision: 401562 URL: https://svnweb.freebsd.org/changeset/ports/401562 Log: - Clarify LICENSE - Add LICENSE_FILE - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/x11-wm/plwm/Makefile head/x11-wm/plwm/files/patch-plwm_outline.py Modified: head/x11-wm/plwm/Makefile ============================================================================== --- head/x11-wm/plwm/Makefile Sat Nov 14 03:55:56 2015 (r401561) +++ head/x11-wm/plwm/Makefile Sat Nov 14 03:55:57 2015 (r401562) @@ -10,7 +10,8 @@ DISTNAME= ${PORTNAME:tu}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Window manager construction kit -LICENSE= GPLv2 +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:${PORTSDIR}/x11-toolkits/py-xlib RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:${PORTSDIR}/x11-toolkits/py-xlib @@ -31,10 +32,12 @@ post-patch: @${REINPLACE_CMD} -e \ 's|$$Id|coding: utf-8 |g' ${WRKSRC}/plwm/mw_apm.py -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} *.pdf \ ${STAGEDIR}${DOCSDIR}) + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${INSTALL_DATA} *.examplewm *.py \ ${STAGEDIR}${EXAMPLESDIR}) Modified: head/x11-wm/plwm/files/patch-plwm_outline.py ============================================================================== --- head/x11-wm/plwm/files/patch-plwm_outline.py Sat Nov 14 03:55:56 2015 (r401561) +++ head/x11-wm/plwm/files/patch-plwm_outline.py Sat Nov 14 03:55:57 2015 (r401562) @@ -1,6 +1,6 @@ ---- plwm/outline.py.orig 2001-11-26 14:48:21.000000000 +0100 -+++ plwm/outline.py 2009-06-06 17:47:13.000000000 +0200 -@@ -63,7 +63,7 @@ +--- plwm/outline.py.orig 2001-11-26 13:48:21 UTC ++++ plwm/outline.py +@@ -63,7 +63,7 @@ class XorOutlineClient: if name: self.outline_gc.set_clip_rectangles(0, 0, [coords], X.YXSorted) @@ -9,7 +9,7 @@ self.screen.root.draw_text(self.outline_gc, sx, sy, name) self.outline_name = (sx, sy, name) else: -@@ -138,8 +138,8 @@ +@@ -138,8 +138,8 @@ class WindowOutlineClient: height = s[3] - s[1] + 1) if name: @@ -20,7 +20,7 @@ width = sw, height = sh) if not self.outline_mapped: -@@ -155,7 +155,7 @@ +@@ -155,7 +155,7 @@ class WindowOutlineClient: # disappear otherwise... if name: self.outline_name_window.image_text(self.outline_name_gc, @@ -29,7 +29,7 @@ def outline_hide(self): if self.outline_mapped: -@@ -246,8 +246,8 @@ +@@ -246,8 +246,8 @@ def calculate_parts(client, x, y, w, h, sw = min(r.overall_width, w) sh = min(r.overall_ascent + r.overall_descent, h)