mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Update to 1.1.5.1

Browse Source 
- Add optional dependency on pygnomedesktop for syntax highlighting
  (default off)

PR:		ports/114417
Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>
This commit is contained in:
Rong-En Fan 2007-07-11 03:51:45 +00:00
parent b8aa8fa974
commit a7f02bc295
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=195397
5 changed files with 32 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
textproc/meld/Makefile
View File

@ -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@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
USE_BZIP2= yes
USE_GNOME= pygnome2
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
MAKEFILE= GNUmakefile
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>

6
textproc/meld/distinfo
View File

@ -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

11
textproc/meld/files/patch-INSTALL
View File

@ -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

185
textproc/meld/files/patch-po-fixes
View File

@ -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

8
textproc/meld/pkg-plist
View File

@ -73,12 +73,18 @@ share/gnome/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/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 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrm share/gnome/omf/meld
@dirrm share/gnome/help/meld/es/figures
@dirrm share/gnome/help/meld/es
@dirrm share/gnome/help/meld/C/figures
@dirrm share/gnome/help/meld/C
@dirrm share/gnome/help/meld