4 files changed, 162 insertions, 136 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index d2bc841c6dd6..7004aa47662f 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.4
 CATEGORIES=	textproc devel python
 MASTER_SITES=	GNOME
 
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	GNOME 2 visual diff and merge tool
 
-OPTIONS=	PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
+LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GNOME=	pygnome2
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	prefix=${PREFIX}
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
-LICENSE=	GPLv2
+
+OPTIONS=	PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
 
 .if defined(WITHOUT_NLS)
 EXTRA_PATCHES=	${FILESDIR}/extra-Makefile-without_nls
@@ -46,10 +47,10 @@ post-patch:
 		 s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file}
 .endfor
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_PYGNOMEDESKTOP)
 USE_GNOME+=	pygnomedesktop
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 655517a4cb96..6fcd6783e25d 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meld-1.4.0.tar.bz2) = 0edb78d9da2bfe7e630742111eb6d8edc476c8cc91b1f6403d940d072dd75469
-SIZE (meld-1.4.0.tar.bz2) = 333793
+SHA256 (meld-1.5.4.tar.xz) = fc6e78dc8cdcff34d14403b1b45dbdf5a8d480e889602cddc0df342b34266612
+SIZE (meld-1.5.4.tar.xz) = 339728
diff --git a/textproc/meld/pkg-descr b/textproc/meld/pkg-descr
index 793a3ec049d9..36349ac5d1c8 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://meld.sourceforge.net/
+WWW: http://meldmerge.org
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 0bb5f472a53b..b8753fb62f93 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -1,164 +1,155 @@
 bin/meld
+lib/meld/meld/__init__.py
+lib/meld/meld/__init__.pyc
+lib/meld/meld/__init__.pyo
+lib/meld/meld/diffmap.py
+lib/meld/meld/diffmap.pyc
+lib/meld/meld/diffmap.pyo
+lib/meld/meld/diffutil.py
+lib/meld/meld/diffutil.pyc
+lib/meld/meld/diffutil.pyo
+lib/meld/meld/dirdiff.py
+lib/meld/meld/dirdiff.pyc
+lib/meld/meld/dirdiff.pyo
+lib/meld/meld/filediff.py
+lib/meld/meld/filediff.pyc
+lib/meld/meld/filediff.pyo
+lib/meld/meld/filemerge.py
+lib/meld/meld/filemerge.pyc
+lib/meld/meld/filemerge.pyo
+lib/meld/meld/linkmap.py
+lib/meld/meld/linkmap.pyc
+lib/meld/meld/linkmap.pyo
+lib/meld/meld/matchers.py
+lib/meld/meld/matchers.pyc
+lib/meld/meld/matchers.pyo
+lib/meld/meld/meldapp.py
+lib/meld/meld/meldapp.pyc
+lib/meld/meld/meldapp.pyo
+lib/meld/meld/melddoc.py
+lib/meld/meld/melddoc.pyc
+lib/meld/meld/melddoc.pyo
+lib/meld/meld/meldwindow.py
+lib/meld/meld/meldwindow.pyc
+lib/meld/meld/meldwindow.pyo
+lib/meld/meld/merge.py
+lib/meld/meld/merge.pyc
+lib/meld/meld/merge.pyo
+lib/meld/meld/misc.py
+lib/meld/meld/misc.pyc
+lib/meld/meld/misc.pyo
+lib/meld/meld/patchdialog.py
+lib/meld/meld/patchdialog.pyc
+lib/meld/meld/patchdialog.pyo
+lib/meld/meld/paths.py
+lib/meld/meld/paths.pyc
+lib/meld/meld/paths.pyo
+lib/meld/meld/preferences.py
+lib/meld/meld/preferences.pyc
+lib/meld/meld/preferences.pyo
+lib/meld/meld/task.py
+lib/meld/meld/task.pyc
+lib/meld/meld/task.pyo
+lib/meld/meld/tree.py
+lib/meld/meld/tree.pyc
+lib/meld/meld/tree.pyo
 lib/meld/meld/ui/__init__.py
-lib/meld/meld/ui/findbar.py
-lib/meld/meld/ui/gnomeglade.py
-lib/meld/meld/ui/historyentry.py
-lib/meld/meld/ui/msgarea.py
-lib/meld/meld/ui/notebooklabel.py
-lib/meld/meld/ui/wraplabel.py
 lib/meld/meld/ui/__init__.pyc
-lib/meld/meld/ui/findbar.pyc
-lib/meld/meld/ui/gnomeglade.pyc
-lib/meld/meld/ui/historyentry.pyc
-lib/meld/meld/ui/msgarea.pyc
-lib/meld/meld/ui/notebooklabel.pyc
-lib/meld/meld/ui/wraplabel.pyc
 lib/meld/meld/ui/__init__.pyo
+lib/meld/meld/ui/emblemcellrenderer.py
+lib/meld/meld/ui/emblemcellrenderer.pyc
+lib/meld/meld/ui/emblemcellrenderer.pyo
+lib/meld/meld/ui/findbar.py
+lib/meld/meld/ui/findbar.pyc
 lib/meld/meld/ui/findbar.pyo
+lib/meld/meld/ui/gladesupport.py
+lib/meld/meld/ui/gladesupport.pyc
+lib/meld/meld/ui/gladesupport.pyo
+lib/meld/meld/ui/gnomeglade.py
+lib/meld/meld/ui/gnomeglade.pyc
 lib/meld/meld/ui/gnomeglade.pyo
+lib/meld/meld/ui/historyentry.py
+lib/meld/meld/ui/historyentry.pyc
 lib/meld/meld/ui/historyentry.pyo
+lib/meld/meld/ui/listwidget.py
+lib/meld/meld/ui/listwidget.pyc
+lib/meld/meld/ui/listwidget.pyo
+lib/meld/meld/ui/msgarea.py
+lib/meld/meld/ui/msgarea.pyc
 lib/meld/meld/ui/msgarea.pyo
+lib/meld/meld/ui/notebooklabel.py
+lib/meld/meld/ui/notebooklabel.pyc
 lib/meld/meld/ui/notebooklabel.pyo
+lib/meld/meld/ui/wraplabel.py
+lib/meld/meld/ui/wraplabel.pyc
 lib/meld/meld/ui/wraplabel.pyo
+lib/meld/meld/undo.py
+lib/meld/meld/undo.pyc
+lib/meld/meld/undo.pyo
 lib/meld/meld/util/__init__.py
-lib/meld/meld/util/prefs.py
-lib/meld/meld/util/sourceviewer.py
 lib/meld/meld/util/__init__.pyc
-lib/meld/meld/util/prefs.pyc
-lib/meld/meld/util/sourceviewer.pyc
 lib/meld/meld/util/__init__.pyo
+lib/meld/meld/util/namedtuple.py
+lib/meld/meld/util/namedtuple.pyc
+lib/meld/meld/util/namedtuple.pyo
+lib/meld/meld/util/prefs.py
+lib/meld/meld/util/prefs.pyc
 lib/meld/meld/util/prefs.pyo
+lib/meld/meld/util/sourceviewer.py
+lib/meld/meld/util/sourceviewer.pyc
 lib/meld/meld/util/sourceviewer.pyo
 lib/meld/meld/vc/__init__.py
-lib/meld/meld/vc/_null.py
-lib/meld/meld/vc/_vc.py
-lib/meld/meld/vc/bzr.py
-lib/meld/meld/vc/cdv.py
-lib/meld/meld/vc/cvs.py
-lib/meld/meld/vc/darcs.py
-lib/meld/meld/vc/git.py
-lib/meld/meld/vc/mercurial.py
-lib/meld/meld/vc/monotone.py
-lib/meld/meld/vc/rcs.py
-lib/meld/meld/vc/svk.py
-lib/meld/meld/vc/svn.py
-lib/meld/meld/vc/tla.py
 lib/meld/meld/vc/__init__.pyc
-lib/meld/meld/vc/_null.pyc
-lib/meld/meld/vc/_vc.pyc
-lib/meld/meld/vc/bzr.pyc
-lib/meld/meld/vc/cdv.pyc
-lib/meld/meld/vc/cvs.pyc
-lib/meld/meld/vc/darcs.pyc
-lib/meld/meld/vc/git.pyc
-lib/meld/meld/vc/mercurial.pyc
-lib/meld/meld/vc/monotone.pyc
-lib/meld/meld/vc/rcs.pyc
-lib/meld/meld/vc/svk.pyc
-lib/meld/meld/vc/svn.pyc
-lib/meld/meld/vc/tla.pyc
 lib/meld/meld/vc/__init__.pyo
+lib/meld/meld/vc/_null.py
+lib/meld/meld/vc/_null.pyc
 lib/meld/meld/vc/_null.pyo
+lib/meld/meld/vc/_vc.py
+lib/meld/meld/vc/_vc.pyc
 lib/meld/meld/vc/_vc.pyo
+lib/meld/meld/vc/bzr.py
+lib/meld/meld/vc/bzr.pyc
 lib/meld/meld/vc/bzr.pyo
+lib/meld/meld/vc/cdv.py
+lib/meld/meld/vc/cdv.pyc
 lib/meld/meld/vc/cdv.pyo
+lib/meld/meld/vc/cvs.py
+lib/meld/meld/vc/cvs.pyc
 lib/meld/meld/vc/cvs.pyo
+lib/meld/meld/vc/darcs.py
+lib/meld/meld/vc/darcs.pyc
 lib/meld/meld/vc/darcs.pyo
+lib/meld/meld/vc/fossil.py
+lib/meld/meld/vc/fossil.pyc
+lib/meld/meld/vc/fossil.pyo
+lib/meld/meld/vc/git.py
+lib/meld/meld/vc/git.pyc
 lib/meld/meld/vc/git.pyo
+lib/meld/meld/vc/mercurial.py
+lib/meld/meld/vc/mercurial.pyc
 lib/meld/meld/vc/mercurial.pyo
+lib/meld/meld/vc/monotone.py
+lib/meld/meld/vc/monotone.pyc
 lib/meld/meld/vc/monotone.pyo
+lib/meld/meld/vc/rcs.py
+lib/meld/meld/vc/rcs.pyc
 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/tla.py
+lib/meld/meld/vc/tla.pyc
 lib/meld/meld/vc/tla.pyo
-lib/meld/meld/__init__.py
-lib/meld/meld/diffmap.py
-lib/meld/meld/diffutil.py
-lib/meld/meld/dirdiff.py
-lib/meld/meld/filediff.py
-lib/meld/meld/filemerge.py
-lib/meld/meld/matchers.py
-lib/meld/meld/meldapp.py
-lib/meld/meld/melddoc.py
-lib/meld/meld/merge.py
-lib/meld/meld/misc.py
-lib/meld/meld/paths.py
-lib/meld/meld/preferences.py
-lib/meld/meld/task.py
-lib/meld/meld/tree.py
-lib/meld/meld/undo.py
 lib/meld/meld/vcview.py
-lib/meld/meld/__init__.pyc
-lib/meld/meld/diffmap.pyc
-lib/meld/meld/diffutil.pyc
-lib/meld/meld/dirdiff.pyc
-lib/meld/meld/filediff.pyc
-lib/meld/meld/filemerge.pyc
-lib/meld/meld/matchers.pyc
-lib/meld/meld/meldapp.pyc
-lib/meld/meld/melddoc.pyc
-lib/meld/meld/merge.pyc
-lib/meld/meld/misc.pyc
-lib/meld/meld/paths.pyc
-lib/meld/meld/preferences.pyc
-lib/meld/meld/task.pyc
-lib/meld/meld/tree.pyc
-lib/meld/meld/undo.pyc
 lib/meld/meld/vcview.pyc
-lib/meld/meld/__init__.pyo
-lib/meld/meld/diffmap.pyo
-lib/meld/meld/diffutil.pyo
-lib/meld/meld/dirdiff.pyo
-lib/meld/meld/filediff.pyo
-lib/meld/meld/filemerge.pyo
-lib/meld/meld/matchers.pyo
-lib/meld/meld/meldapp.pyo
-lib/meld/meld/melddoc.pyo
-lib/meld/meld/merge.pyo
-lib/meld/meld/misc.pyo
-lib/meld/meld/paths.pyo
-lib/meld/meld/preferences.pyo
-lib/meld/meld/task.pyo
-lib/meld/meld/tree.pyo
-lib/meld/meld/undo.pyo
 lib/meld/meld/vcview.pyo
 share/applications/meld.desktop
-%%DATADIR%%/ui/dirdiff.glade
-%%DATADIR%%/ui/filediff.glade
-%%DATADIR%%/ui/findbar.glade
-%%DATADIR%%/ui/meldapp.glade
-%%DATADIR%%/ui/preferences.glade
-%%DATADIR%%/ui/vcview.glade
-%%DATADIR%%/ui/dirdiff-ui.xml
-%%DATADIR%%/ui/filediff-ui.xml
-%%DATADIR%%/ui/meldapp-ui.xml
-%%DATADIR%%/ui/vcview-ui.xml
-%%DATADIR%%/icons/button_apply0.xpm
-%%DATADIR%%/icons/button_apply1.xpm
-%%DATADIR%%/icons/button_copy0.xpm
-%%DATADIR%%/icons/button_copy1.xpm
-%%DATADIR%%/icons/button_delete.xpm
-%%DATADIR%%/icons/filter-ignored-24.png
-%%DATADIR%%/icons/filter-modified-24.png
-%%DATADIR%%/icons/filter-nonvc-24.png
-%%DATADIR%%/icons/filter-normal-24.png
-%%DATADIR%%/icons/icon.png
-%%DATADIR%%/icons/tree-file-changed.png
-%%DATADIR%%/icons/tree-file-missing.png
-%%DATADIR%%/icons/tree-file-new.png
-%%DATADIR%%/icons/tree-file-newer.png
-%%DATADIR%%/icons/tree-file-normal.png
-%%DATADIR%%/icons/tree-folder-changed.png
-%%DATADIR%%/icons/vc-icon.png
-%%DATADIR%%/icons/tree-folder-missing.png
-%%DATADIR%%/icons/tree-folder-new.png
-%%DATADIR%%/icons/tree-folder-normal.png
-%%DATADIR%%/icons/vc-add-24.png
-%%DATADIR%%/icons/vc-checkout-24.png
-%%DATADIR%%/icons/vc-commit-24.png
-%%DATADIR%%/icons/vc-remove-24.png
-%%DATADIR%%/icons/vc-resolve-24.png
-%%DATADIR%%/icons/vc-update-24.png
 share/gnome/help/meld/C/meld.xml
 share/gnome/help/meld/es/meld.xml
 share/gnome/help/meld/fr/meld.xml
@@ -170,12 +161,15 @@ share/icons/hicolor/scalable/apps/meld.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/da/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/de/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/dz/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/el/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/en_CA/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/es/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/meld.mo
@@ -189,6 +183,7 @@ share/icons/hicolor/scalable/apps/meld.svg
 %%NLS%%share/locale/nl/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/meld.mo
@@ -201,10 +196,40 @@ share/icons/hicolor/scalable/apps/meld.svg
 %%NLS%%share/locale/vi/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/meld.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/meld.mo
+%%DATADIR%%/icons/button_apply0.xpm
+%%DATADIR%%/icons/button_apply1.xpm
+%%DATADIR%%/icons/button_copy0.xpm
+%%DATADIR%%/icons/button_copy1.xpm
+%%DATADIR%%/icons/button_delete.xpm
+%%DATADIR%%/icons/emblem-meld-newer-file.png
+%%DATADIR%%/icons/filter-ignored-24.png
+%%DATADIR%%/icons/filter-modified-24.png
+%%DATADIR%%/icons/filter-nonvc-24.png
+%%DATADIR%%/icons/filter-normal-24.png
+%%DATADIR%%/icons/meld-locked.png
+%%DATADIR%%/icons/meld-unlocked.png
+%%DATADIR%%/icons/vc-add-24.png
+%%DATADIR%%/icons/vc-checkout-24.png
+%%DATADIR%%/icons/vc-commit-24.png
+%%DATADIR%%/icons/vc-icon.png
+%%DATADIR%%/icons/vc-remove-24.png
+%%DATADIR%%/icons/vc-resolve-24.png
+%%DATADIR%%/icons/vc-update-24.png
+%%DATADIR%%/ui/EditableList.ui
+%%DATADIR%%/ui/dirdiff-ui.xml
+%%DATADIR%%/ui/dirdiff.ui
+%%DATADIR%%/ui/filediff-ui.xml
+%%DATADIR%%/ui/filediff.ui
+%%DATADIR%%/ui/findbar.ui
+%%DATADIR%%/ui/meldapp-ui.xml
+%%DATADIR%%/ui/meldapp.ui
+%%DATADIR%%/ui/patch-dialog.ui
+%%DATADIR%%/ui/preferences.ui
+%%DATADIR%%/ui/vcview-ui.xml
+%%DATADIR%%/ui/vcview.ui
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf
 share/omf/meld/meld-fr.omf
-share/pixmaps/meld.png
 @dirrm share/omf/meld
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons