Index: x11/wbarconf/Makefile
===================================================================
--- x11/wbarconf/Makefile	(revision 341293)
+++ x11/wbarconf/Makefile	(working copy)
@@ -3,13 +3,15 @@
 
 PORTNAME=	wbarconf
 PORTVERSION=	0.7.2.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://koti.kapsi.fi/ighea/wbarconf/
-DISTNAME=	wbarconf-${PORTVERSION}
 
 MAINTAINER=	olivier@cochard.me
 COMMENT=	Configuration GUI for wbar
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	wbar:${PORTSDIR}/x11/wbar
 
 USE_GNOME=	pygobject pygtk2 gtk20
@@ -19,19 +21,20 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	README COPYING
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/wbarbacks
-	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${DATADIR}/wbarbacks/)
-	${INSTALL_DATA} ${WRKSRC}/messages.pot ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${PREFIX}/share/applications
-	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/locale/)
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}/wbarbacks
+	(cd ${WRKSRC}/wbarbacks/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/wbarbacks/)
+	${INSTALL_DATA} ${WRKSRC}/messages.pot ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/wbarconf.png ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/wbarconf.desktop ${STAGEDIR}${PREFIX}/share/applications
+	(cd ${WRKSRC}/locale/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale/)
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: x11/wbarconf/pkg-descr
===================================================================
--- x11/wbarconf/pkg-descr	(revision 341293)
+++ x11/wbarconf/pkg-descr	(working copy)
@@ -1,3 +1,3 @@
 wbarconf is graphical configuration utility for wbar written in Python/GTK
 
-WWW:	http://koti.kapsi.fi/ighea/wbarconf/
+WWW: http://koti.kapsi.fi/ighea/wbarconf/