diff options
| -rw-r--r-- | textproc/meld/Makefile | 33 | ||||
| -rw-r--r-- | textproc/meld/distinfo | 6 | ||||
| -rw-r--r-- | textproc/meld/files/patch-INSTALL | 11 | ||||
| -rw-r--r-- | textproc/meld/files/patch-po-fixes | 185 | ||||
| -rw-r--r-- | textproc/meld/pkg-plist | 8 | ||||
| -rw-r--r-- | textproc/scrollkeeper/Makefile | 4 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 3 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 4 | ||||
| -rw-r--r-- | www/mozilla/bsd.gecko.mk | 2 | ||||
| -rw-r--r-- | x11-fm/gnome-commander/Makefile | 8 | ||||
| -rw-r--r-- | x11-themes/gnome-backgrounds/Makefile | 6 | ||||
| -rw-r--r-- | x11-themes/gnome-backgrounds/distinfo | 6 | ||||
| -rw-r--r-- | x11-themes/gnome-backgrounds/pkg-plist | 6 | ||||
| -rw-r--r-- | x11/gnome-panel/Makefile | 4 |
14 files changed, 53 insertions, 233 deletions
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile index 4b1cc0ba4..b4be8d051 100644 --- a/textproc/meld/Makefile +++ b/textproc/meld/Makefile @@ -3,42 +3,37 @@ # Whom: Pav Lucistnik <pav@oook.cz> # # $FreeBSD$ -# $MCom: ports/textproc/meld/Makefile,v 1.5 2007/05/01 13:12:43 ahze Exp $ +# PORTNAME= meld -PORTVERSION= 1.1.4 -PORTREVISION= 4 +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 +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 - - @${FIND} ${WRKSRC}/help -type f -name ${MAKEFILE} -exec \ - ${REINPLACE_CMD} \ - 's|$$(prefix)/var/lib/scrollkeeper|/var/db/scrollkeeper|g' \ - "{}" \; + @${FIND} ${WRKSRC} -name "${MAKEFILE}" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g' .include <bsd.port.pre.mk> -.if defined (WITH_PYGNOMEDESKTOP) + +.if defined(WITH_PYGNOMEDESKTOP) USE_GNOME+= pygnomedesktop .endif + .include <bsd.port.post.mk> diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo index bc62631cf..939300359 100644 --- a/textproc/meld/distinfo +++ b/textproc/meld/distinfo @@ -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 --git a/textproc/meld/files/patch-INSTALL b/textproc/meld/files/patch-INSTALL deleted file mode 100644 index 88628484f..000000000 --- a/textproc/meld/files/patch-INSTALL +++ /dev/null @@ -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 --git a/textproc/meld/files/patch-po-fixes b/textproc/meld/files/patch-po-fixes deleted file mode 100644 index 12915d61c..000000000 --- a/textproc/meld/files/patch-po-fixes +++ /dev/null @@ -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 --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist index c306c87db..d1105a6cc 100644 --- a/textproc/meld/pkg-plist +++ b/textproc/meld/pkg-plist @@ -73,12 +73,18 @@ share/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/omf/meld/meld-C.omf +share/omf/meld/meld-es.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 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/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 diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index 3eef17b76..04f0be593 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -3,11 +3,11 @@ # Whom: Rene Hexel <rh@netbsd.org> # # $FreeBSD$ -# $MCom: ports/textproc/scrollkeeper/Makefile,v 1.7 2007/02/20 20:26:47 marcus Exp $ +# $MCom: ports/textproc/scrollkeeper/Makefile,v 1.9 2007/04/26 15:01:41 ahze Exp $ PORTNAME= scrollkeeper PORTVERSION= 0.3.14 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 2d4a91a00..dd10a7ce7 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,7 +3,8 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.43 2007/03/16 15:29:49 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile,v 1.45 2007/07/05 17:01:49 ahze Exp $ +# PORTNAME= mozilla PORTVERSION= 1.7.13 diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index c1be222e9..31c09bf6f 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,8 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.45 2007/02/06 00:05:55 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.47 2007/07/05 17:01:49 ahze Exp $ +# # This file contains some reusable components for mozilla ports. It's of # use primarily to apps from the mozilla project itself (such as Firefox, @@ -97,7 +98,6 @@ PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ - --exclude mozilla/modules/libimg/png \ --exclude mozilla/jpeg \ --exclude mozilla/dbm \ --exclude mozilla/security/nss \ diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index b27dc306b..d7ba05e0e 100644 --- a/www/mozilla/bsd.gecko.mk +++ b/www/mozilla/bsd.gecko.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # $FreeBSD$ -# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.30 2006/12/09 15:32:06 ahze Exp $ +# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.32 2007/07/05 17:01:49 ahze Exp $ # # 4 column tabs prevent hair loss and tooth decay! diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile index c80cb654b..b950f6c1c 100644 --- a/x11-fm/gnome-commander/Makefile +++ b/x11-fm/gnome-commander/Makefile @@ -31,6 +31,12 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 700042 +BROKEN= Broken with gcc 4.2 +.endif + pre-everything:: .if !defined(WITH_FAM) @${ECHO} "" @@ -39,4 +45,4 @@ pre-everything:: @${ECHO} "" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index ce367972a..0d3a0d39a 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.28 2007/04/28 17:25:25 marcus Exp $ +# $MCom$ # PORTNAME= gnome-backgrounds -PORTVERSION= 2.16.2 -PORTREVISION= 2 +PORTVERSION= 2.18.3 +PORTREVISION= 1 CATEGORIES= x11-themes graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo index 40a613ce9..804ac1709 100644 --- a/x11-themes/gnome-backgrounds/distinfo +++ b/x11-themes/gnome-backgrounds/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-backgrounds-2.16.2.tar.bz2) = 765c19d28d39483769687691941129c9 -SHA256 (gnome2/gnome-backgrounds-2.16.2.tar.bz2) = ed5a97b18dca423c8af26d9c7f1ee50d12c71bbd159313c2ba30b317030f5bb1 -SIZE (gnome2/gnome-backgrounds-2.16.2.tar.bz2) = 1200777 +MD5 (gnome2/gnome-backgrounds-2.18.3.tar.bz2) = d91b925d358d2cbc705b4a033e7d5c2e +SHA256 (gnome2/gnome-backgrounds-2.18.3.tar.bz2) = dfbd4d65a738c37b086fc17000e546e1e080e281bd36677f6f4d081a60a36500 +SIZE (gnome2/gnome-backgrounds-2.18.3.tar.bz2) = 1211585 diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index 02218bac4..245bbf70e 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -14,6 +14,7 @@ share/pixmaps/backgrounds/gnome/translucent/tentacles.svg share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo share/locale/as/LC_MESSAGES/gnome-backgrounds.mo share/locale/be/LC_MESSAGES/gnome-backgrounds.mo +share/locale/be@latin/LC_MESSAGES/gnome-backgrounds.mo share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo share/locale/bn/LC_MESSAGES/gnome-backgrounds.mo share/locale/bn_IN/LC_MESSAGES/gnome-backgrounds.mo @@ -56,6 +57,7 @@ share/locale/nb/LC_MESSAGES/gnome-backgrounds.mo share/locale/ne/LC_MESSAGES/gnome-backgrounds.mo share/locale/nl/LC_MESSAGES/gnome-backgrounds.mo share/locale/nn/LC_MESSAGES/gnome-backgrounds.mo +share/locale/oc/LC_MESSAGES/gnome-backgrounds.mo share/locale/or/LC_MESSAGES/gnome-backgrounds.mo share/locale/pa/LC_MESSAGES/gnome-backgrounds.mo share/locale/pl/LC_MESSAGES/gnome-backgrounds.mo @@ -95,6 +97,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -109,5 +113,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 7b41bb6d6..c06276327 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.154 2007/06/18 12:38:17 ahze Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.155 2007/07/08 23:34:00 mezz Exp $ # PORTNAME= gnome-panel @@ -46,7 +46,7 @@ GCONF_SCHEMAS= clock.schemas fish.schemas \ OPTIONS= EVOLUTION "use the Evolution calendar if installed" on -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME WITH_GNOME= yes .endif |