2 files changed, 20 insertions, 40 deletions

diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index ea6f013fb408..e84b9b467ed5 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -2,48 +2,48 @@
 
 PORTNAME=	tint2
 PORTVERSION=	0.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	yamagi@yamagi.org
 COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 PROJECTHOST=	tint2
 USES=		alias cmake pkgconfig tar:bzip2
-USE_GNOME=	pango glib20
-USE_XORG=	xinerama xrandr xdamage xcomposite
+USE_GNOME=	glib20 pango
+USE_XORG=	xdamage xcomposite xinerama xrandr
 
 CMAKE_ARGS=	-DENABLE_BATTERY:BOOL=ON -DMANDIR:PATH=man
 
-OPTIONS_DEFINE=	PYCONF DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES PYCONF
 OPTIONS_DEFAULT=	PYCONF
 OPTIONS_SUB=	yes
-PYCONF_DESC=	Configuration editing tool (req. python)
+PYCONF_DESC=	Configuration editing tool (requires python)
 
-EXAMPLES=	icon_and_text_1.tint2rc icon_and_text_2.tint2rc \
+PORTEXAMPLES=	icon_and_text_1.tint2rc icon_and_text_2.tint2rc \
 		icon_and_text_3.tint2rc icon_and_text_4.tint2rc \
 		icon_only_1.tint2rc icon_only_2.tint2rc icon_only_3.tint2rc \
 		icon_only_4.tint2rc icon_only_6.tint2rc icon_only_7.tint2rc \
 		text_only_1.tint2rc text_only_2.tint2rc text_only_3.tint2rc \
 		text_only_4.tint2rc text_only_5.tint2rc text_only_6.tint2rc tint2rc
-DOCS=		AUTHORS ChangeLog README
+PORTDOCS=	AUTHORS ChangeLog README
+
+PYCONF_USES=	python
+PYCONF_USE=	gnome=gtk20,pygtk2
+PYCONF_CMAKE_ON=	-DENABLE_TINT2CONF:BOOL=ON
+PYCONF_CMAKE_OFF=	-DENABLE_TINT2CONF:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYCONF}
-USES+=		python
-USE_GNOME=	gtk20 pygtk2
-CMAKE_ARGS+=	-DENABLE_TINT2CONF:BOOL=ON
 PYCONF_SRC=	${WRKSRC}/src/tint2conf
-.else
-CMAKE_ARGS+=	-DENABLE_TINT2CONF:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MPYCONF}
 post-patch:
 	@${MV} ${PYCONF_SRC}/tintwizard.py ${PYCONF_SRC}/tintwizard.py.Dist
 	@${SED} -e 's#pidof#pgrep#g' ${PYCONF_SRC}/tintwizard.py.Dist \
@@ -55,10 +55,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/tint2
 	${INSTALL_DATA} ${WRKSRC}/default_icon.png ${STAGEDIR}${PREFIX}/share/tint2
 	${INSTALL_MAN} ${WRKSRC}/doc/tint2.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR}  ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/sample; ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .if ${PORT_OPTIONS:MPYCONF}
 	${INSTALL_PROGRAM} ${PYCONF_SRC}/tint2conf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${STAGEDIR}${PREFIX}/bin
@@ -66,5 +62,9 @@ do-install:
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${STAGEDIR}${PREFIX}/share/pixmaps
 .endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR}  ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/sample/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/tint/pkg-plist b/x11/tint/pkg-plist
index e54fe4a5ee46..a9c377139e88 100644
--- a/x11/tint/pkg-plist
+++ b/x11/tint/pkg-plist
@@ -1,25 +1,5 @@
 bin/tint2
 man/man1/tint2.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_1.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_2.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_3.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_and_text_4.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_1.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_2.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_3.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_4.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_6.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_only_7.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_1.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_2.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_3.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_4.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_5.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_only_6.tint2rc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tint2rc
 %%DATADIR%%/default_icon.png
 %%PYCONF%%bin/tint2conf
 %%PYCONF%%bin/tintwizard.py