Index: head/x11-wm/plwm/Makefile
===================================================================
--- head/x11-wm/plwm/Makefile	(revision 401561)
+++ head/x11-wm/plwm/Makefile	(revision 401562)
@@ -1,42 +1,45 @@
 # Created by: Mike Meyer <mwm@mired.org>
 # $FreeBSD$
 
 PORTNAME=	plwm
 PORTVERSION=	2.6a
 CATEGORIES=	x11-wm python
 MASTER_SITES=	SF
 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
 
 NO_ARCH=	yes
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|whrandom|random|g' ${WRKSRC}/plwm/inspect.py
 	@${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})
 
 .include <bsd.port.mk>
Index: head/x11-wm/plwm/files/patch-plwm_outline.py
===================================================================
--- head/x11-wm/plwm/files/patch-plwm_outline.py	(revision 401561)
+++ head/x11-wm/plwm/files/patch-plwm_outline.py	(revision 401562)
@@ -1,43 +1,43 @@
---- 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)
 -	    sx, sy, sw, sh, as = namepos
 +	    sx, sy, sw, sh, _as = namepos
  	    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:
 -	    sx, sy, sw, sh, as = namepos
 -	    self.outline_name_window.configure(x = sx, y = sy - as,
 +	    sx, sy, sw, sh, _as = namepos
 +	    self.outline_name_window.configure(x = sx, y = sy - _as,
  					       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,
 -						0, as, name)
 +						0, _as, name)
  	    
      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)
 -	as = r.overall_ascent
 +	_as = r.overall_ascent
      else:
 -	sx = sy = sw = sh = as = 0
 +	sx = sy = sw = sh = _as = 0
  
 -    return (x, y, w, h), s, (sx, sy, sw, sh, as)
 +    return (x, y, w, h), s, (sx, sy, sw, sh, _as)