Update to version 1.7.1

5 files changed, 39 insertions, 29 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 7c6bdf2dcdbf..0024b78be102 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	meld
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 CATEGORIES=	textproc devel python
 MASTER_SITES=	GNOME
 
@@ -12,8 +12,8 @@ COMMENT=	GNOME 2 visual diff and merge tool
 LICENSE=	GPLv2
 
 USE_XZ=		yes
-USE_GNOME=	pygnome2
-USE_PYTHON=	yes
+USE_GNOME=	desktopfileutils pygnome2
+USE_PYTHON=	-2.7
 USE_GMAKE=	yes
 MAKE_ARGS=	prefix=${PREFIX}
 INSTALLS_ICONS=	yes
@@ -28,17 +28,15 @@ PYGNOMEDESKTOP_DESC=	Code syntax hilighting (many dependencies)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
-EXTRA_PATCHES=	${FILESDIR}/extra-Makefile-without_nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-.for file in Makefile
-	@${REINPLACE_CMD} -e '/docdir_/d' ${WRKSRC}/${file}
-.endfor
-.for file in help/Makefile
-	@${REINPLACE_CMD} -e '/^LANGUAGES/s|de||g' ${WRKSRC}/${file}
-.endfor
+	${REINPLACE_CMD} '/docdir_/d' ${WRKSRC}/Makefile
+.if !${PORT_OPTIONS:MNLS}
+	${REINPLACE_CMD} '/po install/d' ${WRKSRC}/Makefile
+.endif
+
 .for file in help/C/Makefile help/es/Makefile help/fr/Makefile
 	@${REINPLACE_CMD} -e \
 		's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index d7ec309ea543..81c7d7b3c225 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meld-1.7.0.tar.xz) = d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b
-SIZE (meld-1.7.0.tar.xz) = 358648
+SHA256 (meld-1.7.1.tar.xz) = c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40
+SIZE (meld-1.7.1.tar.xz) = 374060
diff --git a/textproc/meld/files/extra-Makefile-without_nls b/textproc/meld/files/extra-Makefile-without_nls
deleted file mode 100644
index 3726975507bd..000000000000
--- a/textproc/meld/files/extra-Makefile-without_nls
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2010-10-04 19:00:55.000000000 +0200
-+++ Makefile	2010-10-04 19:01:41.000000000 +0200
-@@ -94,7 +94,6 @@
- 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png
- 	install -m 644 data/icons/48x48/meld.svg \
- 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg
--	$(MAKE) -C po install
- 	$(MAKE) -C help install
- 
- meld.desktop: data/meld.desktop.in
diff --git a/textproc/meld/pkg-descr b/textproc/meld/pkg-descr
index 36349ac5d1c8..825b6c5a90ba 100644
--- a/textproc/meld/pkg-descr
+++ b/textproc/meld/pkg-descr
@@ -4,4 +4,4 @@ dynamically), and a middle column shows detailed changes and allows merges.
 The margins show location of changes for easy navigation, and it also
 features a tabbed interface that allows you to open many diffs at once.
 
-WWW: http://meldmerge.org
+WWW: http://meldmerge.org/
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 65087f569de5..24e3cf81f47c 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -20,6 +20,9 @@ lib/meld/meld/filediff.pyo
 lib/meld/meld/filemerge.py
 lib/meld/meld/filemerge.pyc
 lib/meld/meld/filemerge.pyo
+lib/meld/meld/filters.py
+lib/meld/meld/filters.pyc
+lib/meld/meld/filters.pyo
 lib/meld/meld/linkmap.py
 lib/meld/meld/linkmap.pyc
 lib/meld/meld/linkmap.pyo
@@ -44,6 +47,9 @@ lib/meld/meld/merge.pyo
 lib/meld/meld/misc.py
 lib/meld/meld/misc.pyc
 lib/meld/meld/misc.pyo
+lib/meld/meld/newdifftab.py
+lib/meld/meld/newdifftab.pyc
+lib/meld/meld/newdifftab.pyo
 lib/meld/meld/patchdialog.py
 lib/meld/meld/patchdialog.pyc
 lib/meld/meld/patchdialog.pyo
@@ -53,6 +59,9 @@ lib/meld/meld/paths.pyo
 lib/meld/meld/preferences.py
 lib/meld/meld/preferences.pyc
 lib/meld/meld/preferences.pyo
+lib/meld/meld/recent.py
+lib/meld/meld/recent.pyc
+lib/meld/meld/recent.pyo
 lib/meld/meld/task.py
 lib/meld/meld/task.pyc
 lib/meld/meld/task.pyo
@@ -98,6 +107,9 @@ lib/meld/meld/undo.pyo
 lib/meld/meld/util/__init__.py
 lib/meld/meld/util/__init__.pyc
 lib/meld/meld/util/__init__.pyo
+lib/meld/meld/util/compat.py
+lib/meld/meld/util/compat.pyc
+lib/meld/meld/util/compat.pyo
 lib/meld/meld/util/prefs.py
 lib/meld/meld/util/prefs.pyc
 lib/meld/meld/util/prefs.pyo
@@ -143,12 +155,12 @@ lib/meld/meld/vc/rcs.pyo
 lib/meld/meld/vc/svk.py
 lib/meld/meld/vc/svk.pyc
 lib/meld/meld/vc/svk.pyo
-lib/meld/meld/vc/svn_17.py
-lib/meld/meld/vc/svn_17.pyc
-lib/meld/meld/vc/svn_17.pyo
 lib/meld/meld/vc/svn.py
 lib/meld/meld/vc/svn.pyc
 lib/meld/meld/vc/svn.pyo
+lib/meld/meld/vc/svn_17.py
+lib/meld/meld/vc/svn_17.pyc
+lib/meld/meld/vc/svn_17.pyo
 lib/meld/meld/vc/tla.py
 lib/meld/meld/vc/tla.pyc
 lib/meld/meld/vc/tla.pyo
@@ -159,6 +171,7 @@ share/applications/meld.desktop
 share/gnome/help/meld/C/meld.xml
 share/gnome/help/meld/es/meld.xml
 share/gnome/help/meld/fr/meld.xml
+share/icons/HighContrast/scalable/apps/meld.svg
 share/icons/hicolor/16x16/apps/meld.png
 share/icons/hicolor/22x22/apps/meld.png
 share/icons/hicolor/32x32/apps/meld.png
@@ -233,24 +246,33 @@ share/icons/hicolor/scalable/apps/meld.svg
 %%DATADIR%%/ui/meldapp.ui
 %%DATADIR%%/ui/patch-dialog.ui
 %%DATADIR%%/ui/preferences.ui
+%%DATADIR%%/ui/tab-placeholder.ui
 %%DATADIR%%/ui/vcview-ui.xml
 %%DATADIR%%/ui/vcview.ui
+share/mime/packages/meld.xml
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf
 share/omf/meld/meld-fr.omf
 @dirrm share/omf/meld
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/icons/HighContrast/scalable/apps
+@dirrmtry share/icons/HighContrast/scalable
+@dirrmtry share/icons/HighContrast
 @dirrm share/gnome/help/meld/fr
 @dirrm share/gnome/help/meld/es
 @dirrm share/gnome/help/meld/C
 @dirrm share/gnome/help/meld
+@dirrmtry share/applications
 @dirrm lib/meld/meld/vc
 @dirrm lib/meld/meld/util
 @dirrm lib/meld/meld/ui
 @dirrm lib/meld/meld
 @dirrm lib/meld
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime