[74028] trunk/dports/textproc/meld
jmr at macports.org
jmr at macports.org
Thu Dec 2 14:00:19 PST 2010
Revision: 74028
http://trac.macports.org/changeset/74028
Author: jmr at macports.org
Date: 2010-12-02 14:00:14 -0800 (Thu, 02 Dec 2010)
Log Message:
-----------
meld: update to 1.4.0 and use python 2.6 (#26808, maintainer timeout)
Modified Paths:
--------------
trunk/dports/textproc/meld/Portfile
Removed Paths:
-------------
trunk/dports/textproc/meld/files/patch-scrollkeeper
trunk/dports/textproc/meld/files/patch-translations
Modified: trunk/dports/textproc/meld/Portfile
===================================================================
--- trunk/dports/textproc/meld/Portfile 2010-12-02 21:12:45 UTC (rev 74027)
+++ trunk/dports/textproc/meld/Portfile 2010-12-02 22:00:14 UTC (rev 74028)
@@ -4,7 +4,7 @@
PortSystem 1.0
name meld
-version 1.3.1
+version 1.4.0
categories textproc devel
platforms darwin
maintainers landonf
@@ -18,29 +18,22 @@
systems such such as CVS, Subversion, Bazaar-ng and \
Mercurial.
-master_sites http://ftp.gnome.org/pub/gnome/sources/meld/1.3/
+master_sites gnome:sources/${name}/[join [lrange [split $version .] 0 1] .]
+use_bzip2 yes
+checksums md5 b675ec2006c4452469cf501c51b2a689 \
+ sha1 2db6d610f1d1e2ef2bd0e0027695e72f6f6a6ac9 \
+ rmd160 5e244b450cd1a11b8eeb8176a77043a0a6eff63a
+
depends_lib port:intltool \
- port:py25-gtk \
- port:py25-gnome \
+ port:py26-gnome \
port:rarian
-#patchfiles patch-translations \
-# patch-scrollkeeper
-
-use_configure no
-
post-patch {
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/INSTALL
- reinplace "s|#! /usr/bin/env python|#! ${prefix}/bin/python2.5|" ${worksrcpath}/meld
-
- file mkdir ${worksrcpath}/help/fr/figures
- file mkdir ${worksrcpath}/help/oc/figures
-
- system "cp ${worksrcpath}/help/C/figures/*.png ${worksrcpath}/help/fr/figures"
- system "cp ${worksrcpath}/help/C/figures/*.png ${worksrcpath}/help/oc/figures"
+ reinplace "s|#! /usr/bin/env python|#! ${prefix}/bin/python2.6|" ${worksrcpath}/bin/meld
}
-checksums md5 e153f8d8675659dd0e6563008d4d7b4a \
- sha1 fb3f611de93b63602e963c2fad7ac428d8da95f4 \
- rmd160 c1d950d5cdfa8199e56b917ca6ae9b2c92a8e78d
+use_configure no
+
+build.args PYTHON=${prefix}/bin/python2.6
Deleted: trunk/dports/textproc/meld/files/patch-scrollkeeper
===================================================================
--- trunk/dports/textproc/meld/files/patch-scrollkeeper 2010-12-02 21:12:45 UTC (rev 74027)
+++ trunk/dports/textproc/meld/files/patch-scrollkeeper 2010-12-02 22:00:14 UTC (rev 74028)
@@ -1,19 +0,0 @@
-diff -rwub meld-1.1.4.orig/help/C/GNUmakefile meld-1.1.4/help/C/GNUmakefile
---- help/C/GNUmakefile 2006-11-25 20:16:21.000000000 -0800
-+++ help/C/GNUmakefile 2006-11-25 20:17:12.000000000 -0800
-@@ -18,7 +18,6 @@
- install -m 644 meld.xml $(XML_DIR_)/meld.xml
- install -m 644 figures/*.png $(XML_DIR_)/figures
- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
-- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
-
- .PHONY : uninstall
- uninstall :
-@@ -27,7 +26,6 @@
- $(XML_DIR_)/figures/*.png
- -rmdir $(XML_DIR_)/figures \
- $(XML_DIR_)
-- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
-
- .PHONY : clean
- clean :
Deleted: trunk/dports/textproc/meld/files/patch-translations
===================================================================
--- trunk/dports/textproc/meld/files/patch-translations 2010-12-02 21:12:45 UTC (rev 74027)
+++ trunk/dports/textproc/meld/files/patch-translations 2010-12-02 22:00:14 UTC (rev 74028)
@@ -1,106 +0,0 @@
-diff -rwub meld-1.1.4.orig/po/hu.po meld-1.1.4/po/hu.po
---- po/hu.po 2006-11-25 20:11:27.000000000 -0800
-+++ po/hu.po 2006-11-25 20:11:43.000000000 -0800
-@@ -15,7 +15,7 @@
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=1; plural=0;\n"
-+"Plural-Forms: nplurals=2; plural=0;\n"
- "X-Generator: KBabel 1.10.2\n"
-
- #: ../dirdiff.py:252 ../dirdiff.py:267
-diff -rwub meld-1.1.4.orig/po/ja.po meld-1.1.4/po/ja.po
---- po/ja.po 2006-11-25 20:11:27.000000000 -0800
-+++ po/ja.po 2006-11-25 20:11:57.000000000 -0800
-@@ -14,7 +14,7 @@
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Generated-By: pygettext.py 1.5\n"
--"Plural-Forms: nplurals=1; plural=0;\n"
-+"Plural-Forms: nplurals=2; plural=0;\n"
-
- #: ../dirdiff.py:252 ../dirdiff.py:267
- #, python-format
-diff -rwub meld-1.1.4.orig/po/ru.po meld-1.1.4/po/ru.po
---- po/ru.po 2006-11-25 20:11:27.000000000 -0800
-+++ po/ru.po 2006-11-25 20:13:33.000000000 -0800
-@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101202/ab42008c/attachment.html>
More information about the macports-changes
mailing list