[Midnightbsd-cvs] mports [15867] trunk/textproc: add meld diff tool
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Feb 20 08:22:37 EST 2014
Revision: 15867
http://svnweb.midnightbsd.org/mports/?rev=15867
Author: laffer1
Date: 2014-02-20 08:22:36 -0500 (Thu, 20 Feb 2014)
Log Message:
-----------
add meld diff tool
Obtained from: FreeBSD ports
Modified Paths:
--------------
trunk/textproc/Makefile
Added Paths:
-----------
trunk/textproc/meld/
trunk/textproc/meld/Makefile
trunk/textproc/meld/distinfo
trunk/textproc/meld/pkg-descr
trunk/textproc/meld/pkg-plist
Modified: trunk/textproc/Makefile
===================================================================
--- trunk/textproc/Makefile 2014-02-19 21:38:01 UTC (rev 15866)
+++ trunk/textproc/Makefile 2014-02-20 13:22:36 UTC (rev 15867)
@@ -86,6 +86,7 @@
SUBDIR += linuxdoc
SUBDIR += localize
SUBDIR += makepatch
+SUBDIR += meld
SUBDIR += openjade
SUBDIR += opensp
SUBDIR += p5-HTML-Tidy
Added: trunk/textproc/meld/Makefile
===================================================================
--- trunk/textproc/meld/Makefile (rev 0)
+++ trunk/textproc/meld/Makefile 2014-02-20 13:22:36 UTC (rev 15867)
@@ -0,0 +1,38 @@
+# $MidnightBSD$
+
+PORTNAME= meld
+PORTVERSION= 1.8.4
+CATEGORIES= textproc devel python
+MASTER_SITES= GNOME
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT= GNOME 2 visual diff and merge tool
+
+LICENSE= gpl2
+
+USE_XZ= yes
+USE_GNOME= pygnome2
+USES= desktop-file-utils gmake shared-mime-info shebangfix
+python_OLD_CMD= ${SETENV} python
+python_CMD= ${PYTHON_CMD}
+SHEBANG_FILES= bin/meld
+USE_PYTHON= 2
+MAKE_ARGS= prefix=${PREFIX}
+INSTALLS_ICONS= yes
+INSTALLS_OMF= yes
+
+OPTIONS_DEFINE= NLS PYGNOMEDESKTOP
+OPTIONS_SUB= yes
+
+NLS_USES= gettext
+
+PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies)
+PYGNOMEDESKTOP_USE= GNOME=pygnomedesktop
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|^LANG :=|LANG_ :=|g ; s|$$(LANG)|$$(LANG_)|g ; \
+ s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g' \
+ ${WRKSRC}/help/C/Makefile ${WRKSRC}/help/es/Makefile \
+ ${WRKSRC}/help/fr/Makefile
+
+.include <bsd.port.mk>
Added: trunk/textproc/meld/distinfo
===================================================================
--- trunk/textproc/meld/distinfo (rev 0)
+++ trunk/textproc/meld/distinfo 2014-02-20 13:22:36 UTC (rev 15867)
@@ -0,0 +1,2 @@
+SHA256 (meld-1.8.4.tar.xz) = b46e5786343f236d203037a7ace8f1b28145a51a3f84fa527efcf62f47b5b8de
+SIZE (meld-1.8.4.tar.xz) = 421332
Added: trunk/textproc/meld/pkg-descr
===================================================================
--- trunk/textproc/meld/pkg-descr (rev 0)
+++ trunk/textproc/meld/pkg-descr 2014-02-20 13:22:36 UTC (rev 15867)
@@ -0,0 +1,7 @@
+Meld is a GNOME 2 visual diff and merge tool. It integrates especially well
+with CVS. The diff viewer lets you edit files in place (diffs update
+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://meldmerge.org/
Added: trunk/textproc/meld/pkg-plist
===================================================================
--- trunk/textproc/meld/pkg-plist (rev 0)
+++ trunk/textproc/meld/pkg-plist 2014-02-20 13:22:36 UTC (rev 15867)
@@ -0,0 +1,278 @@
+bin/meld
+lib/meld/meld/__init__.py
+lib/meld/meld/__init__.pyc
+lib/meld/meld/__init__.pyo
+lib/meld/meld/dbus_service.py
+lib/meld/meld/dbus_service.pyc
+lib/meld/meld/dbus_service.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/filters.py
+lib/meld/meld/filters.pyc
+lib/meld/meld/filters.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/meldbuffer.py
+lib/meld/meld/meldbuffer.pyc
+lib/meld/meld/meldbuffer.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/newdifftab.py
+lib/meld/meld/newdifftab.pyc
+lib/meld/meld/newdifftab.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/recent.py
+lib/meld/meld/recent.pyc
+lib/meld/meld/recent.pyo
+lib/meld/meld/task.py
+lib/meld/meld/task.pyc
+lib/meld/meld/task.pyo
+lib/meld/meld/test_matchers.py
+lib/meld/meld/test_matchers.pyc
+lib/meld/meld/test_matchers.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/__init__.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/statusbar.py
+lib/meld/meld/ui/statusbar.pyc
+lib/meld/meld/ui/statusbar.pyo
+lib/meld/meld/ui/vcdialogs.py
+lib/meld/meld/ui/vcdialogs.pyc
+lib/meld/meld/ui/vcdialogs.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/__init__.pyc
+lib/meld/meld/util/__init__.pyo
+lib/meld/meld/util/compat.py
+lib/meld/meld/util/compat.pyc
+lib/meld/meld/util/compat.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/__init__.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/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/svk.py
+lib/meld/meld/vc/svk.pyc
+lib/meld/meld/vc/svk.pyo
+lib/meld/meld/vc/svn.py
+lib/meld/meld/vc/svn.pyc
+lib/meld/meld/vc/svn.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/vcview.py
+lib/meld/meld/vcview.pyc
+lib/meld/meld/vcview.pyo
+share/appdata/meld.appdata.xml
+share/applications/meld.desktop
+share/gnome/help/meld/C/meld.xml
+share/gnome/help/meld/es/meld.xml
+share/gnome/help/meld/fr/meld.xml
+share/icons/HighContrast/scalable/apps/meld.svg
+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
+%%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 at 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/eu/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/id/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/it/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/meld.mo
+%%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/ro/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sr at latin/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/meld.mo
+%%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%%/gtkrc
+%%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/meld-vc-icon.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-push-24.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/tab-placeholder.ui
+%%DATADIR%%/ui/vcview-ui.xml
+%%DATADIR%%/ui/vcview.ui
+share/mime/packages/meld.xml
+share/omf/meld/meld-C.omf
+share/omf/meld/meld-es.omf
+share/omf/meld/meld-fr.omf
+ at dirrm share/omf/meld
+ at dirrmtry share/mime/packages
+ at dirrmtry share/mime
+ at dirrm %%DATADIR%%/ui
+ at dirrm %%DATADIR%%/icons
+ at dirrm %%DATADIR%%
+ at dirrmtry share/locale/rw/LC_MESSAGES
+ at dirrmtry share/locale/rw
+ at dirrmtry share/icons/HighContrast/scalable/apps
+ at dirrmtry share/icons/HighContrast/scalable
+ at dirrmtry share/icons/HighContrast
+ at dirrm share/gnome/help/meld/fr
+ at dirrm share/gnome/help/meld/es
+ at dirrm share/gnome/help/meld/C
+ at dirrm share/gnome/help/meld
+ at dirrmtry share/appdata
+ at dirrm lib/meld/meld/vc
+ at dirrm lib/meld/meld/util
+ at dirrm lib/meld/meld/ui
+ at dirrm lib/meld/meld
+ at dirrm lib/meld
More information about the Midnightbsd-cvs
mailing list