ports/161015: textproc/meld: update to 1.5.2
Barbara
barbara.xxx1975 at libero.it
Sun Sep 25 18:30:10 UTC 2011
>Number: 161015
>Category: ports
>Synopsis: textproc/meld: update to 1.5.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 25 18:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Barbara
>Release: RELENG_8
>Organization:
>Environment:
FreeBSD satanasso.local.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Sep 17 14:30:53 CEST 2011 root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386
>Description:
Update Meld to the latest available version, which is 1.5.2
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2011-03-23 17:58:00.000000000 +0100
+++ Makefile 2011-09-25 20:02:27.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= meld
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.2
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
@@ -36,9 +36,6 @@
.for file in Makefile
@${REINPLACE_CMD} -e '/docdir_/d' ${WRKSRC}/${file}
.endfor
-.for file in help/Makefile
- @${REINPLACE_CMD} -e '/^LANGUAGES/s|de||g' ${WRKSRC}/${file}
-.endfor
.for file in help/C/Makefile help/es/Makefile help/fr/Makefile
@${REINPLACE_CMD} -e \
's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
--- distinfo.orig 2010-11-11 13:08:27.000000000 +0100
+++ distinfo 2011-09-25 20:02:36.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (meld-1.4.0.tar.bz2) = 0edb78d9da2bfe7e630742111eb6d8edc476c8cc91b1f6403d940d072dd75469
-SIZE (meld-1.4.0.tar.bz2) = 333793
+SHA256 (meld-1.5.2.tar.bz2) = ee453dc2aacf7ffbb5fdb99565d88ed075d7d2b8b54521e758c0faf7f19ae9c7
+SIZE (meld-1.5.2.tar.bz2) = 351711
--- pkg-plist.orig 2010-11-11 13:08:27.000000000 +0100
+++ pkg-plist 2011-09-25 20:10:46.000000000 +0200
@@ -1,164 +1,152 @@
bin/meld
+lib/meld/meld/__init__.py
+lib/meld/meld/__init__.pyc
+lib/meld/meld/__init__.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/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/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/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/task.py
+lib/meld/meld/task.pyc
+lib/meld/meld/task.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/findbar.py
-lib/meld/meld/ui/gnomeglade.py
-lib/meld/meld/ui/historyentry.py
-lib/meld/meld/ui/msgarea.py
-lib/meld/meld/ui/notebooklabel.py
-lib/meld/meld/ui/wraplabel.py
lib/meld/meld/ui/__init__.pyc
-lib/meld/meld/ui/findbar.pyc
-lib/meld/meld/ui/gnomeglade.pyc
-lib/meld/meld/ui/historyentry.pyc
-lib/meld/meld/ui/msgarea.pyc
-lib/meld/meld/ui/notebooklabel.pyc
-lib/meld/meld/ui/wraplabel.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/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/prefs.py
-lib/meld/meld/util/sourceviewer.py
lib/meld/meld/util/__init__.pyc
-lib/meld/meld/util/prefs.pyc
-lib/meld/meld/util/sourceviewer.pyc
lib/meld/meld/util/__init__.pyo
+lib/meld/meld/util/namedtuple.py
+lib/meld/meld/util/namedtuple.pyc
+lib/meld/meld/util/namedtuple.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/_null.py
-lib/meld/meld/vc/_vc.py
-lib/meld/meld/vc/bzr.py
-lib/meld/meld/vc/cdv.py
-lib/meld/meld/vc/cvs.py
-lib/meld/meld/vc/darcs.py
-lib/meld/meld/vc/git.py
-lib/meld/meld/vc/mercurial.py
-lib/meld/meld/vc/monotone.py
-lib/meld/meld/vc/rcs.py
-lib/meld/meld/vc/svk.py
-lib/meld/meld/vc/svn.py
-lib/meld/meld/vc/tla.py
lib/meld/meld/vc/__init__.pyc
-lib/meld/meld/vc/_null.pyc
-lib/meld/meld/vc/_vc.pyc
-lib/meld/meld/vc/bzr.pyc
-lib/meld/meld/vc/cdv.pyc
-lib/meld/meld/vc/cvs.pyc
-lib/meld/meld/vc/darcs.pyc
-lib/meld/meld/vc/git.pyc
-lib/meld/meld/vc/mercurial.pyc
-lib/meld/meld/vc/monotone.pyc
-lib/meld/meld/vc/rcs.pyc
-lib/meld/meld/vc/svk.pyc
-lib/meld/meld/vc/svn.pyc
-lib/meld/meld/vc/tla.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/cdv.py
+lib/meld/meld/vc/cdv.pyc
lib/meld/meld/vc/cdv.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/rcs.py
+lib/meld/meld/vc/rcs.pyc
lib/meld/meld/vc/rcs.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/tla.py
+lib/meld/meld/vc/tla.pyc
lib/meld/meld/vc/tla.pyo
-lib/meld/meld/__init__.py
-lib/meld/meld/diffmap.py
-lib/meld/meld/diffutil.py
-lib/meld/meld/dirdiff.py
-lib/meld/meld/filediff.py
-lib/meld/meld/filemerge.py
-lib/meld/meld/matchers.py
-lib/meld/meld/meldapp.py
-lib/meld/meld/melddoc.py
-lib/meld/meld/merge.py
-lib/meld/meld/misc.py
-lib/meld/meld/paths.py
-lib/meld/meld/preferences.py
-lib/meld/meld/task.py
-lib/meld/meld/tree.py
-lib/meld/meld/undo.py
lib/meld/meld/vcview.py
-lib/meld/meld/__init__.pyc
-lib/meld/meld/diffmap.pyc
-lib/meld/meld/diffutil.pyc
-lib/meld/meld/dirdiff.pyc
-lib/meld/meld/filediff.pyc
-lib/meld/meld/filemerge.pyc
-lib/meld/meld/matchers.pyc
-lib/meld/meld/meldapp.pyc
-lib/meld/meld/melddoc.pyc
-lib/meld/meld/merge.pyc
-lib/meld/meld/misc.pyc
-lib/meld/meld/paths.pyc
-lib/meld/meld/preferences.pyc
-lib/meld/meld/task.pyc
-lib/meld/meld/tree.pyc
-lib/meld/meld/undo.pyc
lib/meld/meld/vcview.pyc
-lib/meld/meld/__init__.pyo
-lib/meld/meld/diffmap.pyo
-lib/meld/meld/diffutil.pyo
-lib/meld/meld/dirdiff.pyo
-lib/meld/meld/filediff.pyo
-lib/meld/meld/filemerge.pyo
-lib/meld/meld/matchers.pyo
-lib/meld/meld/meldapp.pyo
-lib/meld/meld/melddoc.pyo
-lib/meld/meld/merge.pyo
-lib/meld/meld/misc.pyo
-lib/meld/meld/paths.pyo
-lib/meld/meld/preferences.pyo
-lib/meld/meld/task.pyo
-lib/meld/meld/tree.pyo
-lib/meld/meld/undo.pyo
lib/meld/meld/vcview.pyo
share/applications/meld.desktop
-%%DATADIR%%/ui/dirdiff.glade
-%%DATADIR%%/ui/filediff.glade
-%%DATADIR%%/ui/findbar.glade
-%%DATADIR%%/ui/meldapp.glade
-%%DATADIR%%/ui/preferences.glade
-%%DATADIR%%/ui/vcview.glade
-%%DATADIR%%/ui/dirdiff-ui.xml
-%%DATADIR%%/ui/filediff-ui.xml
-%%DATADIR%%/ui/meldapp-ui.xml
-%%DATADIR%%/ui/vcview-ui.xml
-%%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/filter-ignored-24.png
-%%DATADIR%%/icons/filter-modified-24.png
-%%DATADIR%%/icons/filter-nonvc-24.png
-%%DATADIR%%/icons/filter-normal-24.png
-%%DATADIR%%/icons/icon.png
-%%DATADIR%%/icons/tree-file-changed.png
-%%DATADIR%%/icons/tree-file-missing.png
-%%DATADIR%%/icons/tree-file-new.png
-%%DATADIR%%/icons/tree-file-newer.png
-%%DATADIR%%/icons/tree-file-normal.png
-%%DATADIR%%/icons/tree-folder-changed.png
-%%DATADIR%%/icons/vc-icon.png
-%%DATADIR%%/icons/tree-folder-missing.png
-%%DATADIR%%/icons/tree-folder-new.png
-%%DATADIR%%/icons/tree-folder-normal.png
-%%DATADIR%%/icons/vc-add-24.png
-%%DATADIR%%/icons/vc-checkout-24.png
-%%DATADIR%%/icons/vc-commit-24.png
-%%DATADIR%%/icons/vc-remove-24.png
-%%DATADIR%%/icons/vc-resolve-24.png
-%%DATADIR%%/icons/vc-update-24.png
share/gnome/help/meld/C/meld.xml
share/gnome/help/meld/es/meld.xml
share/gnome/help/meld/fr/meld.xml
@@ -170,7 +158,9 @@
%%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
@@ -201,23 +191,53 @@
%%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%%/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/vc-add-24.png
+%%DATADIR%%/icons/vc-checkout-24.png
+%%DATADIR%%/icons/vc-commit-24.png
+%%DATADIR%%/icons/vc-icon.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/vcview-ui.xml
+%%DATADIR%%/ui/vcview.ui
share/omf/meld/meld-C.omf
share/omf/meld/meld-es.omf
share/omf/meld/meld-fr.omf
-share/pixmaps/meld.png
- at dirrm share/omf/meld
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
- 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
@dirrm lib/meld/meld/vc
@dirrm lib/meld/meld/util
@dirrm lib/meld/meld/ui
@dirrm lib/meld/meld
@dirrm lib/meld
+ 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 dirrm share/omf/meld
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list