From 951c257ea3655de6e80c26a36c18c69ee8047ea8 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 19 Mar 2007 05:14:07 +0000 Subject: Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME releases in that it focuses more on stability and functionality than on new features. Not that it doesn't have its share of new and exciting items. See http://www.gnome.org/start/2.18/ for all the goodies in this release. GNOME 2.18 for FreeBSD would not have been possible without the hard work of the FreeBSD GNOME Team and our intrepid band of testers including J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi, Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen, Phillip Neumann, Franz Klammer, and Neal Delmonico. --- www/epiphany-extensions/Makefile | 9 +++-- www/epiphany-extensions/distinfo | 6 ++-- www/epiphany-extensions/pkg-plist | 31 ++++++++++++++++- www/epiphany/Makefile | 4 +-- www/epiphany/distinfo | 6 ++-- www/epiphany/pkg-plist | 73 ++++++++++++++++++++++++++++++++++----- www/erwn/Makefile | 4 +-- www/evolution-webcal/Makefile | 4 +-- www/evolution-webcal/distinfo | 6 ++-- www/evolution-webcal/pkg-plist | 9 +++++ www/gtkhtml3/Makefile | 9 +++-- www/gtkhtml3/distinfo | 6 ++-- www/gtkhtml3/pkg-plist | 43 +---------------------- www/gtkhtml38/Makefile | 9 +++-- www/gtkhtml38/distinfo | 6 ++-- www/gtkhtml38/pkg-plist | 43 +---------------------- www/mozilla/Makefile | 5 ++- www/mozilla/Makefile.common | 31 ++++++----------- www/mozilla/bsd.gecko.mk | 2 +- www/mozilla/pkg-deinstall.in | 2 +- www/mozilla/pkg-install.in | 2 +- www/peacock/Makefile | 6 +++- 22 files changed, 161 insertions(+), 155 deletions(-) (limited to 'www') diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 70a86061aa57..b03128a8816e 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.78 2006/10/03 20:07:26 mezz Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.88 2007/03/11 20:34:21 mezz Exp $ # PORTNAME= epiphany -PORTVERSION= 2.16.1 +PORTVERSION= 2.18.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -33,9 +33,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-mozilla=${GECKO} +GCONF_SCHEMAS= smart-bookmarks.schemas + EPHY_EXTENSIONS=all +EPHY_VERSION= 2.18 -PLIST_SUB= VERSION="2.16" EPHY_VERSION="2.16" +PLIST_SUB= VERSION="2.18" EPHY_VERSION=${EPHY_VERSION} OPTIONS= OPENSP "Enable OpenSP SGML support" off \ ADBLOCK "Enable the adblock extension" on diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 706a35e6867e..624d53ca0530 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 93a8d37175dc1f173c0185c254de5c38 -SHA256 (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 315ef2eeaf2943830bdf04958af613dce62574aa6697acfab335a0b9e4f699c5 -SIZE (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 810858 +MD5 (gnome2/epiphany-extensions-2.18.0.tar.bz2) = c0a6218b6a8506f204891a0769ac9553 +SHA256 (gnome2/epiphany-extensions-2.18.0.tar.bz2) = 38c58fb43b6fcfecd80f8d36aa1a0ff1163c050195dda1ed074f5f605b007ff9 +SIZE (gnome2/epiphany-extensions-2.18.0.tar.bz2) = 892671 diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index fc38f54f0ca0..adaa34befc64 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -2,7 +2,11 @@ lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension %%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension -lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension +%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.ephy-extension +%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.py +%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyc +%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyo +%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension %%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py %%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc %%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo @@ -59,6 +63,7 @@ lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension share/gnome/epiphany-extensions/ephy-gestures.xml share/gnome/epiphany-extensions/glade/action-properties.glade share/gnome/epiphany-extensions/glade/actions-editor.glade +%%ADBLOCK%%share/gnome/epiphany-extensions/glade/adblock.glade share/gnome/epiphany-extensions/glade/error-viewer.glade share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade share/gnome/epiphany-extensions/glade/page-info.glade @@ -85,7 +90,29 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/C/legal.xml +share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-forward.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-fullscreen.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-homepage.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-tab.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-window.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-next-tab.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-prev-tab.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-reload.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-stop.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-up.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf +share/gnome/omf/epiphany-extensions/epiphany-extensions-sv.omf +share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @@ -127,6 +154,8 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @dirrm share/gnome/omf/epiphany-extensions +@dirrm share/gnome/help/epiphany-extensions/sv/figures +@dirrm share/gnome/help/epiphany-extensions/sv @dirrm share/gnome/help/epiphany-extensions/C/figures @dirrm share/gnome/help/epiphany-extensions/C @dirrm share/gnome/help/epiphany-extensions diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index d1bc8414e6fa..715e21c7c23d 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.128 2006/10/12 20:03:10 ahze Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.141 2007/03/11 20:12:27 mezz Exp $ # PORTNAME= epiphany -PORTVERSION= 2.16.3 +PORTVERSION= 2.18.0 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index fa9957900eac..609b848b3b20 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.16.3.tar.bz2) = 3ee93d168eb5720a96f4c7adf2cdf2d4 -SHA256 (gnome2/epiphany-2.16.3.tar.bz2) = a1a328d65dc95bd30d79b6434ae25db760f0d383baa9f25bb6862177e4d6f12d -SIZE (gnome2/epiphany-2.16.3.tar.bz2) = 4232106 +MD5 (gnome2/epiphany-2.18.0.tar.bz2) = 3ac47fcf7e9875885c3f4d53dac24b7c +SHA256 (gnome2/epiphany-2.18.0.tar.bz2) = 92c8f698a101ff2fdd9a83b96a5a37376be839df9d918c084c6551a7db587fd5 +SIZE (gnome2/epiphany-2.18.0.tar.bz2) = 4658364 diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index 9be25d1c4645..00f0b4d79202 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -66,12 +66,7 @@ share/dbus-1/services/org.gnome.Epiphany.service %%DOCSDIR%%/up.png share/gnome/applications/bme.desktop share/gnome/applications/epiphany.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -share/gnome/epiphany/art/epiphany-bookmarks.png -share/gnome/epiphany/art/epiphany-download.png -share/gnome/epiphany/art/epiphany-entry.png -share/gnome/epiphany/art/epiphany-history.png -share/gnome/epiphany/art/epiphany-popup-hidden.png +share/gnome/epiphany/about.ini share/gnome/epiphany/chrome/branding/brand.dtd share/gnome/epiphany/chrome/branding/brand.properties share/gnome/epiphany/chrome/epiphany.manifest @@ -91,6 +86,34 @@ share/gnome/epiphany/glade/epiphany.glade share/gnome/epiphany/glade/form-signing-dialog.glade share/gnome/epiphany/glade/prefs-dialog.glade share/gnome/epiphany/glade/print.glade +share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-view.png +share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-web.png +share/gnome/epiphany/icons/hicolor/16x16/actions/download.png +share/gnome/epiphany/icons/hicolor/16x16/actions/history-view.png +share/gnome/epiphany/icons/hicolor/16x16/actions/location-entry.png +share/gnome/epiphany/icons/hicolor/16x16/status/popup-hidden.png +share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-view.png +share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-web.png +share/gnome/epiphany/icons/hicolor/22x22/actions/download.png +share/gnome/epiphany/icons/hicolor/22x22/actions/history-view.png +share/gnome/epiphany/icons/hicolor/22x22/actions/location-entry.png +share/gnome/epiphany/icons/hicolor/22x22/status/popup-hidden.png +share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-view.png +share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-web.png +share/gnome/epiphany/icons/hicolor/24x24/actions/download.png +share/gnome/epiphany/icons/hicolor/24x24/actions/history-view.png +share/gnome/epiphany/icons/hicolor/24x24/actions/location-entry.png +share/gnome/epiphany/icons/hicolor/24x24/status/popup-hidden.png +share/gnome/epiphany/icons/hicolor/32x32/actions/bookmark-view.png +share/gnome/epiphany/icons/hicolor/32x32/actions/download.png +share/gnome/epiphany/icons/hicolor/32x32/actions/history-view.png +share/gnome/epiphany/icons/hicolor/32x32/actions/location-entry.png +share/gnome/epiphany/icons/hicolor/32x32/status/popup-hidden.png +share/gnome/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg +share/gnome/epiphany/icons/hicolor/scalable/actions/download.svg +share/gnome/epiphany/icons/hicolor/scalable/actions/history-view.svg +share/gnome/epiphany/icons/hicolor/scalable/actions/location-entry.svg +share/gnome/epiphany/icons/hicolor/scalable/status/popup-hidden.svg share/gnome/epiphany/mime-types-permissions.xml share/gnome/help/epiphany/C/epiphany.xml share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png @@ -108,6 +131,11 @@ share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.pn share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png share/gnome/help/epiphany/el/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/el/figures/ephy-screenshot.png +share/gnome/help/epiphany/en_GB/epiphany.xml +share/gnome/help/epiphany/en_GB/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/en_GB/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/en_GB/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/en_GB/figures/ephy-screenshot.png share/gnome/help/epiphany/es/epiphany.xml share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png @@ -128,6 +156,11 @@ share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.pn share/gnome/help/epiphany/fr/figures/ephy-bookmarkbar-smartbookmark-screenshot.png share/gnome/help/epiphany/fr/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/fr/figures/ephy-screenshot.png +share/gnome/help/epiphany/it/epiphany.xml +share/gnome/help/epiphany/it/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/it/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/it/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/it/figures/ephy-screenshot.png share/gnome/help/epiphany/ja/epiphany.xml share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png @@ -156,10 +189,12 @@ share/gnome/help/epiphany/uk/figures/ephy-screenshot.png share/gnome/omf/epiphany/epiphany-C.omf share/gnome/omf/epiphany/epiphany-bg.omf share/gnome/omf/epiphany/epiphany-el.omf +share/gnome/omf/epiphany/epiphany-en_GB.omf share/gnome/omf/epiphany/epiphany-es.omf share/gnome/omf/epiphany/epiphany-eu.omf share/gnome/omf/epiphany/epiphany-fi.omf share/gnome/omf/epiphany/epiphany-fr.omf +share/gnome/omf/epiphany/epiphany-it.omf share/gnome/omf/epiphany/epiphany-ja.omf share/gnome/omf/epiphany/epiphany-nl.omf share/gnome/omf/epiphany/epiphany-ru.omf @@ -242,6 +277,7 @@ share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo share/locale/zh_HK/LC_MESSAGES/epiphany.mo share/locale/zh_TW/LC_MESSAGES/epiphany.mo +%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs @dirrm share/gnome/omf/epiphany @dirrm share/gnome/help/epiphany/uk/figures @dirrm share/gnome/help/epiphany/uk @@ -253,6 +289,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/help/epiphany/nl @dirrm share/gnome/help/epiphany/ja/figures @dirrm share/gnome/help/epiphany/ja +@dirrm share/gnome/help/epiphany/it/figures +@dirrm share/gnome/help/epiphany/it @dirrm share/gnome/help/epiphany/fr/figures @dirrm share/gnome/help/epiphany/fr @dirrm share/gnome/help/epiphany/fi/figures @@ -261,6 +299,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/help/epiphany/eu @dirrm share/gnome/help/epiphany/es/figures @dirrm share/gnome/help/epiphany/es +@dirrm share/gnome/help/epiphany/en_GB/figures +@dirrm share/gnome/help/epiphany/en_GB @dirrm share/gnome/help/epiphany/el/figures @dirrm share/gnome/help/epiphany/el @dirrm share/gnome/help/epiphany/bg/figures @@ -268,6 +308,23 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/help/epiphany/C/figures @dirrm share/gnome/help/epiphany/C @dirrm share/gnome/help/epiphany +@dirrm share/gnome/epiphany/icons/hicolor/scalable/status +@dirrm share/gnome/epiphany/icons/hicolor/scalable/actions +@dirrm share/gnome/epiphany/icons/hicolor/scalable +@dirrm share/gnome/epiphany/icons/hicolor/32x32/status +@dirrm share/gnome/epiphany/icons/hicolor/32x32/actions +@dirrm share/gnome/epiphany/icons/hicolor/32x32 +@dirrm share/gnome/epiphany/icons/hicolor/24x24/status +@dirrm share/gnome/epiphany/icons/hicolor/24x24/actions +@dirrm share/gnome/epiphany/icons/hicolor/24x24 +@dirrm share/gnome/epiphany/icons/hicolor/22x22/status +@dirrm share/gnome/epiphany/icons/hicolor/22x22/actions +@dirrm share/gnome/epiphany/icons/hicolor/22x22 +@dirrm share/gnome/epiphany/icons/hicolor/16x16/status +@dirrm share/gnome/epiphany/icons/hicolor/16x16/actions +@dirrm share/gnome/epiphany/icons/hicolor/16x16 +@dirrm share/gnome/epiphany/icons/hicolor +@dirrm share/gnome/epiphany/icons @dirrm share/gnome/epiphany/glade @dirrm share/gnome/epiphany/chrome/global @dirrm share/gnome/epiphany/chrome/branding @@ -281,10 +338,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany @dirrm include/epiphany/%%EPHY_VERSION%% @dirrm include/epiphany +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -%%PYTHON%%@cwd %%LOCALBASE%% -%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs -%%PYTHON%%@cwd %%EPHY_PREFIX%% @dirrmtry share/locale/zh_TW/LC_MESSAGES @dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES diff --git a/www/erwn/Makefile b/www/erwn/Makefile index 283c6ddc245d..5c237b4ce2c7 100644 --- a/www/erwn/Makefile +++ b/www/erwn/Makefile @@ -7,7 +7,7 @@ PORTNAME= erwn PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www editors MASTER_SITES= http://lisas.de/erwin/ DISTNAME= erwin-${PORTVERSION} @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes MAN1= erwin.1 post-patch: - @${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.8|g" \ + @${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.14|g" \ ${WRKSRC}/configure post-install: diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 52363d877848..e16cc25eac41 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -3,11 +3,11 @@ # Whom: Koop Mast # # $FreeBSD$ -# $MCom: ports/www/evolution-webcal/Makefile,v 1.41 2006/09/04 05:53:25 marcus Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.46 2007/03/13 20:47:20 mezz Exp $ # PORTNAME= webcal -PORTVERSION= 2.8.0 +PORTVERSION= 2.10.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index 251b8a724312..1e808f3dd7a0 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.8.0.tar.bz2) = 6dd4821ce90e238acbd8a959fee1ee14 -SHA256 (evolution-webcal-2.8.0.tar.bz2) = 485fb66cd50ba18dde547653cd6a41443a08be74293833552bdde49f402fb554 -SIZE (evolution-webcal-2.8.0.tar.bz2) = 162495 +MD5 (evolution-webcal-2.10.0.tar.bz2) = a29004e6e1ad977845ed7c68963c8925 +SHA256 (evolution-webcal-2.10.0.tar.bz2) = 4017850f067d1b08f7b76b94988978f8f63ecfc8d201c910ea5d6119097add15 +SIZE (evolution-webcal-2.10.0.tar.bz2) = 163306 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index 0fd96d489f15..19e0896fa81e 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -1,5 +1,6 @@ libexec/evolution-webcal share/locale/ar/LC_MESSAGES/evolution-webcal.mo +share/locale/as/LC_MESSAGES/evolution-webcal.mo share/locale/az/LC_MESSAGES/evolution-webcal.mo share/locale/bg/LC_MESSAGES/evolution-webcal.mo share/locale/bn/LC_MESSAGES/evolution-webcal.mo @@ -29,6 +30,7 @@ share/locale/it/LC_MESSAGES/evolution-webcal.mo share/locale/ja/LC_MESSAGES/evolution-webcal.mo share/locale/ka/LC_MESSAGES/evolution-webcal.mo share/locale/ko/LC_MESSAGES/evolution-webcal.mo +share/locale/ku/LC_MESSAGES/evolution-webcal.mo share/locale/ky/LC_MESSAGES/evolution-webcal.mo share/locale/lt/LC_MESSAGES/evolution-webcal.mo share/locale/lv/LC_MESSAGES/evolution-webcal.mo @@ -54,6 +56,7 @@ share/locale/sr/LC_MESSAGES/evolution-webcal.mo share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo share/locale/sv/LC_MESSAGES/evolution-webcal.mo share/locale/ta/LC_MESSAGES/evolution-webcal.mo +share/locale/te/LC_MESSAGES/evolution-webcal.mo share/locale/th/LC_MESSAGES/evolution-webcal.mo share/locale/tr/LC_MESSAGES/evolution-webcal.mo share/locale/ug/LC_MESSAGES/evolution-webcal.mo @@ -75,6 +78,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te @dirrmtry share/locale/sr/LC_MESSAGES @dirrmtry share/locale/sr @dirrmtry share/locale/sl/LC_MESSAGES @@ -95,6 +100,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/mr @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrmtry share/locale/ko/LC_MESSAGES @dirrmtry share/locale/ko @dirrmtry share/locale/gl/LC_MESSAGES @@ -111,3 +118,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index ca6ba20c293c..7751191b948c 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.12.3 +PORTVERSION= 3.14.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,13 +23,12 @@ USE_GETTEXT= yes USE_BZIP2= yes USE_XLIB= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \ - libgnomeprintui ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="3.8" +PLIST_SUB= VERSION="3.14" .include diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 4d3396cc67fd..5c08be207010 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.12.3.tar.bz2) = b580590014988b02e51b66be65319570 -SHA256 (gnome2/gtkhtml-3.12.3.tar.bz2) = 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847 -SIZE (gnome2/gtkhtml-3.12.3.tar.bz2) = 1284704 +MD5 (gnome2/gtkhtml-3.14.0.tar.bz2) = 633fe78fc9b28e013bed269848aa0f9b +SHA256 (gnome2/gtkhtml-3.14.0.tar.bz2) = ca18d5bf20dee45175dc4517b01ff926b0f7bf62a09ed8c97aaa43dd7b0833c7 +SIZE (gnome2/gtkhtml-3.14.0.tar.bz2) = 1273500 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index b8be05dbf59f..1a964af4bdf9 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -14,45 +14,24 @@ lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.a lib/libgtkhtml-%%VERSION%%.la lib/libgtkhtml-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.so.15 +lib/libgtkhtml-%%VERSION%%.so.19 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc share/gnome/gtkhtml-%%VERSION%%/Editor.idl share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png -share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png -share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png -share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png -share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png -share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png -share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg share/gnome/gtkhtml-%%VERSION%%/icons/paper.png -share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png share/gnome/gtkhtml-%%VERSION%%/icons/rect.png -share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png @@ -60,28 +39,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png -share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png share/gnome/gtkhtml-%%VERSION%%/icons/texture.png share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png -share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index ca6ba20c293c..7751191b948c 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.12.3 +PORTVERSION= 3.14.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,13 +23,12 @@ USE_GETTEXT= yes USE_BZIP2= yes USE_XLIB= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \ - libgnomeprintui ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="3.8" +PLIST_SUB= VERSION="3.14" .include diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo index 4d3396cc67fd..5c08be207010 100644 --- a/www/gtkhtml38/distinfo +++ b/www/gtkhtml38/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.12.3.tar.bz2) = b580590014988b02e51b66be65319570 -SHA256 (gnome2/gtkhtml-3.12.3.tar.bz2) = 666849b22375efbaf2ab506b33868ac64126728a8e509f055882ae6940999847 -SIZE (gnome2/gtkhtml-3.12.3.tar.bz2) = 1284704 +MD5 (gnome2/gtkhtml-3.14.0.tar.bz2) = 633fe78fc9b28e013bed269848aa0f9b +SHA256 (gnome2/gtkhtml-3.14.0.tar.bz2) = ca18d5bf20dee45175dc4517b01ff926b0f7bf62a09ed8c97aaa43dd7b0833c7 +SIZE (gnome2/gtkhtml-3.14.0.tar.bz2) = 1273500 diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist index b8be05dbf59f..1a964af4bdf9 100644 --- a/www/gtkhtml38/pkg-plist +++ b/www/gtkhtml38/pkg-plist @@ -14,45 +14,24 @@ lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.a lib/libgtkhtml-%%VERSION%%.la lib/libgtkhtml-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.so.15 +lib/libgtkhtml-%%VERSION%%.so.19 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc share/gnome/gtkhtml-%%VERSION%%/Editor.idl share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png -share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png -share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png -share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png -share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png -share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png -share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg share/gnome/gtkhtml-%%VERSION%%/icons/paper.png -share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png share/gnome/gtkhtml-%%VERSION%%/icons/rect.png -share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png @@ -60,28 +39,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png -share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png -share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png share/gnome/gtkhtml-%%VERSION%%/icons/texture.png share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png -share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png -share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index ea04ea242d34..9fe9ba00a314 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,12 +3,11 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports-stable/www/mozilla/Makefile,v 1.15 2006/10/18 17:29:07 ahze Exp $ -# +# $MCom: ports/www/mozilla/Makefile,v 1.43 2007/03/16 15:29:49 ahze Exp $ PORTNAME= mozilla PORTVERSION= 1.7.13 -PORTREVISION?= 2 +PORTREVISION?= 1 PORTEPOCH= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index ba37784260a8..784085b98cf0 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,7 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports-stable/www/mozilla/Makefile.common,v 1.1 2006/10/18 17:29:07 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.45 2007/02/06 00:05:55 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, @@ -87,19 +87,16 @@ GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig MOZILLA_PLIST_DIRS?= bin include lib share/idl - +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -MASTER_MOZDIR?= ${.CURDIR}/../../www/mozilla +MASTER_MOZDIR?= ${PORTSDIR}/www/mozilla PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST \ --exclude mozilla/modules/libimg/png \ --exclude mozilla/jpeg \ --exclude mozilla/dbm \ @@ -111,12 +108,12 @@ JPI_LIST?=\ ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so -PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ +MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin -CPPFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} +LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv _USE_GECKO_OPTIONS_ALL= java debug logging optimized_cflags @@ -138,9 +135,10 @@ _${option}= ${TRUE} .endfor # Standard options from README +MOZ_TOOLKIT?= gtk2 MOZ_OPTIONS+= --enable-crypto \ --disable-tests \ - --enable-default-toolkit=gtk2 \ + --enable-default-toolkit=${MOZ_TOOLKIT} \ --enable-xft \ --with-pthreads # Configure options for install @@ -222,13 +220,6 @@ MOZ_OPTIONS+= --enable-logging MOZ_OPTIONS+= --disable-logging .endif -.if exists(${LOCALBASE}/include/freetype/freetype.h) -BROKEN= "You must upgrade your freetype port to 1.3.1_2 or higher before \ - installing ${PORTNAME}. If you have 1.3.1_2 installed, please remove \ - ${LOCALBASE}/include/freetype, then build ${PORTNAME}" -.endif - -# Makefile.common defines MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ -e 's|@CFLAGS@|${CFLAGS}|g' \ -e 's|@LDFLAGS@|${LDFLAGS}|g' \ @@ -351,7 +342,7 @@ gecko-pre-install: .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none" ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA} ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config -.for pc in ${PKGCONFIG_FILES:S|${MOZILLA_SUFX}||} +.for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||} ${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \ ${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc .endfor @@ -386,7 +377,7 @@ gecko-create-plist: ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST} .endfor -.for pcfile in ${PKGCONFIG_FILES} +.for pcfile in ${MOZ_PKGCONFIG_FILES} ${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLIST} @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ -e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \ @@ -409,7 +400,7 @@ gecko-do-install: cd ${FAKEDIR}/${dir} && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir} .endfor -.for pcfile in ${PKGCONFIG_FILES} +.for pcfile in ${MOZ_PKGCONFIG_FILES} ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/${pcfile}.pc .endfor diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index d6923aa368b5..b27dc306b473 100644 --- a/www/mozilla/bsd.gecko.mk +++ b/www/mozilla/bsd.gecko.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # $FreeBSD$ -# $MCom: ports-stable/www/mozilla/bsd.gecko.mk,v 1.3 2006/10/24 17:48:39 ahze Exp $ +# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.30 2006/12/09 15:32:06 ahze Exp $ # # 4 column tabs prevent hair loss and tooth decay! diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in index 535f0f50ae43..4a0a2fba8c36 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.9 2006/10/18 17:29:07 ahze Exp $ +# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.19 2006/12/09 15:32:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas () diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in index f3d6e6f1a67f..8fcc2b0ea088 100644 --- a/www/mozilla/pkg-install.in +++ b/www/mozilla/pkg-install.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $MCom: ports-stable/www/mozilla/pkg-install.in,v 1.9 2006/10/18 17:29:07 ahze Exp $ +# $MCom: ports/www/mozilla/pkg-install.in,v 1.19 2006/12/09 15:32:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas () diff --git a/www/peacock/Makefile b/www/peacock/Makefile index 09918aea73aa..ebc4bf3bf1ac 100644 --- a/www/peacock/Makefile +++ b/www/peacock/Makefile @@ -7,7 +7,7 @@ PORTNAME= peacock PORTVERSION= 1.9.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,4 +20,8 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack libgnomeui gtksourceview gtkhtml3 GNU_CONFIGURE= yes +post-patch: + @${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \ + ${WRKSRC}/configure + .include -- cgit v1.2.3