3 files changed, 184 insertions, 148 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 846dc8f1aa5f..0180cc5f8d36 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	1.3.2
 CATEGORIES=	textproc devel python
 MASTER_SITES=	GNOME
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	c0rn@o2.pl
 COMMENT=	GNOME 2 visual diff and merge tool
 
 OPTIONS=	PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
@@ -21,24 +20,24 @@ USE_GNOME=	pygnome2
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-MAKEFILE=	GNUmakefile
 MAKE_ARGS=	prefix=${PREFIX}
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
+LICENSE=	GPLv2
 
 post-patch:
-.for file in GNUmakefile
+.for file in Makefile
 	@${REINPLACE_CMD} -e '/docdir_/d' ${WRKSRC}/${file}
-.endfor 
-.for file in help/GNUmakefile
+.endfor
+.for file in help/Makefile
 	@${REINPLACE_CMD} -e '/^LANGUAGES/s|de||g' ${WRKSRC}/${file}
-.endfor 
-.for file in help/C/GNUmakefile help/es/GNUmakefile help/fr/GNUmakefile
+.endfor
+.for file in help/C/Makefile help/es/Makefile help/fr/Makefile
 	@${REINPLACE_CMD} -e \
 		's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
 		 s|^LANG :=|LANG_ :=|g ; \
 		 s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file}
-.endfor 
+.endfor
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 60916c5554a4..a00450b8c576 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,3 @@
-MD5 (meld-1.3.1.tar.bz2) = 05885811cf0bccc051c3f44938ff54ed
-SHA256 (meld-1.3.1.tar.bz2) = d60e735869bb64cc7007466eea3ad639e22eb223c6d5379508ffd0b4f0901647
-SIZE (meld-1.3.1.tar.bz2) = 795145
+MD5 (meld-1.3.2.tar.bz2) = 7bd37cc8688a8cc2db68d26a2f186ff9
+SHA256 (meld-1.3.2.tar.bz2) = c2868f902c4e6eaa3a02c623fbe1c9277a64aad133030ef7fda1e34baff32fc9
+SIZE (meld-1.3.2.tar.bz2) = 741154
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index e831ef20b2fe..fb3abd9f3bf5 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -1,101 +1,164 @@
 bin/meld
-lib/meld/diffutil.py
-lib/meld/diffutil.pyc
-lib/meld/diffutil.pyo
-lib/meld/dirdiff.py
-lib/meld/dirdiff.pyc
-lib/meld/dirdiff.pyo
-lib/meld/filediff.py
-lib/meld/filediff.pyc
-lib/meld/filediff.pyo
-lib/meld/findbar.py
-lib/meld/findbar.pyc
-lib/meld/findbar.pyo
-lib/meld/gnomeglade.py
-lib/meld/gnomeglade.pyc
-lib/meld/gnomeglade.pyo
-lib/meld/historyentry.py
-lib/meld/historyentry.pyc
-lib/meld/historyentry.pyo
-lib/meld/meldapp.py
-lib/meld/meldapp.pyc
-lib/meld/meldapp.pyo
-lib/meld/melddoc.py
-lib/meld/melddoc.pyc
-lib/meld/melddoc.pyo
-lib/meld/misc.py
-lib/meld/misc.pyc
-lib/meld/misc.pyo
-lib/meld/msgarea.py
-lib/meld/msgarea.pyc
-lib/meld/msgarea.pyo
-lib/meld/notebooklabel.py
-lib/meld/notebooklabel.pyc
-lib/meld/notebooklabel.pyo
-lib/meld/paths.py
-lib/meld/paths.pyc
-lib/meld/paths.pyo
-lib/meld/prefs.py
-lib/meld/prefs.pyc
-lib/meld/prefs.pyo
-lib/meld/sourceviewer.py
-lib/meld/sourceviewer.pyc
-lib/meld/sourceviewer.pyo
-lib/meld/task.py
-lib/meld/task.pyc
-lib/meld/task.pyo
-lib/meld/tree.py
-lib/meld/tree.pyc
-lib/meld/tree.pyo
-lib/meld/undo.py
-lib/meld/undo.pyc
-lib/meld/undo.pyo
-lib/meld/vc/__init__.py
-lib/meld/vc/__init__.pyc
-lib/meld/vc/__init__.pyo
-lib/meld/vc/_null.py
-lib/meld/vc/_null.pyc
-lib/meld/vc/_null.pyo
-lib/meld/vc/_vc.py
-lib/meld/vc/_vc.pyc
-lib/meld/vc/_vc.pyo
-lib/meld/vc/bzr.py
-lib/meld/vc/bzr.pyc
-lib/meld/vc/bzr.pyo
-lib/meld/vc/cdv.py
-lib/meld/vc/cdv.pyc
-lib/meld/vc/cdv.pyo
-lib/meld/vc/cvs.py
-lib/meld/vc/cvs.pyc
-lib/meld/vc/cvs.pyo
-lib/meld/vc/darcs.py
-lib/meld/vc/darcs.pyc
-lib/meld/vc/darcs.pyo
-lib/meld/vc/git.py
-lib/meld/vc/git.pyc
-lib/meld/vc/git.pyo
-lib/meld/vc/mercurial.py
-lib/meld/vc/mercurial.pyc
-lib/meld/vc/mercurial.pyo
-lib/meld/vc/monotone.py
-lib/meld/vc/monotone.pyc
-lib/meld/vc/monotone.pyo
-lib/meld/vc/rcs.py
-lib/meld/vc/rcs.pyc
-lib/meld/vc/rcs.pyo
-lib/meld/vc/svk.py
-lib/meld/vc/svk.pyc
-lib/meld/vc/svk.pyo
-lib/meld/vc/svn.py
-lib/meld/vc/svn.pyc
-lib/meld/vc/svn.pyo
-lib/meld/vc/tla.py
-lib/meld/vc/tla.pyc
-lib/meld/vc/tla.pyo
-lib/meld/vcview.py
-lib/meld/vcview.pyc
-lib/meld/vcview.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/findbar.pyo
+lib/meld/meld/ui/gnomeglade.pyo
+lib/meld/meld/ui/historyentry.pyo
+lib/meld/meld/ui/msgarea.pyo
+lib/meld/meld/ui/notebooklabel.pyo
+lib/meld/meld/ui/wraplabel.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/prefs.pyo
+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.pyo
+lib/meld/meld/vc/_vc.pyo
+lib/meld/meld/vc/bzr.pyo
+lib/meld/meld/vc/cdv.pyo
+lib/meld/meld/vc/cvs.pyo
+lib/meld/meld/vc/darcs.pyo
+lib/meld/meld/vc/git.pyo
+lib/meld/meld/vc/mercurial.pyo
+lib/meld/meld/vc/monotone.pyo
+lib/meld/meld/vc/rcs.pyo
+lib/meld/meld/vc/svk.pyo
+lib/meld/meld/vc/svn.pyo
+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/figures/dirdiff.png
 share/gnome/help/meld/C/figures/filediff.png
 share/gnome/help/meld/C/meld.xml
@@ -105,6 +168,11 @@ share/gnome/help/meld/es/meld.xml
 share/gnome/help/meld/fr/figures/dirdiff.png
 share/gnome/help/meld/fr/figures/filediff.png
 share/gnome/help/meld/fr/meld.xml
+share/icons/hicolor/16x16/apps/meld.png
+share/icons/hicolor/22x22/apps/meld.png
+share/icons/hicolor/32x32/apps/meld.png
+share/icons/hicolor/48x48/apps/meld.png
+share/icons/hicolor/scalable/apps/meld.svg
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/ca/LC_MESSAGES/meld.mo
@@ -131,55 +199,21 @@ share/locale/pt/LC_MESSAGES/meld.mo
 share/locale/pt_BR/LC_MESSAGES/meld.mo
 share/locale/ru/LC_MESSAGES/meld.mo
 share/locale/rw/LC_MESSAGES/meld.mo
+share/locale/sl/LC_MESSAGES/meld.mo
 share/locale/sq/LC_MESSAGES/meld.mo
 share/locale/sr/LC_MESSAGES/meld.mo
-share/locale/sr@Latn/LC_MESSAGES/meld.mo
+share/locale/sr@latin/LC_MESSAGES/meld.mo
 share/locale/sv/LC_MESSAGES/meld.mo
 share/locale/vi/LC_MESSAGES/meld.mo
 share/locale/zh_CN/LC_MESSAGES/meld.mo
 share/locale/zh_TW/LC_MESSAGES/meld.mo
-%%DATADIR%%/glade2/dirdiff-ui.xml
-%%DATADIR%%/glade2/dirdiff.glade
-%%DATADIR%%/glade2/filediff-ui.xml
-%%DATADIR%%/glade2/filediff.glade
-%%DATADIR%%/glade2/findbar.glade
-%%DATADIR%%/glade2/meldapp-ui.xml
-%%DATADIR%%/glade2/meldapp.glade
-%%DATADIR%%/glade2/pixmaps/button_apply0.xpm
-%%DATADIR%%/glade2/pixmaps/button_apply1.xpm
-%%DATADIR%%/glade2/pixmaps/button_copy0.xpm
-%%DATADIR%%/glade2/pixmaps/button_copy1.xpm
-%%DATADIR%%/glade2/pixmaps/button_delete.xpm
-%%DATADIR%%/glade2/pixmaps/filter-ignored-24.png
-%%DATADIR%%/glade2/pixmaps/filter-modified-24.png
-%%DATADIR%%/glade2/pixmaps/filter-nonvc-24.png
-%%DATADIR%%/glade2/pixmaps/filter-normal-24.png
-%%DATADIR%%/glade2/pixmaps/icon.png
-%%DATADIR%%/glade2/pixmaps/tree-file-changed.png
-%%DATADIR%%/glade2/pixmaps/tree-file-missing.png
-%%DATADIR%%/glade2/pixmaps/tree-file-new.png
-%%DATADIR%%/glade2/pixmaps/tree-file-newer.png
-%%DATADIR%%/glade2/pixmaps/tree-file-normal.png
-%%DATADIR%%/glade2/pixmaps/tree-folder-changed.png
-%%DATADIR%%/glade2/pixmaps/tree-folder-missing.png
-%%DATADIR%%/glade2/pixmaps/tree-folder-new.png
-%%DATADIR%%/glade2/pixmaps/tree-folder-normal.png
-%%DATADIR%%/glade2/pixmaps/vc-add-24.png
-%%DATADIR%%/glade2/pixmaps/vc-checkout-24.png
-%%DATADIR%%/glade2/pixmaps/vc-commit-24.png
-%%DATADIR%%/glade2/pixmaps/vc-icon.png
-%%DATADIR%%/glade2/pixmaps/vc-remove-24.png
-%%DATADIR%%/glade2/pixmaps/vc-resolve-24.png
-%%DATADIR%%/glade2/pixmaps/vc-update-24.png
-%%DATADIR%%/glade2/vcview-ui.xml
-%%DATADIR%%/glade2/vcview.glade
 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%%/glade2/pixmaps
-@dirrm %%DATADIR%%/glade2
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 @dirrm share/gnome/help/meld/fr/figures
 @dirrm share/gnome/help/meld/fr
@@ -188,7 +222,10 @@ share/pixmaps/meld.png
 @dirrm share/gnome/help/meld/C/figures
 @dirrm share/gnome/help/meld/C
 @dirrm share/gnome/help/meld
-@dirrm lib/meld/vc
+@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