4 files changed, 186 insertions, 99 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 8610713e2ed6..9657d06afdc8 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -6,33 +6,45 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	0.9.4.1
-PORTREVISION=	4
+PORTVERSION=	1.1.4
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
 
-MAINTAINER=	rui@ruilopes.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 2 visual diff and merge tool
 
 USE_BZIP2=	yes
 USE_GNOME=	pygnome2
+INSTALLS_OMF=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 
 MAKEFILE=	GNUmakefile
 
-post-patch:
-	@${REINPLACE_CMD} -E 's,(prefix := )(.*),\1${PREFIX},; \
-		s,(libdir := )(.*),\1${PREFIX}/share,' ${WRKSRC}/GNUmakefile
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/manual/stylesheet.css ${DOCSDIR}
+OPTIONS=	PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
 
-# This target is only meant to be used by the port maintainer.
-x-generate-plist:
-	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,share/doc/meld,%%DOCSDIR%%,;s,^@dirrm share/(gnome|pixmaps|application|locale).*,,'|${TR} -s '\n') > temp-pkg-plist
-
-.include <bsd.port.mk>
+post-patch:
+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/INSTALL
+
+	@${REINPLACE_CMD} \
+		's|$$(sharedir)/applications|$$(sharedir)/gnome/applications|g ;\
+		s|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g ;\
+		s|$$(sharedir)/pixmaps|$$(sharedir)/gnome/pixmaps|g' \
+		${WRKSRC}/${MAKEFILE}
+
+	@${FIND} ${WRKSRC}/help -type f -name ${MAKEFILE} -exec \
+		${REINPLACE_CMD} \
+		's|$$(prefix)/var/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
+		s|$$(sharedir)/omf/meld|$$(sharedir)/gnome/omf/meld|g' \
+		"{}" \;
+
+.include <bsd.port.pre.mk>
+.if defined (WITH_PYGNOMEDESKTOP)
+USE_GNOME+=	pygnomedesktop
+.endif
+.include <bsd.port.post.mk>
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 50c42cf37ab1..bc62631cf200 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,3 @@
-MD5 (meld-0.9.4.1.tar.bz2) = cd5f02e084529c581ce52a22647ca4dc
-SHA256 (meld-0.9.4.1.tar.bz2) = 26704f6083c27e30bed3df7be8b9f6468e7068b3a9231eabd08b00657940eee3
-SIZE (meld-0.9.4.1.tar.bz2) = 333123
+MD5 (meld-1.1.4.tar.bz2) = e780a8f67183acf7f51b13aa4a62ac85
+SHA256 (meld-1.1.4.tar.bz2) = 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
+SIZE (meld-1.1.4.tar.bz2) = 599912
diff --git a/textproc/meld/files/patch-INSTALL b/textproc/meld/files/patch-INSTALL
new file mode 100644
index 000000000000..88628484fb57
--- /dev/null
+++ b/textproc/meld/files/patch-INSTALL
@@ -0,0 +1,11 @@
+--- INSTALL.orig	Thu Feb  2 18:32:34 2006
++++ INSTALL	Wed Nov 15 15:44:31 2006
+@@ -18,7 +18,7 @@
+ ## 
+ ##   You can customise the install paths used here:
+ PYTHON ?= python
+-prefix := /usr/local
++prefix := %%PREFIX%%
+ bindir := $(prefix)/bin
+ libdir := $(prefix)/lib
+ docdir := $(prefix)/share/doc
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 07b68e8481c7..e1883fa0baed 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -1,102 +1,166 @@
 bin/meld
-share/application-registry/meld.applications
-share/applications/meld.desktop
-%%DOCSDIR%%/manual.html
-%%DOCSDIR%%/stylesheet.css
+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/gnomeglade.py
+lib/meld/gnomeglade.pyc
+lib/meld/gnomeglade.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/paths.py
+lib/meld/paths.pyc
+lib/meld/paths.pyo
+lib/meld/prefs.py
+lib/meld/prefs.pyc
+lib/meld/prefs.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/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/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/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
+share/gnome/application-registry/meld.applications
 share/gnome/applications/meld.desktop
+share/gnome/help/meld/C/figures/dirdiff.png
+share/gnome/help/meld/C/figures/filediff.png
+share/gnome/help/meld/C/meld.xml
+share/gnome/omf/meld/meld-C.omf
+share/gnome/pixmaps/meld.png
+share/locale/bg/LC_MESSAGES/meld.mo
+share/locale/ca/LC_MESSAGES/meld.mo
 share/locale/cs/LC_MESSAGES/meld.mo
 share/locale/de/LC_MESSAGES/meld.mo
 share/locale/en_CA/LC_MESSAGES/meld.mo
 share/locale/en_GB/LC_MESSAGES/meld.mo
+share/locale/es/LC_MESSAGES/meld.mo
+share/locale/fi/LC_MESSAGES/meld.mo
 share/locale/fr/LC_MESSAGES/meld.mo
+share/locale/hu/LC_MESSAGES/meld.mo
+share/locale/it/LC_MESSAGES/meld.mo
 share/locale/ja/LC_MESSAGES/meld.mo
 share/locale/ko/LC_MESSAGES/meld.mo
+share/locale/ne/LC_MESSAGES/meld.mo
 share/locale/nl/LC_MESSAGES/meld.mo
+share/locale/pa/LC_MESSAGES/meld.mo
 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/sr/LC_MESSAGES/meld.mo
 share/locale/sr@Latn/LC_MESSAGES/meld.mo
-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/glade2/cvsview.glade
-share/meld/glade2/dirdiff.glade
-share/meld/glade2/filediff.glade
-share/meld/glade2/meldapp.glade
-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-small.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/svn-icon-small.png
-share/meld/glade2/pixmaps/svn-icon.png
-share/meld/glade2/pixmaps/tree-file-changed.png
-share/meld/glade2/pixmaps/tree-file-new.png
-share/meld/glade2/pixmaps/tree-file-newer.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
-share/meld/gnomeglade.py
-share/meld/gnomeglade.pyc
-share/meld/gnomeglade.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/paths.py
-share/meld/paths.pyc
-share/meld/paths.pyo
-share/meld/prefs.py
-share/meld/prefs.pyc
-share/meld/prefs.pyo
-share/meld/svnview.py
-share/meld/svnview.pyc
-share/meld/svnview.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/pixmaps/meld.png
-@dirrm share/meld/glade2/pixmaps
-@dirrm share/meld/glade2
-@dirrm share/meld
-@dirrmtry share/pixmaps
-@dirrmtry share/applications
-@dirrmtry share/application-registry
-@dirrm %%DOCSDIR%%
+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.glade
+%%DATADIR%%/glade2/filediff.glade
+%%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/close.xpm
+%%DATADIR%%/glade2/pixmaps/cvs-icon-small.png
+%%DATADIR%%/glade2/pixmaps/cvs-icon.png
+%%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/svn-icon-small.png
+%%DATADIR%%/glade2/pixmaps/svn-icon.png
+%%DATADIR%%/glade2/pixmaps/tree-file-changed.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-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-update-24.png
+%%DATADIR%%/glade2/vcview.glade
+@dirrm %%DATADIR%%/glade2/pixmaps
+@dirrm %%DATADIR%%/glade2
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrmtry share/locale/pt/LC_MESSAGES
 @dirrmtry share/locale/pt
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrm share/gnome/omf/meld
+@dirrm share/gnome/help/meld/C/figures
+@dirrm share/gnome/help/meld/C
+@dirrm share/gnome/help/meld
+@exec mkdir -p %%DOCSDIR%%
+@dirrm %%DOCSDIR%%
+@dirrm lib/meld/vc
+@dirrm lib/meld