1 files changed, 33 insertions, 53 deletions

diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index be97ec2f6080..24b351c5999b 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zim
-PORTVERSION=	0.60
+PORTVERSION=	0.61
 CATEGORIES=	editors python
 MASTER_SITES=	http://www.zim-wiki.org/downloads/
 
@@ -11,66 +11,46 @@ COMMENT=	Desktop wiki editor
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
-		${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \
+		xdg-open:${PORTSDIR}/devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
-INSTALLS_ICONS=	yes
-USES=		gettext desktop-file-utils
-USE_GNOME=	gtk20 pygtk2 pygobject
+NO_ARCH=	yes
+
+USES=		desktop-file-utils gettext shared-mime-info
+USE_GNOME=	pygtk2
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+INSTALLS_ICONS=	yes
 
-MAN1=		zim.1
+OPTIONS_DEFINE=		BZR DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
+			MERCURIAL SCROT
 
-OPTIONS_DEFINE=	GNUR LATEX GRAPHVIZ SCROT GNUPLOT BZR GIT MERCURIAL DITAA
-OPTIONS_EXCLUDE=DOCS NLS
-GNUR_DESC=	Support of plot editor based on GNU R
-SCROT_DESC=	Screenshot taking and inserting support
-BZR_DESC=	Version control for notebooks using bzr
-GIT_DESC=	Version control for notebooks using git
-MERCURIAL_DESC=	Version control for notebooks using hg
 DITAA_DESC=		Diagram editor support
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNUR}
-RUN_DEPENDS+=	R:${PORTSDIR}/math/R
-.endif
-.if ${PORT_OPTIONS:MLATEX}
-USE_TEX=	latex
-.endif
-.if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	fdp:${PORTSDIR}/graphics/graphviz
-.endif
-.if ${PORT_OPTIONS:MSCROT}
-RUN_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
-.endif
-.if ${PORT_OPTIONS:MGNUPLOT}
-RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
-.endif
-.if ${PORT_OPTIONS:MBZR}
-RUN_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
-.endif
-.if ${PORT_OPTIONS:MGIT}
-RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
-.endif
-.if ${PORT_OPTIONS:MMERCURIAL}
-RUN_DEPENDS+=	hg:${PORTSDIR}/devel/mercurial
-.endif
-.if ${PORT_OPTIONS:MDITAA}
-RUN_DEPENDS+=	ditaa:${PORTSDIR}/graphics/ditaa
-.endif
+DITAA_RUN_DEPENDS=	ditaa:${PORTSDIR}/graphics/ditaa
+BZR_DESC=		Version control for notebooks using bzr
+BZR_RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+GIT_DESC=		Version control for notebooks using git
+GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+GNUR_DESC=		Support of plot editor based on GNU R
+GNUR_RUN_DEPENDS=	R:${PORTSDIR}/math/R
+GRAPHVIZ_RUN_DEPENDS=	fdp:${PORTSDIR}/graphics/graphviz
+LATEX_USE=		tex=latex:run
+MERCURIAL_DESC=		Version control for notebooks using hg
+MERCURIAL_RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
+SCROT_DESC=		Screenshot taking and inserting support
+SCROT_RUN_DEPENDS=	scrot:${PORTSDIR}/graphics/scrot
 
 post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|share/man|man|' \
-		-e 's,distutils\.command\.install ,setuptools\.command\.install ,' \
+	@${REINPLACE_CMD} -e \
+		'/.command.install /s|distutils|setuptools| ; \
+		 s|share/man|man| ; \
+		 /.skip_xdg_cmd = /s|0|1|' \
 		${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e "s|decode('utf-8')|decode('utf-8','replace')|g" ${WRKSRC}/zim/utils.py
-
-post-install:
-	-@update-desktop-database
+	@${REINPLACE_CMD} -e \
+		's|decode('utf-8')|decode('utf-8','replace')|g' \
+		${WRKSRC}/zim/utils.py
 
 .include <bsd.port.mk>