3 files changed, 102 insertions, 60 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index ab2cd49fe267..11766c741322 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -6,40 +6,49 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.2
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	meld
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	pav@oook.cz
+MAINTAINER=	rui@ruilopes.com
 COMMENT=	GNOME 2 visual diff and merge tool
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
 USE_PYTHON=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${PYTHON_SITELIBDIR}/meldapp"|' ${WRKSRC}/misc.py
-	@${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${PREFIX}/share/doc/meld/index.html"|' ${WRKSRC}/meldapp.py
-	@${REINPLACE_CMD} \
-		-e 's|/usr/share/pixmaps|${X11BASE}/share/gnome/pixmaps|' \
-		${WRKSRC}/cvsview.py
+	@${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${INSTALLDIR}"|' ${WRKSRC}/misc.py
+	@${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${DOCSDIR}/index.html"|' ${WRKSRC}/meldapp.py
+	@${REINPLACE_CMD} -e 's|^Path=.*$$|Icon=${INSTALLDIR}/glade2/pixmaps/icon.png|' ${WRKSRC}/meld.desktop
 
+INSTALLDIR=	${PREFIX}/share/meld
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/meld ${PREFIX}/bin
-	${ECHO} meldapp > ${PYTHON_SITELIBDIR}/meldapp.pth
-	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp
-	${INSTALL_DATA} ${WRKSRC}/*.py ${PYTHON_SITELIBDIR}/meldapp
-	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2
-	${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${PYTHON_SITELIBDIR}/meldapp/glade2
-	${MKDIR} ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${PYTHON_SITELIBDIR}/meldapp/glade2/pixmaps
-	${MKDIR} ${PREFIX}/share/doc/meld
-	${INSTALL_DATA} ${WRKSRC}/manual/*.html ${PREFIX}/share/doc/meld
-	${INSTALL_DATA} ${WRKSRC}/manual/*.css ${PREFIX}/share/doc/meld
+	${MKDIR} ${INSTALLDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/meld ${INSTALLDIR}/meld.py
+	${LN} -sf ${INSTALLDIR}/meld.py ${PREFIX}/bin/meld
+	${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/*.py ${INSTALLDIR}
+	${MKDIR} ${INSTALLDIR}/glade2
+	${INSTALL_DATA} ${WRKSRC}/glade2/*.glade* ${INSTALLDIR}/glade2
+	${MKDIR} ${INSTALLDIR}/glade2/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${INSTALLDIR}/glade2/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${INSTALLDIR}/glade2/pixmaps
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual/*.css ${DOCSDIR}
+.endif
+
+post-install:
+	@${ECHO_CMD} 'Compiling files...'
+	@(cd ${INSTALLDIR} && \
+		${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)" && \
+		${PYTHON_CMD} -O -c "import compileall; compileall.compile_dir('.', 0)")
 
 .include <bsd.port.mk>
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 2c60e87cb4d9..278299d3517e 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1 +1 @@
-MD5 (meld-0.7.1.tgz) = 09bb23c6afd868f209fdc5b0ea26e971
+MD5 (meld-0.8.2.tgz) = e547340b3f8271a2135a0cea9c9b1c2f
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 0da29e6f05f1..b276cc98b4d7 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -1,41 +1,74 @@
 bin/meld
-%%PYTHON_SITELIBDIR%%/meldapp.pth
-%%PYTHON_SITELIBDIR%%/meldapp/cvsview.py
-%%PYTHON_SITELIBDIR%%/meldapp/diffutil.py
-%%PYTHON_SITELIBDIR%%/meldapp/dirdiff.py
-%%PYTHON_SITELIBDIR%%/meldapp/filediff.py
-%%PYTHON_SITELIBDIR%%/meldapp/gnomeglade.py
-%%PYTHON_SITELIBDIR%%/meldapp/meldapp.py
-%%PYTHON_SITELIBDIR%%/meldapp/misc.py
-%%PYTHON_SITELIBDIR%%/meldapp/prefs.py
-%%PYTHON_SITELIBDIR%%/meldapp/undo.py
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.glade
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/cvsview.gladep
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.glade
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/dirdiff.gladep
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.glade
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/filediff.gladep
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.glade
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/meld-app.gladep
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply0.xpm
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_apply1.xpm
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy0.xpm
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_copy1.xpm
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/button_delete.xpm
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/close.xpm
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-add-16.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-commit-16.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-remove-16.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/cvs-update-16.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/icon.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-changed.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-directory.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-new.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/i-regular.png
-%%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps/logo.png
-share/doc/meld/index.html
-share/doc/meld/stylesheet.css
-@dirrm share/doc/meld
-@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2/pixmaps
-@dirrm %%PYTHON_SITELIBDIR%%/meldapp/glade2
-@dirrm %%PYTHON_SITELIBDIR%%/meldapp
+share/gnome/applications/meld.desktop
+share/meld/cvsview.py
+share/meld/cvsview.pyc
+share/meld/cvsview.pyo
+share/meld/diffutil.py
+share/meld/diffutil.pyc
+share/meld/diffutil.pyo
+share/meld/dirdiff.py
+share/meld/dirdiff.pyc
+share/meld/dirdiff.pyo
+share/meld/filediff.py
+share/meld/filediff.pyc
+share/meld/filediff.pyo
+share/meld/gnomeglade.py
+share/meld/gnomeglade.pyc
+share/meld/gnomeglade.pyo
+share/meld/meld.py
+share/meld/meld.pyc
+share/meld/meld.pyo
+share/meld/meldapp.py
+share/meld/meldapp.pyc
+share/meld/meldapp.pyo
+share/meld/melddoc.py
+share/meld/melddoc.pyc
+share/meld/melddoc.pyo
+share/meld/misc.py
+share/meld/misc.pyc
+share/meld/misc.pyo
+share/meld/prefs.py
+share/meld/prefs.pyc
+share/meld/prefs.pyo
+share/meld/task.py
+share/meld/task.pyc
+share/meld/task.pyo
+share/meld/tree.py
+share/meld/tree.pyc
+share/meld/tree.pyo
+share/meld/undo.py
+share/meld/undo.pyc
+share/meld/undo.pyo
+share/meld/glade2/cvsview.glade
+share/meld/glade2/cvsview.gladep
+share/meld/glade2/dirdiff.glade
+share/meld/glade2/dirdiff.gladep
+share/meld/glade2/filediff.glade
+share/meld/glade2/filediff.gladep
+share/meld/glade2/meld-app.glade
+share/meld/glade2/meld-app.gladep
+share/meld/glade2/pixmaps/button_apply0.xpm
+share/meld/glade2/pixmaps/button_apply1.xpm
+share/meld/glade2/pixmaps/button_copy0.xpm
+share/meld/glade2/pixmaps/button_copy1.xpm
+share/meld/glade2/pixmaps/button_delete.xpm
+share/meld/glade2/pixmaps/close.xpm
+share/meld/glade2/pixmaps/cvs-add-16.png
+share/meld/glade2/pixmaps/cvs-commit-16.png
+share/meld/glade2/pixmaps/cvs-icon.png
+share/meld/glade2/pixmaps/cvs-remove-16.png
+share/meld/glade2/pixmaps/cvs-update-16.png
+share/meld/glade2/pixmaps/icon.png
+share/meld/glade2/pixmaps/logo.png
+share/meld/glade2/pixmaps/tree-file-changed.png
+share/meld/glade2/pixmaps/tree-file-new.png
+share/meld/glade2/pixmaps/tree-file-normal.png
+share/meld/glade2/pixmaps/tree-folder-changed.png
+share/meld/glade2/pixmaps/tree-folder-new.png
+share/meld/glade2/pixmaps/tree-folder-normal.png
+%%PORTDOCS%%share/doc/meld/index.html
+%%PORTDOCS%%share/doc/meld/stylesheet.css
+%%PORTDOCS%%@dirrm share/doc/meld
+@dirrm share/meld/glade2/pixmaps
+@dirrm share/meld/glade2
+@dirrm share/meld