From f1bb12de8e50bf76ae21f37debda60994ec7fd99 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 14 Oct 2006 08:35:50 +0000 Subject: Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive amount of work by the FreeBSD GNOME Team and our testers. On top of the usual GNOME update, we have taken this opportunity to move GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of the GNOME Desktop also need to be changed. The bulk of the move was carried out by ahze, mezz, and pav, but it would not have been possible without cooperation from the FreeBSD KDE team who worked with us to make sure GNOME and KDE can still coexist happily. We would also like to send a shout out to kris and pointyhat for putting up with multiple test runs until we got something that was solid. Back to GNOME 2.16. This release brings a huge amount of new functionality to FreeBSD. The standard release notes can be read at http://www.gnome.org/start/2.16/ . But on top of what you will read there, jylefort and marcus have completed work on a port of HAL to FreeBSD. This will allow FreeBSD to take advantage of closer hardware interaction such as auto-mounting CD-ROMs, USB drives, and music players; auto-playing audio CDs; and managing laptop power consumption. But where would this all be without our loyal testers and contributors? Therefore, the FreeBSD GNOME team would like to thank the following users: Phillip Neumann tmclaugh mux Yuri Pankov chinsan Thomas Brian Gruber Franz Klammer Dominique Goncalves Pascal Hofstee Yasuda Keisuke backyard Andris Raugulis Eric L. Chen Pawel Worach QuiRK on #freebsd-gnome Shane Bell luigi sajd on #freebsd-gnome sat Chris Coleman kaeru on #freebsd-gnome crsd_ via irc.freenode.org/#FreeBSD-GNOME Joel Diaz Enjoy! Approved by: portmgr (implicit, kris) --- www/epiphany-extensions/Makefile | 8 +-- www/epiphany-extensions/distinfo | 6 +- www/epiphany-extensions/pkg-plist | 37 +++++++++- www/epiphany/Makefile | 24 ++++--- www/epiphany/distinfo | 6 +- www/epiphany/pkg-plist | 95 ++++++++++++++++++++++---- www/evolution-webcal/Makefile | 7 +- www/evolution-webcal/distinfo | 6 +- www/evolution-webcal/pkg-plist | 44 ++++++++++++ www/firefox-esr/Makefile | 10 +-- www/firefox-esr/files/patch-configure | 9 +-- www/firefox-esr/pkg-message | 2 +- www/firefox/Makefile | 10 +-- www/firefox/files/patch-configure | 9 +-- www/firefox/pkg-message | 2 +- www/firefox15/Makefile | 10 +-- www/firefox15/files/patch-configure | 9 +-- www/firefox15/pkg-message | 2 +- www/firefox36/Makefile | 10 +-- www/firefox36/files/patch-configure | 9 +-- www/firefox36/pkg-message | 2 +- www/gstreamer-plugins-neon/Makefile | 17 +++++ www/mozilla/Makefile | 6 +- www/mozilla/Makefile.common | 68 ++++++++++++------ www/mozilla/bsd.gecko.mk | 20 +++--- www/mozilla/files/patch-gfx_src_ps_nsType1.cpp | 58 ++++++++++++++++ www/mozilla/pkg-deinstall.in | 4 +- www/mozilla/pkg-install.in | 4 +- 28 files changed, 354 insertions(+), 140 deletions(-) create mode 100644 www/gstreamer-plugins-neon/Makefile create mode 100644 www/mozilla/files/patch-gfx_src_ps_nsType1.cpp (limited to 'www') diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index be9f2e0cab97..a28b48cfb275 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.72 2006/04/24 04:49:23 marcus Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.78 2006/10/03 20:07:26 mezz Exp $ # PORTNAME= epiphany -PORTVERSION= 2.14.1.1 +PORTVERSION= 2.16.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,7 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox USE_GNOME= gnomeprefix gnomehack intlhack gnometarget INSTALLS_OMF= yes @@ -35,7 +35,7 @@ CONFIGURE_ARGS= --with-mozilla=${GECKO} EPHY_EXTENSIONS=all -PLIST_SUB= VERSION="2.14" EPHY_VERSION="2.14" +PLIST_SUB= VERSION="2.16" EPHY_VERSION="2.16" 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 8aebb85f91ab..706a35e6867e 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = 3e807a83f068e41ce34c3c653a3353b6 -SHA256 (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = a83b5e0e38afc254a22a430697f29f1fa7db9d6e52ebc16ee793f39a28a310d2 -SIZE (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = 789039 +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 diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index 1c4008cdd651..fc38f54f0ca0 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -107,7 +107,6 @@ share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/no/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @@ -120,13 +119,13 @@ share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/th/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/tr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/vi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo 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 -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw @dirrm share/gnome/omf/epiphany-extensions @dirrm share/gnome/help/epiphany-extensions/C/figures @dirrm share/gnome/help/epiphany-extensions/C @@ -138,3 +137,35 @@ share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @dirrmtry lib/epiphany/%%VERSION%%/plugins @dirrmtry lib/epiphany/%%VERSION%% @dirrmtry lib/epiphany +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index a2886a882de5..543f1a2d2fcb 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,43 +3,44 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.112 2006/04/13 07:52:38 bland Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.128 2006/10/12 20:03:10 ahze Exp $ # PORTNAME= epiphany -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 +PORTREVISION= 1 CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +USE_LDCONFIG= yes +INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_PYTHON= yes GNOME_DESKTOP_VERSION=2 -USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \ - libgnomeprintui +USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox xulrunner +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --with-mozilla=${GECKO} +CONFIGURE_ARGS= --with-mozilla=${GECKO} --mandir=${PREFIX}/man CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \ epiphany-fonts.schemas epiphany-pango.schemas -PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}" \ +PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \ EPHY_PREFIX="${PREFIX}" MAN1= epiphany.1 @@ -51,6 +52,7 @@ WITH_GNOME= yes .include .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" NO_WERROR= yes # allow build with more warnings enabled diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index b192208b751d..7829042ac7cc 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.14.3.tar.bz2) = 40ec39f661ed603d15dc01c86e08d384 -SHA256 (gnome2/epiphany-2.14.3.tar.bz2) = 1acc18428a14806a767f4a10c51d235483dc48b8f42f75c4afe95487f7cf36a0 -SIZE (gnome2/epiphany-2.14.3.tar.bz2) = 3626121 +MD5 (gnome2/epiphany-2.16.1.tar.bz2) = 25fecb147b1c68cc71d2af2bac727724 +SHA256 (gnome2/epiphany-2.16.1.tar.bz2) = edc36ae24624cae00aa06dde6475c31574d5fc281612dfd1e51cda63c7a9300a +SIZE (gnome2/epiphany-2.16.1.tar.bz2) = 3761594 diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index b2ecc45df1d5..9be25d1c4645 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -88,6 +88,7 @@ share/gnome/epiphany/epiphany-ui.xml share/gnome/epiphany/epiphany.xhtml share/gnome/epiphany/glade/certificate-dialogs.glade 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/mime-types-permissions.xml @@ -122,6 +123,11 @@ share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.pn share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/fi/figures/ephy-screenshot.png +share/gnome/help/epiphany/fr/epiphany.xml +share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.png +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/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 @@ -132,6 +138,11 @@ share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.pn share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/nl/figures/ephy-screenshot.png +share/gnome/help/epiphany/ru/epiphany.xml +share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/ru/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/ru/figures/ephy-screenshot.png share/gnome/help/epiphany/sv/epiphany.xml share/gnome/help/epiphany/sv/figures/ephy-addressbar-smartbookmark-screenshot.png share/gnome/help/epiphany/sv/figures/ephy-bookmarkbar-smartbookmark-screenshot.png @@ -148,18 +159,20 @@ share/gnome/omf/epiphany/epiphany-el.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-ja.omf share/gnome/omf/epiphany/epiphany-nl.omf +share/gnome/omf/epiphany/epiphany-ru.omf share/gnome/omf/epiphany/epiphany-sv.omf share/gnome/omf/epiphany/epiphany-uk.omf -share/gnome/pixmaps/epiphany-bookmarks.png +share/icons/hicolor/48x48/apps/epiphany-bookmarks.png share/locale/am/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo share/locale/az/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo share/locale/bg/LC_MESSAGES/epiphany.mo share/locale/bn/LC_MESSAGES/epiphany.mo -share/locale/br/LC_MESSAGES/epiphany.mo +share/locale/bn_IN/LC_MESSAGES/epiphany.mo share/locale/bs/LC_MESSAGES/epiphany.mo share/locale/ca/LC_MESSAGES/epiphany.mo share/locale/cs/LC_MESSAGES/epiphany.mo @@ -193,16 +206,18 @@ share/locale/ku/LC_MESSAGES/epiphany.mo share/locale/li/LC_MESSAGES/epiphany.mo share/locale/lt/LC_MESSAGES/epiphany.mo share/locale/lv/LC_MESSAGES/epiphany.mo +share/locale/mg/LC_MESSAGES/epiphany.mo share/locale/mi/LC_MESSAGES/epiphany.mo share/locale/mk/LC_MESSAGES/epiphany.mo share/locale/ml/LC_MESSAGES/epiphany.mo share/locale/mn/LC_MESSAGES/epiphany.mo +share/locale/mr/LC_MESSAGES/epiphany.mo share/locale/ms/LC_MESSAGES/epiphany.mo share/locale/nb/LC_MESSAGES/epiphany.mo share/locale/ne/LC_MESSAGES/epiphany.mo share/locale/nl/LC_MESSAGES/epiphany.mo share/locale/nn/LC_MESSAGES/epiphany.mo -share/locale/no/LC_MESSAGES/epiphany.mo +share/locale/or/LC_MESSAGES/epiphany.mo share/locale/pa/LC_MESSAGES/epiphany.mo share/locale/pl/LC_MESSAGES/epiphany.mo share/locale/pt/LC_MESSAGES/epiphany.mo @@ -227,27 +242,19 @@ 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 -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/mi/LC_MESSAGES -@dirrmtry share/locale/mi -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/br/LC_MESSAGES -@dirrmtry share/locale/br @dirrm share/gnome/omf/epiphany @dirrm share/gnome/help/epiphany/uk/figures @dirrm share/gnome/help/epiphany/uk @dirrm share/gnome/help/epiphany/sv/figures @dirrm share/gnome/help/epiphany/sv +@dirrm share/gnome/help/epiphany/ru/figures +@dirrm share/gnome/help/epiphany/ru @dirrm share/gnome/help/epiphany/nl/figures @dirrm share/gnome/help/epiphany/nl @dirrm share/gnome/help/epiphany/ja/figures @dirrm share/gnome/help/epiphany/ja +@dirrm share/gnome/help/epiphany/fr/figures +@dirrm share/gnome/help/epiphany/fr @dirrm share/gnome/help/epiphany/fi/figures @dirrm share/gnome/help/epiphany/fi @dirrm share/gnome/help/epiphany/eu/figures @@ -278,3 +285,61 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo %%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 +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk +@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 +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@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 +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 240f13068110..52363d877848 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.37 2006/04/15 06:53:55 marcus Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.41 2006/09/04 05:53:25 marcus Exp $ # PORTNAME= webcal -PORTVERSION= 2.6.0 +PORTVERSION= 2.8.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,10 +17,11 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Webcal(endar) handler for gnome -USE_X_PREFIX= yes +USE_XLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes +USE_PERL= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index 930fe4babf9c..251b8a724312 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.6.0.tar.bz2) = c779dcfc1db419f019abfcaafd6b8e4d -SHA256 (evolution-webcal-2.6.0.tar.bz2) = 93f3ecb53a0ef30d04e7113355f6566cbac939ca2f995d3347e7bb1b3f5f5a80 -SIZE (evolution-webcal-2.6.0.tar.bz2) = 151657 +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 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index 0f6f3709673a..0fd96d489f15 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -3,6 +3,7 @@ share/locale/ar/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 +share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo share/locale/bs/LC_MESSAGES/evolution-webcal.mo share/locale/ca/LC_MESSAGES/evolution-webcal.mo share/locale/cs/LC_MESSAGES/evolution-webcal.mo @@ -30,7 +31,10 @@ share/locale/ka/LC_MESSAGES/evolution-webcal.mo share/locale/ko/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 share/locale/mk/LC_MESSAGES/evolution-webcal.mo +share/locale/ml/LC_MESSAGES/evolution-webcal.mo +share/locale/mr/LC_MESSAGES/evolution-webcal.mo share/locale/ms/LC_MESSAGES/evolution-webcal.mo share/locale/nb/LC_MESSAGES/evolution-webcal.mo share/locale/ne/LC_MESSAGES/evolution-webcal.mo @@ -44,6 +48,7 @@ share/locale/ro/LC_MESSAGES/evolution-webcal.mo share/locale/ru/LC_MESSAGES/evolution-webcal.mo share/locale/rw/LC_MESSAGES/evolution-webcal.mo share/locale/sk/LC_MESSAGES/evolution-webcal.mo +share/locale/sl/LC_MESSAGES/evolution-webcal.mo share/locale/sq/LC_MESSAGES/evolution-webcal.mo share/locale/sr/LC_MESSAGES/evolution-webcal.mo share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo @@ -56,14 +61,53 @@ share/locale/uk/LC_MESSAGES/evolution-webcal.mo share/locale/vi/LC_MESSAGES/evolution-webcal.mo share/locale/xh/LC_MESSAGES/evolution-webcal.mo share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo +share/locale/zh_HK/LC_MESSAGES/evolution-webcal.mo share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ne/LC_MESSAGES +@dirrmtry share/locale/ne +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 7ed74bfeafa2..f5b9ce6e48bf 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,21 +3,20 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ -# +# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $ PORTNAME= firefox DISTVERSION= 1.5.0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -76,6 +75,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} @@ -101,5 +101,5 @@ post-install: ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include diff --git a/www/firefox-esr/files/patch-configure b/www/firefox-esr/files/patch-configure index c3d2a1b9bbe6..923cf5065f18 100644 --- a/www/firefox-esr/files/patch-configure +++ b/www/firefox-esr/files/patch-configure @@ -1,12 +1,5 @@ ---- configure Tue Oct 4 02:01:48 2005 +--- configure.orig Tue Oct 4 02:01:48 2005 +++ configure Wed Nov 23 11:07:17 2005 -@@ -1022,5 +1022,5 @@ - MOZJPEG=62 - MOZPNG=10207 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - @@ -10016,7 +10016,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message index c81c1458d04d..9e0a4dd2e9ff 100644 --- a/www/firefox-esr/pkg-message +++ b/www/firefox-esr/pkg-message @@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication. Any bug reports should be addressed to the maintainers at: gnome@FreeBSD.org -You may also Cc: freebsd-ports@freebsd.org. Please do not send +You may also Cc: freebsd-ports@FreeBSD.org. Please do not send bug reports to any other addresses. Please include the following information with any bug report: diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 7ed74bfeafa2..f5b9ce6e48bf 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,21 +3,20 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ -# +# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $ PORTNAME= firefox DISTVERSION= 1.5.0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -76,6 +75,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} @@ -101,5 +101,5 @@ post-install: ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include diff --git a/www/firefox/files/patch-configure b/www/firefox/files/patch-configure index c3d2a1b9bbe6..923cf5065f18 100644 --- a/www/firefox/files/patch-configure +++ b/www/firefox/files/patch-configure @@ -1,12 +1,5 @@ ---- configure Tue Oct 4 02:01:48 2005 +--- configure.orig Tue Oct 4 02:01:48 2005 +++ configure Wed Nov 23 11:07:17 2005 -@@ -1022,5 +1022,5 @@ - MOZJPEG=62 - MOZPNG=10207 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - @@ -10016,7 +10016,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message index c81c1458d04d..9e0a4dd2e9ff 100644 --- a/www/firefox/pkg-message +++ b/www/firefox/pkg-message @@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication. Any bug reports should be addressed to the maintainers at: gnome@FreeBSD.org -You may also Cc: freebsd-ports@freebsd.org. Please do not send +You may also Cc: freebsd-ports@FreeBSD.org. Please do not send bug reports to any other addresses. Please include the following information with any bug report: diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 7ed74bfeafa2..f5b9ce6e48bf 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -3,21 +3,20 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ -# +# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $ PORTNAME= firefox DISTVERSION= 1.5.0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -76,6 +75,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} @@ -101,5 +101,5 @@ post-install: ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include diff --git a/www/firefox15/files/patch-configure b/www/firefox15/files/patch-configure index c3d2a1b9bbe6..923cf5065f18 100644 --- a/www/firefox15/files/patch-configure +++ b/www/firefox15/files/patch-configure @@ -1,12 +1,5 @@ ---- configure Tue Oct 4 02:01:48 2005 +--- configure.orig Tue Oct 4 02:01:48 2005 +++ configure Wed Nov 23 11:07:17 2005 -@@ -1022,5 +1022,5 @@ - MOZJPEG=62 - MOZPNG=10207 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - @@ -10016,7 +10016,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/www/firefox15/pkg-message b/www/firefox15/pkg-message index c81c1458d04d..9e0a4dd2e9ff 100644 --- a/www/firefox15/pkg-message +++ b/www/firefox15/pkg-message @@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication. Any bug reports should be addressed to the maintainers at: gnome@FreeBSD.org -You may also Cc: freebsd-ports@freebsd.org. Please do not send +You may also Cc: freebsd-ports@FreeBSD.org. Please do not send bug reports to any other addresses. Please include the following information with any bug report: diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 7ed74bfeafa2..f5b9ce6e48bf 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -3,21 +3,20 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ -# +# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $ PORTNAME= firefox DISTVERSION= 1.5.0.7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -USE_X_PREFIX= yes WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -76,6 +75,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} @@ -101,5 +101,5 @@ post-install: ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} -.include "${.CURDIR}/../mozilla/Makefile.common" +.include "${PORTSDIR}/www/mozilla/Makefile.common" .include diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure index c3d2a1b9bbe6..923cf5065f18 100644 --- a/www/firefox36/files/patch-configure +++ b/www/firefox36/files/patch-configure @@ -1,12 +1,5 @@ ---- configure Tue Oct 4 02:01:48 2005 +--- configure.orig Tue Oct 4 02:01:48 2005 +++ configure Wed Nov 23 11:07:17 2005 -@@ -1022,5 +1022,5 @@ - MOZJPEG=62 - MOZPNG=10207 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - @@ -10016,7 +10016,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/www/firefox36/pkg-message b/www/firefox36/pkg-message index c81c1458d04d..9e0a4dd2e9ff 100644 --- a/www/firefox36/pkg-message +++ b/www/firefox36/pkg-message @@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication. Any bug reports should be addressed to the maintainers at: gnome@FreeBSD.org -You may also Cc: freebsd-ports@freebsd.org. Please do not send +You may also Cc: freebsd-ports@FreeBSD.org. Please do not send bug reports to any other addresses. Please include the following information with any bug report: diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile new file mode 100644 index 000000000000..e8d74dbc5e6c --- /dev/null +++ b/www/gstreamer-plugins-neon/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: gstreamer-plugins-neon +# Date created: 6 July 2006 +# Whom: Michael Johnson +# +# $FreeBSD$ +# $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.1 2006/07/06 19:32:35 ahze Exp $ + +PORTREVISION= 0 +CATEGORIES= www + +COMMENT= Gstreamer neon plugin + +GST_PLUGIN= neon + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 2ac5c3e029bd..f646e50a54d4 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,12 +3,11 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.36 2006/03/09 00:45:43 ahze Exp $ -# +# $MCom: ports/www/mozilla/Makefile,v 1.38 2006/07/18 15:03:40 ahze Exp $ PORTNAME= mozilla PORTVERSION= 1.7.13 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ @@ -24,7 +23,6 @@ COMMENT= The open source, standards compliant web browser MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/dist/bin USE_GMAKE= yes USE_BZIP2= yes -USE_X_PREFIX= yes WANT_GNOME= yes HAS_CONFIGURE= yes MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index ae9bebd996c1..540aeaac9fa4 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,7 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.20 2006/03/09 00:45:43 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.31 2006/10/14 03:49:21 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, @@ -59,10 +59,6 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ nss3:${PORTSDIR}/security/nss \ Xft.2:${PORTSDIR}/x11-fonts/libXft -OPTIONS+= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off - MAINTAINER?= gnome@FreeBSD.org MOZILLA?= ${PORTNAME} @@ -72,7 +68,7 @@ MOZ_RPATH?= ${MOZILLA} USE_GNOME+= gtk20 libidl desktopfileutils USE_ICONV= yes USE_PERL5_BUILD=yes -USE_X_PREFIX= yes +USE_XLIB= yes MOZILLA_SUFX?= none WRKSRC?= ${WRKDIR}/mozilla @@ -108,7 +104,6 @@ EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude mozilla/modules/libimg/png \ --exclude mozilla/jpeg \ --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ --exclude mozilla/security/nss \ --exclude mozilla/gc/boehm \ --exclude mozilla/gfx/cairo @@ -125,6 +120,23 @@ CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv +_USE_GECKO_OPTIONS_ALL= java debug logging optimized_cflags + +.if !defined(USE_GECKO_OPTIONS) +USE_GECKO_OPTIONS= debug logging optimized_cflags +.endif + +debug_OPTION= "Build a debugging image" off +java_OPTION= "Enable JAVA xpcom" off +logging_OPTION= "Enable additional log messages" off +optimized_cflags_OPTION= "Enable some additional optimizations" off + +.for option in ${USE_GECKO_OPTIONS:L} +.if ${_USE_GECKO_OPTIONS_ALL:M${option}}!="" +OPTIONS+= ${option:U} ${${option}_OPTION} +.endif +.endfor + # Standard options from README MOZ_OPTIONS+= --enable-crypto \ --disable-tests \ @@ -172,20 +184,13 @@ MOZ_OPTIONS+= --with-system-jpeg=${LOCALBASE} \ --enable-xinerama MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} -#MOZ_EXPORT+= CPPFLAGS=${CPPFLAGS} \ -# CFLAGS=$$CFLAGS \ -# LIBS=$$LIBS \ -# LDFLAGS=$$LDFLAGS \ -# CONFIG_SH=$$SH \ -# XP_UNIX=1 \ -# PERL=$$PERL5 .if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} +CFLAGS:= ${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS} WITH_OPTIMIZE?= -O2 .else -CFLAGS:= ${CFLAGS:N-O*:N-m*} -O -WITH_OPTIMIZE?= -O +CFLAGS:= ${CFLAGS} ${EXTRA_CFLAGS} +WITH_OPTIMIZE?= .endif .if defined(WITH_SMB) @@ -203,6 +208,14 @@ MOZ_OPTIONS+= --disable-debug \ --enable-strip .endif +.if defined(WITH_JAVA) +USE_JAVA= yes +JAVA_VERSION+= 1.4+ +JAVA_OS+= native +CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" +MOZ_OPTIONS+= --enable-javaxpcom +.endif + .if defined(WITH_LOGGING) MOZ_OPTIONS+= --enable-logging .else @@ -289,7 +302,7 @@ gecko-post-patch: @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp + ${WRKSRC}/*/*/*/nsDeviceContextSpecG.cpp @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp @@ -304,18 +317,25 @@ gecko-moz-pis-patch: @${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz} .endfor +post-configure: gecko-post-configure + +gecko-post-configure: + @${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/mozilla-config.h + post-build: gecko-post-build gecko-post-build: @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \ ${WRKSRC}/build/unix/*.pc -pre-install: gecko-pre-install gecko-moz-pis-pre-install gecko-create-plist +pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist -gecko-pre-install: - @${DO_NADA} # Empty for now +.if !target(port-pre-install) +port-pre-install: + @${DO_NADA} +.endif -gecko-create-plist: +gecko-pre-install: .if !defined(NOGECKO_PLIST) @${RM} -rf ${FAKEDIR} ${PLIST} @${TOUCH} -f ${PLIST} @@ -337,6 +357,10 @@ gecko-create-plist: ${FAKEDIR}/bin/${MOZILLA} \ ${FAKEDIR}/bin/${MOZILLA}-config ${RM} -f ${FAKEDIR}/bin/*.bak +.endif + +gecko-create-plist: +.if !defined(NOGECKO_PLIST) # Create the plist .for f in ${GECKO_PLIST_PRE_FILES} ${ECHO_CMD} ${f} >> ${PLIST} diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index e74ccb1d4831..10dd6ef7d966 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.17 2006/03/10 12:42:50 ahze Exp $ +# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.26 2006/10/13 04:20:21 ahze Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -69,19 +69,17 @@ Gecko_Pre_Include= bsd.gecko.mk .if ${OSVERSION} >= 500000 .if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" -_GECKO_ALL= firefox nvu seamonkey sunbird thunderbird xulrunner firefox-devel flock +_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner firefox-devel flock .endif .endif _GECKO_ALL+= mozilla -sunbird_PORTSDIR= deskutils - thunderbird_PORTSDIR= mail .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www ${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} -${gecko}_PLIST?= ${X11BASE}/lib/${gecko}/libgtkembedmoz.so +${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so .endfor # Figure out which mozilla to use @@ -125,18 +123,18 @@ GECKO_FALLTRHOUGH= ${TRUE} .endif # Generic defines -BROWSER_LINUX_PLUGINS_DIR?= ${X11BASE}/lib/browser_linux_plugins -BROWSER_PLUGINS_DIR?= ${X11BASE}/lib/browser_plugins +BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins +BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins -GECKO_CONFIG?= ${X11BASE}/bin/${GECKO}-config -XPIDL?= ${X11BASE}/lib/${GECKO}/xpidl +GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config +XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` .if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} .else -BROKEN=Unable to find a supported gecko, please check USE_GECKO +IGNORE= Unable to find a supported gecko, please check USE_GECKO .endif pre-everything:: _gecko-pre-everything @@ -164,7 +162,7 @@ post-patch: gecko-post-patch gecko-post-patch: .if defined(${GECKO}_HACK) - ${FIND} ${WRKSRC} -name "Makefile.in" -o -name "configure" | \ + ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} .endif diff --git a/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp b/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp new file mode 100644 index 000000000000..29752f34a181 --- /dev/null +++ b/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp @@ -0,0 +1,58 @@ +--- gfx/src/ps/nsType1.cpp.orig Wed Dec 11 01:24:47 2002 ++++ gfx/src/ps/nsType1.cpp Sun Sep 10 09:52:45 2006 +@@ -81,8 +81,8 @@ + int wmode; + } FT2PT1_info; + +-static int cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, +- FT_Vector *aEndPt, void *aClosure); ++static int cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, ++ const FT_Vector *aEndPt, void *aClosure); + static int Type1CharStringCommand(unsigned char **aBufPtrPtr, int aCmd); + static int Type1EncodeCharStringInt(unsigned char **aBufPtrPtr, int aValue); + +@@ -173,7 +173,7 @@ + } + + static PRBool +-sideWidthAndBearing(FT_Vector *aEndPt, FT2PT1_info *aFti) ++sideWidthAndBearing(const FT_Vector *aEndPt, FT2PT1_info *aFti) + { + int aw = 0; + int ah = 0; +@@ -216,7 +216,7 @@ + } + + static int +-moveto(FT_Vector *aEndPt, void *aClosure) ++moveto(const FT_Vector *aEndPt, void *aClosure) + { + FT2PT1_info *fti = (FT2PT1_info *)aClosure; + FT_UShort upm = fti->face->units_per_EM; +@@ -253,7 +253,7 @@ + } + + static int +-lineto(FT_Vector *aEndPt, void *aClosure) ++lineto(const FT_Vector *aEndPt, void *aClosure) + { + FT2PT1_info *fti = (FT2PT1_info *)aClosure; + FT_UShort upm = fti->face->units_per_EM; +@@ -279,7 +279,7 @@ + } + + static int +-conicto(FT_Vector *aControlPt, FT_Vector *aEndPt, void *aClosure) ++conicto(const FT_Vector *aControlPt, const FT_Vector *aEndPt, void *aClosure) + { + FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure; + FT_UShort upm = ftinfo->face->units_per_EM; +@@ -311,7 +311,7 @@ + } + + static int +-cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, FT_Vector *aEndPt, ++cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, const FT_Vector *aEndPt, + void *aClosure) + { + FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure; diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in index 1d381a06fe88..e11caf5589e6 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.12 2006/03/09 00:45:43 ahze Exp $ +# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.15 2006/08/01 21:09:04 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas () @@ -23,5 +23,7 @@ rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/chrome/app-chrome.manifest rm -rf ${MOZDIR}/updates +find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1 +find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1 exit 0 diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in index 13fe40dbee7a..bc083ae6da01 100644 --- a/www/mozilla/pkg-install.in +++ b/www/mozilla/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/www/mozilla/pkg-install.in,v 1.12 2006/03/09 00:45:43 ahze Exp $ +# $MCom: ports/www/mozilla/pkg-install.in,v 1.15 2006/08/01 21:09:04 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas () @@ -37,5 +37,7 @@ fi if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then mkdir -p %%PREFIX%%/lib/browser_plugins fi +cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/plugins/ > /dev/null 2>&1 +cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1 exit 0 -- cgit v1.2.3