--- x11-wm/plwm/Makefile	2014-07-03 06:31:41.000000000 +0900
+++ x11-wm/plwm/Makefile	2014-08-08 00:00:00.000000000 +0900
@@ -2,29 +2,42 @@ 
 # $FreeBSD: head/x11-wm/plwm/Makefile 360222 2014-07-02 16:45:52Z bapt $
 
 PORTNAME=	plwm
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6a
 CATEGORIES=	x11-wm python
 MASTER_SITES=	SF
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A window manager construction kit
+COMMENT=	Window manager construction kit
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
+LICENSE=	GPLv2
 
-INFO=		plwm
+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=		makeinfo
 USE_PYTHON=	yes
-GNU_CONFIGURE=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
-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
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-pre-install:
-	makeinfo -o ${PREFIX}/info/plwm.info ${WRKSRC}/doc/plwm.texi
+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:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.pdf \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${INSTALL_DATA} *.examplewm *.py \
+		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
--- x11-wm/plwm/distinfo	2014-06-21 17:43:15.000000000 +0900
+++ x11-wm/plwm/distinfo	2014-08-08 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@ 
-SHA256 (plwm-2.5.tar.gz) = c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de
-SIZE (plwm-2.5.tar.gz) = 127248
+SHA256 (PLWM-2.6a.tar.gz) = adf7a01f6717235e6ab872f2bcca3d30b10bab31e48aab2afc0cd4c37644d293
+SIZE (PLWM-2.6a.tar.gz) = 452944
--- x11-wm/plwm/pkg-plist	2014-06-21 17:43:15.000000000 +0900
+++ x11-wm/plwm/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,88 +0,0 @@ 
-bin/inspect_plwm
-bin/plwm
-bin/wmm
-%%PYTHON_SITELIBDIR%%/plwm/__init__.py
-%%PYTHON_SITELIBDIR%%/plwm/__init__.pyc
-%%PYTHON_SITELIBDIR%%/plwm/__init__.pyo
-%%PYTHON_SITELIBDIR%%/plwm/border.py
-%%PYTHON_SITELIBDIR%%/plwm/border.pyc
-%%PYTHON_SITELIBDIR%%/plwm/border.pyo
-%%PYTHON_SITELIBDIR%%/plwm/cfilter.py
-%%PYTHON_SITELIBDIR%%/plwm/cfilter.pyc
-%%PYTHON_SITELIBDIR%%/plwm/cfilter.pyo
-%%PYTHON_SITELIBDIR%%/plwm/color.py
-%%PYTHON_SITELIBDIR%%/plwm/color.pyc
-%%PYTHON_SITELIBDIR%%/plwm/color.pyo
-%%PYTHON_SITELIBDIR%%/plwm/cycle.py
-%%PYTHON_SITELIBDIR%%/plwm/cycle.pyc
-%%PYTHON_SITELIBDIR%%/plwm/cycle.pyo
-%%PYTHON_SITELIBDIR%%/plwm/deltamove.py
-%%PYTHON_SITELIBDIR%%/plwm/deltamove.pyc
-%%PYTHON_SITELIBDIR%%/plwm/deltamove.pyo
-%%PYTHON_SITELIBDIR%%/plwm/event.py
-%%PYTHON_SITELIBDIR%%/plwm/event.pyc
-%%PYTHON_SITELIBDIR%%/plwm/event.pyo
-%%PYTHON_SITELIBDIR%%/plwm/focus.py
-%%PYTHON_SITELIBDIR%%/plwm/focus.pyc
-%%PYTHON_SITELIBDIR%%/plwm/focus.pyo
-%%PYTHON_SITELIBDIR%%/plwm/font.py
-%%PYTHON_SITELIBDIR%%/plwm/font.pyc
-%%PYTHON_SITELIBDIR%%/plwm/font.pyo
-%%PYTHON_SITELIBDIR%%/plwm/input.py
-%%PYTHON_SITELIBDIR%%/plwm/input.pyc
-%%PYTHON_SITELIBDIR%%/plwm/input.pyo
-%%PYTHON_SITELIBDIR%%/plwm/inspect.py
-%%PYTHON_SITELIBDIR%%/plwm/inspect.pyc
-%%PYTHON_SITELIBDIR%%/plwm/inspect.pyo
-%%PYTHON_SITELIBDIR%%/plwm/keys.py
-%%PYTHON_SITELIBDIR%%/plwm/keys.pyc
-%%PYTHON_SITELIBDIR%%/plwm/keys.pyo
-%%PYTHON_SITELIBDIR%%/plwm/menu.py
-%%PYTHON_SITELIBDIR%%/plwm/menu.pyc
-%%PYTHON_SITELIBDIR%%/plwm/menu.pyo
-%%PYTHON_SITELIBDIR%%/plwm/message.py
-%%PYTHON_SITELIBDIR%%/plwm/message.pyc
-%%PYTHON_SITELIBDIR%%/plwm/message.pyo
-%%PYTHON_SITELIBDIR%%/plwm/misc.py
-%%PYTHON_SITELIBDIR%%/plwm/misc.pyc
-%%PYTHON_SITELIBDIR%%/plwm/misc.pyo
-%%PYTHON_SITELIBDIR%%/plwm/modestatus.py
-%%PYTHON_SITELIBDIR%%/plwm/modestatus.pyc
-%%PYTHON_SITELIBDIR%%/plwm/modestatus.pyo
-%%PYTHON_SITELIBDIR%%/plwm/modewindow.py
-%%PYTHON_SITELIBDIR%%/plwm/modewindow.pyc
-%%PYTHON_SITELIBDIR%%/plwm/modewindow.pyo
-%%PYTHON_SITELIBDIR%%/plwm/moveresize.py
-%%PYTHON_SITELIBDIR%%/plwm/moveresize.pyc
-%%PYTHON_SITELIBDIR%%/plwm/moveresize.pyo
-%%PYTHON_SITELIBDIR%%/plwm/mw_apm.py
-%%PYTHON_SITELIBDIR%%/plwm/mw_apm.pyc
-%%PYTHON_SITELIBDIR%%/plwm/mw_apm.pyo
-%%PYTHON_SITELIBDIR%%/plwm/mw_biff.py
-%%PYTHON_SITELIBDIR%%/plwm/mw_biff.pyc
-%%PYTHON_SITELIBDIR%%/plwm/mw_biff.pyo
-%%PYTHON_SITELIBDIR%%/plwm/mw_clock.py
-%%PYTHON_SITELIBDIR%%/plwm/mw_clock.pyc
-%%PYTHON_SITELIBDIR%%/plwm/mw_clock.pyo
-%%PYTHON_SITELIBDIR%%/plwm/mw_load.py
-%%PYTHON_SITELIBDIR%%/plwm/mw_load.pyc
-%%PYTHON_SITELIBDIR%%/plwm/mw_load.pyo
-%%PYTHON_SITELIBDIR%%/plwm/outline.py
-%%PYTHON_SITELIBDIR%%/plwm/outline.pyc
-%%PYTHON_SITELIBDIR%%/plwm/outline.pyo
-%%PYTHON_SITELIBDIR%%/plwm/panes.py
-%%PYTHON_SITELIBDIR%%/plwm/panes.pyc
-%%PYTHON_SITELIBDIR%%/plwm/panes.pyo
-%%PYTHON_SITELIBDIR%%/plwm/views.py
-%%PYTHON_SITELIBDIR%%/plwm/views.pyc
-%%PYTHON_SITELIBDIR%%/plwm/views.pyo
-%%PYTHON_SITELIBDIR%%/plwm/wmanager.py
-%%PYTHON_SITELIBDIR%%/plwm/wmanager.pyc
-%%PYTHON_SITELIBDIR%%/plwm/wmanager.pyo
-%%PYTHON_SITELIBDIR%%/plwm/wmevents.py
-%%PYTHON_SITELIBDIR%%/plwm/wmevents.pyc
-%%PYTHON_SITELIBDIR%%/plwm/wmevents.pyo
-%%PYTHON_SITELIBDIR%%/plwm/xlibpath.py
-%%PYTHON_SITELIBDIR%%/plwm/xlibpath.pyc
-%%PYTHON_SITELIBDIR%%/plwm/xlibpath.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/plwm