diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile new file mode 100644 index 00000000000..2b822fa5069 --- /dev/null +++ b/textproc/meld/Makefile @@ -0,0 +1,38 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2009/06/03 18:23:27 landry Exp $ + +COMMENT= graphical diff and merge tool + +DISTNAME= meld-1.3.0 +CATEGORIES= textproc x11 + +HOMEPAGE= http://meld.sourceforge.net/ + +# GPLv2 +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.3/} + +USE_GMAKE= Yes + +MODULES= lang/python + +BUILD_DEPENDS+= ::textproc/rarian + +RUN_DEPENDS= ::x11/gnome/py-gnome \ + ::x11/gnome/yelp \ + ::devel/desktop-file-utils \ + ::x11/py-gtksourceview + +SUBST_VARS+= MODPY_SITEPKG +MAKE_FILE= GNUmakefile +CONFIGURE_STYLE=none +NO_REGRESS= yes +MAKE_ENV= PYTHON=${MODPY_BIN} + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/meld ${WRKSRC}/INSTALL + +.include diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo new file mode 100644 index 00000000000..530026e3b59 --- /dev/null +++ b/textproc/meld/distinfo @@ -0,0 +1,5 @@ +MD5 (meld-1.3.0.tar.gz) = XPxCB3ugu58D1uVo29kG1w== +RMD160 (meld-1.3.0.tar.gz) = e4fIognfai7vr7aSJZG4bTysm4I= +SHA1 (meld-1.3.0.tar.gz) = NjbLvSE4rqzUyWLZI0rQvPB1OpI= +SHA256 (meld-1.3.0.tar.gz) = vGTmQVdLOLvYxbtziy3VrHSbKj+4K8VuT6magds7pms= +SIZE (meld-1.3.0.tar.gz) = 883758 diff --git a/textproc/meld/patches/patch-INSTALL b/textproc/meld/patches/patch-INSTALL new file mode 100644 index 00000000000..30b9de6dc94 --- /dev/null +++ b/textproc/meld/patches/patch-INSTALL @@ -0,0 +1,12 @@ +$OpenBSD: patch-INSTALL,v 1.1.1.1 2009/06/03 18:23:27 landry Exp $ +--- INSTALL.orig Wed Jun 3 10:29:40 2009 ++++ INSTALL Wed Jun 3 10:32:45 2009 +@@ -20,7 +20,7 @@ + PYTHON ?= python + prefix := /usr/local + bindir := $(prefix)/bin +-libdir := $(prefix)/lib ++libdir := ${MODPY_SITEPKG} + docdir := $(prefix)/share/doc + sharedir := $(prefix)/share + helpdir := $(sharedir)/gnome/help diff --git a/textproc/meld/patches/patch-meld b/textproc/meld/patches/patch-meld new file mode 100644 index 00000000000..21d3e472cb7 --- /dev/null +++ b/textproc/meld/patches/patch-meld @@ -0,0 +1,29 @@ +$OpenBSD: patch-meld,v 1.1.1.1 2009/06/03 18:23:27 landry Exp $ +--- meld.orig Fri Apr 17 15:49:43 2009 ++++ meld Wed Jun 3 10:54:34 2009 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!${MODPY_BIN} + + ### Copyright (C) 2002-2006 Stephen Kennedy + +@@ -17,18 +17,9 @@ + ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + # +-# pychecker +-# +-import sys +-if "--pychecker" in sys.argv: +- sys.argv.remove("--pychecker") +- import os +- os.environ['PYCHECKER'] = "--no-argsused --no-classattr --stdlib" +- #'--blacklist=gettext,locale,pygtk,gtk,gtk.keysyms,popen2,random,difflib,filecmp,tempfile' +- import pychecker.checker +-# + # i18n support + # ++import sys + sys.path += [ #LIBDIR# + ] + import paths diff --git a/textproc/meld/pkg/DESCR b/textproc/meld/pkg/DESCR new file mode 100644 index 00000000000..b7914482442 --- /dev/null +++ b/textproc/meld/pkg/DESCR @@ -0,0 +1,6 @@ +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 if the corresponding commands are +installed. diff --git a/textproc/meld/pkg/PLIST b/textproc/meld/pkg/PLIST new file mode 100644 index 00000000000..13125b0ba64 --- /dev/null +++ b/textproc/meld/pkg/PLIST @@ -0,0 +1,192 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/03 18:23:27 landry Exp $ +bin/meld +lib/python${MODPY_VERSION}/site-packages/meld/ +lib/python${MODPY_VERSION}/site-packages/meld/diffutil.py +lib/python${MODPY_VERSION}/site-packages/meld/diffutil.pyc +lib/python${MODPY_VERSION}/site-packages/meld/diffutil.pyo +lib/python${MODPY_VERSION}/site-packages/meld/dirdiff.py +lib/python${MODPY_VERSION}/site-packages/meld/dirdiff.pyc +lib/python${MODPY_VERSION}/site-packages/meld/dirdiff.pyo +lib/python${MODPY_VERSION}/site-packages/meld/filediff.py +lib/python${MODPY_VERSION}/site-packages/meld/filediff.pyc +lib/python${MODPY_VERSION}/site-packages/meld/filediff.pyo +lib/python${MODPY_VERSION}/site-packages/meld/findbar.py +lib/python${MODPY_VERSION}/site-packages/meld/findbar.pyc +lib/python${MODPY_VERSION}/site-packages/meld/findbar.pyo +lib/python${MODPY_VERSION}/site-packages/meld/gnomeglade.py +lib/python${MODPY_VERSION}/site-packages/meld/gnomeglade.pyc +lib/python${MODPY_VERSION}/site-packages/meld/gnomeglade.pyo +lib/python${MODPY_VERSION}/site-packages/meld/historyentry.py +lib/python${MODPY_VERSION}/site-packages/meld/historyentry.pyc +lib/python${MODPY_VERSION}/site-packages/meld/historyentry.pyo +lib/python${MODPY_VERSION}/site-packages/meld/meldapp.py +lib/python${MODPY_VERSION}/site-packages/meld/meldapp.pyc +lib/python${MODPY_VERSION}/site-packages/meld/meldapp.pyo +lib/python${MODPY_VERSION}/site-packages/meld/melddoc.py +lib/python${MODPY_VERSION}/site-packages/meld/melddoc.pyc +lib/python${MODPY_VERSION}/site-packages/meld/melddoc.pyo +lib/python${MODPY_VERSION}/site-packages/meld/misc.py +lib/python${MODPY_VERSION}/site-packages/meld/misc.pyc +lib/python${MODPY_VERSION}/site-packages/meld/misc.pyo +lib/python${MODPY_VERSION}/site-packages/meld/paths.py +lib/python${MODPY_VERSION}/site-packages/meld/paths.pyc +lib/python${MODPY_VERSION}/site-packages/meld/paths.pyo +lib/python${MODPY_VERSION}/site-packages/meld/prefs.py +lib/python${MODPY_VERSION}/site-packages/meld/prefs.pyc +lib/python${MODPY_VERSION}/site-packages/meld/prefs.pyo +lib/python${MODPY_VERSION}/site-packages/meld/sourceviewer.py +lib/python${MODPY_VERSION}/site-packages/meld/sourceviewer.pyc +lib/python${MODPY_VERSION}/site-packages/meld/sourceviewer.pyo +lib/python${MODPY_VERSION}/site-packages/meld/task.py +lib/python${MODPY_VERSION}/site-packages/meld/task.pyc +lib/python${MODPY_VERSION}/site-packages/meld/task.pyo +lib/python${MODPY_VERSION}/site-packages/meld/tree.py +lib/python${MODPY_VERSION}/site-packages/meld/tree.pyc +lib/python${MODPY_VERSION}/site-packages/meld/tree.pyo +lib/python${MODPY_VERSION}/site-packages/meld/undo.py +lib/python${MODPY_VERSION}/site-packages/meld/undo.pyc +lib/python${MODPY_VERSION}/site-packages/meld/undo.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/ +lib/python${MODPY_VERSION}/site-packages/meld/vc/__init__.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/_null.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/_null.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/_null.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/_vc.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/_vc.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/_vc.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/bzr.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/bzr.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/bzr.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/cdv.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/cdv.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/cdv.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/cvs.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/cvs.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/cvs.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/darcs.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/darcs.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/darcs.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/git.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/git.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/git.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/mercurial.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/mercurial.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/mercurial.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/monotone.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/monotone.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/monotone.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/rcs.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/rcs.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/rcs.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/svn.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/svn.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/svn.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vc/tla.py +lib/python${MODPY_VERSION}/site-packages/meld/vc/tla.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vc/tla.pyo +lib/python${MODPY_VERSION}/site-packages/meld/vcview.py +lib/python${MODPY_VERSION}/site-packages/meld/vcview.pyc +lib/python${MODPY_VERSION}/site-packages/meld/vcview.pyo +share/application-registry/meld.applications +share/applications/meld.desktop +share/doc/meld/ +share/gnome/ +share/gnome/help/ +share/gnome/help/meld/ +share/gnome/help/meld/C/ +share/gnome/help/meld/C/figures/ +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/help/meld/es/ +share/gnome/help/meld/es/figures/ +share/gnome/help/meld/es/figures/dirdiff.png +share/gnome/help/meld/es/figures/filediff.png +share/gnome/help/meld/es/meld.xml +share/gnome/help/meld/fr/ +share/gnome/help/meld/fr/figures/ +share/gnome/help/meld/fr/figures/dirdiff.png +share/gnome/help/meld/fr/figures/filediff.png +share/gnome/help/meld/fr/meld.xml +share/locale/ar/LC_MESSAGES/meld.mo +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/dz/LC_MESSAGES/meld.mo +share/locale/el/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/nb/LC_MESSAGES/meld.mo +share/locale/ne/LC_MESSAGES/meld.mo +share/locale/nl/LC_MESSAGES/meld.mo +share/locale/oc/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/sq/LC_MESSAGES/meld.mo +share/locale/sr/LC_MESSAGES/meld.mo +share/locale/sr@Latn/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 +share/meld/ +share/meld/glade2/ +share/meld/glade2/dirdiff-ui.xml +share/meld/glade2/dirdiff.glade +share/meld/glade2/filediff-ui.xml +share/meld/glade2/filediff.glade +share/meld/glade2/findbar.glade +share/meld/glade2/meldapp-ui.xml +share/meld/glade2/meldapp.glade +share/meld/glade2/pixmaps/ +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-ui.xml +share/meld/glade2/vcview.glade +share/omf/ +share/omf/meld/ +share/omf/meld/meld-C.omf +share/omf/meld/meld-es.omf +share/omf/meld/meld-fr.omf +share/pixmaps/meld.png +@exec %D/bin/update-desktop-database +@unexec %D/bin/update-desktop-database