5 files changed, 49 insertions, 145 deletions

diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index 4fda33d85512..dd32b117c17f 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -2,27 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	turpial
-PORTVERSION=	1.6.7.1
-PORTREVISION=	1
+PORTVERSION=	1.6.9
 CATEGORIES=	net-im python
-MASTER_SITES=	http://turpial.org.ve/files/sources/%SUBDIR%/
-MASTER_SITE_SUBDIR=	stable
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1/-1/}
+MASTER_SITES=	http://files.turpial.org.ve/sources/stable/
 
-MAINTAINER=	duchateau.olivier@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Twitter and Identi.ca client written in Python
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \
-		${LOCALBASE}/libdata/pkgconfig/pywebkitgtk-1.0.pc:${PORTSDIR}/www/py-webkitgtk \
-		${PYTHON_SITELIBDIR}/setproctitle.so:${PORTSDIR}/devel/py-setproctitle \
-		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:${PORTSDIR}/www/py-webkitgtk \
+		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:${PORTSDIR}/devel/py-setproctitle \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0.19:${PORTSDIR}/devel/py-xdg
 
-USE_PYTHON=	yes
-USE_GNOME=	pygobject pygtk2 desktopfileutils
+USE_PYTHON=	-2.7
+USE_GNOME=	pygobject pygtk2
 USE_GSTREAMER=	python
 
 REINPLACE_ARGS=	-i ""
@@ -33,7 +29,6 @@ DATADIR=	${PREFIX}/share/${PORTNAME}
 LOCALES_DIR=	ca ca_ES cs de en es es_ES es_VE eu fr gl he hu it nl nn \
 	pt pt_BR ru ru_RU sr uk_UA zh_CN zh_TW
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # Since Python > 2.7, optparse module is deprecated
@@ -44,7 +39,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-optparse-turpial_main.py
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC}/turpial -type f -regex '.*\.py' \
+	@${FIND} ${WRKSRC}/turpial -type f -name '*.py' \
 		| ${XARGS} ${REINPLACE_CMD} 's|bin/python|bin/env python| ; \
 		s|Linux|FreeBSD|g ; \
 		s|from turpial\.|from |g ; \
@@ -52,9 +47,8 @@ post-patch:
 
 do-build:
 	@cd ${WRKSRC} && \
-		${PYTHON_CMD} setup.py compile_catalog --directory turpial/i18n ; \
-		${PYTHON_CMD} -m compileall ${WRKSRC} ; \
-		${PYTHON_CMD} -O -m compileall ${WRKSRC}
+		${PYTHON_CMD} setup.py compile_catalog --directory turpial/i18n
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
 
 	@${ECHO_CMD} "#!/bin/sh" >> ${WRKDIR}/run.sh
 	@${ECHO_CMD} "" >> ${WRKDIR}/run.sh
@@ -63,38 +57,36 @@ do-build:
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name '*.orig' \
-		-exec ${RM} -f "{}" \;
-
-	@${MKDIR} -p ${DOCSDIR} ${DATADIR} \
-		${PREFIX}/share/pixmaps \
-		${PREFIX}/share/applications \
-		${PREFIX}/bin
-.for LOCALE in ${LOCALES_DIR}
-	@${MKDIR} -p ${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES
-.endfor
-	@cd ${WRKSRC}/turpial && \
-		${FIND} . -type d \
-			\! -regex '.*i18n.*' -exec ${MKDIR} -p "${DATADIR}/{}" \;
+		| ${XARGS} rm
 
 do-install:
-	@cd ${WRKSRC} && \
-		${INSTALL_DATA} AUTHORS COPYING TRANSLATORS README.rst ${DOCSDIR} ; \
-		${INSTALL_DATA} turpial/data/pixmaps/turpial.png \
-			${PREFIX}/share/pixmaps ; \
-		${INSTALL_DATA} ${PORTNAME}.desktop ${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/run.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
+.for dir in ${LOCALES_DIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${dir}/LC_MESSAGES
 	@cd ${WRKSRC}/turpial/i18n && \
-		${FIND} . -type f -name '*.mo' \
-			-exec ${INSTALL_DATA} "{}" "${PREFIX}/share/locale/{}" \;
+		${INSTALL_DATA} ${dir}/LC_MESSAGES/${PORTNAME}.mo \
+		${STAGEDIR}${PREFIX}/share/locale/${dir}/LC_MESSAGES
+.endfor
 
+.for dir in ${PORTNAME} pixmaps applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${dir}
+.endfor
+	@cd ${WRKSRC} && \
+		${INSTALL_DATA} turpial/data/pixmaps/turpial.png \
+			${STAGEDIR}${PREFIX}/share/pixmaps ; \
+		${INSTALL_DATA} ${PORTNAME}.desktop \
+			${STAGEDIR}${PREFIX}/share/applications
+	@${RM} -R ${WRKSRC}/turpial/i18n
 	@cd ${WRKSRC}/turpial && \
-		${FIND} . -type f \
-			\( ! -name '*.mo' -and ! -name '*.po*' \) \
-			-exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
-
-	${INSTALL_SCRIPT} ${WRKDIR}/run.sh ${PREFIX}/bin/${PORTNAME}
+		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
-post-install:
-	@-update-desktop-database
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} && \
+		${INSTALL_DATA} AUTHORS COPYING TRANSLATORS README.rst \
+			${STAGEDIR}${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/turpial/distinfo b/net-im/turpial/distinfo
index d72b40b09c94..553e03d50cd9 100644
--- a/net-im/turpial/distinfo
+++ b/net-im/turpial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (turpial-1.6.7-1.tar.gz) = 215b4bdd00393f1ab95b43e3580eea98a7b2d96862a4520044448c93971287fe
-SIZE (turpial-1.6.7-1.tar.gz) = 681643
+SHA256 (turpial-1.6.9.tar.gz) = cf059ef3010c400fd57e30081cd2d54daa0a062817c0ab4b08b7c6c7deac0177
+SIZE (turpial-1.6.9.tar.gz) = 760609
diff --git a/net-im/turpial/files/patch-turpial.desktop b/net-im/turpial/files/patch-turpial.desktop
deleted file mode 100644
index 90e4aeeacd9f..000000000000
--- a/net-im/turpial/files/patch-turpial.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- turpial.desktop.orig	2011-01-22 22:05:07.000000000 +0100
-+++ turpial.desktop	2011-02-18 23:38:51.000000000 +0100
-@@ -3,8 +3,10 @@
- Encoding=UTF-8
- Name=Turpial
- Name[es]=Turpial
-+Name[fr]=Turpial
- GenericName=Twitter client
- GenericName[es]=Cliente Twitter
-+GenericName[fr]=Client pour Twitter et Identi.ca
- Comment=Twitter client written in Python
- Comment[es]=Cliente Twitter escrito en Python
- Exec=turpial
diff --git a/net-im/turpial/pkg-descr b/net-im/turpial/pkg-descr
index 7dea65f32bef..3e2abb2aa7a7 100644
--- a/net-im/turpial/pkg-descr
+++ b/net-im/turpial/pkg-descr
@@ -1,4 +1,4 @@
-Turpial is a microblogging client for social networks like Twitter and
-Identi.ca.
+Turpial is a light and fast microblogging client written in Python. It supports
+Twitter and Identi.ca.
 
-WWW:	http://turpial.org.ve/
+WWW: http://turpial.org.ve/
diff --git a/net-im/turpial/pkg-plist b/net-im/turpial/pkg-plist
index 47bf6200cba7..f97215aa18ed 100644
--- a/net-im/turpial/pkg-plist
+++ b/net-im/turpial/pkg-plist
@@ -1,9 +1,9 @@
 bin/turpial
 share/applications/turpial.desktop
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/README.rst
-%%DOCSDIR%%/TRANSLATORS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README.rst
+%%PORTDOCS%%%%DOCSDIR%%/TRANSLATORS
 share/locale/ca/LC_MESSAGES/turpial.mo
 share/locale/ca_ES/LC_MESSAGES/turpial.mo
 share/locale/cs/LC_MESSAGES/turpial.mo
@@ -31,134 +31,91 @@ share/locale/zh_TW/LC_MESSAGES/turpial.mo
 share/pixmaps/turpial.png
 %%DATADIR%%/__init__.py
 %%DATADIR%%/__init__.pyc
-%%DATADIR%%/__init__.pyo
 %%DATADIR%%/api/__init__.py
 %%DATADIR%%/api/__init__.pyc
-%%DATADIR%%/api/__init__.pyo
 %%DATADIR%%/api/interfaces/__init__.py
 %%DATADIR%%/api/interfaces/__init__.pyc
-%%DATADIR%%/api/interfaces/__init__.pyo
 %%DATADIR%%/api/interfaces/http.py
 %%DATADIR%%/api/interfaces/http.pyc
-%%DATADIR%%/api/interfaces/http.pyo
 %%DATADIR%%/api/interfaces/post.py
 %%DATADIR%%/api/interfaces/post.pyc
-%%DATADIR%%/api/interfaces/post.pyo
 %%DATADIR%%/api/interfaces/protocol.py
 %%DATADIR%%/api/interfaces/protocol.pyc
-%%DATADIR%%/api/interfaces/protocol.pyo
 %%DATADIR%%/api/interfaces/service.py
 %%DATADIR%%/api/interfaces/service.pyc
-%%DATADIR%%/api/interfaces/service.pyo
 %%DATADIR%%/api/protocols/__init__.py
 %%DATADIR%%/api/protocols/__init__.pyc
-%%DATADIR%%/api/protocols/__init__.pyo
 %%DATADIR%%/api/protocols/identica/__init__.py
 %%DATADIR%%/api/protocols/identica/__init__.pyc
-%%DATADIR%%/api/protocols/identica/__init__.pyo
 %%DATADIR%%/api/protocols/identica/globals.py
 %%DATADIR%%/api/protocols/identica/globals.pyc
-%%DATADIR%%/api/protocols/identica/globals.pyo
 %%DATADIR%%/api/protocols/identica/http.py
 %%DATADIR%%/api/protocols/identica/http.pyc
-%%DATADIR%%/api/protocols/identica/http.pyo
 %%DATADIR%%/api/protocols/identica/identica.py
 %%DATADIR%%/api/protocols/identica/identica.pyc
-%%DATADIR%%/api/protocols/identica/identica.pyo
 %%DATADIR%%/api/protocols/twitter/__init__.py
 %%DATADIR%%/api/protocols/twitter/__init__.pyc
-%%DATADIR%%/api/protocols/twitter/__init__.pyo
 %%DATADIR%%/api/protocols/twitter/globals.py
 %%DATADIR%%/api/protocols/twitter/globals.pyc
-%%DATADIR%%/api/protocols/twitter/globals.pyo
 %%DATADIR%%/api/protocols/twitter/http.py
 %%DATADIR%%/api/protocols/twitter/http.pyc
-%%DATADIR%%/api/protocols/twitter/http.pyo
 %%DATADIR%%/api/protocols/twitter/oauth.py
 %%DATADIR%%/api/protocols/twitter/oauth.pyc
-%%DATADIR%%/api/protocols/twitter/oauth.pyo
 %%DATADIR%%/api/protocols/twitter/twitter.py
 %%DATADIR%%/api/protocols/twitter/twitter.pyc
-%%DATADIR%%/api/protocols/twitter/twitter.pyo
 %%DATADIR%%/api/services/__init__.py
 %%DATADIR%%/api/services/__init__.pyc
-%%DATADIR%%/api/services/__init__.pyo
 %%DATADIR%%/api/services/shorturl/__init__.py
 %%DATADIR%%/api/services/shorturl/__init__.pyc
-%%DATADIR%%/api/services/shorturl/__init__.pyo
 %%DATADIR%%/api/services/shorturl/bitly.py
 %%DATADIR%%/api/services/shorturl/bitly.pyc
-%%DATADIR%%/api/services/shorturl/bitly.pyo
 %%DATADIR%%/api/services/shorturl/cligs.py
 %%DATADIR%%/api/services/shorturl/cligs.pyc
-%%DATADIR%%/api/services/shorturl/cligs.pyo
 %%DATADIR%%/api/services/shorturl/googl.py
 %%DATADIR%%/api/services/shorturl/googl.pyc
-%%DATADIR%%/api/services/shorturl/googl.pyo
 %%DATADIR%%/api/services/shorturl/isgd.py
 %%DATADIR%%/api/services/shorturl/isgd.pyc
-%%DATADIR%%/api/services/shorturl/isgd.pyo
 %%DATADIR%%/api/services/shorturl/smlkes.py
 %%DATADIR%%/api/services/shorturl/smlkes.pyc
-%%DATADIR%%/api/services/shorturl/smlkes.pyo
 %%DATADIR%%/api/services/shorturl/supr.py
 %%DATADIR%%/api/services/shorturl/supr.pyc
-%%DATADIR%%/api/services/shorturl/supr.pyo
 %%DATADIR%%/api/services/shorturl/tinyurl.py
 %%DATADIR%%/api/services/shorturl/tinyurl.pyc
-%%DATADIR%%/api/services/shorturl/tinyurl.pyo
 %%DATADIR%%/api/services/shorturl/trim.py
 %%DATADIR%%/api/services/shorturl/trim.pyc
-%%DATADIR%%/api/services/shorturl/trim.pyo
 %%DATADIR%%/api/services/shorturl/unu.py
 %%DATADIR%%/api/services/shorturl/unu.pyc
-%%DATADIR%%/api/services/shorturl/unu.pyo
 %%DATADIR%%/api/services/shorturl/ur1ca.py
 %%DATADIR%%/api/services/shorturl/ur1ca.pyc
-%%DATADIR%%/api/services/shorturl/ur1ca.pyo
 %%DATADIR%%/api/services/shorturl/zima.py
 %%DATADIR%%/api/services/shorturl/zima.pyc
-%%DATADIR%%/api/services/shorturl/zima.pyo
 %%DATADIR%%/api/services/uploadpic/__init__.py
 %%DATADIR%%/api/services/uploadpic/__init__.pyc
-%%DATADIR%%/api/services/uploadpic/__init__.pyo
 %%DATADIR%%/api/services/uploadpic/imgly.py
 %%DATADIR%%/api/services/uploadpic/imgly.pyc
-%%DATADIR%%/api/services/uploadpic/imgly.pyo
 %%DATADIR%%/api/services/uploadpic/imgur.py
 %%DATADIR%%/api/services/uploadpic/imgur.pyc
-%%DATADIR%%/api/services/uploadpic/imgur.pyo
 %%DATADIR%%/api/services/uploadpic/mobypicture.py
 %%DATADIR%%/api/services/uploadpic/mobypicture.pyc
-%%DATADIR%%/api/services/uploadpic/mobypicture.pyo
 %%DATADIR%%/api/services/uploadpic/posterous.py
 %%DATADIR%%/api/services/uploadpic/posterous.pyc
-%%DATADIR%%/api/services/uploadpic/posterous.pyo
 %%DATADIR%%/api/services/uploadpic/pyTweetPhoto.py
 %%DATADIR%%/api/services/uploadpic/pyTweetPhoto.pyc
-%%DATADIR%%/api/services/uploadpic/pyTweetPhoto.pyo
 %%DATADIR%%/api/services/uploadpic/tweetphoto.py
 %%DATADIR%%/api/services/uploadpic/tweetphoto.pyc
-%%DATADIR%%/api/services/uploadpic/tweetphoto.pyo
 %%DATADIR%%/api/services/uploadpic/twitgoo.py
 %%DATADIR%%/api/services/uploadpic/twitgoo.pyc
-%%DATADIR%%/api/services/uploadpic/twitgoo.pyo
 %%DATADIR%%/api/services/uploadpic/twitpic.py
 %%DATADIR%%/api/services/uploadpic/twitpic.pyc
-%%DATADIR%%/api/services/uploadpic/twitpic.pyo
 %%DATADIR%%/api/services/uploadpic/yfrog.py
 %%DATADIR%%/api/services/uploadpic/yfrog.pyc
-%%DATADIR%%/api/services/uploadpic/yfrog.pyo
 %%DATADIR%%/api/servicesapi.py
 %%DATADIR%%/api/servicesapi.pyc
-%%DATADIR%%/api/servicesapi.pyo
 %%DATADIR%%/api/turpialapi.py
 %%DATADIR%%/api/turpialapi.pyc
-%%DATADIR%%/api/turpialapi.pyo
 %%DATADIR%%/certs/cacert.pem
 %%DATADIR%%/config.py
 %%DATADIR%%/config.pyc
-%%DATADIR%%/config.pyo
 %%DATADIR%%/data/pixmaps/action-add-friends.png
 %%DATADIR%%/data/pixmaps/action-autoscroll.png
 %%DATADIR%%/data/pixmaps/action-clear.png
@@ -222,100 +179,70 @@ share/pixmaps/turpial.png
 %%DATADIR%%/data/themes/default/tweet_template.html
 %%DATADIR%%/main.py
 %%DATADIR%%/main.pyc
-%%DATADIR%%/main.pyo
 %%DATADIR%%/notification.py
 %%DATADIR%%/notification.pyc
-%%DATADIR%%/notification.pyo
 %%DATADIR%%/sound.py
 %%DATADIR%%/sound.pyc
-%%DATADIR%%/sound.pyo
 %%DATADIR%%/ui/__init__.py
 %%DATADIR%%/ui/__init__.pyc
-%%DATADIR%%/ui/__init__.pyo
 %%DATADIR%%/ui/base_ui.py
 %%DATADIR%%/ui/base_ui.pyc
-%%DATADIR%%/ui/base_ui.pyo
 %%DATADIR%%/ui/cmd/__init__.py
 %%DATADIR%%/ui/cmd/__init__.pyc
-%%DATADIR%%/ui/cmd/__init__.pyo
 %%DATADIR%%/ui/cmd/main.py
 %%DATADIR%%/ui/cmd/main.pyc
-%%DATADIR%%/ui/cmd/main.pyo
 %%DATADIR%%/ui/gtk/__init__.py
 %%DATADIR%%/ui/gtk/__init__.pyc
-%%DATADIR%%/ui/gtk/__init__.pyo
 %%DATADIR%%/ui/gtk/about.py
 %%DATADIR%%/ui/gtk/about.pyc
-%%DATADIR%%/ui/gtk/about.pyo
 %%DATADIR%%/ui/gtk/button.py
 %%DATADIR%%/ui/gtk/button.pyc
-%%DATADIR%%/ui/gtk/button.pyo
 %%DATADIR%%/ui/gtk/columns.py
 %%DATADIR%%/ui/gtk/columns.pyc
-%%DATADIR%%/ui/gtk/columns.pyo
 %%DATADIR%%/ui/gtk/conversation.py
 %%DATADIR%%/ui/gtk/conversation.pyc
-%%DATADIR%%/ui/gtk/conversation.pyo
 %%DATADIR%%/ui/gtk/dock.py
 %%DATADIR%%/ui/gtk/dock.pyc
-%%DATADIR%%/ui/gtk/dock.pyo
 %%DATADIR%%/ui/gtk/errorbox.py
 %%DATADIR%%/ui/gtk/errorbox.pyc
-%%DATADIR%%/ui/gtk/errorbox.pyo
 %%DATADIR%%/ui/gtk/follow.py
 %%DATADIR%%/ui/gtk/follow.pyc
-%%DATADIR%%/ui/gtk/follow.pyo
 %%DATADIR%%/ui/gtk/friendwin.py
 %%DATADIR%%/ui/gtk/friendwin.pyc
-%%DATADIR%%/ui/gtk/friendwin.pyo
 %%DATADIR%%/ui/gtk/home.py
 %%DATADIR%%/ui/gtk/home.pyc
-%%DATADIR%%/ui/gtk/home.pyo
+%%DATADIR%%/ui/gtk/indicator.py
+%%DATADIR%%/ui/gtk/indicator.pyc
 %%DATADIR%%/ui/gtk/login.py
 %%DATADIR%%/ui/gtk/login.pyc
-%%DATADIR%%/ui/gtk/login.pyo
 %%DATADIR%%/ui/gtk/loginlabel.py
 %%DATADIR%%/ui/gtk/loginlabel.pyc
-%%DATADIR%%/ui/gtk/loginlabel.pyo
 %%DATADIR%%/ui/gtk/main.py
 %%DATADIR%%/ui/gtk/main.pyc
-%%DATADIR%%/ui/gtk/main.pyo
 %%DATADIR%%/ui/gtk/menu.py
 %%DATADIR%%/ui/gtk/menu.pyc
-%%DATADIR%%/ui/gtk/menu.pyo
 %%DATADIR%%/ui/gtk/oauthwin.py
 %%DATADIR%%/ui/gtk/oauthwin.pyc
-%%DATADIR%%/ui/gtk/oauthwin.pyo
 %%DATADIR%%/ui/gtk/preferences.py
 %%DATADIR%%/ui/gtk/preferences.pyc
-%%DATADIR%%/ui/gtk/preferences.pyo
 %%DATADIR%%/ui/gtk/profile.py
 %%DATADIR%%/ui/gtk/profile.pyc
-%%DATADIR%%/ui/gtk/profile.pyo
 %%DATADIR%%/ui/gtk/statuslist.py
 %%DATADIR%%/ui/gtk/statuslist.pyc
-%%DATADIR%%/ui/gtk/statuslist.pyo
 %%DATADIR%%/ui/gtk/tweetslistwk.py
 %%DATADIR%%/ui/gtk/tweetslistwk.pyc
-%%DATADIR%%/ui/gtk/tweetslistwk.pyo
 %%DATADIR%%/ui/gtk/updatebox.py
 %%DATADIR%%/ui/gtk/updatebox.pyc
-%%DATADIR%%/ui/gtk/updatebox.pyo
 %%DATADIR%%/ui/gtk/uploadpicbox.py
 %%DATADIR%%/ui/gtk/uploadpicbox.pyc
-%%DATADIR%%/ui/gtk/uploadpicbox.pyo
 %%DATADIR%%/ui/gtk/userform.py
 %%DATADIR%%/ui/gtk/userform.pyc
-%%DATADIR%%/ui/gtk/userform.pyo
 %%DATADIR%%/ui/gtk/waiting.py
 %%DATADIR%%/ui/gtk/waiting.pyc
-%%DATADIR%%/ui/gtk/waiting.pyo
 %%DATADIR%%/ui/gtk/wrapper.py
 %%DATADIR%%/ui/gtk/wrapper.pyc
-%%DATADIR%%/ui/gtk/wrapper.pyo
 %%DATADIR%%/ui/util.py
 %%DATADIR%%/ui/util.pyc
-%%DATADIR%%/ui/util.pyo
 @dirrm %%DATADIR%%/ui/gtk
 @dirrm %%DATADIR%%/ui/cmd
 @dirrm %%DATADIR%%/ui
@@ -342,6 +269,4 @@ share/pixmaps/turpial.png
 @dirrmtry share/locale/es_VE
 @dirrmtry share/locale/ca_ES/LC_MESSAGES
 @dirrmtry share/locale/ca_ES
-@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%