ports/114417: Update port: textproc/meld to 1.1.5.1
KATO Tsuguru
tkato432 at yahoo.com
Sun Jul 8 18:10:19 UTC 2007
>Number: 114417
>Category: ports
>Synopsis: Update port: textproc/meld to 1.1.5.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: Sun Jul 08 18:10:17 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.5.1
Remove file:
files/patch-po-fixes
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/textproc/meld/Makefile textproc/meld/Makefile
--- /usr/ports/textproc/meld/Makefile Sun May 20 13:57:14 2007
+++ textproc/meld/Makefile Sat Jul 7 22:10:17 2007
@@ -6,46 +6,38 @@
#
PORTNAME= meld
-PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTVERSION= 1.1.5.1
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R:R}
MAINTAINER= ports at FreeBSD.org
COMMENT= GNOME 2 visual diff and merge tool
+OPTIONS= PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
+
USE_BZIP2= yes
USE_GNOME= pygnome2
-INSTALLS_OMF= yes
USE_PYTHON= yes
-NO_BUILD= yes
-USE_GMAKE= yes
USE_GETTEXT= yes
-INSTALLS_ICONS= yes
-
+USE_GMAKE= yes
MAKEFILE= GNUmakefile
-
-OPTIONS= PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
+MAKE_ARGS= prefix=${PREFIX}
+INSTALLS_ICONS= yes
+INSTALLS_OMF= yes
post-patch:
- @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
- ${WRKSRC}/INSTALL
-
- @${REINPLACE_CMD} \
- 's|$$(sharedir)/applications|$$(sharedir)/gnome/applications|g ;\
- s|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g ;\
- s|$$(sharedir)/pixmaps|$$(sharedir)/gnome/pixmaps|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' \
- "{}" \;
+ @${FIND} ${WRKSRC} -name "${MAKEFILE}" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|$$(sharedir)/applications|$$(sharedir)/gnome/applications|g ; \
+ s|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g ; \
+ s|$$(sharedir)/pixmaps|$$(sharedir)/gnome/pixmaps|g ; \
+ s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
+ s|$$(sharedir)/omf/meld|$$(sharedir)/gnome/omf/meld|g'
.include <bsd.port.pre.mk>
-.if defined (WITH_PYGNOMEDESKTOP)
+
+.if defined(WITH_PYGNOMEDESKTOP)
USE_GNOME+= pygnomedesktop
.endif
+
.include <bsd.port.post.mk>
diff -urN /usr/ports/textproc/meld/distinfo textproc/meld/distinfo
--- /usr/ports/textproc/meld/distinfo Thu Jan 18 03:35:03 2007
+++ textproc/meld/distinfo Thu Jul 5 03:50:42 2007
@@ -1,3 +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
+MD5 (meld-1.1.5.1.tar.bz2) = d7366b958f9897f22eb867726b217b5a
+SHA256 (meld-1.1.5.1.tar.bz2) = 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38
+SIZE (meld-1.1.5.1.tar.bz2) = 602859
diff -urN /usr/ports/textproc/meld/files/patch-INSTALL textproc/meld/files/patch-INSTALL
--- /usr/ports/textproc/meld/files/patch-INSTALL Thu Jan 18 01:45:46 2007
+++ textproc/meld/files/patch-INSTALL Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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 -urN /usr/ports/textproc/meld/files/patch-po-fixes textproc/meld/files/patch-po-fixes
--- /usr/ports/textproc/meld/files/patch-po-fixes Sun Mar 18 07:41:06 2007
+++ textproc/meld/files/patch-po-fixes Thu Jan 1 09:00:00 1970
@@ -1,185 +0,0 @@
---- 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 -urN /usr/ports/textproc/meld/pkg-plist textproc/meld/pkg-plist
--- /usr/ports/textproc/meld/pkg-plist Sun May 20 13:57:14 2007
+++ textproc/meld/pkg-plist Thu Jul 5 03:33:28 2007
@@ -73,12 +73,18 @@
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/help/meld/es/figures/dirdiff.png
+share/gnome/help/meld/es/figures/filediff.png
+share/gnome/help/meld/es/meld.xml
share/gnome/omf/meld/meld-C.omf
+share/gnome/omf/meld/meld-es.omf
share/gnome/pixmaps/meld.png
+share/locale/ar/LC_MESSAGES/meld.mo
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/dz/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
@@ -139,6 +145,8 @@
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrm share/gnome/omf/meld
+ at dirrm share/gnome/help/meld/es/figures
+ at dirrm share/gnome/help/meld/es
@dirrm share/gnome/help/meld/C/figures
@dirrm share/gnome/help/meld/C
@dirrm share/gnome/help/meld
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list