4 files changed, 242 insertions, 0 deletions
diff --git a/devel/meld/DESCR b/devel/meld/DESCR
new file mode 100644
index 00000000000..9ec616d0573
--- /dev/null
+++ b/devel/meld/DESCR
@@ -0,0 +1,5 @@
+Meld is a visual diff and merge tool. You can compare two or three
+files and edit them in place (diffs update dynamically). You can
+compare two or three folders and launch file comparisons. You can
+browse and view a working copy from popular version control systems
+such such as CVS, Subversion, Bazaar-ng and Mercurial.
diff --git a/devel/meld/Makefile b/devel/meld/Makefile
new file mode 100644
index 00000000000..c7b036363ad
--- /dev/null
+++ b/devel/meld/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/07/17 22:41:46 wiz Exp $
+#
+
+DISTNAME=		meld-1.1.4
+CATEGORIES=		devel
+MASTER_SITES=		http://ftp.gnome.org/pub/gnome/sources/meld/1.1/
+EXTRACT_SUFX=		.tar.bz2
+
+DEPENDS+=		${PYPKGPREFIX}-gtk2>=2.6.0:../../x11/py-gtk2
+DEPENDS+=		${PYPKGPREFIX}-gnome2>=2.6.0:../../x11/py-gnome2
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://meld.sourceforge.net/
+COMMENT=		Visual diff and merge tool
+
+PYTHON_VERSIONS_ACCEPTED=	24 23
+USE_DIRS+=			xdg-1.3
+USE_DIRS+=			gnome2-1.6
+USE_PKGLOCALEDIR=		YES
+USE_TOOLS+=			gmake intltool
+MAKE_FLAGS+=			prefix=${PREFIX}
+MAKE_FLAGS+=			localedir=${PREFIX}/${PKGLOCALEDIR}
+MAKE_FLAGS+=			PYTHON=${PYTHONBIN}
+MAKEFILE=			GNUmakefile
+
+.include "../../lang/python/application.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
new file mode 100644
index 00000000000..eee4fa323e8
--- /dev/null
+++ b/devel/meld/PLIST
@@ -0,0 +1,204 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/17 22:41:46 wiz Exp $
+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/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/application-registry/meld.applications
+share/applications/meld.desktop
+share/bg/LC_MESSAGES/meld.mo
+share/ca/LC_MESSAGES/meld.mo
+share/cs/LC_MESSAGES/meld.mo
+share/de/LC_MESSAGES/meld.mo
+share/en_CA/LC_MESSAGES/meld.mo
+share/en_GB/LC_MESSAGES/meld.mo
+share/es/LC_MESSAGES/meld.mo
+share/fi/LC_MESSAGES/meld.mo
+share/fr/LC_MESSAGES/meld.mo
+share/gnome/help/meld/C/figures/dirdiff.png
+share/gnome/help/meld/C/figures/filediff.png
+share/gnome/help/meld/C/meld.xml
+share/hu/LC_MESSAGES/meld.mo
+share/it/LC_MESSAGES/meld.mo
+share/ja/LC_MESSAGES/meld.mo
+share/ko/LC_MESSAGES/meld.mo
+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-icon-small.png
+share/meld/glade2/pixmaps/cvs-icon.png
+share/meld/glade2/pixmaps/filter-ignored-24.png
+share/meld/glade2/pixmaps/filter-modified-24.png
+share/meld/glade2/pixmaps/filter-nonvc-24.png
+share/meld/glade2/pixmaps/filter-normal-24.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/glade2/pixmaps/vc-add-24.png
+share/meld/glade2/pixmaps/vc-checkout-24.png
+share/meld/glade2/pixmaps/vc-commit-24.png
+share/meld/glade2/pixmaps/vc-icon.png
+share/meld/glade2/pixmaps/vc-remove-24.png
+share/meld/glade2/pixmaps/vc-update-24.png
+share/meld/glade2/vcview.glade
+share/ne/LC_MESSAGES/meld.mo
+share/nl/LC_MESSAGES/meld.mo
+share/omf/meld/meld-C.omf
+share/pa/LC_MESSAGES/meld.mo
+share/pixmaps/meld.png
+share/pt/LC_MESSAGES/meld.mo
+share/pt_BR/LC_MESSAGES/meld.mo
+share/ru/LC_MESSAGES/meld.mo
+share/rw/LC_MESSAGES/meld.mo
+share/sr/LC_MESSAGES/meld.mo
+share/sr@Latn/LC_MESSAGES/meld.mo
+share/sv/LC_MESSAGES/meld.mo
+share/vi/LC_MESSAGES/meld.mo
+share/zh_CN/LC_MESSAGES/meld.mo
+share/zh_TW/LC_MESSAGES/meld.mo
+@dirrm share/zh_TW/LC_MESSAGES
+@dirrm share/zh_TW
+@dirrm share/zh_CN/LC_MESSAGES
+@dirrm share/zh_CN
+@dirrm share/vi/LC_MESSAGES
+@dirrm share/vi
+@dirrm share/sv/LC_MESSAGES
+@dirrm share/sv
+@dirrm share/sr@Latn/LC_MESSAGES
+@dirrm share/sr@Latn
+@dirrm share/sr/LC_MESSAGES
+@dirrm share/sr
+@dirrm share/rw/LC_MESSAGES
+@dirrm share/rw
+@dirrm share/ru/LC_MESSAGES
+@dirrm share/ru
+@dirrm share/pt_BR/LC_MESSAGES
+@dirrm share/pt_BR
+@dirrm share/pt/LC_MESSAGES
+@dirrm share/pt
+@comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/pa/LC_MESSAGES
+@dirrm share/pa
+@dirrm share/omf/meld
+@comment in scrollkeeper: @dirrm share/omf
+@dirrm share/nl/LC_MESSAGES
+@dirrm share/nl
+@dirrm share/ne/LC_MESSAGES
+@dirrm share/ne
+@dirrm share/meld/glade2/pixmaps
+@dirrm share/meld/glade2
+@dirrm share/meld
+@dirrm share/ko/LC_MESSAGES
+@dirrm share/ko
+@dirrm share/ja/LC_MESSAGES
+@dirrm share/ja
+@dirrm share/it/LC_MESSAGES
+@dirrm share/it
+@dirrm share/hu/LC_MESSAGES
+@dirrm share/hu
+@dirrm share/gnome/help/meld/C/figures
+@dirrm share/gnome/help/meld/C
+@dirrm share/gnome/help/meld
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@dirrm share/fr/LC_MESSAGES
+@dirrm share/fr
+@dirrm share/fi/LC_MESSAGES
+@dirrm share/fi
+@dirrm share/es/LC_MESSAGES
+@dirrm share/es
+@dirrm share/en_GB/LC_MESSAGES
+@dirrm share/en_GB
+@dirrm share/en_CA/LC_MESSAGES
+@dirrm share/en_CA
+@exec ${MKDIR} %D/share/doc/meld
+@dirrm share/doc/meld
+@dirrm share/de/LC_MESSAGES
+@dirrm share/de
+@dirrm share/cs/LC_MESSAGES
+@dirrm share/cs
+@dirrm share/ca/LC_MESSAGES
+@dirrm share/ca
+@dirrm share/bg/LC_MESSAGES
+@dirrm share/bg
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
+@dirrm lib/meld/vc
+@dirrm lib/meld
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
new file mode 100644
index 00000000000..01a1ef1bfe4
--- /dev/null
+++ b/devel/meld/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/07/17 22:41:46 wiz Exp $
+
+SHA1 (meld-1.1.4.tar.bz2) = 52f51e5825b4e2bb56594a9f4e180908e714848f
+RMD160 (meld-1.1.4.tar.bz2) = ae327557458cae31660d3c30bcd6640f0406f1fa
+Size (meld-1.1.4.tar.bz2) = 599912 bytes