diff options
| -rw-r--r-- | textproc/meld/Makefile | 48 | ||||
| -rw-r--r-- | textproc/meld/distinfo | 3 | ||||
| -rw-r--r-- | textproc/meld/files/patch-INSTALL | 11 | ||||
| -rw-r--r-- | textproc/meld/files/patch-po-fixes | 185 | ||||
| -rw-r--r-- | textproc/meld/pkg-descr | 7 | ||||
| -rw-r--r-- | textproc/meld/pkg-plist | 166 |
6 files changed, 420 insertions, 0 deletions
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile new file mode 100644 index 000000000..382613735 --- /dev/null +++ b/textproc/meld/Makefile @@ -0,0 +1,48 @@ +# New ports collection makefile for: meld +# Date created: 2003-04-13 +# Whom: Pav Lucistnik <pav@oook.cz> +# +# $FreeBSD$ +# $MCom$ + +PORTNAME= meld +PORTVERSION= 1.1.4 +PORTREVISION= 2 +CATEGORIES= textproc devel python +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 + +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 + +OPTIONS= PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off + +post-patch: + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/INSTALL + + @${REINPLACE_CMD} 's|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|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 new file mode 100644 index 000000000..bc62631cf --- /dev/null +++ b/textproc/meld/distinfo @@ -0,0 +1,3 @@ +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 000000000..88628484f --- /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/files/patch-po-fixes b/textproc/meld/files/patch-po-fixes new file mode 100644 index 000000000..12915d61c --- /dev/null +++ b/textproc/meld/files/patch-po-fixes @@ -0,0 +1,185 @@ +--- po/ru.po.orig 2006/08/27 09:11:02 1.1 ++++ po/ru.po 2006/08/27 09:11:53 +@@ -190,57 +190,57 @@ + #, python-format + msgid "%i second" + msgid_plural "%i seconds" +-msgstr[0] "секунда" +-msgstr[1] "секунды" +-msgstr[2] "секунд" ++msgstr[0] "%i секунда" ++msgstr[1] "%i секунды" ++msgstr[2] "%i секунд" + + #: ../dirdiff.py:571 + #, python-format + msgid "%i minute" + msgid_plural "%i minutes" +-msgstr[0] "минута" +-msgstr[1] "минуты" +-msgstr[2] "минут" ++msgstr[0] "%i минута" ++msgstr[1] "%i минуты" ++msgstr[2] "%i минут" + + #: ../dirdiff.py:572 + #, python-format + msgid "%i hour" + msgid_plural "%i hours" +-msgstr[0] "час" +-msgstr[1] "часа" +-msgstr[2] "часов" ++msgstr[0] "%i час" ++msgstr[1] "%i часа" ++msgstr[2] "%i часов" + + #: ../dirdiff.py:573 + #, python-format + msgid "%i day" + msgid_plural "%i days" +-msgstr[0] "день" +-msgstr[1] "дня" +-msgstr[2] "дней" ++msgstr[0] "%i день" ++msgstr[1] "%i дня" ++msgstr[2] "%i дней" + + #: ../dirdiff.py:574 + #, python-format + msgid "%i week" + msgid_plural "%i weeks" +-msgstr[0] "неделя" +-msgstr[1] "недели" +-msgstr[2] "недель" ++msgstr[0] "%i неделя" ++msgstr[1] "%i недели" ++msgstr[2] "%i недель" + + #: ../dirdiff.py:575 + #, python-format + msgid "%i month" + msgid_plural "%i months" +-msgstr[0] "месяц" +-msgstr[1] "месяца" +-msgstr[2] "месяцев" ++msgstr[0] "%i месяц" ++msgstr[1] "%i месяца" ++msgstr[2] "%i месяцев" + + #: ../dirdiff.py:576 + #, python-format + msgid "%i year" + msgid_plural "%i years" +-msgstr[0] "год" +-msgstr[1] "года" +-msgstr[2] "лет" ++msgstr[0] "%i год" ++msgstr[1] "%i года" ++msgstr[2] "%i лет" + + #. Abbreviation for insert,overwrite so that it will fit in the status bar + #: ../filediff.py:224 +--- po/hu.po.orig 2006-02-24 19:19:25.000000000 -0500 ++++ po/hu.po 2006-09-11 13:18:43.000000000 -0400 +@@ -99,49 +99,42 @@ + msgid "%i second" + msgid_plural "%i seconds" + msgstr[0] "%i másodperc" +-msgstr[1] "%i másodperc" + + #: ../dirdiff.py:570 + #, python-format + msgid "%i minute" + msgid_plural "%i minutes" + msgstr[0] "%i perc" +-msgstr[1] "%i perc" + + #: ../dirdiff.py:571 + #, python-format + msgid "%i hour" + msgid_plural "%i hours" + msgstr[0] "%i óra" +-msgstr[1] "%i óra" + + #: ../dirdiff.py:572 + #, python-format + msgid "%i day" + msgid_plural "%i days" + msgstr[0] "%i nap" +-msgstr[1] "%i nap" + + #: ../dirdiff.py:573 + #, python-format + msgid "%i week" + msgid_plural "%i weeks" + msgstr[0] "%i hét" +-msgstr[1] "%i hét" + + #: ../dirdiff.py:574 + #, python-format + msgid "%i month" + msgid_plural "%i months" + msgstr[0] "%i hónap" +-msgstr[1] "%i hónap" + + #: ../dirdiff.py:575 + #, python-format + msgid "%i year" + msgid_plural "%i years" + msgstr[0] "%i év" +-msgstr[1] "%i év" + + #. Abbreviation for insert,overwrite so that it will fit in the status bar + #: ../filediff.py:214 +--- po/ja.po.orig 2006-03-05 06:03:44.000000000 -0500 ++++ po/ja.po 2006-09-11 13:19:58.000000000 -0400 +@@ -97,49 +97,42 @@ + msgid "%i second" + msgid_plural "%i seconds" + msgstr[0] "%i 秒" +-msgstr[1] "%i 秒" + + #: ../dirdiff.py:570 + #, python-format + msgid "%i minute" + msgid_plural "%i minutes" + msgstr[0] "%i 分" +-msgstr[1] "%i 分" + + #: ../dirdiff.py:571 + #, python-format + msgid "%i hour" + msgid_plural "%i hours" + msgstr[0] "%i 時間" +-msgstr[1] "%i 時間" + + #: ../dirdiff.py:572 + #, python-format + msgid "%i day" + msgid_plural "%i days" + msgstr[0] "%i 日" +-msgstr[1] "%i 日" + + #: ../dirdiff.py:573 + #, python-format + msgid "%i week" + msgid_plural "%i weeks" + msgstr[0] "%i 週間" +-msgstr[1] "%i 週間" + + #: ../dirdiff.py:574 + #, python-format + msgid "%i month" + msgid_plural "%i months" + msgstr[0] "%i ヶ月" +-msgstr[1] "%i ヶ月" + + #: ../dirdiff.py:575 + #, python-format + msgid "%i year" + msgid_plural "%i years" + msgstr[0] "%i 年" +-msgstr[1] "%i 年" + + #. Abbreviation for insert,overwrite so that it will fit in the status bar + #: ../filediff.py:215 diff --git a/textproc/meld/pkg-descr b/textproc/meld/pkg-descr new file mode 100644 index 000000000..793a3ec04 --- /dev/null +++ b/textproc/meld/pkg-descr @@ -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://meld.sourceforge.net/ diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist new file mode 100644 index 000000000..2ae0315f5 --- /dev/null +++ b/textproc/meld/pkg-plist @@ -0,0 +1,166 @@ +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/gnome/application-registry/meld.applications +share/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/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/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 |