Date: Wed, 2 Sep 2009 03:00:50 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138457: Update port: textproc/meld to 1.3.1 Message-ID: <20090902030050.ead4914a.tkato432@yahoo.com> Resent-Message-ID: <200909011810.n81IA720086926@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138457
>Category: ports
>Synopsis: Update port: textproc/meld to 1.3.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 01 18:10:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.2-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.3.1
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/textproc/meld/Makefile textproc/meld/Makefile
--- /usr/ports/textproc/meld/Makefile 2009-08-01 04:45:18.000000000 +0900
+++ textproc/meld/Makefile 2009-09-02 01:01:13.000000000 +0900
@@ -6,8 +6,7 @@
#
PORTNAME= meld
-PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTVERSION= 1.3.1
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
@@ -27,8 +26,18 @@
INSTALLS_OMF= yes
post-patch:
- @${FIND} ${WRKSRC} -name "${MAKEFILE}" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g'
+.for file in GNUmakefile
+ @${REINPLACE_CMD} -e '/docdir_/d' ${WRKSRC}/${file}
+.endfor
+.for file in help/GNUmakefile
+ @${REINPLACE_CMD} -e '/^LANGUAGES/s|de||g' ${WRKSRC}/${file}
+.endfor
+.for file in help/C/GNUmakefile help/es/GNUmakefile help/fr/GNUmakefile
+ @${REINPLACE_CMD} -e \
+ 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
+ s|^LANG :=|LANG_ :=|g ; \
+ s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file}
+.endfor
.include <bsd.port.pre.mk>
diff -urN /usr/ports/textproc/meld/distinfo textproc/meld/distinfo
--- /usr/ports/textproc/meld/distinfo 2009-07-02 04:37:08.000000000 +0900
+++ textproc/meld/distinfo 2009-08-26 00:56:05.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (meld-1.3.0.tar.bz2) = 8f8eaabfb398cb59e7cb51284003f552
-SHA256 (meld-1.3.0.tar.bz2) = 94a6f834ce236fc1efb026fb9a875c8cb51d2c4f82361b0c989bef38ae015bfc
-SIZE (meld-1.3.0.tar.bz2) = 799554
+MD5 (meld-1.3.1.tar.bz2) = 05885811cf0bccc051c3f44938ff54ed
+SHA256 (meld-1.3.1.tar.bz2) = d60e735869bb64cc7007466eea3ad639e22eb223c6d5379508ffd0b4f0901647
+SIZE (meld-1.3.1.tar.bz2) = 795145
diff -urN /usr/ports/textproc/meld/pkg-plist textproc/meld/pkg-plist
--- /usr/ports/textproc/meld/pkg-plist 2009-07-02 04:37:08.000000000 +0900
+++ textproc/meld/pkg-plist 2009-08-28 01:18:54.000000000 +0900
@@ -26,6 +26,12 @@
lib/meld/misc.py
lib/meld/misc.pyc
lib/meld/misc.pyo
+lib/meld/msgarea.py
+lib/meld/msgarea.pyc
+lib/meld/msgarea.pyo
+lib/meld/notebooklabel.py
+lib/meld/notebooklabel.pyc
+lib/meld/notebooklabel.pyo
lib/meld/paths.py
lib/meld/paths.pyc
lib/meld/paths.pyo
@@ -77,6 +83,9 @@
lib/meld/vc/rcs.py
lib/meld/vc/rcs.pyc
lib/meld/vc/rcs.pyo
+lib/meld/vc/svk.py
+lib/meld/vc/svk.pyc
+lib/meld/vc/svk.pyo
lib/meld/vc/svn.py
lib/meld/vc/svn.pyc
lib/meld/vc/svn.pyo
@@ -86,7 +95,6 @@
lib/meld/vcview.py
lib/meld/vcview.pyc
lib/meld/vcview.pyo
-share/application-registry/meld.applications
share/applications/meld.desktop
share/gnome/help/meld/C/figures/dirdiff.png
share/gnome/help/meld/C/figures/filediff.png
@@ -97,10 +105,6 @@
share/gnome/help/meld/fr/figures/dirdiff.png
share/gnome/help/meld/fr/figures/filediff.png
share/gnome/help/meld/fr/meld.xml
-share/omf/meld/meld-C.omf
-share/omf/meld/meld-es.omf
-share/omf/meld/meld-fr.omf
-share/pixmaps/meld.png
share/locale/ar/LC_MESSAGES/meld.mo
share/locale/bg/LC_MESSAGES/meld.mo
share/locale/ca/LC_MESSAGES/meld.mo
@@ -113,6 +117,7 @@
share/locale/es/LC_MESSAGES/meld.mo
share/locale/fi/LC_MESSAGES/meld.mo
share/locale/fr/LC_MESSAGES/meld.mo
+share/locale/gl/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
@@ -133,33 +138,30 @@
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/dirdiff-ui.xml
+%%DATADIR%%/glade2/dirdiff.glade
%%DATADIR%%/glade2/filediff-ui.xml
%%DATADIR%%/glade2/filediff.glade
%%DATADIR%%/glade2/findbar.glade
-%%DATADIR%%/glade2/meldapp.glade
%%DATADIR%%/glade2/meldapp-ui.xml
+%%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-missing.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-missing.png
%%DATADIR%%/glade2/pixmaps/tree-folder-new.png
%%DATADIR%%/glade2/pixmaps/tree-folder-normal.png
%%DATADIR%%/glade2/pixmaps/vc-add-24.png
@@ -167,15 +169,18 @@
%%DATADIR%%/glade2/pixmaps/vc-commit-24.png
%%DATADIR%%/glade2/pixmaps/vc-icon.png
%%DATADIR%%/glade2/pixmaps/vc-remove-24.png
+%%DATADIR%%/glade2/pixmaps/vc-resolve-24.png
%%DATADIR%%/glade2/pixmaps/vc-update-24.png
-%%DATADIR%%/glade2/vcview.glade
%%DATADIR%%/glade2/vcview-ui.xml
+%%DATADIR%%/glade2/vcview.glade
+share/omf/meld/meld-C.omf
+share/omf/meld/meld-es.omf
+share/omf/meld/meld-fr.omf
+share/pixmaps/meld.png
+@dirrm share/omf/meld
@dirrm %%DATADIR%%/glade2/pixmaps
@dirrm %%DATADIR%%/glade2
@dirrm %%DATADIR%%
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrm share/omf/meld
@dirrm share/gnome/help/meld/fr/figures
@dirrm share/gnome/help/meld/fr
@dirrm share/gnome/help/meld/es/figures
@@ -183,8 +188,8 @@
@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
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090902030050.ead4914a.tkato432>