- Update to 0.9.1

PR:		ports/59929
Submitted by:	Rui Lopes <rui@ruilopes.com> (maintainer)

3 files changed, 22 insertions, 28 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 4b0179cd9911..20c5eed3aecf 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	0.8.5
+PORTVERSION=	0.9.1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	meld
@@ -21,32 +21,21 @@ USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+
+MAKEFILE=	GNUmakefile
 
 post-patch:
-	@${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:
-	${MKDIR} ${INSTALLDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/meld ${INSTALLDIR}
-	${LN} -sf ${INSTALLDIR}/meld ${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
+	@${REINPLACE_CMD} -E 's,(prefix := )(.*),\1${PREFIX},g ; \
+		s,(libdir := )(.*),\1${PREFIX}/share,g ; \
+		s,( glade2/pixmaps/\*\.){xpm\,png},\1xpm\1png,g' ${WRKSRC}/GNUmakefile
+	@${REINPLACE_CMD} -E 's,(.+)(install )-D (-m 644 \$$\^ \$$@),\1mkdir -m 755 -p $$(shell dirname $$@) \&\& \2\3,g' ${WRKSRC}/po/GNUmakefile
+	@${REINPLACE_CMD} -e 's,^Path=.*$$,Icon=${DATADIR}/glade2/pixmaps/icon.png,' ${WRKSRC}/meld.desktop
 
 post-install:
-	@cd ${INSTALLDIR} && \
+	${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/manual/stylesheet.css ${DOCSDIR}
+	@cd ${DATADIR} && \
 		${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)"
 
 .include <bsd.port.mk>
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index f9d9626cdece..844367e7a15d 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1 +1 @@
-MD5 (meld-0.8.5.tgz) = 463553f70bda8c400843fd34270de2fd
+MD5 (meld-0.9.1.tgz) = 1dfd1205c405bc263fc49ea1d92d47bf
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 9dd21a95efce..67d716859c4d 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -10,13 +10,14 @@ share/meld/filediff.py
 share/meld/filediff.pyc
 share/meld/gnomeglade.py
 share/meld/gnomeglade.pyc
-share/meld/meld
 share/meld/meldapp.py
 share/meld/meldapp.pyc
 share/meld/melddoc.py
 share/meld/melddoc.pyc
 share/meld/misc.py
 share/meld/misc.pyc
+share/meld/paths.py
+share/meld/paths.pyc
 share/meld/prefs.py
 share/meld/prefs.pyc
 share/meld/task.py
@@ -25,6 +26,8 @@ share/meld/tree.py
 share/meld/tree.pyc
 share/meld/undo.py
 share/meld/undo.pyc
+share/locale/en_IE/LC_MESSAGES/meld.mo
+share/locale/fr/LC_MESSAGES/meld.mo
 share/meld/glade2/cvsview.glade
 share/meld/glade2/dirdiff.glade
 share/meld/glade2/filediff.glade
@@ -49,9 +52,11 @@ 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%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DOCSDIR%%/manual.html
+%%DOCSDIR%%/stylesheet.css
+@dirrm %%DOCSDIR%%
+@unexec (rmdir %D/share/locale/en_IE/LC_MESSAGES && rmdir %D/share/locale/en_IE) 2>/dev/null || true
+@unexec (rmdir %D/share/locale/fr/LC_MESSAGES && rmdir %D/share/locale/fr) 2>/dev/null || true
 @dirrm share/meld/glade2/pixmaps
 @dirrm share/meld/glade2
 @dirrm share/meld