diff options
Diffstat (limited to 'www')
377 files changed, 0 insertions, 23667 deletions
diff --git a/www/adblock/Makefile b/www/adblock/Makefile deleted file mode 100644 index 1403cc14f..000000000 --- a/www/adblock/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Ports collection makefile for: adblock -# Date created: Thu Aug 4, 2005 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= adblock -DISTVERSION= 0.5-dev -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= thierry -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= A content filtering plug-in for ${GECKO} - -PLIST_FILES= %%MOZDIR%%/chrome/adblock.jar - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozex/Makefile.xpi" - -.if ${GECKO} == mozilla -PLIST_FILES+= %%MOZDIR%%/chrome/overlayinfo/mozapps/content/overlays.rdf -.endif - -do-install: - @${INSTALL_DATA} ${WRKDIR}/chrome/adblock.jar ${MOZDIR}/chrome - -.include <bsd.port.post.mk> diff --git a/www/adblock/distinfo b/www/adblock/distinfo deleted file mode 100644 index e505c2d04..000000000 --- a/www/adblock/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (adblock-0.5.d/adblock-0.5-dev.xpi) = bf938b034e2439e3e137cb892906afb8 -SHA256 (adblock-0.5.d/adblock-0.5-dev.xpi) = 097e55e8579bea31c7821ebefb74a9ef56068b6b0b437f3580c3a18d38fc5563 -SIZE (adblock-0.5.d/adblock-0.5-dev.xpi) = 72084 diff --git a/www/adblock/files/installed-chrome.txt b/www/adblock/files/installed-chrome.txt deleted file mode 100644 index 37af91024..000000000 --- a/www/adblock/files/installed-chrome.txt +++ /dev/null @@ -1 +0,0 @@ -content,install,url,jar:resource:/chrome/adblock.jar!/content/ diff --git a/www/adblock/pkg-descr b/www/adblock/pkg-descr deleted file mode 100644 index 9c8a689fb..000000000 --- a/www/adblock/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Adblock is a content filtering plug-in for the Mozilla and Seamonkey browsers. -It is both more robust and more precise than the built-in image blocker. - -Adblock allows the user to specify filters, which remove unwanted content based -on the source-address. - -WWW: http://adblock.mozdev.org/ diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile deleted file mode 100644 index f3ffdbf56..000000000 --- a/www/bluefish/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# New ports collection makefile for: bluefish -# Date created: 23 January 2003 -# Whom: Koop Mast <einekoai@chello.nl> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= bluefish -PORTVERSION= 1.0.5 -PORTREVISION= 1 -CATEGORIES= www editors -MASTER_SITES= http://pkedu.fbt.wur.nl/~olivier/${DOWNLOAD}/ \ - http://bluefish.mrball.net/${DOWNLOAD}/ \ - ftp://ftp.ratisbona.com/pub/bluefish/${DOWNLOAD}/ \ - ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= HTML editor designed for the experienced web designer - -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 \ - aspell.16:${PORTSDIR}/textproc/aspell - -.if !defined(WITHOUT_WEBLINT) -RUN_DEPENDS+= weblint:${PORTSDIR}/www/weblint -.endif -.if defined(WITH_TIDY) -RUN_DEPENDS+= tidy:${PORTSDIR}/www/tidy -.endif - -DOWNLOAD= downloads -USE_BZIP2= yes -USE_GETTEXT= yes -USE_GNOME= gnomehier gtk20 gnomevfs2 -WANT_GNOME= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-freedesktop_org-menu=${PREFIX}/share/gnome/applications \ - --with-freedesktop_org-mime=${PREFIX}/share/mime \ - --without-gnome2_4-mime \ - --without-gnome2_4-appreg \ - --with-icon-path=${PREFIX}/share/gnome/pixmaps - -# Turns debugging output on -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --with-debugging-output -.endif - -.if defined(WITHOUT_SPLASH) -CONFIGURE_ARGS+= --disable-splash-screen -.endif - -MAN1= bluefish.1 - -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Bluefish has the following tunable option(s):" - @${ECHO_MSG} " WITH_DEBUG for debug support" - @${ECHO_MSG} " WITHOUT_WEBLINT disable the weblint syntax and style checker" - @${ECHO_MSG} " WITH_TIDY for the tidy html cleanup program" - @${ECHO_MSG} " WITHOUT_SPLASH disable the splash screen" - @${ECHO_MSG} "" - @${ECHO_MSG} "For Highlighting to work, please enable UTF-8 support in devel/pcre." - @${ECHO_MSG} "This will reduce the number of warning in the console when running bluefish." - @${ECHO_MSG} "" - -.include <bsd.port.pre.mk> - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -.endif - -.include <bsd.port.post.mk> diff --git a/www/bluefish/distinfo b/www/bluefish/distinfo deleted file mode 100644 index 91c590d2b..000000000 --- a/www/bluefish/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (bluefish-1.0.5.tar.bz2) = 26701c09d41e5dea987155cdc9d0ac94 -SHA256 (bluefish-1.0.5.tar.bz2) = dc957c1af2f272c7d518c68c1c5d3beb693e02dd538f0641ef58d7eeccd41221 -SIZE (bluefish-1.0.5.tar.bz2) = 1492532 diff --git a/www/bluefish/pkg-descr b/www/bluefish/pkg-descr deleted file mode 100644 index 0c573e8b7..000000000 --- a/www/bluefish/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Bluefish is a powerful editor for experienced web designers and programmers. -Bluefish supports many programming and markup languages, but it focuses on -editing dynamic and interactive websites - -WWW: http://bluefish.openoffice.nl/ diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist deleted file mode 100644 index 47400723d..000000000 --- a/www/bluefish/pkg-plist +++ /dev/null @@ -1,74 +0,0 @@ -bin/bluefish -%%DATADIR%%/bluefish_splash.png -%%DATADIR%%/custom_menu.de.default -%%DATADIR%%/custom_menu.default -%%DATADIR%%/custom_menu.fr.default -%%DATADIR%%/encodings.default -%%DATADIR%%/filetypes.default -%%DATADIR%%/funcref_css.xml -%%DATADIR%%/funcref_html.xml -%%DATADIR%%/funcref_php.xml -%%DATADIR%%/funcref_python.xml -%%DATADIR%%/highlighting.default -%%DATADIR%%/icon_c.png -%%DATADIR%%/icon_cfml.png -%%DATADIR%%/icon_dir.png -%%DATADIR%%/icon_html.png -%%DATADIR%%/icon_image.png -%%DATADIR%%/icon_java.png -%%DATADIR%%/icon_pascal.png -%%DATADIR%%/icon_php.png -%%DATADIR%%/icon_python.png -%%DATADIR%%/icon_r.png -%%DATADIR%%/icon_unknown.png -%%DATADIR%%/icon_xml.png -share/gnome/applications/bluefish-project.desktop -share/gnome/applications/bluefish.desktop -share/gnome/pixmaps/bluefish-icon.png -share/gnome/pixmaps/gnome-application-bluefish-project.png -share/locale/bg/LC_MESSAGES/bluefish.mo -share/locale/cs/LC_MESSAGES/bluefish.mo -share/locale/da/LC_MESSAGES/bluefish.mo -share/locale/de/LC_MESSAGES/bluefish.mo -share/locale/es/LC_MESSAGES/bluefish.mo -share/locale/eu/LC_MESSAGES/bluefish.mo -share/locale/fi/LC_MESSAGES/bluefish.mo -share/locale/fr/LC_MESSAGES/bluefish.mo -share/locale/hu/LC_MESSAGES/bluefish.mo -share/locale/it/LC_MESSAGES/bluefish.mo -share/locale/ja/LC_MESSAGES/bluefish.mo -share/locale/no/LC_MESSAGES/bluefish.mo -share/locale/pl/LC_MESSAGES/bluefish.mo -share/locale/pt/LC_MESSAGES/bluefish.mo -share/locale/pt_BR/LC_MESSAGES/bluefish.mo -share/locale/ru/LC_MESSAGES/bluefish.mo -share/locale/sk/LC_MESSAGES/bluefish.mo -share/locale/sr/LC_MESSAGES/bluefish.mo -share/locale/sv/LC_MESSAGES/bluefish.mo -share/locale/ta/LC_MESSAGES/bluefish.mo -share/locale/tr/LC_MESSAGES/bluefish.mo -share/locale/zh_CN/LC_MESSAGES/bluefish.mo -share/locale/zh_TW/LC_MESSAGES/bluefish.mo -share/mime/packages/bluefish.xml -@dirrm share/bluefish -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/sr/LC_MESSAGES -@dirrmtry share/locale/sr -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/no/LC_MESSAGES -@dirrmtry share/locale/no -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs diff --git a/www/bugmenot/Makefile b/www/bugmenot/Makefile deleted file mode 100644 index 97cde4c64..000000000 --- a/www/bugmenot/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Ports collection Makefile for: bugmenot -# Date created: Tue May 24, 2005 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= bugmenot -PORTVERSION= 1.3 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://extensions.roachfiend.com/ -DISTNAME= ${PORTNAME} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_${PORTREVISION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= ${GECKO} extension to bypass compulsory web registration - -PLIST_FILES= %%MOZDIR%%/chrome/bugmenot.jar - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozex/Makefile.xpi" - -.if ${GECKO} == mozilla -PLIST_FILES+= %%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf -.endif - -do-install: - @${INSTALL_DATA} ${WRKDIR}/chrome/bugmenot.jar ${MOZDIR}/chrome - -.include <bsd.port.post.mk> diff --git a/www/bugmenot/distinfo b/www/bugmenot/distinfo deleted file mode 100644 index b5874e6ad..000000000 --- a/www/bugmenot/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (bugmenot-1.3_1/bugmenot.xpi) = f446463062b623004db61563eab815c2 -SHA256 (bugmenot-1.3_1/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18 -SIZE (bugmenot-1.3_1/bugmenot.xpi) = 19249 diff --git a/www/bugmenot/files/installed-chrome.txt b/www/bugmenot/files/installed-chrome.txt deleted file mode 100644 index b57772746..000000000 --- a/www/bugmenot/files/installed-chrome.txt +++ /dev/null @@ -1 +0,0 @@ -content,install,url,jar:resource:/chrome/bugmenot.jar!/content/bugmenot/ diff --git a/www/bugmenot/pkg-descr b/www/bugmenot/pkg-descr deleted file mode 100644 index 367d4be7c..000000000 --- a/www/bugmenot/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Bypass compulsory web registration via Mozilla's right-click context menu. -Compatibile with Mozilla and current Seamonkey releases. - -Visit bugmenot.com for full details of their service. - -WWW: http://roachfiend.com/archives/2005/02/07/bugmenot/ diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile deleted file mode 100644 index 6dd12fe89..000000000 --- a/www/epiphany-extensions/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# Ports collection Makefile for: epiphany-extensions -# Date created: 30 December 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.77 2006/09/03 21:25:58 marcus Exp $ -# - -PORTNAME= epiphany -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/} -PKGNAMESUFFIX= -extensions -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A set of add-ons for the Epiphany web browser - -BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany -RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany - -USE_GETTEXT= yes -USE_BZIP2= yes -USE_XLIB= yes -USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget -INSTALLS_OMF= yes -GNU_CONFIGURE= yes -USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --with-mozilla=${GECKO} - -EPHY_EXTENSIONS=all - -PLIST_SUB= VERSION="2.16" EPHY_VERSION="2.16" - -OPTIONS= OPENSP "Enable OpenSP SGML support" off \ - ADBLOCK "Enable the adblock extension" on - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" - -.if defined(WITH_OPENSP) -CONFIGURE_ARGS+= --enable-opensp=yes -.else -CONFIGURE_ARGS+= --disable-opensp -.endif - -.if !defined(WITHOUT_ADBLOCK) -EPHY_EXTENSIONS:= ${EPHY_EXTENSIONS},adblock -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre-utf8 -PLIST_SUB+= ADBLOCK="" -.else -PLIST_SUB+= ADBLOCK="@comment " -.endif - -.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs) -USE_PYTHON= yes -.include "${PORTSDIR}/Mk/bsd.python.mk" -PLIST_SUB+= PYTHON="" -.else -PLIST_SUB+= PYTHON="@comment " -.endif - -CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}" - -pre-everything:: - @${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):" - @${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation" - @${ECHO_MSG} "" - -.include <bsd.port.post.mk> diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo deleted file mode 100644 index 706a35e68..000000000 --- a/www/epiphany-extensions/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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-descr b/www/epiphany-extensions/pkg-descr deleted file mode 100644 index 06c245526..000000000 --- a/www/epiphany-extensions/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Epiphany-extensions is a set of plugins for the Epiphany web browser that -extend its base functionality. Currently, the following extensions are -supported: - -* Mouse gestures -* Pop-up blocker -* Tabs menu - -WWW: http://www.gnome.org/projects/epiphany/extensions diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist deleted file mode 100644 index fc38f54f0..000000000 --- a/www/epiphany-extensions/pkg-plist +++ /dev/null @@ -1,171 +0,0 @@ -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/console.py -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo -lib/epiphany/%%VERSION%%/extensions/error-viewer.ephy-extension -lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.ephy-extension -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.py -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyc -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyo -lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension -lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension -lib/epiphany/%%VERSION%%/extensions/libactionsextension.la -lib/epiphany/%%VERSION%%/extensions/libactionsextension.so -%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la -%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so -lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la -lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so -lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la -lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so -lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.la -lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so -lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.la -lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so -lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la -lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so -lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la -lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so -lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.la -lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.so -lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.la -lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so -lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la -lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so -lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.la -lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so -lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la -lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so -lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.la -lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.so -lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la -lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so -lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la -lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so -lib/epiphany/%%VERSION%%/extensions/page-info.ephy-extension -lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension -%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/python-console.ephy-extension -lib/epiphany/%%VERSION%%/extensions/select-stylesheet.ephy-extension -lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension -lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension -lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension -lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension -%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns -%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg -share/gnome/epiphany-extensions/ephy-gestures.xml -share/gnome/epiphany-extensions/glade/action-properties.glade -share/gnome/epiphany-extensions/glade/actions-editor.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 -share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml -share/gnome/epiphany-extensions/xml/page-info-context-ui.xml -share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml -share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-forward.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-fullscreen.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-homepage.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-tab.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-window.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-next-tab.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-prev-tab.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-reload.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-stop.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-up.png -share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source-2.png -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/omf/epiphany-extensions/epiphany-extensions-C.omf -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 -share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/de/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -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/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 -share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/rw/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -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 -@dirrm share/gnome/omf/epiphany-extensions -@dirrm share/gnome/help/epiphany-extensions/C/figures -@dirrm share/gnome/help/epiphany-extensions/C -@dirrm share/gnome/help/epiphany-extensions -@dirrm share/gnome/epiphany-extensions/xml -@dirrm share/gnome/epiphany-extensions/glade -@dirrm share/gnome/epiphany-extensions -@dirrmtry lib/epiphany/%%VERSION%%/extensions -@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 deleted file mode 100644 index 2397b2728..000000000 --- a/www/epiphany/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# Ports collection Makefile for: epiphany -# Date created: 24 April 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.127 2006/10/07 19:45:38 marcus Exp $ -# - -PORTNAME= epiphany -PORTVERSION= 2.16.1 -PORTREVISION= 1 -CATEGORIES= www gnome -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-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_XLIB= yes -USE_PYTHON= yes -GNOME_DESKTOP_VERSION=2 -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} --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]+$//}" \ - EPHY_PREFIX="${PREFIX}" - -MAN1= epiphany.1 - -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - -NO_WERROR= yes -# allow build with more warnings enabled -.if defined(NO_WERROR) -CONFIGURE_ARGS+= --enable-compile-warnings=no -.endif - -.if ${HAVE_GNOME:Mpygnome2}!="" -USE_PYTHON= yes -.include "${PORTSDIR}/Mk/bsd.python.mk" -USE_GNOME+= pygnome2 -CONFIGURE_ARGS+=--enable-python -PLIST_SUB+= PYTHON="" -.else -CONFIGURE_ARGS+=--disable-python -PLIST_SUB+= PYTHON="@comment " -.endif - -post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' - @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \ - ${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp - @${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \ - ${WRKSRC}/src/Makefile.in - -post-install: - ${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \ - ${PREFIX}/etc/gconf/schemas - @-update-desktop-database - -.include <bsd.port.post.mk> diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo deleted file mode 100644 index 7829042ac..000000000 --- a/www/epiphany/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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/files/patch-src_bookmarks_ephy-bookmarks.c b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c deleted file mode 100644 index 146b9e594..000000000 --- a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/bookmarks/ephy-bookmarks.c.orig Sat Apr 15 04:11:39 2006 -+++ src/bookmarks/ephy-bookmarks.c Sat Apr 15 04:13:43 2006 -@@ -92,7 +92,10 @@ static const EphyBookmarksBookmarkInfo d - * For instance in .nl these should be - * "http://www.google.nl" and "http://www.google.nl/search?q=%s" - */ -- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } -+ { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }, -+ { N_("The FreeBSD Project"), N_("http://www.freebsd.org/") }, -+ { N_("Daemon News"), N_("http://daemonnews.org/") }, -+ { N_("BSD News"), N_("http://bsdnews.com/") } - }; - - static const char *default_topics [] = diff --git a/www/epiphany/pkg-descr b/www/epiphany/pkg-descr deleted file mode 100644 index 51066f8d5..000000000 --- a/www/epiphany/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Epiphany is a web browser designed to be as lightweight and fast as -possible, at the expense of many of the features found in other -browsers. - -WWW: http://www.gnome.org/projects/epiphany/ diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist deleted file mode 100644 index 9be25d1c4..000000000 --- a/www/epiphany/pkg-plist +++ /dev/null @@ -1,345 +0,0 @@ -bin/epiphany -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-single.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-loader.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node-db.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-notebook.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-password-manager.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-session.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-tab.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h -lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la -lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so -libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc -share/aclocal/epiphany.m4 -share/dbus-1/services/org.gnome.Epiphany.service -%%DOCSDIR%%/EphyCommandManager.html -%%DOCSDIR%%/EphyEmbed.html -%%DOCSDIR%%/EphyNodeDb.html -%%DOCSDIR%%/EphyTab.html -%%DOCSDIR%%/EphyWindow.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/epiphany-EphyEmbedFactory.html -%%DOCSDIR%%/epiphany-EphyEmbedPersist.html -%%DOCSDIR%%/epiphany-EphyEmbedSingle.html -%%DOCSDIR%%/epiphany-EphyExtensionsManager.html -%%DOCSDIR%%/epiphany-EphyGlade.html -%%DOCSDIR%%/epiphany-EphyPermissionManager.html -%%DOCSDIR%%/epiphany-ephy-cookie-manager.html -%%DOCSDIR%%/epiphany-ephy-password-manager.html -%%DOCSDIR%%/epiphany-ephy-session.html -%%DOCSDIR%%/epiphany-ephy-shell.html -%%DOCSDIR%%/epiphany.devhelp -%%DOCSDIR%%/epiphany.devhelp2 -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%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/chrome/branding/brand.dtd -share/gnome/epiphany/chrome/branding/brand.properties -share/gnome/epiphany/chrome/epiphany.manifest -share/gnome/epiphany/chrome/global/about.xhtml -share/gnome/epiphany/default-prefs.js -share/gnome/epiphany/ephy-xml2ini.xsl -share/gnome/epiphany/epiphany-bookmark-editor-ui.xml -share/gnome/epiphany/epiphany-bookmarks-html.xsl -share/gnome/epiphany/epiphany-bookmarksbar.xml -share/gnome/epiphany/epiphany-fs-toolbar.xml -share/gnome/epiphany/epiphany-history-window-ui.xml -share/gnome/epiphany/epiphany-toolbar.xml -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 -share/gnome/help/epiphany/C/epiphany.xml -share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/C/figures/ephy-screenshot.png -share/gnome/help/epiphany/C/legal.xml -share/gnome/help/epiphany/bg/epiphany.xml -share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/bg/figures/ephy-screenshot.png -share/gnome/help/epiphany/el/epiphany.xml -share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.png -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/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 -share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/es/figures/ephy-screenshot.png -share/gnome/help/epiphany/eu/epiphany.xml -share/gnome/help/epiphany/eu/figures/ephy-addressbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/eu/figures/ephy-bookmarkbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/eu/figures/ephy-screenshot.png -share/gnome/help/epiphany/fi/epiphany.xml -share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.png -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 -share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/ja/figures/ephy-screenshot.png -share/gnome/help/epiphany/nl/epiphany.xml -share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.png -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 -share/gnome/help/epiphany/sv/figures/ephy-history-window-screenshot.png -share/gnome/help/epiphany/sv/figures/ephy-screenshot.png -share/gnome/help/epiphany/uk/epiphany.xml -share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png -share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png -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-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/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/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 -share/locale/cy/LC_MESSAGES/epiphany.mo -share/locale/da/LC_MESSAGES/epiphany.mo -share/locale/de/LC_MESSAGES/epiphany.mo -share/locale/dz/LC_MESSAGES/epiphany.mo -share/locale/el/LC_MESSAGES/epiphany.mo -share/locale/en_CA/LC_MESSAGES/epiphany.mo -share/locale/en_GB/LC_MESSAGES/epiphany.mo -share/locale/es/LC_MESSAGES/epiphany.mo -share/locale/et/LC_MESSAGES/epiphany.mo -share/locale/eu/LC_MESSAGES/epiphany.mo -share/locale/fa/LC_MESSAGES/epiphany.mo -share/locale/fi/LC_MESSAGES/epiphany.mo -share/locale/fr/LC_MESSAGES/epiphany.mo -share/locale/ga/LC_MESSAGES/epiphany.mo -share/locale/gl/LC_MESSAGES/epiphany.mo -share/locale/gu/LC_MESSAGES/epiphany.mo -share/locale/he/LC_MESSAGES/epiphany.mo -share/locale/hi/LC_MESSAGES/epiphany.mo -share/locale/hr/LC_MESSAGES/epiphany.mo -share/locale/hu/LC_MESSAGES/epiphany.mo -share/locale/id/LC_MESSAGES/epiphany.mo -share/locale/is/LC_MESSAGES/epiphany.mo -share/locale/it/LC_MESSAGES/epiphany.mo -share/locale/ja/LC_MESSAGES/epiphany.mo -share/locale/ka/LC_MESSAGES/epiphany.mo -share/locale/ko/LC_MESSAGES/epiphany.mo -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/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 -share/locale/pt_BR/LC_MESSAGES/epiphany.mo -share/locale/ro/LC_MESSAGES/epiphany.mo -share/locale/ru/LC_MESSAGES/epiphany.mo -share/locale/rw/LC_MESSAGES/epiphany.mo -share/locale/sk/LC_MESSAGES/epiphany.mo -share/locale/sl/LC_MESSAGES/epiphany.mo -share/locale/sq/LC_MESSAGES/epiphany.mo -share/locale/sr/LC_MESSAGES/epiphany.mo -share/locale/sr@Latn/LC_MESSAGES/epiphany.mo -share/locale/sv/LC_MESSAGES/epiphany.mo -share/locale/ta/LC_MESSAGES/epiphany.mo -share/locale/te/LC_MESSAGES/epiphany.mo -share/locale/th/LC_MESSAGES/epiphany.mo -share/locale/tk/LC_MESSAGES/epiphany.mo -share/locale/tr/LC_MESSAGES/epiphany.mo -share/locale/uk/LC_MESSAGES/epiphany.mo -share/locale/vi/LC_MESSAGES/epiphany.mo -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 -@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 -@dirrm share/gnome/help/epiphany/eu -@dirrm share/gnome/help/epiphany/es/figures -@dirrm share/gnome/help/epiphany/es -@dirrm share/gnome/help/epiphany/el/figures -@dirrm share/gnome/help/epiphany/el -@dirrm share/gnome/help/epiphany/bg/figures -@dirrm share/gnome/help/epiphany/bg -@dirrm share/gnome/help/epiphany/C/figures -@dirrm share/gnome/help/epiphany/C -@dirrm share/gnome/help/epiphany -@dirrm share/gnome/epiphany/glade -@dirrm share/gnome/epiphany/chrome/global -@dirrm share/gnome/epiphany/chrome/branding -@dirrm share/gnome/epiphany/chrome -@dirrm share/gnome/epiphany/art -@dirrm share/gnome/epiphany -@dirrm %%DOCSDIR%% -@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins -@dirrmtry lib/epiphany/%%EPHY_VERSION%% -@dirrmtry lib/epiphany -@dirrm include/epiphany/%%EPHY_VERSION%%/epiphany -@dirrm include/epiphany/%%EPHY_VERSION%% -@dirrm include/epiphany -@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 -@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 deleted file mode 100644 index 5df5908d1..000000000 --- a/www/evolution-webcal/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: evolution-webcal -# Date created: Mon Apr 26 18:08:00 CEST 2004 -# Whom: Koop Mast <kwm@rainbow-runner.nl> -# -# $FreeBSD$ -# $MCom: ports/www/evolution-webcal/Makefile,v 1.40 2006/07/21 20:47:01 mezz Exp $ -# - -PORTNAME= webcal -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/} -PKGNAMEPREFIX= evolution- -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Webcal(endar) handler for gnome - -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" \ - LDFLAGS="-L${LOCALBASE}/lib" - -GCONF_SCHEMAS= evolution-webcal.schemas - -post-patch: - @${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \ - ${WRKSRC}/po/Makefile.in.in - -.include <bsd.port.mk> diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo deleted file mode 100644 index 251b8a724..000000000 --- a/www/evolution-webcal/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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-descr b/www/evolution-webcal/pkg-descr deleted file mode 100644 index ab2f04e9d..000000000 --- a/www/evolution-webcal/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Evolution Webcal installs a GNOME URL Handler for "webcal:". -This will pop up a subscription dialog when you point your web browser at it. -The calendars will automaticaly appear in Evolution 1.5.x if it is running, -or will show up the next time you start Evolution. - -It also works for non-GNOME applications. These applications need to set -there URL handler to be "gnome-open". diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist deleted file mode 100644 index 0fd96d489..000000000 --- a/www/evolution-webcal/pkg-plist +++ /dev/null @@ -1,113 +0,0 @@ -libexec/evolution-webcal -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 -share/locale/cy/LC_MESSAGES/evolution-webcal.mo -share/locale/da/LC_MESSAGES/evolution-webcal.mo -share/locale/de/LC_MESSAGES/evolution-webcal.mo -share/locale/dz/LC_MESSAGES/evolution-webcal.mo -share/locale/el/LC_MESSAGES/evolution-webcal.mo -share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo -share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo -share/locale/es/LC_MESSAGES/evolution-webcal.mo -share/locale/et/LC_MESSAGES/evolution-webcal.mo -share/locale/eu/LC_MESSAGES/evolution-webcal.mo -share/locale/fa/LC_MESSAGES/evolution-webcal.mo -share/locale/fi/LC_MESSAGES/evolution-webcal.mo -share/locale/fr/LC_MESSAGES/evolution-webcal.mo -share/locale/gl/LC_MESSAGES/evolution-webcal.mo -share/locale/gu/LC_MESSAGES/evolution-webcal.mo -share/locale/hi/LC_MESSAGES/evolution-webcal.mo -share/locale/hu/LC_MESSAGES/evolution-webcal.mo -share/locale/id/LC_MESSAGES/evolution-webcal.mo -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/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 -share/locale/nl/LC_MESSAGES/evolution-webcal.mo -share/locale/or/LC_MESSAGES/evolution-webcal.mo -share/locale/pa/LC_MESSAGES/evolution-webcal.mo -share/locale/pl/LC_MESSAGES/evolution-webcal.mo -share/locale/pt/LC_MESSAGES/evolution-webcal.mo -share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo -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 -share/locale/sv/LC_MESSAGES/evolution-webcal.mo -share/locale/ta/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 -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-devel/Makefile b/www/firefox-devel/Makefile deleted file mode 100644 index 8b79a7272..000000000 --- a/www/firefox-devel/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports-experimental/www/firefox-devel/Makefile,v 1.2 2006/09/25 22:44:03 ahze Exp $ - -PORTNAME= firefox -DISTVERSION= 2.0rc2 -PORTEPOCH= 1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -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 - -BUILD_DEPENDS= nss>=3.11.2:${PORTSDIR}/security/nss - -LATEST_LINK= firefox2 -MOZILLA= ${PORTNAME}${MOZILLA_SUFX} -MOZILLA_NAME= Firefox${MOZILLA_SUFX} -MOZILLA_SUFX= -devel -MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' - -WANT_GNOME= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ -LIBS= -Wl,-Bsymbolic -lc -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons - -FIREFOX_ICON= ${MOZILLA}.xpm -FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --enable-application=browser \ - --enable-system-cairo \ - --enable-official-branding \ - --enable-canvas \ - --with-system-nss - -SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome - -OPTIONS= NEWTAB "Open external links in a new tab" on \ - SMB "Enable smb:// URI support using gnomevfs" off - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - -.if ${OSVERSION} >= 600000 -MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo -.endif - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif - -post-extract:: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor - -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} - ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ - >> ${SYSTEM_PREFS} -.endif # !defined(WITHOUT_NEWTAB) - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - -post-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} - -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo deleted file mode 100644 index dd95c332d..000000000 --- a/www/firefox-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (firefox-2.0rc2-source.tar.bz2) = b2cbe4bef6971bb7342970ce24514c28 -SHA256 (firefox-2.0rc2-source.tar.bz2) = 21ae0d20cae31922bad2677b737da3989089ee836c19b846fea17cea7108e966 -SIZE (firefox-2.0rc2-source.tar.bz2) = 36945630 diff --git a/www/firefox-devel/files/extra-patch-config_make-jars.pl b/www/firefox-devel/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca..000000000 --- a/www/firefox-devel/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/www/firefox-devel/files/firefox.desktop.in b/www/firefox-devel/files/firefox.desktop.in deleted file mode 100644 index d72090e1a..000000000 --- a/www/firefox-devel/files/firefox.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; diff --git a/www/firefox-devel/files/moz_pis_S50cleanhome b/www/firefox-devel/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e3..000000000 --- a/www/firefox-devel/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/firefox-devel/files/patch-Double.cpp b/www/firefox-devel/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff..000000000 --- a/www/firefox-devel/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/firefox-devel/files/patch-browser_app_mozilla.in b/www/firefox-devel/files/patch-browser_app_mozilla.in deleted file mode 100644 index c815a4780..000000000 --- a/www/firefox-devel/files/patch-browser_app_mozilla.in +++ /dev/null @@ -1,125 +0,0 @@ ---- browser/app/mozilla.in.orig Mon Apr 4 15:08:49 2005 -+++ browser/app/mozilla.in Wed Jun 1 14:47:45 2005 -@@ -49,51 +49,83 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh diff --git a/www/firefox-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox-devel/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 87114cc7b..000000000 --- a/www/firefox-devel/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h b/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/firefox-devel/files/patch-config-rules.mk b/www/firefox-devel/files/patch-config-rules.mk deleted file mode 100644 index 7377726fd..000000000 --- a/www/firefox-devel/files/patch-config-rules.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- config/rules.mk.orig Fri Jul 7 00:13:36 2006 -+++ config/rules.mk Sun Sep 3 00:04:03 2006 -@@ -443,7 +443,7 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - endif - diff --git a/www/firefox-devel/files/patch-config_autoconf.mk.in b/www/firefox-devel/files/patch-config_autoconf.mk.in deleted file mode 100644 index 29fe7f8fb..000000000 --- a/www/firefox-devel/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 -+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 -@@ -50,13 +50,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/firefox-devel/files/patch-config_mkdepend_Makefile.in b/www/firefox-devel/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index bace012a2..000000000 --- a/www/firefox-devel/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox-devel/files/patch-configure b/www/firefox-devel/files/patch-configure deleted file mode 100644 index ee6087d2d..000000000 --- a/www/firefox-devel/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig Tue Aug 8 13:59:01 2006 -+++ configure Tue Sep 19 07:52:08 2006 -@@ -1047,7 +1047,7 @@ - - MOZJPEG=62 - MOZPNG=10207 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - NSS_VERSION=3 - -@@ -10267,7 +10267,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10273 "configure" - #include "confdefs.h" -@@ -10298,7 +10298,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10308,7 +10308,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10314 "configure" - #include "confdefs.h" -@@ -10339,7 +10339,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74..000000000 --- a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b43..000000000 --- a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/firefox-devel/files/patch-libm b/www/firefox-devel/files/patch-libm deleted file mode 100644 index d9295c906..000000000 --- a/www/firefox-devel/files/patch-libm +++ /dev/null @@ -1,9 +0,0 @@ ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox-devel/files/patch-modules_libpref_src_init_all.js b/www/firefox-devel/files/patch-modules_libpref_src_init_all.js deleted file mode 100644 index 1700380a5..000000000 --- a/www/firefox-devel/files/patch-modules_libpref_src_init_all.js +++ /dev/null @@ -1,53 +0,0 @@ ---- modules/libpref/src/init/all.js.orig Mon Feb 13 22:58:15 2006 -+++ modules/libpref/src/init/all.js Tue May 2 00:32:55 2006 -@@ -1883,33 +1883,33 @@ - - // th - --pref("font.name.serif.tr", "Times"); --pref("font.name.sans-serif.tr", "Helvetica"); --pref("font.name.monospace.tr", "Courier"); -+pref("font.name.serif.tr", "serif"); -+pref("font.name.sans-serif.tr", "sans-serif"); -+pref("font.name.monospace.tr", "monospace"); - - pref("font.name.serif.x-baltic", "serif"); - pref("font.name.sans-serif.x-baltic", "sans-serif"); - pref("font.name.monospace.x-baltic", "monospace"); - --pref("font.name.serif.x-central-euro", "Times"); --pref("font.name.sans-serif.x-central-euro", "Helvetica"); --pref("font.name.monospace.x-central-euro", "Courier"); -+pref("font.name.serif.x-central-euro", "serif"); -+pref("font.name.sans-serif.x-central-euro", "sans-serif"); -+pref("font.name.monospace.x-central-euro", "monospace"); - - pref("font.name.serif.x-cyrillic", "serif"); - pref("font.name.sans-serif.x-cyrillic", "sans-serif"); - pref("font.name.monospace.x-cyrillic", "monospace"); - --pref("font.name.serif.x-unicode", "Times"); --pref("font.name.sans-serif.x-unicode", "Helvetica"); --pref("font.name.monospace.x-unicode", "Courier"); -- --pref("font.name.serif.x-user-def", "Times"); --pref("font.name.sans-serif.x-user-def", "Helvetica"); --pref("font.name.monospace.x-user-def", "Courier"); -- --pref("font.name.serif.x-western", "Times"); --pref("font.name.sans-serif.x-western", "Helvetica"); --pref("font.name.monospace.x-western", "Courier"); -+pref("font.name.serif.x-unicode", "serif"); -+pref("font.name.sans-serif.x-unicode", "sans-serif"); -+pref("font.name.monospace.x-unicode", "monospace"); -+ -+pref("font.name.serif.x-user-def", "serif"); -+pref("font.name.sans-serif.x-user-def", "sans-serif"); -+pref("font.name.monospace.x-user-def", "monospace"); -+ -+pref("font.name.serif.x-western", "serif"); -+pref("font.name.sans-serif.x-western", "sans-serif"); -+pref("font.name.monospace.x-western", "monospace"); - - pref("font.name.serif.zh-CN", "serif"); - pref("font.name.sans-serif.zh-CN", "sans-serif"); diff --git a/www/firefox-devel/files/patch-nopangoxft b/www/firefox-devel/files/patch-nopangoxft deleted file mode 100644 index 5a11c8c48..000000000 --- a/www/firefox-devel/files/patch-nopangoxft +++ /dev/null @@ -1,20 +0,0 @@ ---- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400 -+++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); diff --git a/www/firefox-devel/files/patch-nothreads-sqlite b/www/firefox-devel/files/patch-nothreads-sqlite deleted file mode 100644 index 1b1bbbcbd..000000000 --- a/www/firefox-devel/files/patch-nothreads-sqlite +++ /dev/null @@ -1,12 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 -+++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 -@@ -99,7 +99,8 @@ - # REFEF_IO allows us to override IO functions, which is used in the AsyncIO - # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we - # don't have to vacuum to make sure the data is not visible in the file. --DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 -+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -+# -DTHREADSAFE=1 - - ifdef ENABLE_TESTS - ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/www/firefox-devel/files/patch-security-coreconf-FreeBSD.mk b/www/firefox-devel/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 0f7a04a02..000000000 --- a/www/firefox-devel/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,24 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 -+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 -@@ -45,8 +45,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -73,7 +77,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif diff --git a/www/firefox-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229..000000000 --- a/www/firefox-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/firefox-devel/files/patch-sysnss b/www/firefox-devel/files/patch-sysnss deleted file mode 100644 index d69df4045..000000000 --- a/www/firefox-devel/files/patch-sysnss +++ /dev/null @@ -1,174 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006 -+++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006 -@@ -54,22 +54,13 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) -- --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -217,11 +208,6 @@ - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - endif - -@@ -248,47 +234,6 @@ - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -299,42 +244,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -351,12 +260,6 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox-devel/files/patch-toolkit_xre_nsXREDirProvider.cpp b/www/firefox-devel/files/patch-toolkit_xre_nsXREDirProvider.cpp deleted file mode 100644 index 0c5a07ab2..000000000 --- a/www/firefox-devel/files/patch-toolkit_xre_nsXREDirProvider.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- toolkit/xre/nsXREDirProvider.cpp.orig Tue Oct 4 11:46:26 2005 -+++ toolkit/xre/nsXREDirProvider.cpp Sun Feb 5 23:54:31 2006 -@@ -820,6 +820,7 @@ - - char* appNameFolder = nsnull; - char profileFolderName[MAXPATHLEN] = "."; -+ char temp[MAXPATHLEN]; - - // Offset 1 for the outermost folder to make it hidden (i.e. using the ".") - char* writing = profileFolderName + 1; -@@ -829,7 +830,6 @@ - rv = localDir->AppendNative(nsDependentCString(profileFolderName)); - NS_ENSURE_SUCCESS(rv, rv); - -- char temp[MAXPATHLEN]; - GetProfileFolderName(temp, gAppData->name); - appNameFolder = temp; - } - diff --git a/www/firefox-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/firefox-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/firefox-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4..000000000 --- a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a..000000000 --- a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/firefox-devel/files/patch-xptcall-alpha b/www/firefox-devel/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/firefox-devel/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/firefox-devel/files/patch-xptcall-sparc64 b/www/firefox-devel/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/firefox-devel/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/firefox-devel/pkg-descr b/www/firefox-devel/pkg-descr deleted file mode 100644 index 4870c99fb..000000000 --- a/www/firefox-devel/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Firefox is an award winning, free, open-source web browser for many platforms -and is based on the Mozilla codebase. It is small, fast and easy to use, and -offers many advanced features: - o Popup Blocking - o Tabbed Browsing - o Live Bookmarks (ie. RSS) - o Extensions - o Themes - o FastFind - o Improved Security - -This is the latest bleeding edge release. Beware that you'll probably find -bugs here, so if you value stability, try www/firefox. - -WWW: http://www.mozilla.org/projects/bonecho/ diff --git a/www/firefox-devel/pkg-message b/www/firefox-devel/pkg-message deleted file mode 100644 index 5c9d24b32..000000000 --- a/www/firefox-devel/pkg-message +++ /dev/null @@ -1,32 +0,0 @@ -====================================================================== - -SMB issues: -Network group, machine, and share browsing does not work correctly. - -SFTP: -Only sftp access using public key authentication works. To easily -setup public key authentication to "remote_host": - -ssh-keygen -t dsa -cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" - -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 -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Date/time stamp from www/firefox-devel/Makefile. -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gnome@) -====================================================================== diff --git a/www/firefox-remote/Makefile b/www/firefox-remote/Makefile deleted file mode 100644 index e580beba8..000000000 --- a/www/firefox-remote/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# New ports collection makefile for: firefox-remote -# Date created: 13 May 2004 -# Whom: Franz Klammer <klammer@webonaut.com> -# -# $FreeBSD$ -# - -PORTNAME= firefox -PORTVERSION= 20040803 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://www.webonaut.com/distfiles/${PORTNAME}${PKGNAMESUFFIX}/ -PKGNAMESUFFIX= -remote -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} - -MAINTAINER= klammer@webonaut.com -COMMENT= Wrapper scripts for firefox web browser - -USE_BZIP2= yes - -UTF8_HACK= no -FIREFOX_REMOTE= ${PORTNAME}${PKGNAMESUFFIX} -THUNDERBIRD_REMOTE= thunderbird${PKGNAMESUFFIX} - -OPTIONS=UTF8_LOCALE "Use UTF8 locale (read Makefile for details)" off \ - MENU_FIREFOX "Add menu entry for firefox" off \ - MENU_THUNDERBIRD "Add menu entry for thunderbird" off - -.include <bsd.port.pre.mk> - -# firefox/thunderbird can't display unicode filenames with special -# characters like umlaute in german correctly if a ISO-locale is set. -# when enabled the remote scripts try to switch to the UTF8-locale if -# available (e.g. de_DE.UTF8 instead of de_DE.ISO8859-xx) -.if defined(WITH_UTF8_LOCALE) -UTF8_HACK= yes -.endif - -.if defined(WITH_MENU_FIREFOX) -PLIST_SUB+= MENU_FIREFOX="" -.else -PLIST_SUB+= MENU_FIREFOX="@comment " -.endif - -.if defined(WITH_MENU_THUNDERBIRD) -PLIST_SUB+= MENU_THUNDERBIRD="" -.else -PLIST_SUB+= MENU_THUNDERBIRD="@comment " -.endif - -do-build: - @${REINPLACE_CMD} -e 's|@X11BASE@|${PREFIX}|g' \ - ${WRKSRC}/${FIREFOX_REMOTE} - @${REINPLACE_CMD} -e 's|@UTF8@|${UTF8_HACK}|g' \ - ${WRKSRC}/${FIREFOX_REMOTE} - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${FIREFOX_REMOTE} \ - ${PREFIX}/bin/${FIREFOX_REMOTE} - ${RM} -f ${PREFIX}/bin/${THUNDERBIRD_REMOTE} - ${LN} -s ${PREFIX}/bin/${FIREFOX_REMOTE} \ - ${PREFIX}/bin/${THUNDERBIRD_REMOTE} -.if defined (WITH_MENU_FIREFOX) - ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.desktop \ - ${X11BASE}/share/applications/ - ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.png \ - ${X11BASE}/share/pixmaps/ -.endif -.if defined (WITH_MENU_THUNDERBIRD) - ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.desktop \ - ${X11BASE}/share/applications/ - ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.png \ - ${X11BASE}/share/pixmaps/ -.endif - ${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/www/firefox-remote/distinfo b/www/firefox-remote/distinfo deleted file mode 100644 index 7e3713b5b..000000000 --- a/www/firefox-remote/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (firefox-remote-20040803.tar.bz2) = 41cb8969eab5233662c24bfa75585062 -SHA256 (firefox-remote-20040803.tar.bz2) = 37832c77437ad1438e8a8a865387eb555c69b83c899440f752012d4e98576d56 -SIZE (firefox-remote-20040803.tar.bz2) = 12789 diff --git a/www/firefox-remote/pkg-descr b/www/firefox-remote/pkg-descr deleted file mode 100644 index 19bda45f1..000000000 --- a/www/firefox-remote/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Wrapper script for firefox web browser to add the open-in-new-tab functionality -missing in the original startup script. - -also included thunderbird-remote. diff --git a/www/firefox-remote/pkg-message b/www/firefox-remote/pkg-message deleted file mode 100644 index 796f2f260..000000000 --- a/www/firefox-remote/pkg-message +++ /dev/null @@ -1,7 +0,0 @@ -======================================================================== - -To enable mailto: in firefox the easiest way is to install the MozEx -navigation extension and use "${X11BASE}/bin/thunderbird-remote %r" -(without quotes) as the Mailer command. - -======================================================================== diff --git a/www/firefox-remote/pkg-plist b/www/firefox-remote/pkg-plist deleted file mode 100644 index fa3626ff6..000000000 --- a/www/firefox-remote/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/firefox-remote -bin/thunderbird-remote -%%MENU_FIREFOX%%share/applications/mozilla_firefox.desktop -%%MENU_THUNDERBIRD%%share/applications/mozilla_thunderbird.desktop -%%MENU_FIREFOX%%share/pixmaps/mozilla_firefox.png -%%MENU_THUNDERBIRD%%share/pixmaps/mozilla_thunderbird.png -@dirrmtry share/applications diff --git a/www/firefox/Makefile b/www/firefox/Makefile deleted file mode 100644 index c85891cf2..000000000 --- a/www/firefox/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.35 2006/09/14 12:37:00 ahze Exp $ - -PORTNAME= firefox -DISTVERSION= 1.5.0.7 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= www -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 - -WANT_GNOME= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ - -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons - -FIREFOX_ICON= ${MOZILLA}.xpm -FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --enable-application=browser \ - --enable-system-cairo \ - --enable-official-branding \ - --enable-canvas - -SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome - -OPTIONS= NEWTAB "Open external links in a new tab" on \ - SMB "Enable smb:// URI support using gnomevfs" off - -.include <bsd.port.pre.mk> - -.if ${ARCH}=="alpha" && ${OSVERSION} < 500035 -IGNORE= core dumps on ${ARCH} -.endif - -.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 -IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed -.endif - -.if ${OSVERSION} >= 600000 -MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo -.endif - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif - -post-extract:: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - -post-patch: -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor - -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} - ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ - >> ${SYSTEM_PREFS} -.endif # !defined(WITHOUT_NEWTAB) - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - -post-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} - -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/firefox/distinfo b/www/firefox/distinfo deleted file mode 100644 index b826286ba..000000000 --- a/www/firefox/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (firefox-1.5.0.7-source.tar.bz2) = 518cbd99a3fe663237070013e5cdb1a4 -SHA256 (firefox-1.5.0.7-source.tar.bz2) = 9fea10a367f7709649fdd93830cf1d9e2c63b9a840a6f03e28da6afd5d286989 -SIZE (firefox-1.5.0.7-source.tar.bz2) = 35541113 diff --git a/www/firefox/files/extra-patch-config_make-jars.pl b/www/firefox/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca..000000000 --- a/www/firefox/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/www/firefox/files/firefox.desktop.in b/www/firefox/files/firefox.desktop.in deleted file mode 100644 index c1b7a2e59..000000000 --- a/www/firefox/files/firefox.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Firefox Web Browser -Name[am]= -Name[ar]= -Name[az]=Firefox Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър Firefox -Name[bn]= -Name[bs]=Firefox web preglednik -Name[ca]=Navegador web Firefox -Name[cs]=Prohlížeč WWW Firefox -Name[cy]=Y Porwr Gwe Firefox -Name[da]=Firefox - internetsurfning -Name[de]=Firefox Webbrowser -Name[el]=Περιηγητής Διαδικτύου Firefox -Name[en_CA]=Firefox Web Browser -Name[en_GB]=Firefox Web Browser -Name[es]=Navegador Web Firefox -Name[et]=Firefox veebibrauser -Name[eu]=Firefox web arakatzailea -Name[fi]=Firefox, WWW-selain -Name[fr]=Navigateur Web Firefox -Name[ga]=Brabhsálaí Lín Firefox -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן Firefox -Name[hi]= -Name[hr]=Firefox Web preglednik -Name[hu]=Firefox webböngésző -Name[id]=Web Browser Firefox -Name[it]=Browser web Firefox -Name[ja]=Firefox ウェブ・ブラウザ -Name[ko]=Firefox 웹 브라우저 -Name[li]=Firefox Web Browser -Name[lt]=Firefox web naršyklė -Name[mk]=Firefox веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=Firefox веб хөтөч -Name[ms]=Pelungsur Web Firefox -Name[nb]=Firefox nettleser -Name[nl]=Firefox Webbrowser -Name[nn]=Firefox nettlesar -Name[no]=Firefox nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW Firefox -Name[pt]=Navegador Web Firefox -Name[pt_BR]=Navegador Web Firefox -Name[ro]=Navigatorul Firefox -Name[ru]=Веб-браузер Firefox -Name[sk]= -Name[sl]=Spletni brskalnik Firefox -Name[sq]=Firefox - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren Firefox -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=Firefox Web Ahtarçisi -Name[tr]=Firefox Web Tarayıcı -Name[uk]=Переглядач web Firefox -Name[vi]=Trình Duyệt Web Firefox -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=Firefox Web 浏览器 -Name[zh_TW]=Firefox 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web Firefox -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ Firefox -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/firefox/files/moz_pis_S50cleanhome b/www/firefox/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e3..000000000 --- a/www/firefox/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/firefox/files/patch-Double.cpp b/www/firefox/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff..000000000 --- a/www/firefox/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/firefox/files/patch-browser_app_mozilla.in b/www/firefox/files/patch-browser_app_mozilla.in deleted file mode 100644 index c815a4780..000000000 --- a/www/firefox/files/patch-browser_app_mozilla.in +++ /dev/null @@ -1,125 +0,0 @@ ---- browser/app/mozilla.in.orig Mon Apr 4 15:08:49 2005 -+++ browser/app/mozilla.in Wed Jun 1 14:47:45 2005 -@@ -49,51 +49,83 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh diff --git a/www/firefox/files/patch-build_unix_run-mozilla.sh b/www/firefox/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 87114cc7b..000000000 --- a/www/firefox/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/firefox/files/patch-config-mkdepend-imakemdep.h b/www/firefox/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/firefox/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/firefox/files/patch-config-rules.mk b/www/firefox/files/patch-config-rules.mk deleted file mode 100644 index ecc3c8194..000000000 --- a/www/firefox/files/patch-config-rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/firefox/files/patch-config_autoconf.mk.in b/www/firefox/files/patch-config_autoconf.mk.in deleted file mode 100644 index 29fe7f8fb..000000000 --- a/www/firefox/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 -+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 -@@ -50,13 +50,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/firefox/files/patch-config_mkdepend_Makefile.in b/www/firefox/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index bace012a2..000000000 --- a/www/firefox/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox/files/patch-configure b/www/firefox/files/patch-configure deleted file mode 100644 index 923cf5065..000000000 --- a/www/firefox/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Wed Nov 23 11:07:17 2005 -@@ -10016,7 +10016,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10022 "configure" - #include "confdefs.h" -@@ -10047,7 +10047,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10063 "configure" - #include "confdefs.h" -@@ -10088,7 +10088,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74..000000000 --- a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b43..000000000 --- a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/firefox/files/patch-libm b/www/firefox/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/firefox/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox/files/patch-modules_libpref_src_init_all.js b/www/firefox/files/patch-modules_libpref_src_init_all.js deleted file mode 100644 index 1700380a5..000000000 --- a/www/firefox/files/patch-modules_libpref_src_init_all.js +++ /dev/null @@ -1,53 +0,0 @@ ---- modules/libpref/src/init/all.js.orig Mon Feb 13 22:58:15 2006 -+++ modules/libpref/src/init/all.js Tue May 2 00:32:55 2006 -@@ -1883,33 +1883,33 @@ - - // th - --pref("font.name.serif.tr", "Times"); --pref("font.name.sans-serif.tr", "Helvetica"); --pref("font.name.monospace.tr", "Courier"); -+pref("font.name.serif.tr", "serif"); -+pref("font.name.sans-serif.tr", "sans-serif"); -+pref("font.name.monospace.tr", "monospace"); - - pref("font.name.serif.x-baltic", "serif"); - pref("font.name.sans-serif.x-baltic", "sans-serif"); - pref("font.name.monospace.x-baltic", "monospace"); - --pref("font.name.serif.x-central-euro", "Times"); --pref("font.name.sans-serif.x-central-euro", "Helvetica"); --pref("font.name.monospace.x-central-euro", "Courier"); -+pref("font.name.serif.x-central-euro", "serif"); -+pref("font.name.sans-serif.x-central-euro", "sans-serif"); -+pref("font.name.monospace.x-central-euro", "monospace"); - - pref("font.name.serif.x-cyrillic", "serif"); - pref("font.name.sans-serif.x-cyrillic", "sans-serif"); - pref("font.name.monospace.x-cyrillic", "monospace"); - --pref("font.name.serif.x-unicode", "Times"); --pref("font.name.sans-serif.x-unicode", "Helvetica"); --pref("font.name.monospace.x-unicode", "Courier"); -- --pref("font.name.serif.x-user-def", "Times"); --pref("font.name.sans-serif.x-user-def", "Helvetica"); --pref("font.name.monospace.x-user-def", "Courier"); -- --pref("font.name.serif.x-western", "Times"); --pref("font.name.sans-serif.x-western", "Helvetica"); --pref("font.name.monospace.x-western", "Courier"); -+pref("font.name.serif.x-unicode", "serif"); -+pref("font.name.sans-serif.x-unicode", "sans-serif"); -+pref("font.name.monospace.x-unicode", "monospace"); -+ -+pref("font.name.serif.x-user-def", "serif"); -+pref("font.name.sans-serif.x-user-def", "sans-serif"); -+pref("font.name.monospace.x-user-def", "monospace"); -+ -+pref("font.name.serif.x-western", "serif"); -+pref("font.name.sans-serif.x-western", "sans-serif"); -+pref("font.name.monospace.x-western", "monospace"); - - pref("font.name.serif.zh-CN", "serif"); - pref("font.name.sans-serif.zh-CN", "sans-serif"); diff --git a/www/firefox/files/patch-nopangoxft b/www/firefox/files/patch-nopangoxft deleted file mode 100644 index 5a11c8c48..000000000 --- a/www/firefox/files/patch-nopangoxft +++ /dev/null @@ -1,20 +0,0 @@ ---- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400 -+++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); diff --git a/www/firefox/files/patch-security-coreconf-FreeBSD.mk b/www/firefox/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 3e0e14aca..000000000 --- a/www/firefox/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,28 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +75,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/firefox/files/patch-sysnss b/www/firefox/files/patch-sysnss deleted file mode 100644 index d854cabc0..000000000 --- a/www/firefox/files/patch-sysnss +++ /dev/null @@ -1,178 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 -+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 -@@ -37,16 +37,7 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) -@@ -132,9 +123,4 @@ - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - -@@ -153,43 +139,4 @@ - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif --ifndef DISABLE_DIST_GRE -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) --endif --endif --ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ -@@ -200,18 +147,4 @@ - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -227,9 +160,4 @@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); diff --git a/www/firefox/files/patch-toolkit_xre_nsXREDirProvider.cpp b/www/firefox/files/patch-toolkit_xre_nsXREDirProvider.cpp deleted file mode 100644 index 0c5a07ab2..000000000 --- a/www/firefox/files/patch-toolkit_xre_nsXREDirProvider.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- toolkit/xre/nsXREDirProvider.cpp.orig Tue Oct 4 11:46:26 2005 -+++ toolkit/xre/nsXREDirProvider.cpp Sun Feb 5 23:54:31 2006 -@@ -820,6 +820,7 @@ - - char* appNameFolder = nsnull; - char profileFolderName[MAXPATHLEN] = "."; -+ char temp[MAXPATHLEN]; - - // Offset 1 for the outermost folder to make it hidden (i.e. using the ".") - char* writing = profileFolderName + 1; -@@ -829,7 +830,6 @@ - rv = localDir->AppendNative(nsDependentCString(profileFolderName)); - NS_ENSURE_SUCCESS(rv, rv); - -- char temp[MAXPATHLEN]; - GetProfileFolderName(temp, gAppData->name); - appNameFolder = temp; - } - diff --git a/www/firefox/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/firefox/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/firefox/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4..000000000 --- a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a..000000000 --- a/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/firefox/files/patch-xptcall-alpha b/www/firefox/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/firefox/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/firefox/files/patch-xptcall-sparc64 b/www/firefox/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/firefox/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/firefox/pkg-descr b/www/firefox/pkg-descr deleted file mode 100644 index 4f5cfbf2c..000000000 --- a/www/firefox/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Firefox is an award winning, free, open-source web browser for many platforms -and is based on the Mozilla codebase. It is small, fast and easy to use, and -offers many advanced features: - o Popup Blocking - o Tabbed Browsing - o Live Bookmarks (ie. RSS) - o Extensions - o Themes - o FastFind - o Improved Security - -WWW: http://www.mozilla.com/firefox/ diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message deleted file mode 100644 index 9e0a4dd2e..000000000 --- a/www/firefox/pkg-message +++ /dev/null @@ -1,32 +0,0 @@ -====================================================================== - -SMB issues: -Network group, machine, and share browsing does not work correctly. - -SFTP: -Only sftp access using public key authentication works. To easily -setup public key authentication to "remote_host": - -ssh-keygen -t dsa -cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" - -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 -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Date/time stamp from www/firefox/Makefile. -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gnome@) -====================================================================== diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile deleted file mode 100644 index 8b79a7272..000000000 --- a/www/firefox3-devel/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports-experimental/www/firefox-devel/Makefile,v 1.2 2006/09/25 22:44:03 ahze Exp $ - -PORTNAME= firefox -DISTVERSION= 2.0rc2 -PORTEPOCH= 1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -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 - -BUILD_DEPENDS= nss>=3.11.2:${PORTSDIR}/security/nss - -LATEST_LINK= firefox2 -MOZILLA= ${PORTNAME}${MOZILLA_SUFX} -MOZILLA_NAME= Firefox${MOZILLA_SUFX} -MOZILLA_SUFX= -devel -MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' - -WANT_GNOME= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ -LIBS= -Wl,-Bsymbolic -lc -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons - -FIREFOX_ICON= ${MOZILLA}.xpm -FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --enable-application=browser \ - --enable-system-cairo \ - --enable-official-branding \ - --enable-canvas \ - --with-system-nss - -SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome - -OPTIONS= NEWTAB "Open external links in a new tab" on \ - SMB "Enable smb:// URI support using gnomevfs" off - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - -.if ${OSVERSION} >= 600000 -MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo -.endif - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif - -post-extract:: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor - -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} - ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ - >> ${SYSTEM_PREFS} -.endif # !defined(WITHOUT_NEWTAB) - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - -post-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} - -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo deleted file mode 100644 index dd95c332d..000000000 --- a/www/firefox3-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (firefox-2.0rc2-source.tar.bz2) = b2cbe4bef6971bb7342970ce24514c28 -SHA256 (firefox-2.0rc2-source.tar.bz2) = 21ae0d20cae31922bad2677b737da3989089ee836c19b846fea17cea7108e966 -SIZE (firefox-2.0rc2-source.tar.bz2) = 36945630 diff --git a/www/firefox3-devel/files/extra-patch-config_make-jars.pl b/www/firefox3-devel/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca..000000000 --- a/www/firefox3-devel/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/www/firefox3-devel/files/firefox.desktop.in b/www/firefox3-devel/files/firefox.desktop.in deleted file mode 100644 index d72090e1a..000000000 --- a/www/firefox3-devel/files/firefox.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; diff --git a/www/firefox3-devel/files/moz_pis_S50cleanhome b/www/firefox3-devel/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e3..000000000 --- a/www/firefox3-devel/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/firefox3-devel/files/patch-Double.cpp b/www/firefox3-devel/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff..000000000 --- a/www/firefox3-devel/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/firefox3-devel/files/patch-browser_app_mozilla.in b/www/firefox3-devel/files/patch-browser_app_mozilla.in deleted file mode 100644 index c815a4780..000000000 --- a/www/firefox3-devel/files/patch-browser_app_mozilla.in +++ /dev/null @@ -1,125 +0,0 @@ ---- browser/app/mozilla.in.orig Mon Apr 4 15:08:49 2005 -+++ browser/app/mozilla.in Wed Jun 1 14:47:45 2005 -@@ -49,51 +49,83 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh diff --git a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 87114cc7b..000000000 --- a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h b/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/firefox3-devel/files/patch-config-rules.mk b/www/firefox3-devel/files/patch-config-rules.mk deleted file mode 100644 index 7377726fd..000000000 --- a/www/firefox3-devel/files/patch-config-rules.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- config/rules.mk.orig Fri Jul 7 00:13:36 2006 -+++ config/rules.mk Sun Sep 3 00:04:03 2006 -@@ -443,7 +443,7 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - endif - diff --git a/www/firefox3-devel/files/patch-config_autoconf.mk.in b/www/firefox3-devel/files/patch-config_autoconf.mk.in deleted file mode 100644 index 29fe7f8fb..000000000 --- a/www/firefox3-devel/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 -+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 -@@ -50,13 +50,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in b/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index bace012a2..000000000 --- a/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox3-devel/files/patch-configure b/www/firefox3-devel/files/patch-configure deleted file mode 100644 index ee6087d2d..000000000 --- a/www/firefox3-devel/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig Tue Aug 8 13:59:01 2006 -+++ configure Tue Sep 19 07:52:08 2006 -@@ -1047,7 +1047,7 @@ - - MOZJPEG=62 - MOZPNG=10207 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - NSS_VERSION=3 - -@@ -10267,7 +10267,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10273 "configure" - #include "confdefs.h" -@@ -10298,7 +10298,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10308,7 +10308,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10314 "configure" - #include "confdefs.h" -@@ -10339,7 +10339,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74..000000000 --- a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b43..000000000 --- a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/firefox3-devel/files/patch-libm b/www/firefox3-devel/files/patch-libm deleted file mode 100644 index d9295c906..000000000 --- a/www/firefox3-devel/files/patch-libm +++ /dev/null @@ -1,9 +0,0 @@ ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox3-devel/files/patch-modules_libpref_src_init_all.js b/www/firefox3-devel/files/patch-modules_libpref_src_init_all.js deleted file mode 100644 index 1700380a5..000000000 --- a/www/firefox3-devel/files/patch-modules_libpref_src_init_all.js +++ /dev/null @@ -1,53 +0,0 @@ ---- modules/libpref/src/init/all.js.orig Mon Feb 13 22:58:15 2006 -+++ modules/libpref/src/init/all.js Tue May 2 00:32:55 2006 -@@ -1883,33 +1883,33 @@ - - // th - --pref("font.name.serif.tr", "Times"); --pref("font.name.sans-serif.tr", "Helvetica"); --pref("font.name.monospace.tr", "Courier"); -+pref("font.name.serif.tr", "serif"); -+pref("font.name.sans-serif.tr", "sans-serif"); -+pref("font.name.monospace.tr", "monospace"); - - pref("font.name.serif.x-baltic", "serif"); - pref("font.name.sans-serif.x-baltic", "sans-serif"); - pref("font.name.monospace.x-baltic", "monospace"); - --pref("font.name.serif.x-central-euro", "Times"); --pref("font.name.sans-serif.x-central-euro", "Helvetica"); --pref("font.name.monospace.x-central-euro", "Courier"); -+pref("font.name.serif.x-central-euro", "serif"); -+pref("font.name.sans-serif.x-central-euro", "sans-serif"); -+pref("font.name.monospace.x-central-euro", "monospace"); - - pref("font.name.serif.x-cyrillic", "serif"); - pref("font.name.sans-serif.x-cyrillic", "sans-serif"); - pref("font.name.monospace.x-cyrillic", "monospace"); - --pref("font.name.serif.x-unicode", "Times"); --pref("font.name.sans-serif.x-unicode", "Helvetica"); --pref("font.name.monospace.x-unicode", "Courier"); -- --pref("font.name.serif.x-user-def", "Times"); --pref("font.name.sans-serif.x-user-def", "Helvetica"); --pref("font.name.monospace.x-user-def", "Courier"); -- --pref("font.name.serif.x-western", "Times"); --pref("font.name.sans-serif.x-western", "Helvetica"); --pref("font.name.monospace.x-western", "Courier"); -+pref("font.name.serif.x-unicode", "serif"); -+pref("font.name.sans-serif.x-unicode", "sans-serif"); -+pref("font.name.monospace.x-unicode", "monospace"); -+ -+pref("font.name.serif.x-user-def", "serif"); -+pref("font.name.sans-serif.x-user-def", "sans-serif"); -+pref("font.name.monospace.x-user-def", "monospace"); -+ -+pref("font.name.serif.x-western", "serif"); -+pref("font.name.sans-serif.x-western", "sans-serif"); -+pref("font.name.monospace.x-western", "monospace"); - - pref("font.name.serif.zh-CN", "serif"); - pref("font.name.sans-serif.zh-CN", "sans-serif"); diff --git a/www/firefox3-devel/files/patch-nopangoxft b/www/firefox3-devel/files/patch-nopangoxft deleted file mode 100644 index 5a11c8c48..000000000 --- a/www/firefox3-devel/files/patch-nopangoxft +++ /dev/null @@ -1,20 +0,0 @@ ---- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400 -+++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); diff --git a/www/firefox3-devel/files/patch-nothreads-sqlite b/www/firefox3-devel/files/patch-nothreads-sqlite deleted file mode 100644 index 1b1bbbcbd..000000000 --- a/www/firefox3-devel/files/patch-nothreads-sqlite +++ /dev/null @@ -1,12 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 -+++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 -@@ -99,7 +99,8 @@ - # REFEF_IO allows us to override IO functions, which is used in the AsyncIO - # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we - # don't have to vacuum to make sure the data is not visible in the file. --DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 -+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -+# -DTHREADSAFE=1 - - ifdef ENABLE_TESTS - ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk b/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 0f7a04a02..000000000 --- a/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,24 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 -+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 -@@ -45,8 +45,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -73,7 +77,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif diff --git a/www/firefox3-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox3-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229..000000000 --- a/www/firefox3-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/firefox3-devel/files/patch-sysnss b/www/firefox3-devel/files/patch-sysnss deleted file mode 100644 index d69df4045..000000000 --- a/www/firefox3-devel/files/patch-sysnss +++ /dev/null @@ -1,174 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006 -+++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006 -@@ -54,22 +54,13 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) -- --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -217,11 +208,6 @@ - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - endif - -@@ -248,47 +234,6 @@ - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -299,42 +244,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -351,12 +260,6 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox3-devel/files/patch-toolkit_xre_nsXREDirProvider.cpp b/www/firefox3-devel/files/patch-toolkit_xre_nsXREDirProvider.cpp deleted file mode 100644 index 0c5a07ab2..000000000 --- a/www/firefox3-devel/files/patch-toolkit_xre_nsXREDirProvider.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- toolkit/xre/nsXREDirProvider.cpp.orig Tue Oct 4 11:46:26 2005 -+++ toolkit/xre/nsXREDirProvider.cpp Sun Feb 5 23:54:31 2006 -@@ -820,6 +820,7 @@ - - char* appNameFolder = nsnull; - char profileFolderName[MAXPATHLEN] = "."; -+ char temp[MAXPATHLEN]; - - // Offset 1 for the outermost folder to make it hidden (i.e. using the ".") - char* writing = profileFolderName + 1; -@@ -829,7 +830,6 @@ - rv = localDir->AppendNative(nsDependentCString(profileFolderName)); - NS_ENSURE_SUCCESS(rv, rv); - -- char temp[MAXPATHLEN]; - GetProfileFolderName(temp, gAppData->name); - appNameFolder = temp; - } - diff --git a/www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/firefox3-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4..000000000 --- a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a..000000000 --- a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/firefox3-devel/files/patch-xptcall-alpha b/www/firefox3-devel/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/firefox3-devel/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/firefox3-devel/files/patch-xptcall-sparc64 b/www/firefox3-devel/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/firefox3-devel/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/firefox3-devel/pkg-descr b/www/firefox3-devel/pkg-descr deleted file mode 100644 index 4870c99fb..000000000 --- a/www/firefox3-devel/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Firefox is an award winning, free, open-source web browser for many platforms -and is based on the Mozilla codebase. It is small, fast and easy to use, and -offers many advanced features: - o Popup Blocking - o Tabbed Browsing - o Live Bookmarks (ie. RSS) - o Extensions - o Themes - o FastFind - o Improved Security - -This is the latest bleeding edge release. Beware that you'll probably find -bugs here, so if you value stability, try www/firefox. - -WWW: http://www.mozilla.org/projects/bonecho/ diff --git a/www/firefox3-devel/pkg-message b/www/firefox3-devel/pkg-message deleted file mode 100644 index 5c9d24b32..000000000 --- a/www/firefox3-devel/pkg-message +++ /dev/null @@ -1,32 +0,0 @@ -====================================================================== - -SMB issues: -Network group, machine, and share browsing does not work correctly. - -SFTP: -Only sftp access using public key authentication works. To easily -setup public key authentication to "remote_host": - -ssh-keygen -t dsa -cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" - -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 -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Date/time stamp from www/firefox-devel/Makefile. -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gnome@) -====================================================================== diff --git a/www/flock/Makefile b/www/flock/Makefile deleted file mode 100644 index 6abe9d42f..000000000 --- a/www/flock/Makefile +++ /dev/null @@ -1,109 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/flock/Makefile,v 1.1 2006/07/18 14:53:33 ahze Exp $ -# - -PORTNAME= flock -DISTVERSION= 0.7 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -# http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock -MASTER_SITE_SUBDIR= ahze -DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ - clucene-flock-3${EXTRACT_SUFX} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla - -LIB_DEPENDS= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \ - jasper.4:${PORTSDIR}/graphics/jasper - -MOZILLA_NAME= Flock -CLUCENE_WRKSRC= ${WRKDIR}/clucene -WANT_GNOME= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ - -CPPFLAGS= -I${WRKDIR}/local/include -LDFLAGS= -L${WRKDIR}/local/lib - -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons - -FLOCK_ICON= ${MOZILLA}.xpm -FLOCK_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -CONFIGURE_ARGS= --with-clucene-prefix=${WRKDIR}/local -MOZ_OPTIONS= --enable-application=browser \ - --enable-system-cairo \ - --enable-official-branding \ - --enable-canvas - -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome - -OPTIONS= SMB "Enable smb:// URI support using gnomevfs" off - -.include <bsd.port.pre.mk> - -.if ${ARCH}=="alpha" || ${ARCH}=="ia64" -IGNORE= core dumps on ${ARCH} -.endif - -.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 -IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 -.endif - -.if ${OSVERSION} >= 600000 -MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo -.endif - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif - -post-extract:: - @${SED} -e 's|@FLOCK_ICON@|${FLOCK_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/flock.desktop.in >${WRKDIR}/${MOZILLA}.desktop - -pre-build: - @(cd ${CLUCENE_WRKSRC} && ${SETENV} LIBS="-lcompat" \ - CC="${CC}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \./configure --prefix=${WRKDIR}/local --disable-shared) - @(cd ${CLUCENE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) - @(cd ${CLUCENE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install) - -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/${FLOCK_ICON}' >> ${PLIST} - ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - -post-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default - ${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm - ${LN} -sf ${FLOCK_ICON_SRC} ${PREFIX}/share/pixmaps/${FLOCK_ICON} - -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/flock/distinfo b/www/flock/distinfo deleted file mode 100644 index 206c045c7..000000000 --- a/www/flock/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (flock-0.7.tar.bz2) = cadaa412cdcc238672d1e1382d426c8f -SHA256 (flock-0.7.tar.bz2) = e278d1860f066e7cf7606f140ef73e98191c0ded947fdae5b1272d5cedb28729 -SIZE (flock-0.7.tar.bz2) = 43048787 -MD5 (clucene-flock-3.tar.bz2) = 46eb9b11e8b77b7c7deb1fbfc5636c97 -SHA256 (clucene-flock-3.tar.bz2) = 991c9f20c800f0bd22f2a721cefc7c5933fb954479feddfc3c13d1972823bfba -SIZE (clucene-flock-3.tar.bz2) = 2076764 diff --git a/www/flock/files/extra-patch-config_make-jars.pl b/www/flock/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca..000000000 --- a/www/flock/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/www/flock/files/flock.desktop.in b/www/flock/files/flock.desktop.in deleted file mode 100644 index 5c7f770b6..000000000 --- a/www/flock/files/flock.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %U -Icon=@FLOCK_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/flock/files/moz_pis_S50cleanhome b/www/flock/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e3..000000000 --- a/www/flock/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/flock/files/patch-Double.cpp b/www/flock/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff..000000000 --- a/www/flock/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/flock/files/patch-browser_app_mozilla.in b/www/flock/files/patch-browser_app_mozilla.in deleted file mode 100644 index c815a4780..000000000 --- a/www/flock/files/patch-browser_app_mozilla.in +++ /dev/null @@ -1,125 +0,0 @@ ---- browser/app/mozilla.in.orig Mon Apr 4 15:08:49 2005 -+++ browser/app/mozilla.in Wed Jun 1 14:47:45 2005 -@@ -49,51 +49,83 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh diff --git a/www/flock/files/patch-build_unix_run-mozilla.sh b/www/flock/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 87114cc7b..000000000 --- a/www/flock/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/flock/files/patch-config-mkdepend-imakemdep.h b/www/flock/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/flock/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/flock/files/patch-config-rules.mk b/www/flock/files/patch-config-rules.mk deleted file mode 100644 index ecc3c8194..000000000 --- a/www/flock/files/patch-config-rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/flock/files/patch-config_autoconf.mk.in b/www/flock/files/patch-config_autoconf.mk.in deleted file mode 100644 index 29fe7f8fb..000000000 --- a/www/flock/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 -+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 -@@ -50,13 +50,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/flock/files/patch-config_mkdepend_Makefile.in b/www/flock/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index bace012a2..000000000 --- a/www/flock/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/flock/files/patch-configure b/www/flock/files/patch-configure deleted file mode 100644 index 923cf5065..000000000 --- a/www/flock/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Wed Nov 23 11:07:17 2005 -@@ -10016,7 +10016,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10022 "configure" - #include "confdefs.h" -@@ -10047,7 +10047,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10063 "configure" - #include "confdefs.h" -@@ -10088,7 +10088,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74..000000000 --- a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b43..000000000 --- a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/flock/files/patch-libm b/www/flock/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/flock/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/flock/files/patch-modules_libpref_src_init_all.js b/www/flock/files/patch-modules_libpref_src_init_all.js deleted file mode 100644 index 1700380a5..000000000 --- a/www/flock/files/patch-modules_libpref_src_init_all.js +++ /dev/null @@ -1,53 +0,0 @@ ---- modules/libpref/src/init/all.js.orig Mon Feb 13 22:58:15 2006 -+++ modules/libpref/src/init/all.js Tue May 2 00:32:55 2006 -@@ -1883,33 +1883,33 @@ - - // th - --pref("font.name.serif.tr", "Times"); --pref("font.name.sans-serif.tr", "Helvetica"); --pref("font.name.monospace.tr", "Courier"); -+pref("font.name.serif.tr", "serif"); -+pref("font.name.sans-serif.tr", "sans-serif"); -+pref("font.name.monospace.tr", "monospace"); - - pref("font.name.serif.x-baltic", "serif"); - pref("font.name.sans-serif.x-baltic", "sans-serif"); - pref("font.name.monospace.x-baltic", "monospace"); - --pref("font.name.serif.x-central-euro", "Times"); --pref("font.name.sans-serif.x-central-euro", "Helvetica"); --pref("font.name.monospace.x-central-euro", "Courier"); -+pref("font.name.serif.x-central-euro", "serif"); -+pref("font.name.sans-serif.x-central-euro", "sans-serif"); -+pref("font.name.monospace.x-central-euro", "monospace"); - - pref("font.name.serif.x-cyrillic", "serif"); - pref("font.name.sans-serif.x-cyrillic", "sans-serif"); - pref("font.name.monospace.x-cyrillic", "monospace"); - --pref("font.name.serif.x-unicode", "Times"); --pref("font.name.sans-serif.x-unicode", "Helvetica"); --pref("font.name.monospace.x-unicode", "Courier"); -- --pref("font.name.serif.x-user-def", "Times"); --pref("font.name.sans-serif.x-user-def", "Helvetica"); --pref("font.name.monospace.x-user-def", "Courier"); -- --pref("font.name.serif.x-western", "Times"); --pref("font.name.sans-serif.x-western", "Helvetica"); --pref("font.name.monospace.x-western", "Courier"); -+pref("font.name.serif.x-unicode", "serif"); -+pref("font.name.sans-serif.x-unicode", "sans-serif"); -+pref("font.name.monospace.x-unicode", "monospace"); -+ -+pref("font.name.serif.x-user-def", "serif"); -+pref("font.name.sans-serif.x-user-def", "sans-serif"); -+pref("font.name.monospace.x-user-def", "monospace"); -+ -+pref("font.name.serif.x-western", "serif"); -+pref("font.name.sans-serif.x-western", "sans-serif"); -+pref("font.name.monospace.x-western", "monospace"); - - pref("font.name.serif.zh-CN", "serif"); - pref("font.name.sans-serif.zh-CN", "sans-serif"); diff --git a/www/flock/files/patch-nopangoxft b/www/flock/files/patch-nopangoxft deleted file mode 100644 index 5a11c8c48..000000000 --- a/www/flock/files/patch-nopangoxft +++ /dev/null @@ -1,20 +0,0 @@ ---- gfx/src/gtk/mozilla-decoder.cpp.orig 2005-08-18 22:41:26.000000000 -0400 -+++ gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 -@@ -40,7 +40,7 @@ - #define PANGO_ENABLE_ENGINE - - #include "mozilla-decoder.h" --#include <pango/pangoxft.h> -+#include <pango/pangocairo.h> - #include <pango/pangofc-fontmap.h> - #include <pango/pangofc-font.h> - #include <gdk/gdkx.h> -@@ -208,7 +208,7 @@ - } - } - -- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), -+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), - mozilla_find_decoder, - NULL, - NULL); diff --git a/www/flock/files/patch-security-coreconf-FreeBSD.mk b/www/flock/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 3e0e14aca..000000000 --- a/www/flock/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,28 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +75,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/flock/files/patch-sysnss b/www/flock/files/patch-sysnss deleted file mode 100644 index d854cabc0..000000000 --- a/www/flock/files/patch-sysnss +++ /dev/null @@ -1,178 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 -+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 -@@ -37,16 +37,7 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) -@@ -132,9 +123,4 @@ - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - -@@ -153,43 +139,4 @@ - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif --ifndef DISABLE_DIST_GRE -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) --endif --endif --ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ -@@ -200,18 +147,4 @@ - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -227,9 +160,4 @@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); diff --git a/www/flock/files/patch-toolkit_xre_nsXREDirProvider.cpp b/www/flock/files/patch-toolkit_xre_nsXREDirProvider.cpp deleted file mode 100644 index 0c5a07ab2..000000000 --- a/www/flock/files/patch-toolkit_xre_nsXREDirProvider.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- toolkit/xre/nsXREDirProvider.cpp.orig Tue Oct 4 11:46:26 2005 -+++ toolkit/xre/nsXREDirProvider.cpp Sun Feb 5 23:54:31 2006 -@@ -820,6 +820,7 @@ - - char* appNameFolder = nsnull; - char profileFolderName[MAXPATHLEN] = "."; -+ char temp[MAXPATHLEN]; - - // Offset 1 for the outermost folder to make it hidden (i.e. using the ".") - char* writing = profileFolderName + 1; -@@ -829,7 +830,6 @@ - rv = localDir->AppendNative(nsDependentCString(profileFolderName)); - NS_ENSURE_SUCCESS(rv, rv); - -- char temp[MAXPATHLEN]; - GetProfileFolderName(temp, gAppData->name); - appNameFolder = temp; - } - diff --git a/www/flock/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/flock/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/flock/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/flock/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/flock/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4..000000000 --- a/www/flock/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/flock/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/flock/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a..000000000 --- a/www/flock/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/flock/files/patch-xptcall-sparc64 b/www/flock/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/flock/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/flock/pkg-descr b/www/flock/pkg-descr deleted file mode 100644 index 81d19b220..000000000 --- a/www/flock/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Flock is a social browser, cross platform, open source, and -based on Mozilla technologies. Flock includes such features -as blogging tools, feed handling, and integrated del.icio.us -favorites and Flickr photo sharing. - -WWW: http://www.flock.com/ diff --git a/www/galeon/Makefile b/www/galeon/Makefile deleted file mode 100644 index 4eb02fe3b..000000000 --- a/www/galeon/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# Ports collection Makefile for: galeon -# Date created: 1 August 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= galeon -PORTVERSION= 2.0.1 -PORTREVISION= 1 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://osdn.dl.sourceforge.net/sourceforge/galeon/ -MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine) - -USE_GECKO= firefox mozilla seamonkey xulrunner -WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//} -USE_BZIP2= yes -USE_XLIB= yes -INSTALLS_OMF= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ - gnomedesktop -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_GETTEXT= yes -CONFIGURE_ARGS= --enable-nautilus-view=no \ - --with-mozilla=${GECKO} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" - -MAN1= galeon.1 -GCONF_SCHEMAS= galeon.schemas - -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - -.if ${OSVERSION} > 500000 -# Galeon does not build correctly in -CURRENT if -Werror is passed -# to the compiler. -NO_WERROR= yes -.endif -# allow build with more warnings enabled -.if defined(NO_WERROR) -CONFIGURE_ARGS+= --disable-werror -.endif - -post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' - @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|malloc\.h|stdlib.h|g' - @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \ - ${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in - @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \ - ${WRKSRC}/mozilla/mozilla-embed-shell.cpp - -.include <bsd.port.post.mk> diff --git a/www/galeon/distinfo b/www/galeon/distinfo deleted file mode 100644 index f6f52b435..000000000 --- a/www/galeon/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (galeon-2.0.1.tar.bz2) = 34d6e3a6ee78f9e4d12736e5d81b462b -SHA256 (galeon-2.0.1.tar.bz2) = 26f0d37b8e8d17d4ad51091527907c233dfbcd513d776608bb2d435a37aea4e6 -SIZE (galeon-2.0.1.tar.bz2) = 2991656 diff --git a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c deleted file mode 100644 index 0400ebcf4..000000000 --- a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c +++ /dev/null @@ -1,10 +0,0 @@ ---- bookmarks/bookmarks-import-druid-konqueror.c.orig Tue Mar 30 16:33:05 2004 -+++ bookmarks/bookmarks-import-druid-konqueror.c Mon May 31 23:35:26 2004 -@@ -20,6 +20,7 @@ - #include "config.h" - #endif - -+#include <sys/types.h> - #include <glib/gi18n.h> - #include "bookmarks-import-druid-konqueror.h" - #include "gul-gobject-misc.h" diff --git a/www/galeon/files/patch-src_Makefile.in b/www/galeon/files/patch-src_Makefile.in deleted file mode 100644 index 3c75398d9..000000000 --- a/www/galeon/files/patch-src_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.in.orig Thu Dec 18 15:12:38 2003 -+++ src/Makefile.in Thu Dec 18 15:13:13 2003 -@@ -206,6 +206,7 @@ - -I$(top_srcdir)/bookmarks \ - $(GALEON_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -DDATADIR=\""$(datadir)"\" - - diff --git a/www/galeon/files/patch-src_galeon-main.c b/www/galeon/files/patch-src_galeon-main.c deleted file mode 100644 index 777907e0e..000000000 --- a/www/galeon/files/patch-src_galeon-main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/galeon-main.c.orig Thu Sep 11 01:11:30 2003 -+++ src/galeon-main.c Thu Sep 11 01:12:31 2003 -@@ -130,7 +130,7 @@ - #ifdef ENABLE_NLS - /* Initialize the i18n stuff */ - setlocale(LC_ALL, ""); -- bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale"); -+ bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR); - textdomain(GETTEXT_PACKAGE); - #endif - /* set the application name manually until gnome handles the diff --git a/www/galeon/files/patch-ui_Makefile.in b/www/galeon/files/patch-ui_Makefile.in deleted file mode 100644 index 9e87b8029..000000000 --- a/www/galeon/files/patch-ui_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- ui/Makefile.in.orig Fri Jan 23 01:48:25 2004 -+++ ui/Makefile.in Fri Jan 23 01:48:55 2004 -@@ -265,8 +265,7 @@ - uidir = $(pkgdatadir) - - uixmldir = $(datadir)/gnome-2.0/ui --uixml_in_files = galeon-bookmarks-editor-ui.xml.in \ -- nautilus-galeon-view-ui.xml.in -+uixml_in_files = galeon-bookmarks-editor-ui.xml.in - - - uixml_DATA = $(uixml_in_files:.xml.in=.xml) diff --git a/www/galeon/pkg-descr b/www/galeon/pkg-descr deleted file mode 100644 index 9a4205386..000000000 --- a/www/galeon/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Galeon is a GNOME 2 Web browser based on Gecko (the mozilla rendering engine). -It's fast, it has a light interface, and it is fully standards-compliant. - -WWW: http://galeon.sourceforge.net/ diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist deleted file mode 100644 index bdd828503..000000000 --- a/www/galeon/pkg-plist +++ /dev/null @@ -1,273 +0,0 @@ -bin/galeon -bin/galeon-config-tool -etc/sound/events/galeon.soundlist -libdata/bonobo/servers/GNOME_Galeon_Automation.server -libdata/bonobo/servers/GNOME_Galeon_NautilusView.server -share/gnome/applications/galeon.desktop -share/gnome/galeon/FAQ.html -share/gnome/galeon/about_logo.png -share/gnome/galeon/autoscroll.xpm -share/gnome/galeon/bookmarks-editor-small.glade -share/gnome/galeon/bookmarks-editor.glade -share/gnome/galeon/bookmarks.glade -share/gnome/galeon/bug.png -share/gnome/galeon/certificate-dialogs.glade -share/gnome/galeon/chrome/branding/brand.dtd -share/gnome/galeon/chrome/branding/brand.properties -share/gnome/galeon/chrome/galeon.manifest -share/gnome/galeon/chrome/global/about.xhtml -share/gnome/galeon/debian.png -share/gnome/galeon/default-bookmarks.xbel -share/gnome/galeon/default-prefs.js -share/gnome/galeon/fetch_favicon.xpm -share/gnome/galeon/freshmeat.png -share/gnome/galeon/galeon-bookmark-alias-mark.png -share/gnome/galeon/galeon-default.png -share/gnome/galeon/galeon-download.png -share/gnome/galeon/galeon-egg-ui-toolbar.xml -share/gnome/galeon/galeon-egg-ui.xml -share/gnome/galeon/galeon-entry.png -share/gnome/galeon/galeon-filter.png -share/gnome/galeon/galeon-folder.png -share/gnome/galeon/galeon-history.png -share/gnome/galeon/galeon-insecure.png -share/gnome/galeon/galeon-popup-blocked.png -share/gnome/galeon/galeon-prefs-fonts.png -share/gnome/galeon/galeon-prefs-general.png -share/gnome/galeon/galeon-prefs-language.png -share/gnome/galeon/galeon-prefs-mouse.png -share/gnome/galeon/galeon-prefs-network.png -share/gnome/galeon/galeon-prefs-privacy.png -share/gnome/galeon/galeon-prefs-tabs.png -share/gnome/galeon/galeon-prefs-web-content.png -share/gnome/galeon/galeon-secure.png -share/gnome/galeon/galeon-separator.png -share/gnome/galeon/galeon-tab-loading.gif -share/gnome/galeon/galeon.glade -share/gnome/galeon/galeon.png -share/gnome/galeon/gnu.png -share/gnome/galeon/google.png -share/gnome/galeon/google_groups.png -share/gnome/galeon/google_images.png -share/gnome/galeon/hand-open.png -share/gnome/galeon/imdb_movies.png -share/gnome/galeon/logo.png -share/gnome/galeon/myportal.css -share/gnome/galeon/new_alias.xpm -share/gnome/galeon/new_alias_small.xpm -share/gnome/galeon/new_folder.xpm -share/gnome/galeon/new_folder_small.xpm -share/gnome/galeon/new_item.xpm -share/gnome/galeon/new_item_small.xpm -share/gnome/galeon/new_separator.xpm -share/gnome/galeon/new_separator_small.xpm -share/gnome/galeon/prefs-dialog.glade -share/gnome/galeon/print.glade -share/gnome/galeon/rpm.png -share/gnome/galeon/slack.png -share/gnome/galeon/smart-bm-fold.png -share/gnome/galeon/smart-bm-unfold.png -share/gnome/galeon/stocks.png -share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml -share/gnome/help/galeon/C/apx-authors.xml -share/gnome/help/galeon/C/apx-bugs.xml -share/gnome/help/galeon/C/apx-command-line.xml -share/gnome/help/galeon/C/apx-compiling.xml -share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml -share/gnome/help/galeon/C/apx-mouse-gestures.xml -share/gnome/help/galeon/C/apx-troubleshooting.xml -share/gnome/help/galeon/C/bookmarks.xml -share/gnome/help/galeon/C/browser-window.xml -share/gnome/help/galeon/C/figures/bookmarks-editor.png -share/gnome/help/galeon/C/figures/browser-window.png -share/gnome/help/galeon/C/figures/find-dialog.png -share/gnome/help/galeon/C/figures/gesture-back.png -share/gnome/help/galeon/C/figures/gesture-clone-tab.png -share/gnome/help/galeon/C/figures/gesture-clone-window.png -share/gnome/help/galeon/C/figures/gesture-close-2.png -share/gnome/help/galeon/C/figures/gesture-close.png -share/gnome/help/galeon/C/figures/gesture-contents.png -share/gnome/help/galeon/C/figures/gesture-forward.png -share/gnome/help/galeon/C/figures/gesture-fullscreen.png -share/gnome/help/galeon/C/figures/gesture-homepage.png -share/gnome/help/galeon/C/figures/gesture-new-tab.png -share/gnome/help/galeon/C/figures/gesture-new-window.png -share/gnome/help/galeon/C/figures/gesture-next-link.png -share/gnome/help/galeon/C/figures/gesture-next-tab.png -share/gnome/help/galeon/C/figures/gesture-prev-link.png -share/gnome/help/galeon/C/figures/gesture-prev-tab.png -share/gnome/help/galeon/C/figures/gesture-reload-bypass.png -share/gnome/help/galeon/C/figures/gesture-reload.png -share/gnome/help/galeon/C/figures/gesture-stop.png -share/gnome/help/galeon/C/figures/gesture-up.png -share/gnome/help/galeon/C/figures/gesture-view-source.png -share/gnome/help/galeon/C/figures/othertools-history.png -share/gnome/help/galeon/C/figures/othertools-pdm.png -share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png -share/gnome/help/galeon/C/figures/statusbar.png -share/gnome/help/galeon/C/figures/tabbed-browsing.png -share/gnome/help/galeon/C/figures/toolbars-bookmarks.png -share/gnome/help/galeon/C/figures/toolbars-main.png -share/gnome/help/galeon/C/galeon.xml -share/gnome/help/galeon/C/getting-started.xml -share/gnome/help/galeon/C/other-tools.xml -share/gnome/help/galeon/C/plugins.xml -share/gnome/help/galeon/C/preface.xml -share/gnome/help/galeon/C/preferences.xml -share/gnome/help/galeon/es/apx-authors.xml -share/gnome/help/galeon/es/apx-bugs.xml -share/gnome/help/galeon/es/apx-command-line.xml -share/gnome/help/galeon/es/apx-compiling.xml -share/gnome/help/galeon/es/apx-keyboard-shortcuts.xml -share/gnome/help/galeon/es/apx-mouse-gestures.xml -share/gnome/help/galeon/es/apx-troubleshooting.xml -share/gnome/help/galeon/es/bookmarks.xml -share/gnome/help/galeon/es/browser-window.xml -share/gnome/help/galeon/es/figures/bookmarks-editor.png -share/gnome/help/galeon/es/figures/browser-window.png -share/gnome/help/galeon/es/figures/find-dialog.png -share/gnome/help/galeon/es/figures/gesture-back.png -share/gnome/help/galeon/es/figures/gesture-clone-tab.png -share/gnome/help/galeon/es/figures/gesture-clone-window.png -share/gnome/help/galeon/es/figures/gesture-close-2.png -share/gnome/help/galeon/es/figures/gesture-close.png -share/gnome/help/galeon/es/figures/gesture-contents.png -share/gnome/help/galeon/es/figures/gesture-forward.png -share/gnome/help/galeon/es/figures/gesture-fullscreen.png -share/gnome/help/galeon/es/figures/gesture-homepage.png -share/gnome/help/galeon/es/figures/gesture-new-tab.png -share/gnome/help/galeon/es/figures/gesture-new-window.png -share/gnome/help/galeon/es/figures/gesture-next-link.png -share/gnome/help/galeon/es/figures/gesture-next-tab.png -share/gnome/help/galeon/es/figures/gesture-prev-link.png -share/gnome/help/galeon/es/figures/gesture-prev-tab.png -share/gnome/help/galeon/es/figures/gesture-reload-bypass.png -share/gnome/help/galeon/es/figures/gesture-reload.png -share/gnome/help/galeon/es/figures/gesture-stop.png -share/gnome/help/galeon/es/figures/gesture-up.png -share/gnome/help/galeon/es/figures/gesture-view-source.png -share/gnome/help/galeon/es/figures/othertools-history.png -share/gnome/help/galeon/es/figures/othertools-pdm.png -share/gnome/help/galeon/es/figures/othertools-toolbar-editor.png -share/gnome/help/galeon/es/figures/statusbar.png -share/gnome/help/galeon/es/figures/tabbed-browsing.png -share/gnome/help/galeon/es/figures/toolbars-bookmarks.png -share/gnome/help/galeon/es/figures/toolbars-main.png -share/gnome/help/galeon/es/galeon.xml -share/gnome/help/galeon/es/getting-started.xml -share/gnome/help/galeon/es/other-tools.xml -share/gnome/help/galeon/es/plugins.xml -share/gnome/help/galeon/es/preface.xml -share/gnome/help/galeon/es/preferences.xml -share/gnome/omf/galeon/galeon-C.omf -share/gnome/omf/galeon/galeon-es.omf -share/gnome/pixmaps/galeon.png -share/gnome/sounds/galeon/clicked.wav -share/locale/am/LC_MESSAGES/galeon-2.0.mo -share/locale/az/LC_MESSAGES/galeon-2.0.mo -share/locale/be/LC_MESSAGES/galeon-2.0.mo -share/locale/bg/LC_MESSAGES/galeon-2.0.mo -share/locale/bs/LC_MESSAGES/galeon-2.0.mo -share/locale/ca/LC_MESSAGES/galeon-2.0.mo -share/locale/cs/LC_MESSAGES/galeon-2.0.mo -share/locale/da/LC_MESSAGES/galeon-2.0.mo -share/locale/de/LC_MESSAGES/galeon-2.0.mo -share/locale/el/LC_MESSAGES/galeon-2.0.mo -share/locale/en_CA/LC_MESSAGES/galeon-2.0.mo -share/locale/en_GB/LC_MESSAGES/galeon-2.0.mo -share/locale/es/LC_MESSAGES/galeon-2.0.mo -share/locale/et/LC_MESSAGES/galeon-2.0.mo -share/locale/eu/LC_MESSAGES/galeon-2.0.mo -share/locale/fi/LC_MESSAGES/galeon-2.0.mo -share/locale/fr/LC_MESSAGES/galeon-2.0.mo -share/locale/ga/LC_MESSAGES/galeon-2.0.mo -share/locale/gl/LC_MESSAGES/galeon-2.0.mo -share/locale/hr/LC_MESSAGES/galeon-2.0.mo -share/locale/hu/LC_MESSAGES/galeon-2.0.mo -share/locale/it/LC_MESSAGES/galeon-2.0.mo -share/locale/ja/LC_MESSAGES/galeon-2.0.mo -share/locale/ko/LC_MESSAGES/galeon-2.0.mo -share/locale/lt/LC_MESSAGES/galeon-2.0.mo -share/locale/lv/LC_MESSAGES/galeon-2.0.mo -share/locale/mk/LC_MESSAGES/galeon-2.0.mo -share/locale/ml/LC_MESSAGES/galeon-2.0.mo -share/locale/mn/LC_MESSAGES/galeon-2.0.mo -share/locale/ms/LC_MESSAGES/galeon-2.0.mo -share/locale/nb/LC_MESSAGES/galeon-2.0.mo -share/locale/nl/LC_MESSAGES/galeon-2.0.mo -share/locale/nn/LC_MESSAGES/galeon-2.0.mo -share/locale/no/LC_MESSAGES/galeon-2.0.mo -share/locale/pa/LC_MESSAGES/galeon-2.0.mo -share/locale/pl/LC_MESSAGES/galeon-2.0.mo -share/locale/pt/LC_MESSAGES/galeon-2.0.mo -share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo -share/locale/ro/LC_MESSAGES/galeon-2.0.mo -share/locale/ru/LC_MESSAGES/galeon-2.0.mo -share/locale/rw/LC_MESSAGES/galeon-2.0.mo -share/locale/sk/LC_MESSAGES/galeon-2.0.mo -share/locale/sl/LC_MESSAGES/galeon-2.0.mo -share/locale/sq/LC_MESSAGES/galeon-2.0.mo -share/locale/sr/LC_MESSAGES/galeon-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo -share/locale/sv/LC_MESSAGES/galeon-2.0.mo -share/locale/ta/LC_MESSAGES/galeon-2.0.mo -share/locale/tr/LC_MESSAGES/galeon-2.0.mo -share/locale/uk/LC_MESSAGES/galeon-2.0.mo -share/locale/vi/LC_MESSAGES/galeon-2.0.mo -share/locale/wa/LC_MESSAGES/galeon-2.0.mo -share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo -share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo -share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo -@dirrm share/gnome/sounds/galeon -@dirrm share/gnome/omf/galeon -@dirrm share/gnome/help/galeon/es/figures -@dirrm share/gnome/help/galeon/es -@dirrm share/gnome/help/galeon/C/figures -@dirrm share/gnome/help/galeon/C -@dirrm share/gnome/help/galeon -@dirrm share/gnome/galeon/chrome/global -@dirrm share/gnome/galeon/chrome/branding -@dirrm share/gnome/galeon/chrome -@dirrm share/gnome/galeon -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@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/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/no/LC_MESSAGES -@dirrmtry share/locale/no -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@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 -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile deleted file mode 100644 index 242a3a4c0..000000000 --- a/www/glibwww/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: glibwww -# Date created: 26 July 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= glibwww -PORTVERSION= 0.2 -PORTREVISION= 4 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/glibwww/0.2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A library for people wanting to use libwww with gtk/gnome - -LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww - -USE_GMAKE= yes -USE_GNOME= gnomelibs -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -.include <bsd.port.mk> diff --git a/www/glibwww/distinfo b/www/glibwww/distinfo deleted file mode 100644 index f165db59a..000000000 --- a/www/glibwww/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (glibwww-0.2.tar.gz) = 3f20f0e7b01acb8dc81502e088cd9389 -SHA256 (glibwww-0.2.tar.gz) = 005befefb7dbff0c9356e4403ffdf865da9c65a59edaa39b4e2498d79e99cfb4 -SIZE (glibwww-0.2.tar.gz) = 162157 diff --git a/www/glibwww/files/patch-aa b/www/glibwww/files/patch-aa deleted file mode 100644 index 8786c1acb..000000000 --- a/www/glibwww/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed Jul 26 14:35:29 2000 -+++ Makefile.in Wed Jul 26 14:40:27 2000 -@@ -105,7 +105,7 @@ - cflags_set = @cflags_set@ - cxxflags_set = @cxxflags_set@ - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = glibwwwConf.sh - - SUBDIRS = macros src diff --git a/www/glibwww/pkg-descr b/www/glibwww/pkg-descr deleted file mode 100644 index 37b833a0e..000000000 --- a/www/glibwww/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Event register/unregister functions that use the glib event loop. This makes -libwww fit nicely into just about any gnome or gtk+ program. - -This code may be useful for other people wanting to use libwww with gtk. - -This code includes a nice bonobo control. diff --git a/www/glibwww/pkg-plist b/www/glibwww/pkg-plist deleted file mode 100644 index 72ccac02d..000000000 --- a/www/glibwww/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -etc/glibwwwConf.sh -include/glibwww/glibwww.h -lib/libglibwww.a -lib/libglibwww.la -lib/libglibwww.so -lib/libglibwww.so.1 -@dirrm include/glibwww diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile deleted file mode 100644 index b1fcaf6d0..000000000 --- a/www/gnome-web-photo/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: gnome-web-photo -# Date created: 2005-11-30 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= gnome-web-photo -PORTVERSION= 0.2 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 - -MAINTAINER= ahze@FreeBSD.org -COMMENT= Tool to generate full-size image files and thumbnails - -USE_BZIP2= yes -USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gecko=${GECKO} -USE_GMAKE= yes -USE_XLIB= yes -USE_GNOME= gnomevfs2 gnomehack gnomeprefix -GCONF_SCHEMAS= thumbnailer.schemas - -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - -post-patch: - @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure - -.include <bsd.port.post.mk> diff --git a/www/gnome-web-photo/distinfo b/www/gnome-web-photo/distinfo deleted file mode 100644 index ed5b8e643..000000000 --- a/www/gnome-web-photo/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome-web-photo-0.2.tar.bz2) = 177641fa35cc66771bfa574e17768605 -SHA256 (gnome-web-photo-0.2.tar.bz2) = c8e441cfa96a62e37d6a031ca15abc7782318a834362879bb8c311aadd475ee6 -SIZE (gnome-web-photo-0.2.tar.bz2) = 298503 diff --git a/www/gnome-web-photo/pkg-descr b/www/gnome-web-photo/pkg-descr deleted file mode 100644 index cfc2e65ff..000000000 --- a/www/gnome-web-photo/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -GNOME Web Photographer is a tool to generate full-size image -files and thumbnails from HTML files and web pages. diff --git a/www/gnome-web-photo/pkg-plist b/www/gnome-web-photo/pkg-plist deleted file mode 100644 index 816a430a8..000000000 --- a/www/gnome-web-photo/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/gnome-web-photo -bin/gnome-web-print -bin/gnome-web-thumbnail -share/gnome/gnome-web-photo/prefs.js -share/gnome/gnome-web-photo/style.css -@dirrm share/gnome/gnome-web-photo diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile deleted file mode 100644 index 7f7d509aa..000000000 --- a/www/gstreamer-plugins-neon/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: gstreamer-plugins-neon -# Date created: 6 July 2006 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ - -PORTREVISION= 0 -CATEGORIES= www - -COMMENT= Gstreamer neon plugin - -GST_PLUGIN= neon - -MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile deleted file mode 100644 index cfec1ebda..000000000 --- a/www/gtkhtml/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# New ports collection makefile for: gtkhtml -# Date created: 2nd June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gtkhtml -PORTVERSION= 1.1.10 -PORTREVISION= 6 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 -DIST_SUBDIR= gnome - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Lightweight HTML rendering/printing/editing engine - -LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell - -USE_BZIP2= yes -USE_XLIB= yes -USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal -USE_GETTEXT= yes -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gconf=yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -VERSION= ${PORTNAME}-${PORTVERSION} - -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP) -LIB_DEPENDS+= soup.6:${PORTSDIR}/devel/soup -.endif - -post-configure: - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; \ - s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \ - > ${WRKSRC}/gtkhtmlConf.sh - -post-install: - ${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \ - ${PREFIX}/etc/gtkhtmlConf.sh - -.include <bsd.port.post.mk> diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo deleted file mode 100644 index e0f60008d..000000000 --- a/www/gtkhtml/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome/gtkhtml-1.1.10.tar.bz2) = 8647407560e4b61ba4a12653b9cc8869 -SHA256 (gnome/gtkhtml-1.1.10.tar.bz2) = ccfba890cfd818ba9da3a0198c8223d08dc89da3d02042ed78b25c7382ea5fbb -SIZE (gnome/gtkhtml-1.1.10.tar.bz2) = 1029542 diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh deleted file mode 100644 index 4dc806a68..000000000 --- a/www/gtkhtml/files/gtkhtmlConf.sh +++ /dev/null @@ -1,5 +0,0 @@ -GTKHTML_LIBDIR="-L%%PREFIX%%/lib" -GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm" -GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" -GTKHTML_DATADIR="%%PREFIX%%/share/gnome" -MODULE_VERSION="%%VERSION%%" diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad deleted file mode 100644 index 863d79c3b..000000000 --- a/www/gtkhtml/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtkhtml.c.orig Wed Sep 4 20:00:35 2002 -+++ src/gtkhtml.c Wed Sep 18 21:40:55 2002 -@@ -4353,7 +4353,7 @@ - { - gchar *rcfile; - -- rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()), -+ rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()), - (from_share ? "" : "/.gnome/"), name, NULL); - - if (g_file_test (rcfile, G_FILE_TEST_ISFILE)) diff --git a/www/gtkhtml/files/patch-af b/www/gtkhtml/files/patch-af deleted file mode 100644 index 473c4820b..000000000 --- a/www/gtkhtml/files/patch-af +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.orig Mon Mar 31 13:06:33 2003 -+++ configure Fri Apr 4 22:43:24 2003 -@@ -5895,6 +5895,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7736,7 +7737,7 @@ - - if test "x$enable_xim" = "xyes"; then - BACKUP_LDFLAGS=$LDFLAGS -- LDFLAGS="$LDFLAGS `gtk-config --libs`" -+ LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`" - echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6 - echo "configure:7742: checking for gdk_im_begin" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gdk_im_begin'+set}'`\" = set"; then diff --git a/www/gtkhtml/files/patch-components::http-editor::popup.c b/www/gtkhtml/files/patch-components::http-editor::popup.c deleted file mode 100644 index ad7a02fe2..000000000 --- a/www/gtkhtml/files/patch-components::http-editor::popup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- components/html-editor/popup.c.orig Thu Jan 23 16:44:21 2003 -+++ components/html-editor/popup.c Sat Aug 14 00:58:07 2004 -@@ -496,6 +496,7 @@ - ADD_PROP (PARAGRAPH); - break; - default: -+ break; - } - if (obj->parent && obj->parent->parent && HTML_IS_TABLE_CELL (obj->parent->parent)) { - if (cd->format_html) { diff --git a/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in deleted file mode 100644 index 6f238102e..000000000 --- a/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- components/http-storage-module/Makefile.in 2002/01/22 14:05:48 1.1 -+++ components/http-storage-module/Makefile.in 2002/01/22 14:06:05 -@@ -154,7 +154,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" -I$(includedir) $(EXTRA_GNOME_CFLAGS) - - --common_ldflags = -avoid-version -+common_ldflags = -avoid-version -module - - bonobo_plugindir = $(PLUGIN_DIR) - bonobo_plugin_LTLIBRARIES = libstorage_http.la diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in deleted file mode 100644 index 575490af8..000000000 --- a/www/gtkhtml/files/patch-doc::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- doc/Makefile.in 2002/05/01 09:15:00 1.1 -+++ doc/Makefile.in 2002/05/01 09:16:10 -@@ -151,7 +151,7 @@ - CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS) - LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS) - --HTML_DIR = $(datadir)/html -+HTML_DIR = $(prefix)/share/doc/gtkhtml - - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - diff --git a/www/gtkhtml/files/patch-po::Makefile.in.in b/www/gtkhtml/files/patch-po::Makefile.in.in deleted file mode 100644 index 42f683d3e..000000000 --- a/www/gtkhtml/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- po/Makefile.in.in 2002/03/25 14:35:10 1.1 -+++ po/Makefile.in.in 2002/03/25 14:35:35 -@@ -106,7 +106,7 @@ - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ -- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ -+ lang=`echo $$cat | sed 's/\.mo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then \ diff --git a/www/gtkhtml/files/patch-src_gtkhtml-propmanager.c b/www/gtkhtml/files/patch-src_gtkhtml-propmanager.c deleted file mode 100644 index 3c1d4e916..000000000 --- a/www/gtkhtml/files/patch-src_gtkhtml-propmanager.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/gtkhtml-propmanager.c.orig Mon Sep 22 19:08:54 2003 -+++ src/gtkhtml-propmanager.c Mon Sep 22 19:09:24 2003 -@@ -24,6 +24,7 @@ - #include <glib.h> - #include <gnome.h> - -+#ifdef GTKHTML_HAVE_GCONF - - #include "gtkhtml-propmanager.h" - #include "gtkhtml-properties.h" -@@ -611,3 +612,5 @@ - - return propmanager_type; - } -+ -+#endif diff --git a/www/gtkhtml/pkg-descr b/www/gtkhtml/pkg-descr deleted file mode 100644 index abb1b154d..000000000 --- a/www/gtkhtml/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This is GtkHTML, a lightweight HTML rendering/printing/editing engine. -It was originally based on KHTMLW, but is now being developed -independently. - -WWW: http://www.gnome.org/ diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist deleted file mode 100644 index 43c5598ee..000000000 --- a/www/gtkhtml/pkg-plist +++ /dev/null @@ -1,234 +0,0 @@ -bin/ebrowser -bin/gnome-gtkhtml-editor-1.1 -bin/gtkhtml-properties-capplet -etc/gtkhtmlConf.sh -include/gtkhtml-1.1/gtkhtml/gtkhtml-compat.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-embedded.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-enums.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-im.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-keybinding.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-private.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-properties.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-propmanager.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-search.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-stream.h -include/gtkhtml-1.1/gtkhtml/gtkhtml-types.h -include/gtkhtml-1.1/gtkhtml/gtkhtml.h -include/gtkhtml-1.1/gtkhtml/gtkhtmldebug.h -include/gtkhtml-1.1/gtkhtml/gtkhtmlfontstyle.h -include/gtkhtml-1.1/gtkhtml/htmlanchor.h -include/gtkhtml-1.1/gtkhtml/htmlbutton.h -include/gtkhtml-1.1/gtkhtml/htmlcheckbox.h -include/gtkhtml-1.1/gtkhtml/htmlclue.h -include/gtkhtml-1.1/gtkhtml/htmlcluealigned.h -include/gtkhtml-1.1/gtkhtml/htmlclueflow.h -include/gtkhtml-1.1/gtkhtml/htmlclueh.h -include/gtkhtml-1.1/gtkhtml/htmlcluev.h -include/gtkhtml-1.1/gtkhtml/htmlcolor.h -include/gtkhtml-1.1/gtkhtml/htmlcolorset.h -include/gtkhtml-1.1/gtkhtml/htmlcursor.h -include/gtkhtml-1.1/gtkhtml/htmldrawqueue.h -include/gtkhtml-1.1/gtkhtml/htmlembedded.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-clueflowstyle.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cursor.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-cut-and-paste.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-fontstyle.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-images.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-movement.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-rule.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-selection-updater.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-table.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-tablecell.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit-text.h -include/gtkhtml-1.1/gtkhtml/htmlengine-edit.h -include/gtkhtml-1.1/gtkhtml/htmlengine-print.h -include/gtkhtml-1.1/gtkhtml/htmlengine-save.h -include/gtkhtml-1.1/gtkhtml/htmlengine-search.h -include/gtkhtml-1.1/gtkhtml/htmlengine.h -include/gtkhtml-1.1/gtkhtml/htmlentity.h -include/gtkhtml-1.1/gtkhtml/htmlenums.h -include/gtkhtml-1.1/gtkhtml/htmlenumutils.h -include/gtkhtml-1.1/gtkhtml/htmlfontmanager.h -include/gtkhtml-1.1/gtkhtml/htmlform.h -include/gtkhtml-1.1/gtkhtml/htmlframe.h -include/gtkhtml-1.1/gtkhtml/htmlframeset.h -include/gtkhtml-1.1/gtkhtml/htmlgdkpainter.h -include/gtkhtml-1.1/gtkhtml/htmlhidden.h -include/gtkhtml-1.1/gtkhtml/htmlhspace.h -include/gtkhtml-1.1/gtkhtml/htmliframe.h -include/gtkhtml-1.1/gtkhtml/htmlimage.h -include/gtkhtml-1.1/gtkhtml/htmlimageinput.h -include/gtkhtml-1.1/gtkhtml/htmlinterval.h -include/gtkhtml-1.1/gtkhtml/htmllinktext.h -include/gtkhtml-1.1/gtkhtml/htmllist.h -include/gtkhtml-1.1/gtkhtml/htmlmap.h -include/gtkhtml-1.1/gtkhtml/htmlobject.h -include/gtkhtml-1.1/gtkhtml/htmlpainter.h -include/gtkhtml-1.1/gtkhtml/htmlplainpainter.h -include/gtkhtml-1.1/gtkhtml/htmlprinter.h -include/gtkhtml-1.1/gtkhtml/htmlradio.h -include/gtkhtml-1.1/gtkhtml/htmlreplace.h -include/gtkhtml-1.1/gtkhtml/htmlrule.h -include/gtkhtml-1.1/gtkhtml/htmlsearch.h -include/gtkhtml-1.1/gtkhtml/htmlselect.h -include/gtkhtml-1.1/gtkhtml/htmlselection.h -include/gtkhtml-1.1/gtkhtml/htmlsettings.h -include/gtkhtml-1.1/gtkhtml/htmlshape.h -include/gtkhtml-1.1/gtkhtml/htmlstack.h -include/gtkhtml-1.1/gtkhtml/htmlstringtokenizer.h -include/gtkhtml-1.1/gtkhtml/htmltable.h -include/gtkhtml-1.1/gtkhtml/htmltablecell.h -include/gtkhtml-1.1/gtkhtml/htmltablepriv.h -include/gtkhtml-1.1/gtkhtml/htmltext.h -include/gtkhtml-1.1/gtkhtml/htmltextarea.h -include/gtkhtml-1.1/gtkhtml/htmltextinput.h -include/gtkhtml-1.1/gtkhtml/htmltextslave.h -include/gtkhtml-1.1/gtkhtml/htmltokenizer.h -include/gtkhtml-1.1/gtkhtml/htmltype.h -include/gtkhtml-1.1/gtkhtml/htmltypes.h -include/gtkhtml-1.1/gtkhtml/htmlundo-action.h -include/gtkhtml-1.1/gtkhtml/htmlundo.h -include/gtkhtml-1.1/gtkhtml/htmlvspace.h -lib/bonobo/plugin/libstorage_http.a -lib/bonobo/plugin/libstorage_http.la -lib/bonobo/plugin/libstorage_http.so -lib/libgtkhtml-1.1.a -lib/libgtkhtml-1.1.la -lib/libgtkhtml-1.1.so -lib/libgtkhtml-1.1.so.3 -libdata/pkgconfig/gtkhtml-1.1.pc -%%DOCSDIR%%/gtkhtml-decl.txt -%%DOCSDIR%%/gtkhtml-sections.txt -%%DOCSDIR%%/gtkhtml.hierarchy -%%DOCSDIR%%/gtkhtml.sgml -%%DOCSDIR%%/gtkhtml.types -share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop -share/gnome/control-center/Documents/gtkhtml-properties.desktop -share/gnome/gtkhtml-1.1/Editor.idl -share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade -share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-1.1/icons/16_copy.png -share/gnome/gtkhtml-1.1/icons/16_cut.png -share/gnome/gtkhtml-1.1/icons/16_paste.png -share/gnome/gtkhtml-1.1/icons/24_copy.png -share/gnome/gtkhtml-1.1/icons/24_cut.png -share/gnome/gtkhtml-1.1/icons/24_paste.png -share/gnome/gtkhtml-1.1/icons/bulb.png -share/gnome/gtkhtml-1.1/icons/empty_image.png -share/gnome/gtkhtml-1.1/icons/flowers.png -share/gnome/gtkhtml-1.1/icons/html-viewer.png -share/gnome/gtkhtml-1.1/icons/insert-image-16.png -share/gnome/gtkhtml-1.1/icons/insert-image-24.png -share/gnome/gtkhtml-1.1/icons/insert-link-16.png -share/gnome/gtkhtml-1.1/icons/insert-link-24.png -share/gnome/gtkhtml-1.1/icons/insert-object-16.png -share/gnome/gtkhtml-1.1/icons/insert-object-24.png -share/gnome/gtkhtml-1.1/icons/insert-rule-16.png -share/gnome/gtkhtml-1.1/icons/insert-rule-24.png -share/gnome/gtkhtml-1.1/icons/insert-table-16.png -share/gnome/gtkhtml-1.1/icons/insert-table-24.png -share/gnome/gtkhtml-1.1/icons/paper.png -share/gnome/gtkhtml-1.1/icons/properties-16.png -share/gnome/gtkhtml-1.1/icons/rect.png -share/gnome/gtkhtml-1.1/icons/redo-16.png -share/gnome/gtkhtml-1.1/icons/redo-24.png -share/gnome/gtkhtml-1.1/icons/rule-blue-center.png -share/gnome/gtkhtml-1.1/icons/rule-blue-left.png -share/gnome/gtkhtml-1.1/icons/rule-blue-right.png -share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png -share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png -share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-1.1/icons/search-16.png -share/gnome/gtkhtml-1.1/icons/search-24.png -share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png -share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png -share/gnome/gtkhtml-1.1/icons/smiley-1.png -share/gnome/gtkhtml-1.1/icons/smiley-10.png -share/gnome/gtkhtml-1.1/icons/smiley-11.png -share/gnome/gtkhtml-1.1/icons/smiley-2.png -share/gnome/gtkhtml-1.1/icons/smiley-3.png -share/gnome/gtkhtml-1.1/icons/smiley-4.png -share/gnome/gtkhtml-1.1/icons/smiley-5.png -share/gnome/gtkhtml-1.1/icons/smiley-6.png -share/gnome/gtkhtml-1.1/icons/smiley-8.png -share/gnome/gtkhtml-1.1/icons/smiley-9.png -share/gnome/gtkhtml-1.1/icons/texture.png -share/gnome/gtkhtml-1.1/icons/transparent.png -share/gnome/gtkhtml-1.1/icons/undo-16.png -share/gnome/gtkhtml-1.1/icons/undo-24.png -share/gnome/gtkhtml-1.1/keybindingsrc.emacs -share/gnome/gtkhtml-1.1/keybindingsrc.ms -share/gnome/gtkhtml-1.1/keybindingsrc.xemacs -share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf -share/gnome/oaf/GNOME_GtkHTML_Editor.oaf -share/gnome/ui/GNOME_GtkHTML_Editor.xml -share/locale/az/LC_MESSAGES/gtkhtml.mo -share/locale/ca/LC_MESSAGES/gtkhtml.mo -share/locale/cs/LC_MESSAGES/gtkhtml.mo -share/locale/da/LC_MESSAGES/gtkhtml.mo -share/locale/de/LC_MESSAGES/gtkhtml.mo -share/locale/el/LC_MESSAGES/gtkhtml.mo -share/locale/es/LC_MESSAGES/gtkhtml.mo -share/locale/et/LC_MESSAGES/gtkhtml.mo -share/locale/eu/LC_MESSAGES/gtkhtml.mo -share/locale/fi/LC_MESSAGES/gtkhtml.mo -share/locale/fr/LC_MESSAGES/gtkhtml.mo -share/locale/gl/LC_MESSAGES/gtkhtml.mo -share/locale/hu/LC_MESSAGES/gtkhtml.mo -share/locale/it/LC_MESSAGES/gtkhtml.mo -share/locale/ja/LC_MESSAGES/gtkhtml.mo -share/locale/ko/LC_MESSAGES/gtkhtml.mo -share/locale/lt/LC_MESSAGES/gtkhtml.mo -share/locale/lv/LC_MESSAGES/gtkhtml.mo -share/locale/ms/LC_MESSAGES/gtkhtml.mo -share/locale/nl/LC_MESSAGES/gtkhtml.mo -share/locale/nn/LC_MESSAGES/gtkhtml.mo -share/locale/no/LC_MESSAGES/gtkhtml.mo -share/locale/pl/LC_MESSAGES/gtkhtml.mo -share/locale/pt/LC_MESSAGES/gtkhtml.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml.mo -share/locale/ru/LC_MESSAGES/gtkhtml.mo -share/locale/sk/LC_MESSAGES/gtkhtml.mo -share/locale/sl/LC_MESSAGES/gtkhtml.mo -share/locale/sv/LC_MESSAGES/gtkhtml.mo -share/locale/tr/LC_MESSAGES/gtkhtml.mo -share/locale/uk/LC_MESSAGES/gtkhtml.mo -share/locale/vi/LC_MESSAGES/gtkhtml.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo -@dirrm share/gnome/gtkhtml-1.1/icons -@dirrm share/gnome/gtkhtml-1.1 -@dirrm %%DOCSDIR%%/gtkhtml -@dirrm %%DOCSDIR%% -@dirrm include/gtkhtml-1.1/gtkhtml -@dirrm include/gtkhtml-1.1 -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -@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/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/no/LC_MESSAGES -@dirrmtry share/locale/no -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@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/gtkhtml3/Makefile b/www/gtkhtml3/Makefile deleted file mode 100644 index 73ad823d7..000000000 --- a/www/gtkhtml3/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: gtkhtml3 -# Date created: 12 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.87 2006/09/04 15:49:36 ahze Exp $ -# - -PORTNAME= gtkhtml3 -PORTVERSION= 3.12.1 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Lightweight HTML rendering/printing/editing engine - -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup - -USE_GETTEXT= yes -USE_BZIP2= yes -USE_XLIB= yes -USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \ - libgnomeprintui ltverhack -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION="3.8" - -.include <bsd.port.mk> diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo deleted file mode 100644 index f4e41067d..000000000 --- a/www/gtkhtml3/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa -SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f -SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075 diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c deleted file mode 100644 index cc9534035..000000000 --- a/www/gtkhtml3/files/patch-src_gtkhtml.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtkhtml.c.orig Mon Aug 22 15:56:46 2005 -+++ src/gtkhtml.c Mon Aug 22 18:56:03 2005 -@@ -3104,7 +3104,7 @@ - add_bindings (klass); - gtk_html_accessibility_init (); - -- filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL); -+ filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL); - gtk_rc_parse (filename); - g_free (filename); - html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs"); diff --git a/www/gtkhtml3/pkg-descr b/www/gtkhtml3/pkg-descr deleted file mode 100644 index 38451dc01..000000000 --- a/www/gtkhtml3/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -GtkHTML is a lightweight HTML rendering, printing, and editing engine. - -WWW: http://www.ximian.com/ diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist deleted file mode 100644 index b8be05dbf..000000000 --- a/www/gtkhtml3/pkg-plist +++ /dev/null @@ -1,212 +0,0 @@ -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h -include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h -include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h -include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.a -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.la -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.a -lib/libgtkhtml-%%VERSION%%.la -lib/libgtkhtml-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.so.15 -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 -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 -share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/fa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -@dirrm share/gnome/gtkhtml-%%VERSION%%/icons -@dirrm share/gnome/gtkhtml-%%VERSION%% -@dirrm lib/gtkhtml -@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml -@dirrm include/libgtkhtml-%%VERSION%% -@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/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/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@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/gtkhtml38/Makefile b/www/gtkhtml38/Makefile deleted file mode 100644 index 73ad823d7..000000000 --- a/www/gtkhtml38/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: gtkhtml3 -# Date created: 12 March 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.87 2006/09/04 15:49:36 ahze Exp $ -# - -PORTNAME= gtkhtml3 -PORTVERSION= 3.12.1 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Lightweight HTML rendering/printing/editing engine - -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup - -USE_GETTEXT= yes -USE_BZIP2= yes -USE_XLIB= yes -USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \ - libgnomeprintui ltverhack -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION="3.8" - -.include <bsd.port.mk> diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo deleted file mode 100644 index f4e41067d..000000000 --- a/www/gtkhtml38/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa -SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f -SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075 diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c deleted file mode 100644 index cc9534035..000000000 --- a/www/gtkhtml38/files/patch-src_gtkhtml.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtkhtml.c.orig Mon Aug 22 15:56:46 2005 -+++ src/gtkhtml.c Mon Aug 22 18:56:03 2005 -@@ -3104,7 +3104,7 @@ - add_bindings (klass); - gtk_html_accessibility_init (); - -- filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL); -+ filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL); - gtk_rc_parse (filename); - g_free (filename); - html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs"); diff --git a/www/gtkhtml38/pkg-descr b/www/gtkhtml38/pkg-descr deleted file mode 100644 index 38451dc01..000000000 --- a/www/gtkhtml38/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -GtkHTML is a lightweight HTML rendering, printing, and editing engine. - -WWW: http://www.ximian.com/ diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist deleted file mode 100644 index b8be05dbf..000000000 --- a/www/gtkhtml38/pkg-plist +++ /dev/null @@ -1,212 +0,0 @@ -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h -include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h -include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h -include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h -include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.a -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.la -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.a -lib/libgtkhtml-%%VERSION%%.la -lib/libgtkhtml-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.so.15 -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 -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 -share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/fa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -@dirrm share/gnome/gtkhtml-%%VERSION%%/icons -@dirrm share/gnome/gtkhtml-%%VERSION%% -@dirrm lib/gtkhtml -@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml -@dirrm include/libgtkhtml-%%VERSION%% -@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/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/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@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/libgtkhtml/Makefile b/www/libgtkhtml/Makefile deleted file mode 100644 index fc633e2ad..000000000 --- a/www/libgtkhtml/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: libgtkhtml -# Date created: 2nd June 2000 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/libgtkhtml/Makefile,v 1.38 2006/07/23 01:51:50 mezz Exp $ -# - -PORTNAME= libgtkhtml -PORTVERSION= 2.11.0 -PORTREVISION= 2 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.11 -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Lightweight HTML rendering/printing/editing engine - -USE_BZIP2= yes -USE_XLIB= yes -USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack -USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.include <bsd.port.mk> diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo deleted file mode 100644 index 219c0a508..000000000 --- a/www/libgtkhtml/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/libgtkhtml-2.11.0.tar.bz2) = ae7fbfda3b5d118c17f089f4de64b5ef -SHA256 (gnome2/libgtkhtml-2.11.0.tar.bz2) = 827ed3c06c883ae63d90499118ac797613f03ed3d733a78c753f8a00ec0e7e74 -SIZE (gnome2/libgtkhtml-2.11.0.tar.bz2) = 565750 diff --git a/www/libgtkhtml/pkg-descr b/www/libgtkhtml/pkg-descr deleted file mode 100644 index 173991abc..000000000 --- a/www/libgtkhtml/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -GtkHTML is a lightweight HTML rendering, printing, and editing engine. - -WWW: http://www.gnome.org/ diff --git a/www/libgtkhtml/pkg-plist b/www/libgtkhtml/pkg-plist deleted file mode 100644 index 0f6b412ae..000000000 --- a/www/libgtkhtml/pkg-plist +++ /dev/null @@ -1,89 +0,0 @@ -include/gtkhtml-2.0/libgtkhtml/css/cssmatcher.h -include/gtkhtml-2.0/libgtkhtml/css/cssparser.h -include/gtkhtml-2.0/libgtkhtml/css/cssstylesheet.h -include/gtkhtml-2.0/libgtkhtml/css/cssvalue.h -include/gtkhtml-2.0/libgtkhtml/document/htmldocument.h -include/gtkhtml-2.0/libgtkhtml/document/htmlparser.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-attr.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-characterdata.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-comment.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-core-utils.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-document.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-documenttype.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-element.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-namednodemap.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-node.h -include/gtkhtml-2.0/libgtkhtml/dom/core/dom-nodelist.h -include/gtkhtml-2.0/libgtkhtml/dom/dom-types.h -include/gtkhtml-2.0/libgtkhtml/dom/events/dom-event.h -include/gtkhtml-2.0/libgtkhtml/dom/events/dom-eventlistener.h -include/gtkhtml-2.0/libgtkhtml/dom/events/dom-eventtarget.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlanchorelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlcollection.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlformelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlinputelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlobjectelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmloptionelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmlselectelement.h -include/gtkhtml-2.0/libgtkhtml/dom/html/dom-htmltextareaelement.h -include/gtkhtml-2.0/libgtkhtml/dom/traversal/dom-documenttraversal.h -include/gtkhtml-2.0/libgtkhtml/dom/traversal/dom-nodefilter.h -include/gtkhtml-2.0/libgtkhtml/dom/traversal/dom-nodeiterator.h -include/gtkhtml-2.0/libgtkhtml/dom/traversal/dom-traversal-utils.h -include/gtkhtml-2.0/libgtkhtml/dom/views/dom-abstractview.h -include/gtkhtml-2.0/libgtkhtml/dom/views/dom-documentview.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlcolor.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlfontspecification.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlgdkpainter.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlimage.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlimagefactory.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlpainter.h -include/gtkhtml-2.0/libgtkhtml/graphics/htmlstylepainter.h -include/gtkhtml-2.0/libgtkhtml/gtkhtml.h -include/gtkhtml-2.0/libgtkhtml/gtkhtmlcontext.h -include/gtkhtml-2.0/libgtkhtml/layout/html/htmlboxembedded.h -include/gtkhtml-2.0/libgtkhtml/layout/html/htmlboxform.h -include/gtkhtml-2.0/libgtkhtml/layout/html/htmlembedded.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlbox.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxblock.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxlistitem.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxroot.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxtable.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxtablecaption.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxtablecell.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxtablerow.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxtablerowgroup.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlboxtext.h -include/gtkhtml-2.0/libgtkhtml/layout/htmllinebox.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlrelayout.h -include/gtkhtml-2.0/libgtkhtml/layout/htmlstyle.h -include/gtkhtml-2.0/libgtkhtml/util/htmlatomlist.h -include/gtkhtml-2.0/libgtkhtml/util/htmlglobalatomlist.h -include/gtkhtml-2.0/libgtkhtml/util/htmlglobalatoms.h -include/gtkhtml-2.0/libgtkhtml/util/htmlstream.h -include/gtkhtml-2.0/libgtkhtml/util/htmlstreambuffer.h -include/gtkhtml-2.0/libgtkhtml/util/rfc1738.h -include/gtkhtml-2.0/libgtkhtml/view/htmlevent.h -include/gtkhtml-2.0/libgtkhtml/view/htmlselection.h -include/gtkhtml-2.0/libgtkhtml/view/htmlview.h -lib/libgtkhtml-2.a -lib/libgtkhtml-2.la -lib/libgtkhtml-2.so -lib/libgtkhtml-2.so.0 -libdata/pkgconfig/libgtkhtml-2.0.pc -@dirrm include/gtkhtml-2.0/libgtkhtml/view -@dirrm include/gtkhtml-2.0/libgtkhtml/util -@dirrm include/gtkhtml-2.0/libgtkhtml/layout/html -@dirrm include/gtkhtml-2.0/libgtkhtml/layout -@dirrm include/gtkhtml-2.0/libgtkhtml/graphics -@dirrm include/gtkhtml-2.0/libgtkhtml/dom/views -@dirrm include/gtkhtml-2.0/libgtkhtml/dom/traversal -@dirrm include/gtkhtml-2.0/libgtkhtml/dom/html -@dirrm include/gtkhtml-2.0/libgtkhtml/dom/events -@dirrm include/gtkhtml-2.0/libgtkhtml/dom/core -@dirrm include/gtkhtml-2.0/libgtkhtml/dom -@dirrm include/gtkhtml-2.0/libgtkhtml/document -@dirrm include/gtkhtml-2.0/libgtkhtml/css -@dirrm include/gtkhtml-2.0/libgtkhtml -@dirrm include/gtkhtml-2.0 diff --git a/www/libxul/Makefile b/www/libxul/Makefile deleted file mode 100644 index 998214ba9..000000000 --- a/www/libxul/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# New ports collection makefile for: xulrunner -# Date created: 2006-02-20 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/xulrunner/Makefile,v 1.12 2006/10/12 09:35:57 ahze Exp $ - -PORTNAME= xulrunner -PORTVERSION= 1.8.0.4 -PORTREVISION?= 4 -CATEGORIES?= www devel -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-source - -MAINTAINER?= gnome@FreeBSD.org -COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps - -WANT_GNOME= yes -ALL_TARGET= default -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ - -PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig -MOZ_OPTIONS?= --disable-javaxpcom --enable-canvas \ - --enable-system-cairo -MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS= # Empty, used for generic gecko OPTIONS -USE_GECKO_OPTIONS= java debug logging optimized_cflags - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/Makefile.common" - -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> diff --git a/www/libxul/distinfo b/www/libxul/distinfo deleted file mode 100644 index f96347037..000000000 --- a/www/libxul/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xulrunner-1.8.0.4-source.tar.bz2) = 4dc09831aa4e94fda5182a4897ed08e9 -SHA256 (xulrunner-1.8.0.4-source.tar.bz2) = 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9 -SIZE (xulrunner-1.8.0.4-source.tar.bz2) = 33846136 diff --git a/www/libxul/files/patch-build_unix_run-mozilla.sh b/www/libxul/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 6d8cb1585..000000000 --- a/www/libxul/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Sat Oct 1 01:36:47 2005 -+++ build/unix/run-mozilla.sh Thu Dec 22 17:51:10 2005 -@@ -328,7 +328,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -415,6 +415,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/libxul/files/patch-config-mkdepend-imakemdep.h b/www/libxul/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/libxul/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/libxul/files/patch-config_autoconf.mk.in b/www/libxul/files/patch-config_autoconf.mk.in deleted file mode 100644 index c4fa0b516..000000000 --- a/www/libxul/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/libxul/files/patch-config_mkdepend_Makefile.in b/www/libxul/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 8da7e48ab..000000000 --- a/www/libxul/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/libxul/files/patch-config_rules.mk b/www/libxul/files/patch-config_rules.mk deleted file mode 100644 index 16cb6ae11..000000000 --- a/www/libxul/files/patch-config_rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/libxul/files/patch-configure b/www/libxul/files/patch-configure deleted file mode 100644 index a973ee058..000000000 --- a/www/libxul/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Thu Dec 22 17:54:43 2005 -@@ -10016,7 +10016,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10022 "configure" - #include "confdefs.h" -@@ -10047,7 +10047,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10063 "configure" - #include "confdefs.h" -@@ -10088,7 +10088,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi -@@ -12518,7 +12518,7 @@ - MOZ_SUITE=1 - MOZ_PROFILESHARING= - MOZ_APP_VERSION=$SEAMONKEY_VERSION -- MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" -+ MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" - cat >> confdefs.h <<\EOF - #define MOZ_SUITE 1 - EOF diff --git a/www/libxul/files/patch-extensions_transformiix_source_base_Double.cpp b/www/libxul/files/patch-extensions_transformiix_source_base_Double.cpp deleted file mode 100644 index 38ce7ec12..000000000 --- a/www/libxul/files/patch-extensions_transformiix_source_base_Double.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006 -+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/www/libxul/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/libxul/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index bc141062f..000000000 --- a/www/libxul/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include <gdk/gdkx.h> - #include <freetype/tttables.h> --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" diff --git a/www/libxul/files/patch-libm b/www/libxul/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/libxul/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/libxul/files/patch-nsISidebar b/www/libxul/files/patch-nsISidebar deleted file mode 100644 index 64cbbe0bd..000000000 --- a/www/libxul/files/patch-nsISidebar +++ /dev/null @@ -1,218 +0,0 @@ -Index: dom/public/idl/sidebar/Makefile.in -=================================================================== -RCS file: dom/public/idl/sidebar/Makefile.in -diff -N dom/public/idl/sidebar/Makefile.in ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dom/public/idl/sidebar/Makefile.in 4 Nov 2005 02:35:53 -0000 -@@ -0,0 +1,53 @@ -+# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Sidebar IDL Makefile code. -+# -+# The Initial Developer of the Original Code is -+# Robert O'Callahan (rocallahan@novell.com) -+# Portions created by the Initial Developer are Copyright (C) 2005 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either of the GNU General Public License Version 2 or later (the "GPL"), -+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+DEPTH = ../../../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+include $(DEPTH)/config/autoconf.mk -+ -+MODULE = dom -+XPIDL_MODULE = dom_sidebar -+GRE_MODULE = 1 -+ -+XPIDLSRCS = \ -+ nsISidebar.idl \ -+ $(NULL) -+ -+include $(topsrcdir)/config/rules.mk -Index: dom/public/idl/sidebar/nsISidebar.idl -=================================================================== -RCS file: dom/public/idl/sidebar/nsISidebar.idl -diff -N dom/public/idl/sidebar/nsISidebar.idl ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dom/public/idl/sidebar/nsISidebar.idl 10 Feb 2005 15:58:02 -0000 -@@ -0,0 +1,70 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* -+ -+ The Sidebar API for 3rd parties -+ -+*/ -+ -+#include "nsISupports.idl" -+ -+[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)] -+interface nsISidebar : nsISupports -+{ -+ void addPanel(in wstring aTitle, in string aContentURL, -+ in string aCustomizeURL); -+ void addPersistentPanel(in wstring aTitle, in string aContentURL, -+ in string aCustomizeURL); -+ void addSearchEngine(in string engineURL, in string iconURL, -+ in wstring suggestedTitle, in wstring suggestedCategory); -+}; -+ -+%{ C++ -+// {577CB744-8CAF-11d3-AAEF-00805F8A4905} -+#define NS_SIDEBAR_CID \ -+{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } } -+ -+#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1" -+%} -+ -+/* -+ var isidebar = Components.interfaces.nsISidebar; -+ var csidebar = Components.classes['@mozilla.org/sidebar;1']; -+ var sidebar = csidebar.createInstance(isidebar); -+*/ -Index: xpinstall/packager/packages-static-unix -=================================================================== -RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/xpinstall/packager/packages-static-unix,v -retrieving revision 1.87 -diff -u -t -p -1 -2 -r1.87 packages-static-unix ---- xpinstall/packager/packages-static-unix 19 Aug 2005 23:09:31 -0000 1.87 -+++ xpinstall/packager/packages-static-unix 4 Nov 2005 02:39:13 -0000 -@@ -89,24 +89,25 @@ bin/components/caps.xpt - bin/components/cookie.xpt - bin/components/jsdservice.xpt - bin/components/libjsd.so - bin/components/dom.xpt - bin/components/dom_base.xpt - bin/components/dom_canvas.xpt - bin/components/dom_core.xpt - bin/components/dom_css.xpt - bin/components/dom_events.xpt - bin/components/dom_loadsave.xpt - bin/components/dom_html.xpt - bin/components/dom_range.xpt -+bin/components/dom_sidebar.xpt - bin/components/dom_stylesheets.xpt - bin/components/dom_traversal.xpt - bin/components/dom_views.xpt - bin/components/dom_xbl.xpt - bin/components/dom_xpath.xpt - bin/components/dom_xul.xpt - bin/components/editor.xpt - bin/components/find.xpt - bin/components/gfx.xpt - bin/components/gfx2.xpt - bin/components/gksvgrenderer.xpt - bin/components/intl.xpt -Index: xpinstall/packager/packages-unix -=================================================================== -RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/xpinstall/packager/packages-unix,v -retrieving revision 1.314 -diff -u -t -p -1 -2 -r1.314 packages-unix ---- xpinstall/packager/packages-unix 31 Oct 2005 13:21:31 -0000 1.314 -+++ xpinstall/packager/packages-unix 4 Nov 2005 02:38:56 -0000 -@@ -106,24 +106,25 @@ bin/components/nsComposerCmdLineHandler. - bin/components/cookie.xpt - bin/components/libjsd.so - bin/components/jsdservice.xpt - bin/components/dom.xpt - bin/components/dom_base.xpt - bin/components/dom_canvas.xpt - bin/components/dom_core.xpt - bin/components/dom_css.xpt - bin/components/dom_events.xpt - bin/components/dom_html.xpt - bin/components/dom_loadsave.xpt - bin/components/dom_range.xpt -+bin/components/dom_sidebar.xpt - bin/components/dom_stylesheets.xpt - bin/components/dom_traversal.xpt - bin/components/dom_views.xpt - bin/components/dom_xbl.xpt - bin/components/dom_xpath.xpt - bin/components/dom_xul.xpt - bin/components/editor.xpt - bin/components/find.xpt - bin/components/gfx.xpt - bin/components/gksvgrenderer.xpt - bin/components/intl.xpt - bin/components/imglib2.xpt -Index: dom/public/idl/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/dom/public/idl/Makefile.in,v -retrieving revision 1.13 -diff -u -p -r1.13 Makefile.in ---- dom/public/idl/Makefile.in 18 Apr 2005 06:33:17 -0000 1.13 -+++ dom/public/idl/Makefile.in 7 Nov 2005 08:39:01 -0000 -@@ -51,6 +51,7 @@ DIRS = \ - stylesheets \ - views \ - css \ -+ sidebar \ - traversal \ - range \ - xbl \ diff --git a/www/libxul/files/patch-security_coreconf_FreeBSD.mk b/www/libxul/files/patch-security_coreconf_FreeBSD.mk deleted file mode 100644 index 5c76b5af5..000000000 --- a/www/libxul/files/patch-security_coreconf_FreeBSD.mk +++ /dev/null @@ -1,37 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+CCC = ${CXX} - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +73,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/libxul/files/patch-sysnss b/www/libxul/files/patch-sysnss deleted file mode 100644 index a9154ce9a..000000000 --- a/www/libxul/files/patch-sysnss +++ /dev/null @@ -1,156 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); ---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 -+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 -@@ -52,18 +52,9 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) - ifndef HAVE_64BIT_OS -@@ -151,11 +142,6 @@ - - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - - .nss.checkout: -@@ -176,10 +162,10 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - ifndef SKIP_CHK -@@ -203,20 +189,6 @@ - endif - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -232,11 +204,6 @@ - $(MAKE) -C pki $@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: - $(MAKE) -C boot $@ diff --git a/www/libxul/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/libxul/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/libxul/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca..000000000 --- a/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index dbdc47b6f..000000000 --- a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/libxul/files/patch-xptcall-alpha b/www/libxul/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/libxul/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/libxul/files/patch-xptcall-amd64 b/www/libxul/files/patch-xptcall-amd64 deleted file mode 100644 index 3227cad02..000000000 --- a/www/libxul/files/patch-xptcall-amd64 +++ /dev/null @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ diff --git a/www/libxul/files/patch-xptcall-ia64 b/www/libxul/files/patch-xptcall-ia64 deleted file mode 100644 index 7d33a8693..000000000 --- a/www/libxul/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Fri Sep 16 15:50:20 2005 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments diff --git a/www/libxul/files/patch-xptcall-sparc64 b/www/libxul/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/libxul/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/libxul/files/patch-xulrunner_app_mozilla.in b/www/libxul/files/patch-xulrunner_app_mozilla.in deleted file mode 100644 index 1839a79d7..000000000 --- a/www/libxul/files/patch-xulrunner_app_mozilla.in +++ /dev/null @@ -1,18 +0,0 @@ ---- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006 -+++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006 -@@ -193,12 +193,12 @@ - done #others arg - - #???: needs check if othersopt begin with -* ? --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -+if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then - # Last argument seems to be a local file/directory - # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) - # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before... -+ [ `expr -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" -+elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before... - _NEW_WINDOW=1 - fi - diff --git a/www/libxul/pkg-descr b/www/libxul/pkg-descr deleted file mode 100644 index a4c33d7df..000000000 --- a/www/libxul/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications -that are as rich as Firefox and Thunderbird. It will provide mechanisms for -installing, upgrading, and uninstalling these applications. XULRunner will -also provide libxul, a solution which allows the embedding of Mozilla -technologies in other projects and products. - -WWW: http://developer.mozilla.org/en/docs/XULRunner diff --git a/www/mozex/Makefile b/www/mozex/Makefile deleted file mode 100644 index 94dc57764..000000000 --- a/www/mozex/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Ports collection makefile for: mozex -# Date created: Sun Oct 26, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= mozex -PORTVERSION= 1.07 -PORTREVISION= 5 -CATEGORIES= www mail news ftp -MASTER_SITES= ${MASTER_SITE_MOZDEV} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Mozex allows users of ${GEKO} to use external programs for mail, news, etc. - -SUB_FILES= pkg-message -SUB_LIST= GECKO=${GECKO} -PKGMESSAGE= ${WRKDIR}/pkg-message - -PLIST_FILES= %%MOZDIR%%/chrome/mozex.jar - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozex/Makefile.xpi" - -.if ${GECKO} == mozilla -PLIST_FILES+= %%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf -.endif - -do-install: - @${INSTALL_DATA} ${WRKDIR}/mozex.jar ${MOZDIR}/chrome - -.include <bsd.port.post.mk> diff --git a/www/mozex/Makefile.xpi b/www/mozex/Makefile.xpi deleted file mode 100644 index 434c9d0eb..000000000 --- a/www/mozex/Makefile.xpi +++ /dev/null @@ -1,47 +0,0 @@ -# Date created: Sun Oct 26, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -USE_GECKO= seamonkey mozilla -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - -EXTRACT_SUFX= .xpi - -NO_BUILD= yes -USE_ZIP= yes - -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${PKGINSTALL} - -MOZLDIR= lib/${GECKO} -MOZDIR= ${LOCALBASE}/${MOZLDIR} -PLIST_SUB= MOZDIR=${MOZLDIR} - -pre-configure: - ${SED} -e 's|%%GECKO%%|${GECKO}|g' \ - < ${.CURDIR}/../../www/mozex/pkg-install.xpi \ - > ${PKGINSTALL} - -pre-install: -.if ${PREFIX} != ${LOCALBASE} - @${ECHO_MSG} "" - @${ECHO_MSG} "${PREFIX} invalid - must be installed under ${LOCALBASE}." - @${ECHO_MSG} "" - @${FALSE} -.else - @${CP} ${FILESDIR}/installed-chrome.txt ${MOZDIR}/${PORTNAME}-installed-chrome.txt -.endif - -post-install: - @${ECHO_CMD} ${MOZLDIR}/${PORTNAME}-installed-chrome.txt >> ${TMPPLIST} - @${CAT} ${MOZDIR}/${PORTNAME}-installed-chrome.txt \ - >> ${MOZDIR}/chrome/installed-chrome.txt - @${ECHO_CMD} "@exec ${CAT} ${MOZDIR}/${PORTNAME}-installed-chrome.txt \ - >> ${MOZDIR}/chrome/installed-chrome.txt" >> ${TMPPLIST} - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if exists(${PKGMESSAGE}) - @${CAT} ${PKGMESSAGE} -.endif diff --git a/www/mozex/distinfo b/www/mozex/distinfo deleted file mode 100644 index 699f98daa..000000000 --- a/www/mozex/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mozex-1.07.xpi) = 9383380b78ed69409c0880a99b07e297 -SHA256 (mozex-1.07.xpi) = 81a06238416621540343e14c762bdf195277a406991c63a1cb6245eeb63ededf -SIZE (mozex-1.07.xpi) = 17072 diff --git a/www/mozex/files/installed-chrome.txt b/www/mozex/files/installed-chrome.txt deleted file mode 100644 index 4626d5403..000000000 --- a/www/mozex/files/installed-chrome.txt +++ /dev/null @@ -1 +0,0 @@ -content,install,url,jar:resource:/chrome/mozex.jar!/content/mozex/ diff --git a/www/mozex/files/pkg-message.in b/www/mozex/files/pkg-message.in deleted file mode 100644 index ff22ac4a2..000000000 --- a/www/mozex/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -************************************************************************** -Mozex has been installed. If %%GECKO%% is running, restart it. -A new "mozex" entry is present in page context menu (right click somewhere -on the page), and you have to edit preferences (for every profile). - -To set up your external programs, please follow the instructions on -<http://mozex.mozdev.org/arguments.html>. -************************************************************************** diff --git a/www/mozex/pkg-descr b/www/mozex/pkg-descr deleted file mode 100644 index 14fad01f6..000000000 --- a/www/mozex/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Mozex is an extension to Mozilla or Seamonkey which allows the user to use -external programs for these actions: - - * view page source - * edit content of textareas (possibly utilizing a spell-checker in the - text editor) - * handle mailto, news, telnet and FTP links - * download files - -WWW: http://mozex.mozdev.org/index.html diff --git a/www/mozex/pkg-install.xpi b/www/mozex/pkg-install.xpi deleted file mode 100644 index 511847138..000000000 --- a/www/mozex/pkg-install.xpi +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Oct 27, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Register the extension $1 in the chrome registry for the browser %%GECKO%%. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" = "xPRE-INSTALL" ] && exit 0 -[ "x$2" = "xDEINSTALL" ] && exit 0 - -PREFIX=${PKG_PREFIX:-/usr/local} - -PKG_NAME=${1%%-[0-9._]*} - -MOZDIR=$PREFIX/lib/%%GECKO%% -REGXPCOM=$MOZDIR/regxpcom -REGCHROME=$MOZDIR/regchrome - -if [ "x$2" = "xPOST-DEINSTALL" ]; then - case $PKG_NAME in - fr-mozilla-flp) - MODEXT="FR.jar fr-unix.jar" - ;; - - *) - MODEXT=$PKG_NAME - ;; - esac - # Removing definition of extension $MODEXT - for mod in $MODEXT; do - sed -i .bak -e "/$mod/d" $MOZDIR/chrome/installed-chrome.txt - done -fi - -echo "===> Re-building Chrome's registry..." -rm -rf $MOZDIR/chrome/overlayinfo -rm -f $MOZDIR/chrome/*.rdf -mkdir -p $MOZDIR/chrome/overlayinfo -rm -f $MOZDIR/component.reg - -LD_LIBRARY_PATH=$MOZDIR MOZILLA_FIVE_HOME=$MOZDIR $MOZDIR/regxpcom || true -LD_LIBRARY_PATH=$MOZDIR MOZILLA_FIVE_HOME=$MOZDIR $MOZDIR/regchrome || true - -if [ -d "$MOZDIR/searchplugins" ]; then - chmod -R u+w "$MOZDIR/searchplugins" -fi -#touch $MOZDIR/chrome/user-skins.rdf $MOZDIR/chrome/user-locales.rdf - -[ "x$2" = "xPOST-INSTALL" ] || rm $MOZDIR/chrome/installed-chrome.txt.bak - -exit 0 diff --git a/www/mozilla-bonobo/Makefile b/www/mozilla-bonobo/Makefile deleted file mode 100644 index e19d0c43c..000000000 --- a/www/mozilla-bonobo/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: mozilla-bonobo -# Date created: 20 Nov 2003 -# Whom: Jean-Yves Lefort <jylefort@brutele.be> -# -# $FreeBSD$ -# - -PORTNAME= mozilla-bonobo -PORTVERSION= 0.4.0 -PORTREVISION= 7 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= moz-bonobo - -MAINTAINER= ports@FreeBSD.org -COMMENT= A Netscape/Mozilla plugin using Bonobo controls to display files - -BUILD_DEPENDS= ${LOCALBASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -RUN_DEPENDS= ${LOCALBASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} - -MOZILLA= mozilla -HEADERS_SUFX= - -USE_XLIB= yes -USE_GNOME= gnomeprefix libgnomeui libgnomeprint -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --with-plugin-install-dir="${PREFIX}/lib/browser_plugins" \ - --with-mozilla-include-dir="${LOCALBASE}/include/mozilla${HEADERS_SUFX}" - -BROKEN= "Does not build with new Mozilla" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2006-12-01 - -post-patch: - @${REINPLACE_CMD} -e \ - 's|\$${prefix}/doc/mozilla-bonobo|${DOCSDIR}| ; \ - s|COPYING\\|\\| ; \ - s|INSTALL\\|\\| ; \ - s|TODO\\|TODO| ; \ - s|ABOUT-NLS||' ${WRKSRC}/Makefile.in -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e \ - 's|\$$(libmozilla_bonobodoc_DATA)|| ; \ - s|\$$(mkinstalldirs) \$$(DESTDIR)\$$(libmozilla_bonobodocdir)|| ; \ - s| \$$(DESTDIR)\$$(libmozilla_bonobodocdir) | |' ${WRKSRC}/Makefile.in -.endif - -.include <bsd.port.mk> diff --git a/www/mozilla-bonobo/distinfo b/www/mozilla-bonobo/distinfo deleted file mode 100644 index 43391f3e1..000000000 --- a/www/mozilla-bonobo/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mozilla-bonobo-0.4.0.tar.gz) = e8080758f7319ac3255ba7cc4bdeb514 -SHA256 (mozilla-bonobo-0.4.0.tar.gz) = a6eac6c3bdfa53a50de0a3ed8a1cbe7e6b82889841f2d1225d22f64474bcd526 -SIZE (mozilla-bonobo-0.4.0.tar.gz) = 317184 diff --git a/www/mozilla-bonobo/pkg-descr b/www/mozilla-bonobo/pkg-descr deleted file mode 100644 index f2addc655..000000000 --- a/www/mozilla-bonobo/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -mozilla-bonobo is a netscape-compatible browser plugin which allows -your browser to use bonobo controls to display supported mime types. - -WWW: http://www.nongnu.org/moz-bonobo/ - -- Jean-Yves Lefort -jylefort@FreeBSD.org diff --git a/www/mozilla-bonobo/pkg-plist b/www/mozilla-bonobo/pkg-plist deleted file mode 100644 index 5fc178a0a..000000000 --- a/www/mozilla-bonobo/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/mozilla-bonobo-viewer -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mozilla-bonobo.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/mozilla-bonobo.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mozilla-bonobo.schemas > /dev/null || /usr/bin/true -lib/browser_plugins/libmozilla_bonobo.so -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile deleted file mode 100644 index 11cca9f00..000000000 --- a/www/mozilla/Makefile +++ /dev/null @@ -1,157 +0,0 @@ -# New ports collection makefile for: mozilla -# Date created: 31 Mar 1998 -# Whom: eivind/dima/jseger -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.36 2006/03/09 00:45:43 ahze Exp $ - -PORTNAME= mozilla -PORTVERSION= 1.7.13 -PORTREVISION?= 1 -PORTEPOCH= 2 -CATEGORIES?= www -MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION}/source \ - ahze/:local -DISTFILES= ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ - libart_lgpl-1${EXTRACT_SUFX}:local - -MAINTAINER= gnome@FreeBSD.org -COMMENT= The open source, standards compliant web browser - -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -USE_GMAKE= yes -USE_BZIP2= yes -WANT_GNOME= yes -HAS_CONFIGURE= yes -MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -ALL_TARGET= default - -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} - -MOZ_EXTENSIONS= default -MOZ_EXPORT+= MOZ_INTERNAL_LIBART_LGPL=1 -MOZ_MK_OPTIONS+=MOZ_INTERNAL_LIBART_LGPL=1 -MOZ_OPTIONS+= --enable-svg-renderer-libart --enable-svg \ - --disable-plaintext-editor-only - -NOT_FOR_ARCHS= ia64 - -OPTIONS=CALENDAR "Enable the Calendar module" off \ - MAILNEWS "Enable Mail and News modules" on \ - COMPOSER "Enable the HTML Composer module" on \ - LDAP "Enable LDAP support for Mailnews" on \ - CHATZILLA "Enable the Chatzilla IRC module" on \ - XMLTERM "Enable the XMLTerm module" on \ - JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ - SMB "Enable smb:// URI support using gnomevfs" off - -.if !defined(WITHOUT_MAILNEWS) -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/defaults/isp/US/movemail.rdf \ - lib/${MOZILLA}/defaults/isp/movemail.rdf -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/defaults/isp/US/ \ - lib/${MOZILLA}/defaults/isp -.endif - -.include <bsd.port.pre.mk> - -# libart patches -.if ${OSVERSION} < 500035 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp -.endif - -LATEST_LINK= ${MOZILLA} - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= core dumps on ${ARCH} during post-build -.endif - -.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ - defined(WITHOUT_COMPOSER)) -BROKEN= Calendar requires Composer and Mailnews support. -.endif -.if defined(WITHOUT_MAILNEWS) -MOZ_OPTIONS+= --disable-ldap --disable-mailnews -.else -# mail and news desired, but not LDAP -.if defined(WITHOUT_LDAP) -MOZ_OPTIONS+= --disable-ldap --enable-mailnews -.else -MOZ_OPTIONS+= --enable-ldap --enable-mailnews -.endif -.endif - -.if !defined(WITHOUT_CHATZILLA) -MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc -.endif - -.if !defined(WITHOUT_XMLTERM) && defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm -.endif - -.if defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_OPTIONS+= --enable-jsd \ - --enable-dtd-debug -.else -MOZ_OPTIONS+= --disable-jsd \ - --disable-dtd-debug -.endif - -.if defined(WITH_CALENDAR) -MOZ_OPTIONS+= --enable-calendar -.endif - -.if defined(WITHOUT_COMPOSER) -MOZ_OPTIONS+= --disable-composer -.endif - -post-patch: - @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ - ${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ - ${WRKSRC}/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ - < ${FILESDIR}/mozilla.desktop.in > \ - ${WRKDIR}/mozilla.desktop - -pre-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ - break; \ - fi; \ - done; \ - fi -.if !defined(WITHOUT_MAILNEWS) - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults -.endif - ${ECHO_CMD} share/applications/mozilla.desktop >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \ - ${PREFIX}/share/applications - -post-install: - @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components - -.include "${.CURDIR}/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common deleted file mode 100644 index 7ee3cf869..000000000 --- a/www/mozilla/Makefile.common +++ /dev/null @@ -1,429 +0,0 @@ -# Makefile.common handles common tasks and dependencies for mozilla ports. -# -# Date created: 12 Nov 2005 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.30 2006/10/13 01:32:05 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, -# Thunderbird, etc.), and probably won't be of use for gecko-based ports -# like epiphany, galeon, etc. The reusable components for gecko-based ports -# lives in www/mozilla/bsd.gecko.mk. -# -# -# Ports can use the following: -# -# GECKO_PLIST_PRE_FILES List of files to add to the beginning of plist -# GECKO_PLIST_PRE_DIRS -# -# MOZILLA_PLIST_DIRS List of directories to descend into when -# installing and creating the plist -# MOZ_PIS_SCRIPTS List of scripts residing in ${FILESDIR} to -# be filtered through MOZCONFIG_SED and installed -# along with our Pluggable Init Scripts (PIS) -# MOZ_SED_ARGS sed(1) commands through which MOZ_PIS_SCRIPTS -# are filtered. There is a default set defined here, -# so you probably want to add to MOZ_SED_ARGS rather -# than clobber it -# -# MOZ_OPTIONS configure arguments (added to .mozconfig). If -# NOMOZCONFIG is defined, you probably want to set -# CONFIGURE_ARGS+=${MOZ_OPTIONS} -# MOZ_MK_OPTIONS make(1) arguments (added to .mozconfig). If -# NOMOZCONFIG is defined, you probably want to set -# MAKE_ARGS+=${MOZ_MK_OPTIONS} -# MOZ_EXPORT environment variables for the build process -# (added to .mozconfig). If NOMOZCONFIG is defined, -# you probably want to set MAKE_ENV+=${MOZ_EXPORT} -# MOZ_EXTENSIONS A list of extensions to build -# MOZ_GRAPHICS A list of image decoders to build -# MOZ_PROTOCOLS A list of protocols to build (http, ftp, etc.) -# -# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can -# be set to a generic mozconfig included with -# the port -# -# NOGECKO_INSTALL Don't install the built gecko (most likely -# for testing) -# NOGECKO_PLIST Don't create a dynamically-generated playlist -# NOMOZCONFIG Don't drop a customized .mozconfig into the -# build directory. Options will have to be -# specified in CONFIGURE_ARGS instead - -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - nspr4:${PORTSDIR}/devel/nspr \ - nss3:${PORTSDIR}/security/nss \ - Xft.2:${PORTSDIR}/x11-fonts/libXft - -MAINTAINER?= gnome@FreeBSD.org - -MOZILLA?= ${PORTNAME} -MOZILLA_VER?= ${PORTVERSION} -MOZILLA_BIN?= ${PORTNAME}-bin -MOZ_RPATH?= ${MOZILLA} -USE_GNOME+= gtk20 libidl desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_XLIB= yes - -MOZILLA_SUFX?= none -WRKSRC?= ${WRKDIR}/mozilla -FAKEDIR?= ${WRKDIR}/fake -PLIST?= ${WRKDIR}/plist -MASTER_DIR?= ${.CURDIR}/../../www/mozilla - -KRB5_HOME?= /usr -BROWSER_PLUGINS_DIR?= lib/browser_plugins -MOZ_PIS_DIR?= lib/${MOZILLA}/init.d - -ESD_LIB?= libesd.so.2 -FREETYPE_LIB?= libfreetype.so.9 - -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 - -PKGINSTALL?= ${WRKDIR}/pkg-install -PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -MASTER_MOZDIR?= ${.CURDIR}/../../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 */nsprpub/* \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude mozilla/gfx/cairo - -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 \ - ${MOZILLA}-xpcom ${MOZILLA}-plugin - -CPPFLAGS+= -I${X11BASE}/include -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 \ - --enable-default-toolkit=gtk2 \ - --enable-xft \ - --with-pthreads -# Configure options for install -MOZ_OPTIONS+= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib -.if !defined(MOZ_EXTENSIONS) -MOZ_OPTIONS+= --enable-extensions=default -.else -MOZ_OPTIONS+= --enable-extensions=${MOZ_EXTENSIONS} -.endif -.if !defined(MOZ_GRAPHICS) -MOZ_OPTIONS+= --enable-image-decoders=default -.else -MOZ_OPTIONS+= --enable-image-decoders=${MOZ_GRAPHICS} -.endif -.if !defined(MOZ_PROTOCOLS) -MOZ_OPTIONS+= --enable-necko-protocols=default -.else -MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} -.endif -# others -MOZ_OPTIONS+= --with-system-jpeg=${LOCALBASE} \ - --with-system-zlib=/usr \ - --with-system-png=${LOCALBASE} \ - --with-gssapi=${KRB5_HOME} \ - --with-system-nspr \ - --disable-auto-deps \ - --enable-chrome-format=jar \ - --disable-cpp-exceptions \ - --disable-cpp-rtti \ - --disable-glibtest \ - --disable-gtktest \ - --disable-freetypetest \ - --enable-double-buffer \ - --enable-mathml \ - --disable-installer \ - --disable-md \ - --disable-pedantic \ - --disable-bidi \ - --disable-xterm-updates \ - --enable-xinerama -MOZ_MK_OPTIONS+= XP_UNIX=1 \ - PERL=${PERL} - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= ${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS} -WITH_OPTIMIZE?= -O2 -.else -CFLAGS:= ${CFLAGS} ${EXTRA_CFLAGS} -WITH_OPTIMIZE?= -.endif - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -MOZ_OPTIONS+= --enable-gnomevfs -.endif - -.if defined(WITH_DEBUG) -MOZ_OPTIONS+= --enable-debug \ - --disable-strip -WITH_LOGGING= yes -.else -MOZ_OPTIONS+= --disable-debug \ - --enable-optimize=${WITH_OPTIMIZE} \ - --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 -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' \ - -e 's|@LIBS@|${LIBS}|g' \ - -e 's|@X11BASE@|${X11BASE}|g' \ - -e 's|@LOCALBASE@|${LOCALBASE}|g' \ - -e 's|@FAKEDIR@|${FAKEDIR}|g' \ - -e 's|@PERL@|${PERL5}|g' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|g' \ - -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g' \ - -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%CFLAGS%%|${CFLAGS}|g' \ - -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ - -e 's|%%LIBS%%|${LIBS}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ - -e 's|%%PERL%%|${PERL5}|g' \ - -e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \ - -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - -e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g' \ - -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' -MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} - -post-patch: gecko-post-patch gecko-moz-pis-patch - -gecko-post-patch: -.if exists(${PKGINSTALL_INC}) - @${MOZCONFIG_SED} < ${PKGINSTALL_INC} > ${PKGINSTALL} -.endif -.if exists(${PKGDEINSTALL_INC}) - @${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${PKGDEINSTALL} -.endif - @${RM} -f ${MOZCONFIG} -.if !defined(NOMOZCONFIG) -.if exists(${GENERIC_MOZCONFIG}) - @${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG} -.endif - @if [ -e ${PORT_MOZCONFIG} ] ; then \ - ${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \ - fi -.for arg in ${MOZ_OPTIONS} - @${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG} -.endfor -.for arg in ${MOZ_MK_OPTIONS} - @${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG} -.endfor -.for var in ${MOZ_EXPORT} - @${ECHO_CMD} "export ${var}" >> ${MOZCONFIG} -.endfor -.endif # .if !defined(NOMOZCONFIG) - @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \ - s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \ - s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ - ${WRKSRC}/build/unix/mozilla-config.in - @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - ${WRKSRC}/config/autoconf.mk.in - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|/usr/X11R6|${X11BASE}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${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}/*/*/*/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ - s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi - -# handles mozilla pis scripts. -gecko-moz-pis-patch: -.for moz in ${MOZ_PIS_SCRIPTS} - @${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-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist - -.if !target(port-pre-install) -port-pre-install: - @${DO_NADA} -.endif - -gecko-pre-install: -.if !defined(NOGECKO_PLIST) - @${RM} -rf ${FAKEDIR} ${PLIST} - @${TOUCH} -f ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} -.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}||} - ${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 - @${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \ - s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \ - ${FAKEDIR}/bin/${MOZILLA} \ - ${FAKEDIR}/bin/${MOZILLA}-config -.endif - @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${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} -.endfor -.for f in ${GECKO_PLIST_PRE_DIRS} - ${ECHO_CMD} "@dirrm ${f}" >> ${PLIST} -.endfor - ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/${BROWSER_PLUGINS_DIR} 2>/dev/null || ${TRUE}" >> ${PLIST} - ${MKDIR} ${FAKEDIR}/libdata - ${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ - ${RM} -f ${FAKEDIR}/lib/pkgconfig -.for dir in ${MOZILLA_PLIST_DIRS} - @cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|${dir}/|' >> ${PLIST} && \ - ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST} -.endfor -.for pcfile in ${PKGCONFIG_FILES} - ${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLIST} - @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - -e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \ - ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc -.endfor - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}" >> ${PLIST} -.endif # !defined(NOGECKO_PLIST) - -do-install: gecko-do-install - -gecko-do-install: -.if !defined(NOGECKO_INSTALL) -.for dir in ${MOZILLA_PLIST_DIRS} -.if !exists(${PREFIX}/${dir}) - ${MKDIR} ${PREFIX}/${dir} - ${CHMOD} 755 ${PREFIX}/${dir} -.endif - cd ${FAKEDIR}/${dir} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir} -.endfor -.for pcfile in ${PKGCONFIG_FILES} - ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/${pcfile}.pc -.endfor - ${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR} - ${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep -.endif # !defined(NOGECKO_INSTALL) - -gecko-moz-pis-pre-install: -.if defined(MOZ_PIS_SCRIPTS) - ${MKDIR} ${FAKEDIR}/${MOZ_PIS_DIR} -.for moz in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/${moz} ${FAKEDIR}/${MOZ_PIS_DIR} -.endfor -.endif - -post-install: gecko-post-install - -gecko-post-install: -.if !defined(PACKAGE_BUILDING) - @if [ -e ${PKGINSTALL} ] ; then \ - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \ - fi -.endif - @-update-desktop-database diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk deleted file mode 100644 index 911c543a5..000000000 --- a/www/mozilla/bsd.gecko.mk +++ /dev/null @@ -1,171 +0,0 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=4 -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.25 2006/10/01 02:41:33 ahze Exp $ -# -# 4 column tabs prevent hair loss and tooth decay! - -# bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users -# and porters to support any available gecko backend without needing to build -# many conditional tests. ${USE_GECKO} is the list of backends that your port -# can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. -# Users set ${WITH_GECKO} to the list of gecko backends they want on their system. - -.if defined(USE_GECKO) -#.if defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) - -# Please make sure all changes to this file are passed through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gecko_Include_MAINTAINER= gnome@FreeBSD.org -Gecko_Pre_Include= bsd.gecko.mk - - -# Users should use the following syntax: -# -# WITH_GECKO= mozilla firefox seamonkey -# Use mozilla whenever a port supports it, falling back on firefox and -# then seamonkey. -# WITH_GECKO= firefox -# Sets your preferred backend. With this example, firefox will always -# be chosen, unless the port doesn't support a firefox backend. In that -# case, you get whatever the porter chose as the default. Better to use -# the first example. -# -# -# Ports should use the following: -# -# USE_GECKO= mozilla firefox-devel firefox seamonkey -# The list of gecko backends that the port supports. Unless the user -# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO -# will be the default. In the above example, www/mozilla will be used -# as a gecko backend unless WITH_GECKO=firefox or WITH_GECKO=seamonkey -# is defined by the user. -# -# USE_GECKO= firefox-devel<->firefox -# This will sed -e 's/firefox/firefox-devel/' on Makefile.in's and configure -# if ${GECKO}=="firefox-devel" -# -# Example: -# USE_GECKO= mozilla firefox seamonkey -# .include <bsd.port.pre.mk> -# .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -# post-patch: -# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ -# ${WRKSRC}/configure -# -# If you want your port to check the ${GECKO} variable to see which backend -# has been chosen. -# -# Example: -# USE_GECKO= mozilla firefox seamonkey -# .include <bsd.port.pre.mk> -# .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -# post-patch: -# .if ${GECKO}=="seamonkey" -# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ -# ${WRKSRC}/configure -# .endif - -.if ${OSVERSION} >= 500000 -.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" -_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner firefox-devel flock -.endif -.endif -_GECKO_ALL+= mozilla - -thunderbird_PORTSDIR= mail - -.for gecko in ${_GECKO_ALL} -${gecko}_PORTSDIR?= www -${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} -${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so -.endfor - -# Figure out which mozilla to use -# Weed out bad options in USE_GECKO -.for badgecko in ${USE_GECKO} -. if ${_GECKO_ALL:M${badgecko:C/^([^<->]+).*/\1/}}!="" -GOOD_USE_GECKO+= ${badgecko:C/^([^<->]+).*/\1/} -. endif -. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}" -${badgecko:C/^([^<->]+).*/\1/}_HACK= s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g -. endif -.endfor - -.undef GECKO_FALLTHROUGH -.undef _FOUND_WITH_GECKO -# Figure out which gecko to use and weed out the bad ones -.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) -. for badgecko in ${WITH_GECKO} -. if ${GOOD_USE_GECKO:M${badgecko}}!="" -GOOD_WITH_GECKO+= ${badgecko} -. endif -. endfor -. if defined(GOOD_WITH_GECKO) -. for gecko in ${GOOD_WITH_GECKO} -. if !defined(GECKO_FALLTHROUGH) -GECKO= ${gecko} -GECKO_FALLTHROUGH= ${TRUE} -_FOUND_WITH_GECKO= ${TRUE} -. endif -. endfor -. endif -.endif - -.if !defined(GECKO) && defined(GOOD_USE_GECKO) -. for gecko in ${GOOD_USE_GECKO} -. if !defined(GECKO_FALLTRHOUGH) -GECKO= ${gecko} -GECKO_FALLTRHOUGH= ${TRUE} -. endif -. endfor -.endif - -# Generic defines -BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins -BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins - -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 -IGNORE= Unable to find a supported gecko, please check USE_GECKO -.endif - -pre-everything:: _gecko-pre-everything - -_gecko-pre-everything:: - @${ECHO_CMD} "" -.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO) - @${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you" - @${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}." - @${ECHO_CMD} " \"${GECKO}\" will be used" - @${ECHO_CMD} "" - @${ECHO_CMD} " for gecko support, but you can change that by using one of" - @${ECHO_CMD} " the following values:" -.else - @${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can" - @${ECHO_CMD} " change that by defining WITH_GECKO to the following values:" -.endif - @${ECHO_CMD} "" -.for gecko in ${GOOD_USE_GECKO} - @${ECHO_CMD} " ${gecko} " -.endfor - @${ECHO_CMD} "" - -post-patch: gecko-post-patch - -gecko-post-patch: -.if defined(${GECKO}_HACK) - ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ - ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} -.endif - -#.endif # end it all -.endif -# HERE THERE BE TACOS diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo deleted file mode 100644 index 82439353f..000000000 --- a/www/mozilla/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (mozilla-1.7.13-source.tar.bz2) = eb0683207f7668319c65e403d04bfc41 -SHA256 (mozilla-1.7.13-source.tar.bz2) = 015018ffa88843563c8acbbcad16ffdc22a1e2d1a9e5a28972164ab86273b01e -SIZE (mozilla-1.7.13-source.tar.bz2) = 30525187 -MD5 (libart_lgpl-1.tar.bz2) = c6dba83a091336ef8abdb7c85694f16e -SHA256 (libart_lgpl-1.tar.bz2) = cd964fb67183c048f2c245ee26beeade29f3109e947c6d8a8993374c8f8392df -SIZE (libart_lgpl-1.tar.bz2) = 102977 diff --git a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp deleted file mode 100644 index 758c0146c..000000000 --- a/www/mozilla/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp +++ /dev/null @@ -1,88 +0,0 @@ ---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Wed Mar 2 12:36:59 2005 -+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Wed Mar 2 12:36:37 2005 -@@ -56,6 +56,13 @@ - #include "nsArray.h" - #include "nsDataHashtable.h" - -+ -+#ifdef HAVE_CPP_2BYTE_WCHAR_T -+ typedef nsDependentString nsLiteralString; -+#else -+ typedef NS_ConvertASCIItoUTF16 nsLiteralString; -+#endif -+ - /** - * \addtogroup libart_renderer Libart Rendering Engine - * @{ -@@ -112,7 +119,7 @@ - nsCOMPtr<nsISVGGlyphMetricsSource> mSource; - - public: -- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases; -+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases; - }; - - /** @} */ -@@ -120,7 +127,7 @@ - //---------------------------------------------------------------------- - // nsSVGLibartGlyphMetricsFT implementation: - --nsDataHashtable<nsStringHashKey,nsDependentString*> -+nsDataHashtable<nsStringHashKey,nsLiteralString*> - nsSVGLibartGlyphMetricsFT::sFontAliases; - - -@@ -155,15 +162,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsLiteralString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsLiteralString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsLiteralString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -406,7 +413,7 @@ - } - else { - // try alias if there is one: -- nsDependentString *alias = nsnull; -+ nsLiteralString *alias = nsnull; - nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), - &alias); - if (alias) { -@@ -440,19 +447,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp deleted file mode 100644 index 84392bd4a..000000000 --- a/www/mozilla/files/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $ - -diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-03-19 10:36:16.000000000 +0900 -+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-07-04 22:59:19.000000000 +0900 -@@ -155,15 +155,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsDependentString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsDependentString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsDependentString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in deleted file mode 100644 index 9af187e48..000000000 --- a/www/mozilla/files/mozconfig-generic.in +++ /dev/null @@ -1,8 +0,0 @@ -ac_add_options --prefix=@FAKEDIR@ -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -export PERL="@PERL@" diff --git a/www/mozilla/files/mozilla.desktop.in b/www/mozilla/files/mozilla.desktop.in deleted file mode 100644 index 191765663..000000000 --- a/www/mozilla/files/mozilla.desktop.in +++ /dev/null @@ -1,169 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Mozilla Web Browser -Name[az]=Mozilla Veb Səyyahı -Name[bg]=Интернет браузър (Mozilla) -Name[bs]=Mozilla web preglednik -Name[ca]=Navegador web Mozilla -Name[cs]=Prohlížeč WWW Mozilla -Name[cy]=Y Porwr Gwe Mozilla -Name[da]=Mozilla - internetbrowser -Name[de]=Mozilla Webbrowser -Name[el]=Περιηγητής Διαδικτύου Mozilla -Name[en_CA]=Mozilla Web Browser -Name[en_GB]=Mozilla Web Browser -Name[es]=Navegador Web Mozilla -Name[et]=Mozilla veebibrauser -Name[eu]=Mozilla web arakatzailea -Name[fa]=مرورگر وب Mozilla -Name[fi]=Mozilla, WWW-selain -Name[fr]=Navigateur Web Mozilla -Name[ga]=Brabhsálaí Lín Mozilla -Name[he]=דפדפן Mozilla -Name[hr]=Mozilla Web preglednik -Name[hu]=Mozilla webböngésző -Name[id]=Web Browser Mozilla -Name[it]=Browser web Mozilla -Name[ja]=Mozilla ウェブ・ブラウザ -Name[ko]=Mozilla 웹 브라우저 -Name[li]=Mozilla Web Browser -Name[lt]=Mozilla web naršyklė -Name[mk]=Mozilla Веб Прелистувач -Name[mn]=Mozilla веб хөтөч -Name[ms]=Pelungsur Web Mozilla -Name[nb]=Mozilla nettleser -Name[nl]=Mozilla webbrowser -Name[nn]=Mozilla nettlesar -Name[no]=Mozilla nettleser -Name[pl]=Przeglądarka WWW Mozilla -Name[pt]=Navegador Web Mozilla -Name[pt_BR]=Navegador Web Mozilla -Name[ro]=Navigatorul Mozilla -Name[sl]=Spletni brskalnik Mozilla -Name[sq]=Mozilla - Shfletuesi Web -Name[sv]=Webbläsaren Mozilla -Name[tk]=Mozilla Web Ahtarçisi -Name[tr]=Mozilla Web Tarayıcı -Name[uk]=Переглядач web Mozilla -Name[vi]=Trình Duyệt Web Mozilla -Name[wa]=Betchteu waibe mozilla -Name[zh_CN]=Mozilla Web 浏览器 -Name[zh_TW]=Mozilla 網頁瀏覽器 -GenericName=Mozilla Web Browser -GenericName[az]=Mozilla Veb Səyyahı -GenericName[bg]=Интернет браузър (Mozilla) -GenericName[bs]=Mozilla web preglednik -GenericName[ca]=Navegador web Mozilla -GenericName[cs]=Prohlížeč WWW Mozilla -GenericName[cy]=Y Porwr Gwe Mozilla -GenericName[da]=Mozilla - internetbrowser -GenericName[de]=Mozilla Webbrowser -GenericName[el]=Περιηγητής Διαδικτύου Mozilla -GenericName[en_CA]=Mozilla Web Browser -GenericName[en_GB]=Mozilla Web Browser -GenericName[es]=Navegador Web Mozilla -GenericName[et]=Mozilla veebibrauser -GenericName[eu]=Mozilla web arakatzailea -GenericName[fa]=مرورگر وب Mozilla -GenericName[fi]=Mozilla, WWW-selain -GenericName[fr]=Navigateur Web Mozilla -GenericName[ga]=Brabhsálaí Lín Mozilla -GenericName[he]=דפדפן Mozilla -GenericName[hr]=Mozilla Web preglednik -GenericName[hu]=Mozilla webböngésző -GenericName[id]=Web Browser Mozilla -GenericName[it]=Browser web Mozilla -GenericName[ja]=Mozilla ウェブ・ブラウザ -GenericName[ko]=Mozilla 웹 브라우저 -GenericName[li]=Mozilla Web Browser -GenericName[lt]=Mozilla web naršyklė -GenericName[mk]=Mozilla Веб Прелистувач -GenericName[mn]=Mozilla веб хөтөч -GenericName[ms]=Pelungsur Web Mozilla -GenericName[nb]=Mozilla nettleser -GenericName[nl]=Mozilla webbrowser -GenericName[nn]=Mozilla nettlesar -GenericName[no]=Mozilla nettleser -GenericName[pl]=Przeglądarka WWW Mozilla -GenericName[pt]=Navegador Web Mozilla -GenericName[pt_BR]=Navegador Web Mozilla -GenericName[ro]=Navigatorul Mozilla -GenericName[sl]=Spletni brskalnik Mozilla -GenericName[sq]=Mozilla - Shfletuesi Web -GenericName[sv]=Webbläsaren Mozilla -GenericName[tk]=Mozilla Web Ahtarçisi -GenericName[tr]=Mozilla Web Tarayıcı -GenericName[uk]=Переглядач web Mozilla -GenericName[vi]=Trình Duyệt Web Mozilla -GenericName[wa]=Betchteu waibe mozilla -GenericName[zh_CN]=Mozilla Web 浏览器 -GenericName[zh_TW]=Mozilla 網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Benyt internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fa]=مرور وب -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте го вебот -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Программа для просмотра веб-страниц -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ Mozilla -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=mozilla %U -StartupNotify=false -Terminal=false -Type=Application -Icon=%%PREFIX%%/lib/mozilla/chrome/icons/default/default.xpm -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/mozilla/files/patch-Double.cpp b/www/mozilla/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff..000000000 --- a/www/mozilla/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in deleted file mode 100644 index 5480cb799..000000000 --- a/www/mozilla/files/patch-Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.in.orig Fri Aug 29 20:20:58 2003 -+++ Makefile.in Sat Oct 18 15:34:15 2003 -@@ -67,8 +67,7 @@ - $(tier_2_dirs) \ - $(tier_9_dirs) \ - $(tier_40_dirs) \ -- $(tier_50_dirs) \ -- $(NULL) -+ $(tier_50_dirs) - - ifdef GC_LEAK_DETECTOR - DIRS += gc/boehm -@@ -87,7 +86,8 @@ - DIRS += $(tier_98_dirs) - endif - --DIRS += $(tier_99_dirs) -+DIRS += $(tier_99_dirs) \ -+ $(NULL) - - # - # tier 0 - base build config dirs diff --git a/www/mozilla/files/patch-bugzilla149334 b/www/mozilla/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8..000000000 --- a/www/mozilla/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/www/mozilla/files/patch-build_unix_run-mozilla.sh b/www/mozilla/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 87114cc7b..000000000 --- a/www/mozilla/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/mozilla/files/patch-config-mkdepend-imakemdep.h b/www/mozilla/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/mozilla/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/mozilla/files/patch-config::mkdepend::Makefile.in b/www/mozilla/files/patch-config::mkdepend::Makefile.in deleted file mode 100644 index bace012a2..000000000 --- a/www/mozilla/files/patch-config::mkdepend::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/mozilla/files/patch-config::rules.mk b/www/mozilla/files/patch-config::rules.mk deleted file mode 100644 index 16cb6ae11..000000000 --- a/www/mozilla/files/patch-config::rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/mozilla/files/patch-config_autoconf.mk.in b/www/mozilla/files/patch-config_autoconf.mk.in deleted file mode 100644 index c4fa0b516..000000000 --- a/www/mozilla/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/mozilla/files/patch-extensions_p3p_Makefile.in b/www/mozilla/files/patch-extensions_p3p_Makefile.in deleted file mode 100644 index efade70e9..000000000 --- a/www/mozilla/files/patch-extensions_p3p_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- extensions/p3p/Makefile.in.orig Sun Jul 9 14:10:16 2006 -+++ extensions/p3p/Makefile.in Sun Jul 9 14:20:10 2006 -@@ -62,23 +62,23 @@ - p3p200010.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2000/10/18/P3Pv1 \ -- -DHAS_TMPL_RETENTION\ -+ -DHAS_TMPL_RETENTION \ - $< > $@ - - p3p200012.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2000/12/P3Pv1 \ -- -DHAS_CALL_OURS\ -+ -DHAS_CALL_OURS \ - $< > $@ - - p3p200109.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2001/09/P3Pv1 \ -- -DHAS_CALL_OURS\ -+ -DHAS_CALL_OURS \ - $< > $@ - - p3p200201.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2002/01/P3Pv1 \ -- -DHAS_CALL_OURS -DHAS_PURPOSE_SRC\ -+ -DHAS_CALL_OURS -DHAS_PURPOSE_SRC \ - $< > $@ diff --git a/www/mozilla/files/patch-gfx-src-gtk-Makefile.in b/www/mozilla/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b69984..000000000 --- a/www/mozilla/files/patch-gfx-src-gtk-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not -contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''. - -This causes an error, because libgfxshared_s is only under dist/lib. - - -mi - ---- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003 -+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005 -@@ -165,4 +165,5 @@ - ifdef MOZ_ENABLE_GTK2 - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ -+ $(LIBS_DIR) \ - -lgkgfx \ - -lgfxshared_s \ diff --git a/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp b/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp deleted file mode 100644 index 29752f34a..000000000 --- a/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp +++ /dev/null @@ -1,58 +0,0 @@ ---- 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/files/patch-libm b/www/mozilla/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/mozilla/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt deleted file mode 100644 index d1cb9f9f7..000000000 --- a/www/mozilla/files/patch-qt +++ /dev/null @@ -1,65 +0,0 @@ ---- configure.orig Tue Oct 12 00:13:29 2004 -+++ configure Wed Nov 23 01:48:55 2005 -@@ -9368,7 +9368,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9374 "configure" - #include "confdefs.h" -@@ -9399,7 +9399,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9409,7 +9409,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9415 "configure" - #include "confdefs.h" -@@ -9440,7 +9440,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi -@@ -11401,12 +11401,12 @@ - - echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 - echo "configure:11404: checking MOZ_GTK2_CFLAGS" >&5 -- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` -+ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"` - echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 - echo "configure:11409: checking MOZ_GTK2_LIBS" >&5 -- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"` -+ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"` - echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 - else - MOZ_GTK2_CFLAGS="" -@@ -12344,9 +12344,9 @@ - - - --MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth" -+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth" - --MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks" -+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks" - - # Check whether --enable-extensions or --disable-extensions was given. - if test "${enable_extensions+set}" = set; then diff --git a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk b/www/mozilla/files/patch-security::coreconf::FreeBSD.mk deleted file mode 100644 index 5c76b5af5..000000000 --- a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk +++ /dev/null @@ -1,37 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+CCC = ${CXX} - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +73,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/mozilla/files/patch-sysnspr b/www/mozilla/files/patch-sysnspr deleted file mode 100644 index 19e2703b4..000000000 --- a/www/mozilla/files/patch-sysnspr +++ /dev/null @@ -1,21 +0,0 @@ ---- directory/c-sdk/ldap/include/Makefile.in.orig Sat Aug 20 02:15:05 2005 -+++ directory/c-sdk/ldap/include/Makefile.in Sat Aug 20 02:15:55 2005 -@@ -76,7 +76,6 @@ - $(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR) - rm -rf $(NSPRINCDIR)/* -- cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR) - - $(INCLUDEDIR): FORCE - $(NSINSTALL) -D $(INCLUDEDIR) ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig Sat Aug 20 02:14:33 2005 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in Sat Aug 20 02:14:39 2005 -@@ -58,7 +58,7 @@ - - LOCAL_INCLUDES = -I$(PUBLIC)/nspr - INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \ -- -I$(DIST)/include/nspr -+ $(shell nspr-config --cflags) - DEFINES += $(DEFS) - - PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS diff --git a/www/mozilla/files/patch-sysnss b/www/mozilla/files/patch-sysnss deleted file mode 100644 index d854cabc0..000000000 --- a/www/mozilla/files/patch-sysnss +++ /dev/null @@ -1,178 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 -+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 -@@ -37,16 +37,7 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) -@@ -132,9 +123,4 @@ - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - -@@ -153,43 +139,4 @@ - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif --ifndef DISABLE_DIST_GRE -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) --endif --endif --ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ -@@ -200,18 +147,4 @@ - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -227,9 +160,4 @@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); diff --git a/www/mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/mozilla/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc b/www/mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca..000000000 --- a/www/mozilla/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index dbdc47b6f..000000000 --- a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/mozilla/files/patch-xpfe_bootstrap_mozilla.in b/www/mozilla/files/patch-xpfe_bootstrap_mozilla.in deleted file mode 100644 index 768eaf648..000000000 --- a/www/mozilla/files/patch-xpfe_bootstrap_mozilla.in +++ /dev/null @@ -1,436 +0,0 @@ ---- xpfe/bootstrap/mozilla.in.orig Fri Feb 20 19:13:46 2004 -+++ xpfe/bootstrap/mozilla.in Tue Mar 22 22:40:43 2005 -@@ -29,141 +29,324 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - - #uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" - --# honor MOZILLA_FIVE_HOME if it's there --if [ -n "$MOZILLA_FIVE_HOME" ] ; then -- dist_bin="$MOZILLA_FIVE_HOME" --else -- # Use run-mozilla.sh in the current dir if it exists -- # If not, then start resolving symlinks until we find run-mozilla.sh -- found=0 -- progname=$0 -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if test -x "$run_moz"; then -- dist_bin=$curdir -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME -+ -+# Use run-mozilla.sh in the current dir if it exists -+# If not, then start resolving symlinks until we find run-mozilla.sh -+found=0 -+progname="$0" -+curdir=`dirname "$progname"` -+progbase=`basename "$progname"` -+run_moz="$curdir/run-mozilla.sh" -+# mozilla must obey MOZILLA_FIVE_HOME -+if [ -n "$MOZILLA_FIVE_HOME" -a -d "$MOZILLA_FIVE_HOME" -a \ -+ -x "$MOZILLA_FIVE_HOME/run-mozilla.sh" ]; then -+ curdir="$MOZILLA_FIVE_HOME" -+ run_moz="$curdir/run-mozilla.sh" -+ dist_bin="$curdir" - found=1 -- else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- found=1 -- break -- fi -+elif [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 -+else -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi - done -- cd "$here" -- fi -- if [ $found = 0 ]; then -+ cd "${here}" -+fi -+if [ $found = 0 ]; then - # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin=$moz_libdir -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi -- fi -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" -+ else -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 -+ fi - fi - --script_args="" --debugging=0 --MOZILLA_BIN="%MOZILLA-BIN%" -- -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F $MOZILLA_BIN -+ mimeset -F "$MOZILLA_BIN" - fi - -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi -+ -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" - pass_arg_count=0 - while [ $# -gt $pass_arg_count ] - do -- case "$1" in -- -p | -pure) -- MOZILLA_BIN="%MOZILLA-BIN%.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- # Move the unrecognized argument to the end of the list. -- arg="$1" -- shift -- set -- "$@" "$arg" -- pass_arg_count=`expr $pass_arg_count + 1` -- ;; -- esac -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -browser) -+ # browser is default for mozilla -+ shift -+ ;; -+ -mail) -+ _remote_cmd="xfeDoCommand(openInbox)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -compose) -+ _remote_cmd="xfeDoCommand(composeMessage)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ *) -+ target="$1" -+ shift -+ ;; -+ esac - done - --export MRE_HOME -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ if [ `expr "${target}" : '/.*'` -eq 0 ]; then -+ target="${here}/${target}" -+ fi -+ if [ -r "${target}" -o -d "${target}" ]; then -+ [ -n "${use_openFile}" ] || target="file://${target}" -+ else -+ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 -+ ALREADY_RUNNING= # null -+ fi -+ else -+ # an former URI, don't use openFile -+ use_openFile= # null -+ fi -+ fi -+fi -+ -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${use_openFile}" ]; then -+ _remote_cmd="openFile(${target})" -+ elif [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" -+ else -+ _remote_cmd="openURL(${target})" -+ fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi -+fi -+ -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi -+ -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts diff --git a/www/mozilla/files/patch-xptcall-alpha b/www/mozilla/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/mozilla/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/mozilla/files/patch-xptcall-amd64 b/www/mozilla/files/patch-xptcall-amd64 deleted file mode 100644 index 3227cad02..000000000 --- a/www/mozilla/files/patch-xptcall-amd64 +++ /dev/null @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ diff --git a/www/mozilla/files/patch-xptcall-ia64 b/www/mozilla/files/patch-xptcall-ia64 deleted file mode 100644 index 9cd07f7dd..000000000 --- a/www/mozilla/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue diff --git a/www/mozilla/files/patch-xptcall-sparc64 b/www/mozilla/files/patch-xptcall-sparc64 deleted file mode 100755 index 9599a8a71..000000000 --- a/www/mozilla/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in deleted file mode 100644 index 4496b27e9..000000000 --- a/www/mozilla/pkg-deinstall.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.14 2006/07/18 15:03:40 ahze Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components/*.dat -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-descr b/www/mozilla/pkg-descr deleted file mode 100644 index 37a7a6403..000000000 --- a/www/mozilla/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -This is the current release of the Mozilla open source web browser. It should -be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, -JavaScript, MathML, SVG and RDF. This version also supports SSL encryption, -and Java with the use of the FreeBSD native Java plug-in. - -This is the latest release of the Mozilla browser. It contains all the -bugfixes and security enhancements from the mozilla port as well as -new new features. - -WWW: http://www.mozilla.org/ diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in deleted file mode 100644 index bd6131c6d..000000000 --- a/www/mozilla/pkg-install.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/pkg-install.in,v 1.14 2006/07/18 15:03:40 ahze Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -MOZBIN=${MOZDIR}/%%MOZILLA_BIN%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg - -cd ${MOZDIR} || exit 1 -if [ -f ${REGXPCOM} ]; then - ./run-mozilla.sh ${REGXPCOM} || true -fi -if [ -f ${REGCHROME} ]; then - ./run-mozilla.sh ${REGCHROME} || true -fi -if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then - ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1 -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 diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile deleted file mode 100644 index 43ff04711..000000000 --- a/www/mplayer-plugin/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: mplayerplug-in -# Date Created: 20 February 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= mplayerplug-in -PORTVERSION= 3.31 -PORTREVISION= 1 -CATEGORIES= www multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mplayerplug-in - -MAINTAINER= marcus@FreeBSD.org -COMMENT= A Mozilla plugin for the MPlayer media player - -RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer - -WRKSRC= ${WRKDIR}/${PORTNAME} -USE_GETTEXT= yes -USE_GMAKE= yes -USE_GECKO= firefox mozilla seamonkey -PLUGINSFILES= mplayerplug-in.so mplayerplug-in.xpt mplayerplug-in-wmp.so \ - mplayerplug-in-qt.so mplayerplug-in-rm.so \ - mplayerplug-in-gmp.so mplayerplug-in-wmp.xpt \ - mplayerplug-in-qt.xpt mplayerplug-in-rm.xpt \ - mplayerplug-in-gmp.xpt mplayerplug-in-dvx.so \ - mplayerplug-in-dvx.xpt -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-gmp -USE_GNOME= gnometarget -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -DBSD" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" - -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|make|${GMAKE}|g' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ - ${WRKSRC}/Source/plugin-setup.cpp - -do-install: - ${MKDIR} ${PREFIX}/lib/browser_plugins -.for moo in ${PLUGINSFILES} - ${INSTALL_DATA} ${WRKSRC}/${moo} ${PREFIX}/lib/browser_plugins -.endfor - ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \ - ${PREFIX}/etc/mplayerplug-in.conf.dist - if [ ! -f ${PREFIX}/etc/mplayerplug-in.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \ - ${PREFIX}/etc/mplayerplug-in.conf ; \ - fi - ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \ - ${PREFIX}/etc/mplayerplug-in.types.dist - if [ ! -f ${PREFIX}/etc/mplayerplug-in.types ]; then \ - ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \ - ${PREFIX}/etc/mplayerplug-in.types ;\ - fi - cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} install - -.include <bsd.port.post.mk> diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo deleted file mode 100644 index b5c43eb3c..000000000 --- a/www/mplayer-plugin/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mplayerplug-in-3.31.tar.gz) = be26b17cde385c7a34fc634d2c88c5c9 -SHA256 (mplayerplug-in-3.31.tar.gz) = 359b33927eb2837a544592afc00b55671e02694a8c54d3e7af3c81600bc38885 -SIZE (mplayerplug-in-3.31.tar.gz) = 211714 diff --git a/www/mplayer-plugin/files/patch-Source_plugin-support.cpp b/www/mplayer-plugin/files/patch-Source_plugin-support.cpp deleted file mode 100644 index 5e2dc49d1..000000000 --- a/www/mplayer-plugin/files/patch-Source_plugin-support.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- Source/plugin-support.cpp.orig Sat Feb 18 17:05:30 2006 -+++ Source/plugin-support.cpp Sat Feb 18 17:05:58 2006 -@@ -486,9 +486,13 @@ void killmplayer(nsPluginInstance * inst - if (instance->paused == 1) - sendCommand(instance, "pause\n"); - sendCommand(instance, "quit\n"); -+#ifndef BSD - pthread_mutex_lock(&(instance->read_mutex)); -+#endif - instance->cancelled = 1; -+#ifndef BSD - pthread_mutex_unlock(&(instance->read_mutex)); -+#endif - - /* count = 0; - while (count < 500) { diff --git a/www/mplayer-plugin/pkg-descr b/www/mplayer-plugin/pkg-descr deleted file mode 100644 index 5426030de..000000000 --- a/www/mplayer-plugin/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A Mozilla plugin that uses MPlayer to play videos from websites. - -WWW: http://mplayerplug-in.sourceforge.net/ diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist deleted file mode 100644 index 5af28f140..000000000 --- a/www/mplayer-plugin/pkg-plist +++ /dev/null @@ -1,39 +0,0 @@ -@unexec if cmp -s %D/etc/mplayerplug-in.conf %D/etc/mplayerplug-in.conf.dist; then rm -f %D/etc/mplayerplug-in.conf; fi -etc/mplayerplug-in.conf.dist -@unexec if cmp -s %D/etc/mplayerplug-in.types %D/etc/mplayerplug-in.types.dist; then rm -f %D/etc/mplayerplug-in.types; fi -etc/mplayerplug-in.types.dist -lib/browser_plugins/mplayerplug-in-dvx.so -lib/browser_plugins/mplayerplug-in-dvx.xpt -lib/browser_plugins/mplayerplug-in-gmp.so -lib/browser_plugins/mplayerplug-in-gmp.xpt -lib/browser_plugins/mplayerplug-in-qt.so -lib/browser_plugins/mplayerplug-in-qt.xpt -lib/browser_plugins/mplayerplug-in-rm.so -lib/browser_plugins/mplayerplug-in-rm.xpt -lib/browser_plugins/mplayerplug-in-wmp.so -lib/browser_plugins/mplayerplug-in-wmp.xpt -lib/browser_plugins/mplayerplug-in.so -lib/browser_plugins/mplayerplug-in.xpt -share/locale/da/LC_MESSAGES/mplayerplug-in.mo -share/locale/de/LC_MESSAGES/mplayerplug-in.mo -share/locale/en_US/LC_MESSAGES/mplayerplug-in.mo -share/locale/es/LC_MESSAGES/mplayerplug-in.mo -share/locale/fr/LC_MESSAGES/mplayerplug-in.mo -share/locale/hu/LC_MESSAGES/mplayerplug-in.mo -share/locale/it/LC_MESSAGES/mplayerplug-in.mo -share/locale/ja/LC_MESSAGES/mplayerplug-in.mo -share/locale/ko/LC_MESSAGES/mplayerplug-in.mo -share/locale/nl/LC_MESSAGES/mplayerplug-in.mo -share/locale/pl/LC_MESSAGES/mplayerplug-in.mo -share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo -share/locale/ru/LC_MESSAGES/mplayerplug-in.mo -share/locale/se/LC_MESSAGES/mplayerplug-in.mo -@dirrmtry lib/browser_plugins -@dirrmtry share/locale/se/LC_MESSAGES -@dirrmtry share/locale/se -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US diff --git a/www/nscache/Makefile b/www/nscache/Makefile deleted file mode 100644 index 800556bca..000000000 --- a/www/nscache/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# New ports collection makefile for: nscache -# Date created: 04 March 2000 -# Whom: Kris Kennaway <kris@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ - -PORTNAME= nscache -PORTVERSION= 0.6 -PORTREVISION= 4 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://www.idata.sk/~ondrej/sw/ -MASTER_SITE_SUBDIR= ${PORTNAME} -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= Netscape cache browser - -USE_GNOME= gnomehier gtk12 -USE_GETOPT_LONG= yes -USE_GMAKE= yes -USE_GETTEXT= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} --disable-gnome -MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ - AUTOHEADER="${TRUE}" - -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib - -post-install: - ${INSTALL_DATA} ${WRKSRC}/nscache.desktop \ - ${PREFIX}/share/gnome/apps/Internet - ${INSTALL_DATA} ${WRKSRC}/nscache.xpm \ - ${PREFIX}/share/gnome/pixmaps - -.include <bsd.port.mk> diff --git a/www/nscache/distinfo b/www/nscache/distinfo deleted file mode 100644 index e7ae94afe..000000000 --- a/www/nscache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nscache-0.6.tgz) = aa88ad458be394a2fccac39906226cff -SHA256 (nscache-0.6.tgz) = 88474cb1158337cbab22354d08d54b8bcd291c7f5d76a342491ebd4bf61416bb -SIZE (nscache-0.6.tgz) = 132422 diff --git a/www/nscache/files/patch-ac b/www/nscache/files/patch-ac deleted file mode 100644 index d9cde7ef7..000000000 --- a/www/nscache/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- src/re.h.orig Sun Nov 12 23:09:38 2000 -+++ src/re.h Tue Jan 16 03:06:40 2001 -@@ -3,6 +3,7 @@ - - #ifdef HAVE_REGEX - #ifdef HAVE_REGEX_H -+#include <sys/types.h> - #include <regex.h> - #endif - diff --git a/www/nscache/pkg-descr b/www/nscache/pkg-descr deleted file mode 100644 index 034d18e34..000000000 --- a/www/nscache/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -from nscache's README: - -NScache is simple program for viewing and amanging contents of Netscape(tm) -browsers cache directory. - -It have very easy user interface writen by using of GTK+1.2 widget libraries. -It shows 3 levels tree of cache contents. At first level are protocols, at -second level are servers and at third level are regular documents. - -For each document there is shown its URL, name of cache file, its size, -MIME type, encoding type, character set for HTML documents, modification -time, access time and time when document expires. - -When you press right mouse button inside tree list, you can make any action -on selected item. You can save file from cache to other location, you can -remove files and entries from chache (one or all entries for server), or you -can compute numbers of documents in subtrees and size of all documets in -subtree. You can launch any viewer command on cache file or on source URL. -The viewers you can assign to any MIME type. You can also copy selected URL -to clipboard. - -WWW: http://www.idata.sk/~ondrej/nscache/ diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist deleted file mode 100644 index 50d9f91a1..000000000 --- a/www/nscache/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -bin/nscache -share/locale/de/LC_MESSAGES/nscache.mo -share/locale/es/LC_MESSAGES/nscache.mo -share/locale/fr/LC_MESSAGES/nscache.mo -share/locale/it/LC_MESSAGES/nscache.mo -share/locale/ja/LC_MESSAGES/nscache.mo -share/locale/pt_BR/LC_MESSAGES/nscache.mo -share/locale/sk/LC_MESSAGES/nscache.mo -share/locale/tr/LC_MESSAGES/nscache.mo -share/gnome/apps/Internet/nscache.desktop -share/gnome/pixmaps/nscache.xpm -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk diff --git a/www/nvu/Makefile b/www/nvu/Makefile deleted file mode 100644 index 4ae5c3749..000000000 --- a/www/nvu/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: nvu -# Date created: August 21, 2004 -# Whom: Thierry Thomas <thierry@pompo.net> -# -# $FreeBSD$ -# $MCom: ports/www/nvu/Makefile,v 1.3 2005/11/23 00:40:57 ahze Exp $ - -PORTNAME= nvu -DISTVERSION= 1.0 -PORTREVISION= 2 -CATEGORIES= www -MASTER_SITES= http://cvs.nvu.com/download/ -DISTNAME= ${PORTNAME}-${DISTVERSION}-sources - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A complete Web Authoring System similar to Dreamweaver or Frontpage - -USE_BZIP2= yes -WANT_GNOME= yes -USE_GMAKE= yes -NVU= ${PORTNAME}-${DISTVERSION} -MAKEFILE= client.mk -ALL_TARGET= build_all -PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux -CFLAGS+= -I${X11BASE}/include - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/Makefile.common" - -.if ${ARCH} == "ia64" -BROKEN= does not build -.endif - -.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 -IGNORE= does not build -.endif - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif - -post-patch: - @${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache - @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in - @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in - -.include <bsd.port.post.mk> diff --git a/www/nvu/distinfo b/www/nvu/distinfo deleted file mode 100644 index fad90f165..000000000 --- a/www/nvu/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nvu-1.0-sources.tar.bz2) = ae0f7c85e230ce8a90dc438b53be06e6 -SHA256 (nvu-1.0-sources.tar.bz2) = 9ec892e352c3596a4f734a885c6e085028574714cf0d44c2dac32b0d89b4b630 -SIZE (nvu-1.0-sources.tar.bz2) = 29687976 diff --git a/www/nvu/files/extra-patch-config_make-jars.pl b/www/nvu/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca..000000000 --- a/www/nvu/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/www/nvu/files/patch-bugzilla149334 b/www/nvu/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8..000000000 --- a/www/nvu/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/www/nvu/files/patch-build_unix_mozilla-xpcom.pc.in b/www/nvu/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a544..000000000 --- a/www/nvu/files/patch-build_unix_mozilla-xpcom.pc.in +++ /dev/null @@ -1,8 +0,0 @@ ---- build/unix/mozilla-xpcom.pc.in.orig Thu Jun 24 12:23:09 2004 -+++ build/unix/mozilla-xpcom.pc.in Thu Jun 24 12:23:18 2004 -@@ -8,4 +8,4 @@ - Version: %MOZILLA_VERSION% - Requires: mozilla-nspr = %MOZILLA_VERSION% - Libs: -L${libdir} -lxpcom --Cflags: -I${includedir}/xpcom -I${includedir}/string -+Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir} diff --git a/www/nvu/files/patch-config_autoconf.mk.in b/www/nvu/files/patch-config_autoconf.mk.in deleted file mode 100644 index 29fe7f8fb..000000000 --- a/www/nvu/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 -+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 -@@ -50,13 +50,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/nvu/files/patch-extensions_p3p_Makefile.in b/www/nvu/files/patch-extensions_p3p_Makefile.in deleted file mode 100644 index efade70e9..000000000 --- a/www/nvu/files/patch-extensions_p3p_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- extensions/p3p/Makefile.in.orig Sun Jul 9 14:10:16 2006 -+++ extensions/p3p/Makefile.in Sun Jul 9 14:20:10 2006 -@@ -62,23 +62,23 @@ - p3p200010.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2000/10/18/P3Pv1 \ -- -DHAS_TMPL_RETENTION\ -+ -DHAS_TMPL_RETENTION \ - $< > $@ - - p3p200012.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2000/12/P3Pv1 \ -- -DHAS_CALL_OURS\ -+ -DHAS_CALL_OURS \ - $< > $@ - - p3p200109.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2001/09/P3Pv1 \ -- -DHAS_CALL_OURS\ -+ -DHAS_CALL_OURS \ - $< > $@ - - p3p200201.xsl: resources/content/p3p.xsl.in Makefile.in - @$(RM) -f $@ - $(PP) -DNAMESPACE=http://www.w3.org/2002/01/P3Pv1 \ -- -DHAS_CALL_OURS -DHAS_PURPOSE_SRC\ -+ -DHAS_CALL_OURS -DHAS_PURPOSE_SRC \ - $< > $@ diff --git a/www/nvu/files/patch-extensions_transformiix_source_base_Double.cpp b/www/nvu/files/patch-extensions_transformiix_source_base_Double.cpp deleted file mode 100644 index 38ce7ec12..000000000 --- a/www/nvu/files/patch-extensions_transformiix_source_base_Double.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006 -+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/www/nvu/files/patch-gfx-src-gtk-Makefile.in b/www/nvu/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b69984..000000000 --- a/www/nvu/files/patch-gfx-src-gtk-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not -contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''. - -This causes an error, because libgfxshared_s is only under dist/lib. - - -mi - ---- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003 -+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005 -@@ -165,4 +165,5 @@ - ifdef MOZ_ENABLE_GTK2 - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ -+ $(LIBS_DIR) \ - -lgkgfx \ - -lgfxshared_s \ diff --git a/www/nvu/files/patch-libm b/www/nvu/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/nvu/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/nvu/files/patch-sysnss b/www/nvu/files/patch-sysnss deleted file mode 100644 index d854cabc0..000000000 --- a/www/nvu/files/patch-sysnss +++ /dev/null @@ -1,178 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 -+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 -@@ -37,16 +37,7 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) -@@ -132,9 +123,4 @@ - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - -@@ -153,43 +139,4 @@ - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif --ifndef DISABLE_DIST_GRE -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) --endif --endif --ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ -@@ -200,18 +147,4 @@ - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -227,9 +160,4 @@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); diff --git a/www/nvu/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/nvu/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/nvu/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/nvu/files/patch-venkman b/www/nvu/files/patch-venkman deleted file mode 100644 index 547fa3d01..000000000 --- a/www/nvu/files/patch-venkman +++ /dev/null @@ -1,30 +0,0 @@ ---- configure.orig Thu Dec 29 00:16:56 2005 -+++ configure Thu Dec 29 00:17:37 2005 -@@ -12674,10 +12674,8 @@ - MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` - fi - --if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then -- echo "configure: warning: Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS." 1>&2 -- MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` --fi -+echo "configure: warning: Removing venkman from MOZ_EXTENSIONS." 1>&2 -+MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` - - if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then - echo "configure: warning: tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS." 1>&2 ---- configure.in.orig Thu Dec 29 00:17:05 2005 -+++ configure.in Thu Dec 29 00:18:39 2005 -@@ -3841,10 +3841,8 @@ - MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` - fi - --if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then -- AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.]) -- MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` --fi -+AC_MSG_WARN([Removing venkman from MOZ_EXTENSIONS.]) -+MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` - - dnl This might be temporary: build tridentprofile only on Windows - if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then diff --git a/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a..000000000 --- a/www/nvu/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/nvu/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc b/www/nvu/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca..000000000 --- a/www/nvu/files/patch-xpcom::reflect::xptcall::public::xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/nvu/files/patch-xptcall-alpha b/www/nvu/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/nvu/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/nvu/files/patch-xptcall-ia64 b/www/nvu/files/patch-xptcall-ia64 deleted file mode 100644 index 9cd07f7dd..000000000 --- a/www/nvu/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue diff --git a/www/nvu/files/patch-xptcall-sparc64 b/www/nvu/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/nvu/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/nvu/pkg-descr b/www/nvu/pkg-descr deleted file mode 100644 index 178966003..000000000 --- a/www/nvu/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -Nvu is a complete Web Authoring System that combines web file management and -easy-to-use WYSIWYG web page editing. Nvu is based on the Mozilla Firefox -codebase and is designed to be extremely easy to use, making it ideal for -non-technical computer users who want to create an attractive, professional -looking web site without needing to know HTML or web coding. - -Features: - - FTP site manager - - A new color picker - - Tabs! - - CSS editor - - A dash of style(s) - - Customizable toolbars - - Forms - - Cleaner markup - - Visible marks - -WWW: http://www.nvu.com/ diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile deleted file mode 100644 index 94590321b..000000000 --- a/www/openvrml/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# New ports collection makefile for: OpenVRML -# Date created: 8 Jan 2001 -# Whom: Marc van Woerkom <3d@freebsd.org> -# -# $FreeBSD$ -# - -PORTNAME= openvrml -PORTVERSION= 0.15.10 -PORTREVISION= 5 -CATEGORIES= www graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= VRML97 runtime and browser ("lookat") - -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla \ - ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ - pkg-config:${PORTSDIR}/devel/pkg-config -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-js.pc:${PORTSDIR}/www/mozilla - -USE_GL= yes -USE_GNOME= gnomehack gtk20 -USE_SDL= sdl -USE_GCC= 3.4 -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -largp -Wl,--rpath -Wl,${LOCALBASE}/lib/mozilla -L${X11BASE}/lib -lXext" \ - XPIDLFLAGS="-I${LOCALBASE}/share/idl/mozilla" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_GMAKE= yes -USE_LDCONFIG= yes - -PLIST_SUB= VER=${PORTVERSION} -SUB_FILES= lookat.sh - -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on ${OPSYS}-${OSREL} -.endif -.if ${ARCH} == "sparc64" -BROKEN= Gets internal gcc error on ${ARCH} -.endif - -.if exists(${LOCALBASE}/include/boost/python.hpp) -LIB_DEPENDS+= boost_python.3:${PORTSDIR}/devel/boost-python -.else -LIB_DEPENDS+= boost_regex.3:${PORTSDIR}/devel/boost -.endif - -post-patch: - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/configure - -post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${CP} -R ${WRKSRC}/doc/manual/ ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/models/*.wrl ${EXAMPLESDIR} -.endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.if defined(MAINTAINER_MODE) -test: build - (cd ${WRKSRC}/tests ; \ - ./testsuite ) -.endif - -.include <bsd.port.post.mk> diff --git a/www/openvrml/distinfo b/www/openvrml/distinfo deleted file mode 100644 index 113339544..000000000 --- a/www/openvrml/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (openvrml-0.15.10.tar.gz) = 9ed3fa9da6f74e2a0bf45cdab655db30 -SHA256 (openvrml-0.15.10.tar.gz) = a91dca66e83b921c7a06ad7986d6f58a3d27db30250081aff745e84db9f5960f -SIZE (openvrml-0.15.10.tar.gz) = 5334341 diff --git a/www/openvrml/files/lookat.sh.in b/www/openvrml/files/lookat.sh.in deleted file mode 100644 index 0f3d2f823..000000000 --- a/www/openvrml/files/lookat.sh.in +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -# $FreeBSD$ - -LD_LIBRARY_PATH=%%LOCALBASE%%/lib/mozilla %%PREFIX%%/bin/lookat $1 diff --git a/www/openvrml/files/patch-030_freetype_prototypes b/www/openvrml/files/patch-030_freetype_prototypes deleted file mode 100644 index 5f6dc6700..000000000 --- a/www/openvrml/files/patch-030_freetype_prototypes +++ /dev/null @@ -1,50 +0,0 @@ -Index: openvrml-0.15.10/src/libopenvrml/openvrml/vrml97node.cpp -=================================================================== ---- src/libopenvrml/openvrml/vrml97node.cpp.orig 2006-06-11 14:23:00.000000000 +0200 -+++ src/libopenvrml/openvrml/vrml97node.cpp 2006-06-11 15:12:02.000000000 +0200 -@@ -16604,7 +16604,7 @@ - - const float stepSize_ = 0.2; - -- int moveTo_(FT_Vector * const to, void * const user) throw () -+ int moveTo_(const FT_Vector * to, void * user) - { - using std::vector; - assert(user); -@@ -16620,7 +16620,7 @@ - return 0; - } - -- int lineTo_(FT_Vector * const to, void * const user) throw () -+ int lineTo_(const FT_Vector * to, void * user) - { - assert(user); - GlyphContours_ & c = *static_cast<GlyphContours_ *>(user); -@@ -16682,10 +16682,9 @@ - } - } - -- int conicTo_(FT_Vector * const control, -- FT_Vector * const to, -+ int conicTo_(const FT_Vector * control, -+ const FT_Vector * to, - void * const user) -- throw () - { - using std::vector; - -@@ -16716,11 +16715,10 @@ - return 0; - } - -- int cubicTo_(FT_Vector * const control1, -- FT_Vector * const control2, -- FT_Vector * const to, -+ int cubicTo_(const FT_Vector * control1, -+ const FT_Vector * control2, -+ const FT_Vector * to, - void * const user) -- throw () - { - using std::vector; - diff --git a/www/openvrml/files/patch-Makefile.in b/www/openvrml/files/patch-Makefile.in deleted file mode 100644 index 8386629f5..000000000 --- a/www/openvrml/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Jul 4 01:29:49 2005 -+++ Makefile.in Fri Jul 22 16:32:32 2005 -@@ -236,7 +236,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --SUBDIRS = doc ide-projects m4 models lib java src mozilla-plugin tests -+SUBDIRS = ide-projects m4 models lib java src mozilla-plugin tests - ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = \ - openvrml.pc.in \ diff --git a/www/openvrml/files/patch-ltmain.sh b/www/openvrml/files/patch-ltmain.sh deleted file mode 100644 index e7be8dd9a..000000000 --- a/www/openvrml/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Wed Apr 7 12:00:09 2004 -+++ ltmain.sh Wed Apr 7 12:00:20 2004 -@@ -5428,10 +5428,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false ; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp b/www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp deleted file mode 100644 index 6bc8559c9..000000000 --- a/www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- mozilla-plugin/src/openvrml-player/player.cpp.orig Tue Nov 15 00:16:02 2005 -+++ mozilla-plugin/src/openvrml-player/player.cpp Tue Nov 15 00:21:07 2005 -@@ -22,14 +22,14 @@ - # include <boost/lexical_cast.hpp> - # include <boost/spirit.hpp> - # include <boost/spirit/phoenix.hpp> -+# include <openvrml/browser.h> -+# include <openvrml/gl/viewer.h> - # include <unistd.h> - # include <argp.h> - # include <X11/keysym.h> - # include <gdk/gdkx.h> - # include <gtk/gtk.h> - # include <gtk/gtkgl.h> --# include <openvrml/browser.h> --# include <openvrml/gl/viewer.h> - - namespace { - diff --git a/www/openvrml/pkg-descr b/www/openvrml/pkg-descr deleted file mode 100644 index 4c4f1c135..000000000 --- a/www/openvrml/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -OpenVRML is a free cross-platform runtime for VRML97 available under -the GNU Lesser General Public License. - -The basic OpenVRML distribution includes libraries you can use to -add VRML support to an application, and "Lookat", a simple -stand-alone VRML browser. A plug-in for mozilla is included. - -WWW: http://openvrml.sourceforge.net/ diff --git a/www/openvrml/pkg-message b/www/openvrml/pkg-message deleted file mode 100644 index 6cdf9f2d0..000000000 --- a/www/openvrml/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -=========================================== -Please run lookat via the script lookat.sh: - -lookat.sh sample.wrl -=========================================== diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist deleted file mode 100644 index ac860cb36..000000000 --- a/www/openvrml/pkg-plist +++ /dev/null @@ -1,62 +0,0 @@ -bin/lookat -bin/lookat.sh -include/openvrml/openvrml/basetypes.h -include/openvrml/openvrml/bounding_volume.h -include/openvrml/openvrml/browser.h -include/openvrml/openvrml/common.h -include/openvrml/openvrml/event.h -include/openvrml/openvrml/exposedfield.h -include/openvrml/openvrml/field_value.h -include/openvrml/openvrml/frustum.h -include/openvrml/openvrml/gl/viewer.h -include/openvrml/openvrml/img.h -include/openvrml/openvrml/node.h -include/openvrml/openvrml/node_ptr.h -include/openvrml/openvrml/rendering_context.h -include/openvrml/openvrml/scope.h -include/openvrml/openvrml/script.h -include/openvrml/openvrml/system.h -include/openvrml/openvrml/viewer.h -include/openvrml/openvrml/vrml97node.h -lib/libopenvrml-gl.a -lib/libopenvrml-gl.la -lib/libopenvrml-gl.so -lib/libopenvrml-gl.so.6 -lib/libopenvrml.a -lib/libopenvrml.la -lib/libopenvrml.so -lib/libopenvrml.so.5 -libdata/pkgconfig/openvrml-gl.pc -libdata/pkgconfig/openvrml.pc -libexec/openvrml-player -share/idl/openvrml-%%VER%%/openvrml.idl -share/pixmaps/lookat.xpm -lib/mozilla/plugins/openvrml.so -lib/mozilla/plugins/openvrml.xpt -%%PORTDOCS%%%%EXAMPLESDIR%%/Anchor.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/Click.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/EventPROTO.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/ExternPROTO.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/Inline.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/Prox1.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/RefractiveMaterial.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/SimplePROTO.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/TestJSAI.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/bounce.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/groundPlane.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/jsTouch.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/orbit3.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/pixtex1.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/rotation_toy.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/scale.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/snoman.wrl -%%PORTDOCS%%%%EXAMPLESDIR%%/warbird.wrl -@dirrm include/openvrml/openvrml/gl -@dirrm include/openvrml/openvrml -@dirrm include/openvrml -@dirrm share/idl/openvrml-%%VER%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@dirrmtry share/gtk-doc/html/gtkglext -@dirrmtry share/gtk-doc/html -@dirrmtry share/gtk-doc -@dirrmtry share/pixmaps diff --git a/www/plugger-plugins-hubbe/Makefile b/www/plugger-plugins-hubbe/Makefile deleted file mode 100644 index 88f9d8221..000000000 --- a/www/plugger-plugins-hubbe/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# New ports collection makefile for: plugger-plugins-hubbe -# Date created: 11 February 2004 -# Whom: John Merryweather Cooper <coop9211@uidaho.edu> -# -# $FreeBSD$ -# - -PORTNAME= plugger-plugins-hubbe -PORTVERSION= 5.0 -PORTREVISION= 9 -CATEGORIES= www multimedia audio graphics print editors -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty - -MAINTAINER= ports@FreeBSD.org -COMMENT= Meta package installing all author-recommended Plugger plugins - -RUN_DEPENDS= sidplay:${PORTSDIR}/audio/sidplay \ - acroread7:${PORTSDIR}/print/acroread7 \ - mpg123:${PORTSDIR}/audio/mpg123 \ - mikmod:${PORTSDIR}/audio/mikmod \ - ogg123:${PORTSDIR}/audio/vorbis-tools \ - xanim:${PORTSDIR}/multimedia/xanim \ - ${LOCALBASE}/share/eawpats/acbass.pat:${PORTSDIR}/audio/eawpats \ - alsaplayer:${PORTSDIR}/audio/alsaplayer \ - xpdf:${PORTSDIR}/graphics/xpdf \ - gqview:${PORTSDIR}/graphics/gqview \ - plugger-controller:${PORTSDIR}/www/plugger \ - gv:${PORTSDIR}/print/gv \ - xmp:${PORTSDIR}/audio/xmp \ - ${LOCALBASE}/bin/xscreensaver-hacks/molecule:${PORTSDIR}/x11/xscreensaver-gnome \ - mplayer:${PORTSDIR}/multimedia/mplayer \ - gnumeric:${PORTSDIR}/math/gnumeric \ - abiword:${PORTSDIR}/editors/abiword \ - display:${PORTSDIR}/graphics/ImageMagick - -.if exists(${LOCALBASE}/bin/oowrite) -RUN_DEPENDS+= openoffice-1.1-swriter:${PORTSDIR}/editors/openoffice-1.1 -.endif - -# -# Missing because not ported to FreeBSD: -# audio/STsound -# graphics/p5-gimp-perl -# www/vrweb -# Missing because HUGE!! -# openoffice-1.1 (include it only if it already exists) -# - -NO_BUILD= yes - -do-install: # empty - -.include <bsd.port.mk> diff --git a/www/plugger-plugins-hubbe/pkg-descr b/www/plugger-plugins-hubbe/pkg-descr deleted file mode 100644 index 49dbe0568..000000000 --- a/www/plugger-plugins-hubbe/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Plugger-plugins-hubbe - -This collection consists of all the helper applications -recommended on the Plugger website. - -Plugger-plugins-hubbe will be the supported plugin package for -www/plugger. - -WWW: http://fredrik.hubbe.net/plugger.html - --- -John Merryweather Cooper <coop9211@uidaho.edu> diff --git a/www/plugger/Makefile b/www/plugger/Makefile deleted file mode 100644 index fa02ac144..000000000 --- a/www/plugger/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# New ports collection makefile for: plugger -# Date created: 11 Februrary 1999 -# Whom: Jay Sachs <sachs@cs.williams.edu> -# -# $FreeBSD$ -# - -PORTNAME= plugger -PORTVERSION= 5.1.3 -PORTREVISION= 2 -CATEGORIES= www audio graphics multimedia -MASTER_SITES= http://fredrik.hubbe.net/plugger/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= A multimedia front-end plugin for Mozilla or Opera - -USE_X_PREFIX= yes -GNU_CONFIGURE= yes - -MAN7= plugger.7 -PKGDEINSTALL= ${PKGINSTALL} - -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e \ - 's|/usr/X11R6/lib/xscreensaver|${LOCALBASE}/bin/xscreensaver-hacks|g ; \ - s|acroread|acroread7|g ; s|+useFrontEndProgram||g' \ - ${WRKSRC}/pluggerrc - -pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ - ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ - ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \ - ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/plugger-oohelper \ - ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/browser_plugins - @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ - ${PREFIX}/lib/browser_plugins/npplugger.so - @if [ -f ${PREFIX}/etc/pluggerrc-${PORTVERSION} ]; then \ - ${MV} ${PREFIX}/etc/pluggerrc-${PORTVERSION} \ - ${PREFIX}/etc/pluggerrc-${PORTVERSION}.old; \ - fi - @${INSTALL_DATA} ${WRKSRC}/pluggerrc \ - ${PREFIX}/etc/pluggerrc-${PORTVERSION}.sample - @${INSTALL_MAN} ${WRKSRC}/plugger.7 ${MANPREFIX}/man/man7 - -local-install: - @${MKDIR} ${HOME}/.plugger - @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ - ${HOME}/.plugger - @${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \ - ${HOME}/.plugger - @${INSTALL_SCRIPT} ${WRKSRC}/plugger-oohelper \ - ${HOME}/.plugger - @if [ -f ${HOME}/.plugger/pluggerrc-${PORTVERSION} ]; then \ - ${MV} ${HOME}/.plugger/pluggerrc-${PORTVERSION} \ - ${HOME}/.plugger/pluggerrc-${PORTVERSION}.old; \ - fi - @${INSTALL_DATA} ${WRKSRC}/pluggerrc \ - ${HOME}/.plugger/pluggerrc-${PORTVERSION} - -local-mozilla-install: local-install - @${MKDIR} ${HOME}/.mozilla/plugins - @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ - ${HOME}/.mozilla/plugins/npplugger.so - -local-opera-install: local-install - @${MKDIR} ${HOME}/.opera/plugins - @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ - ${HOME}/.opera/plugins/npplugger.so - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ - ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include <bsd.port.post.mk> diff --git a/www/plugger/distinfo b/www/plugger/distinfo deleted file mode 100644 index 90404ce1a..000000000 --- a/www/plugger/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (plugger-5.1.3.tar.gz) = 576e32a13955330ee3f7dca3583fcd62 -SHA256 (plugger-5.1.3.tar.gz) = 424724ba3ee9cc47c035587b9fbd944bf42a089110139f9464d530a61d295fe7 -SIZE (plugger-5.1.3.tar.gz) = 90660 diff --git a/www/plugger/files/patch-Makefile.in b/www/plugger/files/patch-Makefile.in deleted file mode 100644 index 529b5467b..000000000 --- a/www/plugger/files/patch-Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig Tue May 3 11:46:47 2005 -+++ Makefile.in Tue May 3 11:48:35 2005 -@@ -30,7 +30,7 @@ - CC=@CC@ - LD=@LD@ - BINFORMAT=bin --OPT_FLAGS=-O2 -+OPT_FLAGS=@CFLAGS@ - - @SET_MAKE@ - -@@ -66,7 +66,7 @@ - DEBUG= # -DDEBUG # -DPLUGIN_TRACE - DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\" $(DEBUG) - COMMON_CFLAGS=$(OPT_FLAGS) -I$(SDK)/include -I@x_includes@ -DXP_UNIX $(DEFINES) --COMMON_LDFLAGS= -+COMMON_LDFLAGS=@LDFLAGS@ - NORM_CFLAGS= - NORM_LDFLAGS= - XCFLAGS=@XCFLAGS@ @X_CFLAGS@ -@@ -132,7 +132,7 @@ - plugger-helper.o: plugger.h - - plugger.o: plugger.c plugger.h -- $(CC) -c $(SHARED_CFLAGS) -o plugger.o plugger.c -+ $(CC) -c $(SHARED_CFLAGS) -DSYSCONFDIR=\"$(prefix)/etc\" -o plugger.o plugger.c - - plugger-common.o: plugger-common.c plugger.h - $(CC) -c $(SHARED_CFLAGS) -o plugger-common.o plugger-common.c diff --git a/www/plugger/files/patch-configure b/www/plugger/files/patch-configure deleted file mode 100644 index 4fcd27968..000000000 --- a/www/plugger/files/patch-configure +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.orig Tue May 3 11:49:26 2005 -+++ configure Tue May 3 11:50:09 2005 -@@ -3704,10 +3704,10 @@ - XLDFLAGS='-expect_unresolved "*" -shared -msym -O3' - ;; - -- FreeBSD) -+ FreeBSD*) - case "`file /bin/ls`" in - *ELF*) -- XCFLAGS=-fpic -+ XCFLAGS=-fPIC - XLDFLAGS=-shared - ;; - *) diff --git a/www/plugger/files/patch-plugger-oohelper b/www/plugger/files/patch-plugger-oohelper deleted file mode 100644 index 9357f9b65..000000000 --- a/www/plugger/files/patch-plugger-oohelper +++ /dev/null @@ -1,16 +0,0 @@ ---- plugger-oohelper.orig Tue May 3 12:20:51 2005 -+++ plugger-oohelper Tue May 3 12:21:12 2005 -@@ -45,11 +45,11 @@ - done - done - --if [ "x${ooprefix}" == "xs" ]; then -+if [ "x${ooprefix}" = "xs" ]; then - exec s$1 -n "$@" "$file" >/dev/null - fi - --if [ "x${ooprefix}" == "xo" ]; then -+if [ "x${ooprefix}" = "xo" ]; then - exec oo$1 -n "$@" "$file" >/dev/null - fi - diff --git a/www/plugger/files/patch-plugger.c b/www/plugger/files/patch-plugger.c deleted file mode 100644 index b61b6fdae..000000000 --- a/www/plugger/files/patch-plugger.c +++ /dev/null @@ -1,19 +0,0 @@ ---- plugger.c.orig Tue May 3 11:51:06 2005 -+++ plugger.c Tue May 3 11:51:32 2005 -@@ -624,16 +624,6 @@ - if(cb(fname, data)) return 1; - #endif - -- sprintf(fname,"/usr/local/netscape/%s",basename); -- if(cb(fname, data)) return 1; -- sprintf(fname,"/etc/%s",basename); -- if(cb(fname, data)) return 1; -- sprintf(fname,"/usr/etc/%s",basename); -- if(cb(fname, data)) return 1; -- sprintf(fname,"/usr/local/etc/%s",basename); -- if(cb(fname, data)) return 1; -- if(cb(basename, data)) return 1; -- - return 0; - } - diff --git a/www/plugger/pkg-descr b/www/plugger/pkg-descr deleted file mode 100644 index 0bda60b62..000000000 --- a/www/plugger/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Plugger is a multimedia plugin for Unix Netscape 3.0 or later that -handles Quicktime, MPEG, MP2, AVI, SGI-movie, Tiff, DL, IFF-anim, -MIDI, Soundtracker, AU, WAV and Commodore 64 audio files. Since -Plugger 3.0, MPEG audio and video can be streamed. - -Plugger is a very small plugin, because plugger uses external programs -to show/play the different formats. - -WWW: http://www.hubbe.net/~hubbe/plugger.html - ---jmc -coop9211@uidaho.edu diff --git a/www/plugger/pkg-install b/www/plugger/pkg-install deleted file mode 100644 index 45d4b45eb..000000000 --- a/www/plugger/pkg-install +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -[ $# != 2 ] && exit 1 -PKGNAME=$1 -ACTION=$2 - -FILES_DELETE="pluggerrc-5.1.3.old" - -ETCDIR=${PKG_PREFIX}/etc - -RM=/bin/rm -CP=/bin/cp -ECHO=/bin/echo - -case "$ACTION" in - -POST-INSTALL) - if [ ! -f ${ETCDIR}/pluggerrc-5.1.3 ]; then - ${CP} ${ETCDIR}/pluggerrc-5.1.3.sample ${ETCDIR}/pluggerrc-5.1.3 - fi - ;; - -DEINSTALL) - for file in ${FILES_DELETE} - do - if [ -f ${ETCDIR}/${file} ]; then - ${RM} ${ETCDIR}/${file} - fi - done - ;; - -PRE-INSTALL) - ${ECHO} - ${ECHO} "Run ''make local-mozilla-install'' as user to locally" - ${ECHO} "install plugger for Mozilla" - ${ECHO} - ${ECHO} "Run ''make local-opera-install'' as user to locally" - ${ECHO} "install plugger for Opera" - ${ECHO} - ${ECHO} "NOTE: For plugger-oohelper to work, [o|s]office must be" - ${ECHO} "in the PATH." - ${ECHO} - ;; - -POST-DEINSTALL) - ${ECHO} - ${ECHO} "If you are permanently removing this port," - ${ECHO} "you should do a ''rm -f ${ETCDIR}/pluggerrc-5.1.3''" - ${ECHO} "to remove it." - ${ECHO} - ;; - -*) - exit 1 - ;; -esac - -exit diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist deleted file mode 100644 index 2974fb3c4..000000000 --- a/www/plugger/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/plugger-5.1.3 -bin/plugger-controller -bin/plugger-oohelper -@unexec if cmp %D/etc/pluggerrc-5.1.3.sample %D/etc/pluggerrc-5.1.3 2>/dev/null; then rm -f %D/etc/pluggerrc-5.1.3; fi -etc/pluggerrc-5.1.3.sample -lib/browser_plugins/npplugger.so -@dirrmtry lib/browser_plugins diff --git a/www/preferential/Makefile b/www/preferential/Makefile deleted file mode 100644 index 43f1565d6..000000000 --- a/www/preferential/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Ports collection makefile for: preferential -# Date created: Tue Oct 28, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= preferential -PORTVERSION= 0.7.1 -PORTREVISION= 3 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZDEV} -MASTER_SITE_SUBDIR= ${PORTNAME}/versions -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= GUI interface to view & edit all ${GECKO} prefs - -PLIST_FILES= %%MOZDIR%%/chrome/preferential.jar - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozex/Makefile.xpi" - -.if ${GECKO} == mozilla -PLIST_FILES+= %%MOZDIR%%/chrome/overlayinfo/browser/content/overlays.rdf -.endif - -do-install: - @${INSTALL_DATA} ${WRKDIR}/chrome/preferential.jar ${MOZDIR}/chrome - -.include <bsd.port.post.mk> diff --git a/www/preferential/distinfo b/www/preferential/distinfo deleted file mode 100644 index 4f48812aa..000000000 --- a/www/preferential/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (preferential-0.7.1/preferential-0.7.1.xpi) = 3533345ba8fd120f027a1e63c5668339 -SHA256 (preferential-0.7.1/preferential-0.7.1.xpi) = 7a48e882f5e0e8b30a48801b041414a7fd28d7e651924dbc030dc320e5d277db -SIZE (preferential-0.7.1/preferential-0.7.1.xpi) = 81443 diff --git a/www/preferential/files/installed-chrome.txt b/www/preferential/files/installed-chrome.txt deleted file mode 100644 index 1109a02f4..000000000 --- a/www/preferential/files/installed-chrome.txt +++ /dev/null @@ -1,2 +0,0 @@ -content,install,url,jar:resource:/chrome/preferential.jar!/content/ -locale,install,url,jar:resource:/chrome/preferential.jar!/locale/en-US/preferential/ diff --git a/www/preferential/pkg-descr b/www/preferential/pkg-descr deleted file mode 100644 index a191eeb59..000000000 --- a/www/preferential/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -The Preferential project aims to provide all users of Gecko browsers -(eg. Mozilla, Seamonkey) with a simple, accessible GUI that allows the -modification of any preference set within that browser environment. - -WWW: http://preferential.mozdev.org/ diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile deleted file mode 100644 index 6e2e251ad..000000000 --- a/www/ruby-gtkmozembed/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# New ports collection makefile for: Ruby/GtkMozEmbed -# Date created: 16 October 2005 -# Whom: Mezz <mezz@FreeBSD.org> -# -# $FreeBSD$ -# $MCom$ -# - -PORTNAME= gtkmozembed -PORTVERSION= ${RUBY_GNOME_PORTVERSION} -PORTREVISION= 1 -CATEGORIES= www ruby -MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} -MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} -PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} -DISTNAME= ${RUBY_GNOME_DISTNAME} -DIST_SUBDIR= ruby - -MAINTAINER= mezz@FreeBSD.org -COMMENT= Ruby binding for GtkMozEmbed a widget embedding a Gecko renderer - -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 - -USE_RUBY= yes -USE_GECKO= firefox mozilla xulrunner -USE_RUBY_EXTCONF= yes - -.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" - -WRKSRC= ${RUBY_GNOME_WRKSRC}/gtkmozembed -INSTALL_TARGET= site-install - -DOCS= COPYING.LIB ChangeLog README - -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" - -post-patch: - @${REINPLACE_CMD} -e 's|xulrunner-|${GECKO}-|g ; \ - s|%%GECKO_PATH%%|${LOCALBASE}/lib/${GECKO}|g' \ - ${WRKSRC}/extconf.rb - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${RUBY_MODEXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/ - @${MKDIR} ${RUBY_MODDOCDIR} -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ -.endfor -.endif - -.include <bsd.port.post.mk> diff --git a/www/ruby-gtkmozembed/files/patch-extconf.rb b/www/ruby-gtkmozembed/files/patch-extconf.rb deleted file mode 100644 index c08018c84..000000000 --- a/www/ruby-gtkmozembed/files/patch-extconf.rb +++ /dev/null @@ -1,12 +0,0 @@ ---- extconf.rb.orig Sun Jul 2 19:15:05 2006 -+++ extconf.rb Sun Jul 2 19:19:25 2006 -@@ -23,8 +23,7 @@ - PKGConfig.have_package(PACKAGE_ID) - setup_win32(PACKAGE_NAME) - --mozpath = PKGConfig.libs_only_L(PACKAGE_ID) --mozpath.strip!.sub!(/^-L/, "") -+mozpath = "%%GECKO_PATH%%" - - if mozpath - # please comment the CFLAGS line if you don't want a default comp_path diff --git a/www/ruby-gtkmozembed/pkg-descr b/www/ruby-gtkmozembed/pkg-descr deleted file mode 100644 index f13bc8f3d..000000000 --- a/www/ruby-gtkmozembed/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Ruby/GtkMozEmbed is a Ruby binding of GtkMozEmbed a widget embedding a -Mozilla Gecko renderer. - -WWW: http://ruby-gnome2.sourceforge.jp/ diff --git a/www/ruby-gtkmozembed/pkg-plist b/www/ruby-gtkmozembed/pkg-plist deleted file mode 100644 index b7c06062b..000000000 --- a/www/ruby-gtkmozembed/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -%%RUBY_SITEARCHLIBDIR%%/gtkmozembed.so -%%RUBY_SITELIBDIR%%/gtkmozembed.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/COPYING -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ruby-gecko.rb -%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% diff --git a/www/screem/Makefile b/www/screem/Makefile deleted file mode 100644 index 551d4616d..000000000 --- a/www/screem/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# New ports collection makefile for: SCREEM -# Date created: 05 Nov 1999 -# Whom: Will Andrews <andrews@technologist.com> -# -# $FreeBSD$ -# - -PORTNAME= screem -PORTVERSION= 0.16.1 -PORTREVISION= 4 -CATEGORIES= www gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Nice GNOME/GTK-based HTML editor - -LIB_DEPENDS= croco-0.6.3:${PORTSDIR}/textproc/libcroco - -USE_X_PREFIX= yes -USE_GETTEXT= yes -USE_GNOME= desktopfileutils gnomehack gnomemenus gnomeprefix gnometarget \ - gtksourceview intlhack libgnomeprintui libgnomeui libgtkhtml -USE_XPM= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_OMF= yes - -GCONF_SCHEMAS= screem.schemas - -.if defined(WITHOUT_DBUS) -CONFIGURE_ARGS+= --disable-dbus -.else -LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus -CONFIGURE_ARGS+= --enable-dbus -.endif - -.if defined(WITHOUT_ENCHANT) -CONFIGURE_ARGS+= --disable-enchant -.else -LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant -CONFIGURE_ARGS+= --enable-enchant -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|$${DATADIRNAME}/$${PACKAGE}|$${DATADIRNAME}/gnome/$${PACKAGE}|g ; \ - s|-DGNOME_DISABLE_DEPRECATED||g ; \ - s|-DGNOMEUI_DISABLE_DEPRECATED||g ; \ - s|-DGTK_DISABLE_DEPRECATED||g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' ${WRKSRC}/tests/Makefile.in - -.include <bsd.port.mk> diff --git a/www/screem/distinfo b/www/screem/distinfo deleted file mode 100644 index 88c95080c..000000000 --- a/www/screem/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (screem-0.16.1.tar.gz) = 88bfc0afadb905ddbed9bdfbc869602a -SHA256 (screem-0.16.1.tar.gz) = 8ceed299ebaa85da0f542e727b725b9b55e449347818625863e7ef45fac1951e -SIZE (screem-0.16.1.tar.gz) = 3851388 diff --git a/www/screem/pkg-descr b/www/screem/pkg-descr deleted file mode 100644 index b601941fa..000000000 --- a/www/screem/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -SCREEM (Site CReating and Editing EnvironMent) is a VERY nice -GUI-based HTML editor, much like bluefish. It even imports bluefish -functions from your bluefish installation! - -SCREEM makes a rather ideal GUI HTML editor, especially for -Unixheads who like using CVS to manage source trees, as SCREEM -has functional CVS interaction. - -WWW: http://www.screem.org/ - --- John Merryweather Cooper <coop9211@uidaho.edu> diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist deleted file mode 100644 index a51df3a2b..000000000 --- a/www/screem/pkg-plist +++ /dev/null @@ -1,267 +0,0 @@ -bin/screem -include/screem/fileops.h -include/screem/screem-dtd.h -include/screem/screem-page.h -include/screem/screem-plugin.h -include/screem/screem-site.h -include/screem/screem-skel-plugin.h -include/screem/screem-view.h -lib/screem/plugins/colourWizard.la -lib/screem/plugins/colourWizard.so -lib/screem/plugins/css_wizard.la -lib/screem/plugins/css_wizard.so -lib/screem/plugins/entityWizard.la -lib/screem/plugins/entityWizard.so -lib/screem/plugins/formWizard.la -lib/screem/plugins/formWizard.so -lib/screem/plugins/linkWizard.la -lib/screem/plugins/linkWizard.so -lib/screem/plugins/object_wizard.la -lib/screem/plugins/object_wizard.so -lib/screem/plugins/ssiWizard.la -lib/screem/plugins/ssiWizard.so -lib/screem/plugins/tableWizard.la -lib/screem/plugins/tableWizard.so -lib/screem/plugins/uploadWizard.la -lib/screem/plugins/uploadWizard.so -libdata/pkgconfig/screem-plugin.pc -share/gnome/application-registry/screem.applications -share/gnome/applications/screem.desktop -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -share/gnome/help/screem/C/figures/color-wizard.png -share/gnome/help/screem/C/figures/css-wizard1.png -share/gnome/help/screem/C/figures/css-wizard2.png -share/gnome/help/screem/C/figures/editor-autocomplete1.png -share/gnome/help/screem/C/figures/editor-context-menu.png -share/gnome/help/screem/C/figures/editor-error.png -share/gnome/help/screem/C/figures/editor-inline-tagging.png -share/gnome/help/screem/C/figures/editor-pasting.png -share/gnome/help/screem/C/figures/editor-tooltips.png -share/gnome/help/screem/C/figures/editor.png -share/gnome/help/screem/C/figures/entity-wizard.png -share/gnome/help/screem/C/figures/form-wizard.png -share/gnome/help/screem/C/figures/image-wizard.png -share/gnome/help/screem/C/figures/link-wizard1.png -share/gnome/help/screem/C/figures/link-wizard2.png -share/gnome/help/screem/C/figures/newblankdoc.png -share/gnome/help/screem/C/figures/newdoc.png -share/gnome/help/screem/C/figures/newsite1.png -share/gnome/help/screem/C/figures/newsite2.png -share/gnome/help/screem/C/figures/object-wizard.png -share/gnome/help/screem/C/figures/opensite1.png -share/gnome/help/screem/C/figures/opensite2.png -share/gnome/help/screem/C/figures/opensitelocation.png -share/gnome/help/screem/C/figures/prefs-browsers.png -share/gnome/help/screem/C/figures/prefs-doctypes.png -share/gnome/help/screem/C/figures/prefs-editor.png -share/gnome/help/screem/C/figures/prefs-fonts-colors.png -share/gnome/help/screem/C/figures/prefs-misc.png -share/gnome/help/screem/C/figures/prefs-tag-trees.png -share/gnome/help/screem/C/figures/preview.png -share/gnome/help/screem/C/figures/sidebar-attributes1.png -share/gnome/help/screem/C/figures/sidebar-attributes2.png -share/gnome/help/screem/C/figures/sidebar-attributes3.png -share/gnome/help/screem/C/figures/sidebar-errors.png -share/gnome/help/screem/C/figures/sidebar-files1.png -share/gnome/help/screem/C/figures/sidebar-files2.png -share/gnome/help/screem/C/figures/sidebar-messages.png -share/gnome/help/screem/C/figures/sidebar-resources1.png -share/gnome/help/screem/C/figures/sidebar-resources2.png -share/gnome/help/screem/C/figures/sidebar-resources3.png -share/gnome/help/screem/C/figures/sidebar-symbols.png -share/gnome/help/screem/C/figures/sidebar-tree.png -share/gnome/help/screem/C/figures/ssi-wizard.png -share/gnome/help/screem/C/figures/table-wizard.png -share/gnome/help/screem/C/figures/tree.png -share/gnome/help/screem/C/legal.xml -share/gnome/help/screem/C/screem.xml -share/gnome/omf/screem/screem-C.omf -share/gnome/pixmaps/screem/splash/splash.png -share/gnome/pixmaps/screem.png -share/gnome/screem/doctypes.xml -share/gnome/screem/dtd/HTMLlat1.ent -share/gnome/screem/dtd/HTMLspecial.ent -share/gnome/screem/dtd/HTMLsymbols.ent -share/gnome/screem/dtd/catalog -share/gnome/screem/dtd/gtkuimanager.dtd -share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd -share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd -share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd -share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd -share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd -share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd -share/gnome/screem/dtd/screem-doctypes.dtd -share/gnome/screem/dtd/screem-tagtree-config.dtd -share/gnome/screem/dtd/screem-tagtree.dtd -share/gnome/screem/dtd/xhtml-lat1.ent -share/gnome/screem/dtd/xhtml-special.ent -share/gnome/screem/dtd/xhtml-symbol.ent -share/gnome/screem/features.xml -share/gnome/screem/glade/css-wizard.glade -share/gnome/screem/glade/entityWizard.glade -share/gnome/screem/glade/linkwizard.glade -share/gnome/screem/glade/object-wizard.glade -share/gnome/screem/glade/screem.glade -share/gnome/screem/glade/ssiwizard.glade -share/gnome/screem/glade/tablewizard.glade -share/gnome/screem/glade/uploadwizard.glade -share/gnome/screem/helpers/Tidy/TidyHTML.desktop -share/gnome/screem/helpers/Tidy/TidyXML.desktop -share/gnome/screem/helpers/browsers/epiphany.desktop -share/gnome/screem/helpers/browsers/konqueror.desktop -share/gnome/screem/helpers/browsers/opera.desktop -share/gnome/screem/helpers/browsers-remote/epiphany.desktop -share/gnome/screem/helpers/browsers-remote/konqueror.desktop -share/gnome/screem/helpers/browsers-remote/opera.desktop -share/gnome/screem/hints/screem_hints.txt -share/gnome/screem/hints/screem_hints_fr.txt -share/gnome/screem/hints/screem_hints_pt_BR.txt -share/gnome/screem/hints/screem_hints_sv.txt -share/gnome/screem/pixmaps/add-link-16.png -share/gnome/screem/pixmaps/add-link-24.png -share/gnome/screem/pixmaps/add_column-16.png -share/gnome/screem/pixmaps/add_column-24.png -share/gnome/screem/pixmaps/add_row-16.png -share/gnome/screem/pixmaps/add_row-24.png -share/gnome/screem/pixmaps/bookmarks-open.png -share/gnome/screem/pixmaps/bookmarks-preferences.png -share/gnome/screem/pixmaps/browser.xpm -share/gnome/screem/pixmaps/button.xpm -share/gnome/screem/pixmaps/caption.xpm -share/gnome/screem/pixmaps/checkbutton.xpm -share/gnome/screem/pixmaps/cvs-add-16.png -share/gnome/screem/pixmaps/cvs-add-24.png -share/gnome/screem/pixmaps/cvs-add.png -share/gnome/screem/pixmaps/cvs-checkout-16.png -share/gnome/screem/pixmaps/cvs-checkout-24.png -share/gnome/screem/pixmaps/cvs-checkout.png -share/gnome/screem/pixmaps/cvs-commit-16.png -share/gnome/screem/pixmaps/cvs-commit-24.png -share/gnome/screem/pixmaps/cvs-remove-16.png -share/gnome/screem/pixmaps/cvs-remove-24.png -share/gnome/screem/pixmaps/cvs-remove.png -share/gnome/screem/pixmaps/cvs-update-16.png -share/gnome/screem/pixmaps/cvs-update-24.png -share/gnome/screem/pixmaps/cvs-update.png -share/gnome/screem/pixmaps/entry.xpm -share/gnome/screem/pixmaps/fixed.xpm -share/gnome/screem/pixmaps/gallery.xpm -share/gnome/screem/pixmaps/gnome-fileentry.xpm -share/gnome/screem/pixmaps/hand-open.png -share/gnome/screem/pixmaps/insert-symbol-16.png -share/gnome/screem/pixmaps/insert-symbol-24.png -share/gnome/screem/pixmaps/optionmenu.xpm -share/gnome/screem/pixmaps/paragraphs.png -share/gnome/screem/pixmaps/pre.xpm -share/gnome/screem/pixmaps/radiobutton.xpm -share/gnome/screem/pixmaps/resources.png -share/gnome/screem/pixmaps/screem_site.png -share/gnome/screem/pixmaps/site_preview.png -share/gnome/screem/pixmaps/site_structure-48.png -share/gnome/screem/pixmaps/stock-close-12.png -share/gnome/screem/pixmaps/stock-menu-left-12.png -share/gnome/screem/pixmaps/stock-menu-right-12.png -share/gnome/screem/pixmaps/stock_connect.png -share/gnome/screem/pixmaps/stock_disconnect.png -share/gnome/screem/pixmaps/stock_insert_image-16.png -share/gnome/screem/pixmaps/stock_insert_image.png -share/gnome/screem/pixmaps/stock_insert_object-16.png -share/gnome/screem/pixmaps/stock_insert_object.png -share/gnome/screem/pixmaps/stock_insert_table-16.png -share/gnome/screem/pixmaps/sub.xpm -share/gnome/screem/pixmaps/sup.xpm -share/gnome/screem/pixmaps/td.xpm -share/gnome/screem/pixmaps/text.xpm -share/gnome/screem/pixmaps/th.xpm -share/gnome/screem/pixmaps/todo.png -share/gnome/screem/pixmaps/tr.xpm -share/gnome/screem/resources/Images/made.png -share/gnome/screem/resources/Javascript/linktitle.js -share/gnome/screem/resources/Javascript/preload.js -share/gnome/screem/resources/Javascript/rollover.js -share/gnome/screem/resources/Templates/template.html -share/gnome/screem/tagtrees/apache.tagtree -share/gnome/screem/tagtrees/cfml.tagtree -share/gnome/screem/tagtrees/css.tagtree -share/gnome/screem/tagtrees/funcref_php.tagtree -share/gnome/screem/tagtrees/funcref_python.tagtree -share/gnome/screem/tagtrees/html.tagtree -share/gnome/screem/tagtrees/javascript.tagtree -share/gnome/screem/tagtrees/teixlite.tagtree -share/gnome/screem/ui/layout -share/gnome/screem/ui/screem-editable-toolbars.xml -share/gnome/screem/ui/screem-tag-tree-bar.xml -share/gnome/screem/ui/screem-window-menu.xml -share/gnome/screem/ui/screem-window-popups.xml -share/gnome/screem/ui/screem-window-toolbar.xml -share/locale/az/LC_MESSAGES/screem.mo -share/locale/cs/LC_MESSAGES/screem.mo -share/locale/da/LC_MESSAGES/screem.mo -share/locale/de/LC_MESSAGES/screem.mo -share/locale/el/LC_MESSAGES/screem.mo -share/locale/es/LC_MESSAGES/screem.mo -share/locale/fr/LC_MESSAGES/screem.mo -share/locale/it/LC_MESSAGES/screem.mo -share/locale/ja/LC_MESSAGES/screem.mo -share/locale/ko/LC_MESSAGES/screem.mo -share/locale/nb/LC_MESSAGES/screem.mo -share/locale/no/LC_MESSAGES/screem.mo -share/locale/pl/LC_MESSAGES/screem.mo -share/locale/pt_BR/LC_MESSAGES/screem.mo -share/locale/ru/LC_MESSAGES/screem.mo -share/locale/rw/LC_MESSAGES/screem.mo -share/locale/sk/LC_MESSAGES/screem.mo -share/locale/sv/LC_MESSAGES/screem.mo -share/locale/tr/LC_MESSAGES/screem.mo -share/locale/uk/LC_MESSAGES/screem.mo -share/locale/vi/LC_MESSAGES/screem.mo -share/locale/zh_CN/LC_MESSAGES/screem.mo -share/mime/packages/screem.xml -@dirrm share/gnome/screem/ui -@dirrm share/gnome/screem/tagtrees -@dirrm share/gnome/screem/resources/Templates -@dirrm share/gnome/screem/resources/PHP3 -@dirrm share/gnome/screem/resources/Javascript -@dirrm share/gnome/screem/resources/Images -@dirrm share/gnome/screem/resources/HTML -@dirrm share/gnome/screem/resources/Applets -@dirrm share/gnome/screem/resources -@dirrm share/gnome/screem/pixmaps -@dirrm share/gnome/screem/hints -@dirrm share/gnome/screem/helpers/browsers-remote -@dirrm share/gnome/screem/helpers/browsers -@dirrm share/gnome/screem/helpers/Tidy -@dirrm share/gnome/screem/helpers -@dirrm share/gnome/screem/glade -@dirrm share/gnome/screem/dtd -@dirrm share/gnome/screem -@dirrm share/gnome/pixmaps/screem/splash -@dirrm share/gnome/pixmaps/screem -@dirrm share/gnome/omf/screem -@dirrm share/gnome/help/screem/C/figures -@dirrm share/gnome/help/screem/C -@dirrm share/gnome/help/screem -@dirrm lib/screem/plugins -@dirrm lib/screem -@dirrm include/screem -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@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/sk/LC_MESSAGES -@dirrmtry share/locale/sk -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/no/LC_MESSAGES -@dirrmtry share/locale/no -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile deleted file mode 100644 index baccbecc7..000000000 --- a/www/seamonkey/Makefile +++ /dev/null @@ -1,135 +0,0 @@ -# New ports collection makefile for: mozilla -# Date created: 31 Mar 1998 -# Whom: eivind/dima/jseger -# -# $FreeBSD$ -# $MCom: ports/www/seamonkey/Makefile,v 1.39 2006/08/03 01:21:44 ahze Exp $ -# - -PORTNAME= seamonkey -DISTVERSION= 1.0.5 -PORTREVISION= 1 -CATEGORIES?= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} -DISTNAME= ${PORTNAME}-${DISTVERSION}.source - -MAINTAINER= gnome@FreeBSD.org -COMMENT= The open source, standards compliant web browser - -USE_BZIP2= yes -USE_GMAKE= yes -WANT_GNOME= yes -HAS_CONFIGURE= yes -ALL_TARGET= default -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" - -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} - -MOZ_EXTENSIONS= default -MOZ_OPTIONS+= --enable-application=suite \ - --enable-svg-renderer=cairo \ - --enable-system-cairo \ - --enable-canvas -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite - -NOT_FOR_ARCHS= ia64 - -OPTIONS=MAILNEWS "Enable Mail and News modules" on \ - COMPOSER "Enable the HTML Composer module" on \ - LDAP "Enable LDAP support for Mailnews" on \ - CHATZILLA "Enable the Chatzilla IRC module" on \ - JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ - SMB "Enable smb:// URI support using gnomevfs" off \ - CALENDAR "Enable the calendar" off - -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) -# Glitz support can only be enabled if cairo is built with glitz support -MOZ_OPTIONS+= --enable-glitz -LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz -.endif - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= core dumps on ${ARCH} during post-build -.endif - -.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 -IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 -.endif - -.if ${OSVERSION} < 500000 -USE_GCC= 3.4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-security_manager_Makefile.in -.endif - -.if defined(WITHOUT_MAILNEWS) -MOZ_OPTIONS+= --disable-ldap --disable-mailnews -.else -# mail and news desired, but not LDAP -.if defined(WITHOUT_LDAP) -MOZ_OPTIONS+= --disable-ldap --enable-mailnews -.else -MOZ_OPTIONS+= --enable-ldap --enable-mailnews -.endif -.endif -.if !defined(WITHOUT_CHATZILLA) -MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc -.endif -.if defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_OPTIONS+= --enable-jsd \ - --enable-dtd-debug -.else -MOZ_OPTIONS+= --disable-jsd \ - --disable-dtd-debug -.endif - -.if defined(WITH_CALENDAR) -MOZ_OPTIONS+= --enable-calendar -.endif - -.if defined(WITHOUT_COMPOSER) -MOZ_OPTIONS+= --disable-composer -.endif - -post-patch: - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ - ${WRKSRC}/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ - < ${FILESDIR}/seamonkey.desktop.in > \ - ${WRKDIR}/seamonkey.desktop - -pre-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ - break; \ - fi; \ - done; \ - fi - ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - -do-install: - if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ - for jpi in ${JPI_LIST}; do \ - if [ -f $${jpi} ]; then \ - ${LN} -sf $${jpi} \ - ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ - break; \ - fi; \ - done; \ - fi - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications - -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo deleted file mode 100644 index 10af3792a..000000000 --- a/www/seamonkey/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (seamonkey-1.0.5.source.tar.bz2) = a1b98cd4d2d0f71d50406f8cd3885a5e -SHA256 (seamonkey-1.0.5.source.tar.bz2) = 6325a11996eac3c4adcff69956078116ce87694a849a14f2f6ded4e6901e3b1e -SIZE (seamonkey-1.0.5.source.tar.bz2) = 35886383 diff --git a/www/seamonkey/files/extra-patch-security_manager_Makefile.in b/www/seamonkey/files/extra-patch-security_manager_Makefile.in deleted file mode 100644 index c936ae468..000000000 --- a/www/seamonkey/files/extra-patch-security_manager_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- security/manager/Makefile.in.orig.patched Thu May 25 10:19:22 2006 -+++ security/manager/Makefile.in Thu May 25 10:19:22 2006 -@@ -159,8 +159,6 @@ - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - # $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK diff --git a/www/seamonkey/files/moz_pis_S50cleanhome b/www/seamonkey/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e3..000000000 --- a/www/seamonkey/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/seamonkey/files/patch-build_unix_run-mozilla.sh b/www/seamonkey/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 6d8cb1585..000000000 --- a/www/seamonkey/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Sat Oct 1 01:36:47 2005 -+++ build/unix/run-mozilla.sh Thu Dec 22 17:51:10 2005 -@@ -328,7 +328,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -415,6 +415,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/seamonkey/files/patch-config-mkdepend-imakemdep.h b/www/seamonkey/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/seamonkey/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/seamonkey/files/patch-config_autoconf.mk.in b/www/seamonkey/files/patch-config_autoconf.mk.in deleted file mode 100644 index c4fa0b516..000000000 --- a/www/seamonkey/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/seamonkey/files/patch-config_mkdepend_Makefile.in b/www/seamonkey/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 8da7e48ab..000000000 --- a/www/seamonkey/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/seamonkey/files/patch-config_rules.mk b/www/seamonkey/files/patch-config_rules.mk deleted file mode 100644 index 16cb6ae11..000000000 --- a/www/seamonkey/files/patch-config_rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/seamonkey/files/patch-configure b/www/seamonkey/files/patch-configure deleted file mode 100644 index a973ee058..000000000 --- a/www/seamonkey/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Thu Dec 22 17:54:43 2005 -@@ -10016,7 +10016,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10022 "configure" - #include "confdefs.h" -@@ -10047,7 +10047,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10063 "configure" - #include "confdefs.h" -@@ -10088,7 +10088,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi -@@ -12518,7 +12518,7 @@ - MOZ_SUITE=1 - MOZ_PROFILESHARING= - MOZ_APP_VERSION=$SEAMONKEY_VERSION -- MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" -+ MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" - cat >> confdefs.h <<\EOF - #define MOZ_SUITE 1 - EOF diff --git a/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp b/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp deleted file mode 100644 index 38ce7ec12..000000000 --- a/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006 -+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index bc141062f..000000000 --- a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include <gdk/gdkx.h> - #include <freetype/tttables.h> --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" diff --git a/www/seamonkey/files/patch-libm b/www/seamonkey/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/seamonkey/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/seamonkey/files/patch-security_coreconf_FreeBSD.mk b/www/seamonkey/files/patch-security_coreconf_FreeBSD.mk deleted file mode 100644 index 5c76b5af5..000000000 --- a/www/seamonkey/files/patch-security_coreconf_FreeBSD.mk +++ /dev/null @@ -1,37 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+CCC = ${CXX} - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +73,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/seamonkey/files/patch-sysnss b/www/seamonkey/files/patch-sysnss deleted file mode 100644 index a9154ce9a..000000000 --- a/www/seamonkey/files/patch-sysnss +++ /dev/null @@ -1,156 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); ---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 -+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 -@@ -52,18 +52,9 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) - ifndef HAVE_64BIT_OS -@@ -151,11 +142,6 @@ - - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - - .nss.checkout: -@@ -176,10 +162,10 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - ifndef SKIP_CHK -@@ -203,20 +189,6 @@ - endif - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -232,11 +204,6 @@ - $(MAKE) -C pki $@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: - $(MAKE) -C boot $@ diff --git a/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca..000000000 --- a/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index dbdc47b6f..000000000 --- a/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/seamonkey/files/patch-xpfe_bootstrap_mozilla.in b/www/seamonkey/files/patch-xpfe_bootstrap_mozilla.in deleted file mode 100644 index 6ea8a3568..000000000 --- a/www/seamonkey/files/patch-xpfe_bootstrap_mozilla.in +++ /dev/null @@ -1,441 +0,0 @@ ---- xpfe/bootstrap/mozilla.in.orig Tue Mar 7 16:02:19 2006 -+++ xpfe/bootstrap/mozilla.in Tue Mar 7 18:13:59 2006 -@@ -49,142 +49,324 @@ - ## the application binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - - #uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" - --# honor MOZILLA_FIVE_HOME if it's there --if [ -n "$MOZILLA_FIVE_HOME" ] ; then -- dist_bin="$MOZILLA_FIVE_HOME" --else -- # Use run-mozilla.sh in the current dir if it exists -- # If not, then start resolving symlinks until we find run-mozilla.sh -- found=0 -- progname=$0 -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if test -x "$run_moz"; then -- dist_bin=$curdir -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME -+ -+# Use run-mozilla.sh in the current dir if it exists -+# If not, then start resolving symlinks until we find run-mozilla.sh -+found=0 -+progname="$0" -+curdir=`dirname "$progname"` -+progbase=`basename "$progname"` -+run_moz="$curdir/run-mozilla.sh" -+# mozilla must obey MOZILLA_FIVE_HOME -+if [ -n "$MOZILLA_FIVE_HOME" -a -d "$MOZILLA_FIVE_HOME" -a \ -+ -x "$MOZILLA_FIVE_HOME/run-mozilla.sh" ]; then -+ curdir="$MOZILLA_FIVE_HOME" -+ run_moz="$curdir/run-mozilla.sh" -+ dist_bin="$curdir" - found=1 -- else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- found=1 -- break -- fi -+elif [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 -+else -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi - done -- cd "$here" -- fi -- if [ $found = 0 ]; then -+ cd "${here}" -+fi -+if [ $found = 0 ]; then - # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin=$moz_libdir -- run_moz="$moz_libdir/run-mozilla.sh" -- else -- echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting." -- exit 1 -- fi -- fi -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" -+ else -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 -+ fi - fi - --script_args="" --debugging=0 --MOZILLA_BIN="%MOZILLA-BIN%" -- -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F $MOZILLA_BIN -+ mimeset -F "$MOZILLA_BIN" - fi - -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi -+ -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" - pass_arg_count=0 - while [ $# -gt $pass_arg_count ] - do -- case "$1" in -- -p | -pure) -- MOZILLA_BIN="%MOZILLA-BIN%.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- # Move the unrecognized argument to the end of the list. -- arg="$1" -- shift -- set -- "$@" "$arg" -- pass_arg_count=`expr $pass_arg_count + 1` -- ;; -- esac -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -browser) -+ # browser is default for mozilla -+ shift -+ ;; -+ -mail) -+ _remote_cmd="xfeDoCommand(openInbox)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -compose) -+ _remote_cmd="xfeDoCommand(composeMessage)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ *) -+ target="$1" -+ shift -+ ;; -+ esac - done - --export MRE_HOME -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ if [ `expr "${target}" : '/.*'` -eq 0 ]; then -+ target="${here}/${target}" -+ fi -+ if [ -r "${target}" -o -d "${target}" ]; then -+ [ -n "${use_openFile}" ] || target="file://${target}" -+ else -+ echo "$0: WARN, target: ${target} not an URI/file/dir" 1>&2 -+ ALREADY_RUNNING= # null -+ fi -+ else -+ # an former URI, don't use openFile -+ use_openFile= # null -+ fi -+ fi -+fi -+ -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${use_openFile}" ]; then -+ _remote_cmd="openFile(${target})" -+ elif [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" -+ else -+ _remote_cmd="openURL(${target})" -+ fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi -+fi -+ -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi -+ -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts - - - - diff --git a/www/seamonkey/files/patch-xptcall-alpha b/www/seamonkey/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/seamonkey/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/seamonkey/files/patch-xptcall-amd64 b/www/seamonkey/files/patch-xptcall-amd64 deleted file mode 100644 index 3227cad02..000000000 --- a/www/seamonkey/files/patch-xptcall-amd64 +++ /dev/null @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ diff --git a/www/seamonkey/files/patch-xptcall-ia64 b/www/seamonkey/files/patch-xptcall-ia64 deleted file mode 100644 index 7d33a8693..000000000 --- a/www/seamonkey/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Fri Sep 16 15:50:20 2005 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments diff --git a/www/seamonkey/files/patch-xptcall-sparc64 b/www/seamonkey/files/patch-xptcall-sparc64 deleted file mode 100755 index 9599a8a71..000000000 --- a/www/seamonkey/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/seamonkey/files/seamonkey.desktop.in b/www/seamonkey/files/seamonkey.desktop.in deleted file mode 100644 index 16966f348..000000000 --- a/www/seamonkey/files/seamonkey.desktop.in +++ /dev/null @@ -1,169 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Seamonkey Web Browser -Name[az]=Seamonkey Veb Səyyahı -Name[bg]=Интернет браузър (Seamonkey) -Name[bs]=Seamonkey web preglednik -Name[ca]=Navegador web Seamonkey -Name[cs]=Prohlížeč WWW Seamonkey -Name[cy]=Y Porwr Gwe Seamonkey -Name[da]=Seamonkey - internetbrowser -Name[de]=Seamonkey Webbrowser -Name[el]=Περιηγητής Διαδικτύου Seamonkey -Name[en_CA]=Seamonkey Web Browser -Name[en_GB]=Seamonkey Web Browser -Name[es]=Navegador Web Seamonkey -Name[et]=Seamonkey veebibrauser -Name[eu]=Seamonkey web arakatzailea -Name[fa]=مرورگر وب Seamonkey -Name[fi]=Seamonkey, WWW-selain -Name[fr]=Navigateur Web Seamonkey -Name[ga]=Brabhsálaí Lín Seamonkey -Name[he]=דפדפן Seamonkey -Name[hr]=Seamonkey Web preglednik -Name[hu]=Seamonkey webböngésző -Name[id]=Web Browser Seamonkey -Name[it]=Browser web Seamonkey -Name[ja]=Seamonkey ウェブ・ブラウザ -Name[ko]=Seamonkey 웹 브라우저 -Name[li]=Seamonkey Web Browser -Name[lt]=Seamonkey web naršyklė -Name[mk]=Seamonkey Веб Прелистувач -Name[mn]=Seamonkey веб хөтөч -Name[ms]=Pelungsur Web Seamonkey -Name[nb]=Seamonkey nettleser -Name[nl]=Seamonkey webbrowser -Name[nn]=Seamonkey nettlesar -Name[no]=Seamonkey nettleser -Name[pl]=Przeglądarka WWW Seamonkey -Name[pt]=Navegador Web Seamonkey -Name[pt_BR]=Navegador Web Seamonkey -Name[ro]=Navigatorul Seamonkey -Name[sl]=Spletni brskalnik Seamonkey -Name[sq]=Seamonkey - Shfletuesi Web -Name[sv]=Webbläsaren Seamonkey -Name[tk]=Seamonkey Web Ahtarçisi -Name[tr]=Seamonkey Web Tarayıcı -Name[uk]=Переглядач web Seamonkey -Name[vi]=Trình Duyệt Web Seamonkey -Name[wa]=Betchteu waibe Seamonkey -Name[zh_CN]=Seamonkey Web 浏览器 -Name[zh_TW]=Seamonkey 網頁瀏覽器 -GenericName=Seamonkey Web Browser -GenericName[az]=Seamonkey Veb Səyyahı -GenericName[bg]=Интернет браузър (Seamonkey) -GenericName[bs]=Seamonkey web preglednik -GenericName[ca]=Navegador web Seamonkey -GenericName[cs]=Prohlížeč WWW Seamonkey -GenericName[cy]=Y Porwr Gwe Seamonkey -GenericName[da]=Seamonkey - internetbrowser -GenericName[de]=Seamonkey Webbrowser -GenericName[el]=Περιηγητής Διαδικτύου Seamonkey -GenericName[en_CA]=Seamonkey Web Browser -GenericName[en_GB]=Seamonkey Web Browser -GenericName[es]=Navegador Web Seamonkey -GenericName[et]=Seamonkey veebibrauser -GenericName[eu]=Seamonkey web arakatzailea -GenericName[fa]=مرورگر وب Seamonkey -GenericName[fi]=Seamonkey, WWW-selain -GenericName[fr]=Navigateur Web Seamonkey -GenericName[ga]=Brabhsálaí Lín Seamonkey -GenericName[he]=דפדפן Seamonkey -GenericName[hr]=Seamonkey Web preglednik -GenericName[hu]=Seamonkey webböngésző -GenericName[id]=Web Browser Seamonkey -GenericName[it]=Browser web Seamonkey -GenericName[ja]=Seamonkey ウェブ・ブラウザ -GenericName[ko]=Seamonkey 웹 브라우저 -GenericName[li]=Seamonkey Web Browser -GenericName[lt]=Seamonkey web naršyklė -GenericName[mk]=Seamonkey Веб Прелистувач -GenericName[mn]=Seamonkey веб хөтөч -GenericName[ms]=Pelungsur Web Seamonkey -GenericName[nb]=Seamonkey nettleser -GenericName[nl]=Seamonkey webbrowser -GenericName[nn]=Seamonkey nettlesar -GenericName[no]=Seamonkey nettleser -GenericName[pl]=Przeglądarka WWW Seamonkey -GenericName[pt]=Navegador Web Seamonkey -GenericName[pt_BR]=Navegador Web Seamonkey -GenericName[ro]=Navigatorul Seamonkey -GenericName[sl]=Spletni brskalnik Seamonkey -GenericName[sq]=Seamonkey - Shfletuesi Web -GenericName[sv]=Webbläsaren Seamonkey -GenericName[tk]=Seamonkey Web Ahtarçisi -GenericName[tr]=Seamonkey Web Tarayıcı -GenericName[uk]=Переглядач web Seamonkey -GenericName[vi]=Trình Duyệt Web Seamonkey -GenericName[wa]=Betchteu waibe Seamonkey -GenericName[zh_CN]=Seamonkey Web 浏览器 -GenericName[zh_TW]=Seamonkey 網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Benyt internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fa]=مرور وب -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте го вебот -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Программа для просмотра веб-страниц -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ Seamonkey -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=seamonkey %U -StartupNotify=true -Terminal=false -Type=Application -Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default.xpm -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/seamonkey/pkg-descr b/www/seamonkey/pkg-descr deleted file mode 100644 index e0b5dede0..000000000 --- a/www/seamonkey/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This is the current release of the Seamonkey open source web browser. It should -be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, -JavaScript, MathML, SSL encryption, SVG and RDF. Also supports Java with -the use of the FreeBSD native Java plug-in. - -WWW: http://www.mozilla.org/projects/seamonkey/ diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile deleted file mode 100644 index c96f33368..000000000 --- a/www/swfdec-plugin/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# Ports collection makefile for: swfdec-plugin -# Date created: Jun 14, 2005 -# Whom: anholt -# -# $FreeBSD$ -# - -PORTNAME= swfdec-plugin -PORTVERSION= 0.3.5 -PORTREVISION= 3 -CATEGORIES= www -MASTER_SITES= http://www.schleef.org/swfdec/download/ -DISTNAME= swfdec-${PORTVERSION} - -MAINTAINER= anholt@FreeBSD.org -COMMENT= Flash rendering plugin - -LIB_DEPENDS= swfdec-0.3.0:${PORTSDIR}/graphics/swfdec -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -.else -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -.endif - -BROKEN= Does not compile -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2006-12-01 - -USE_SDL= sdl -USE_GNOME= gnomehack gtk20 libartlgpl2 -USE_GSTREAMER80= gconf -USE_GETOPT_LONG= yes -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" -CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/bin/firefox-config" -.else -CONFIGURE_ENV+= MOZILLA_CONFIG="${LOCALBASE}/lib/mozilla/mozilla-config" -.endif - -INSTALLS_SHLIB= yes -INSTALL_WRKSRC= ${WRKSRC}/plugin - -PLIST_SUB= VERSION=${PORTVERSION:R} - -post-patch: - @${REINPLACE_CMD} -e "s,int16_t,__int16_t," ${WRKSRC}/libswfdec/swfdec_shape.c - @${REINPLACE_CMD} -e "s,mozilla/plugins/,browser_plugins/," ${WRKSRC}/plugin/Makefile.in - -.include <bsd.port.mk> diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo deleted file mode 100644 index 026cdc898..000000000 --- a/www/swfdec-plugin/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (swfdec-0.3.5.tar.gz) = cc40397d7784efee549fb7853b01cac3 -SHA256 (swfdec-0.3.5.tar.gz) = 23094a5ec8f2a23c78e09b5a30dde8d0dc66d3d6488a4b9ea58b3bfb3943c06b -SIZE (swfdec-0.3.5.tar.gz) = 512041 diff --git a/www/swfdec-plugin/files/patch-Makefile.in b/www/swfdec-plugin/files/patch-Makefile.in deleted file mode 100644 index af3c1f30c..000000000 --- a/www/swfdec-plugin/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Jun 14 21:37:46 2005 -+++ Makefile.in Tue Jun 14 21:43:11 2005 -@@ -227,7 +227,7 @@ - @WITH_GLIB_COMPAT_TRUE@glib_compat_subdirs = glib-compat - @WITH_GLIB_COMPAT_FALSE@no_glib_compat_subdirs = gimp-loader pixbuf-loader - @WITH_GLIB_COMPAT_TRUE@no_glib_compat_subdirs = --SUBDIRS = $(glib_compat_subdirs) libswfdec test player plugin $(no_glib_compat_subdirs) -+SUBDIRS = $(glib_compat_subdirs) libswfdec plugin - DIST_SUBDIRS = \ - gimp-loader \ - glib-compat \ diff --git a/www/swfdec-plugin/files/patch-ltmain.sh b/www/swfdec-plugin/files/patch-ltmain.sh deleted file mode 100644 index b3c8af1df..000000000 --- a/www/swfdec-plugin/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Wed Nov 24 17:28:43 2004 -+++ ltmain.sh Wed Nov 24 17:28:55 2004 -@@ -5551,10 +5551,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false ; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/swfdec-plugin/pkg-descr b/www/swfdec-plugin/pkg-descr deleted file mode 100644 index c217ddea0..000000000 --- a/www/swfdec-plugin/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -swfdec-plugin is a Mozilla plugin for rendering flash (.swf) animations using -the gstreamer framework and the swfdec library. It should currently play Flash -4 files, and Flash 5 support is under development. - -WWW: http://www.schleef.org/swfdec/ - -- Eric Anholt -anholt@FreeBSD.org diff --git a/www/swfdec-plugin/pkg-plist b/www/swfdec-plugin/pkg-plist deleted file mode 100644 index 5843c8bcc..000000000 --- a/www/swfdec-plugin/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/swfdec-mozilla-player -lib/browser_plugins/libswfdecmozilla.so diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile deleted file mode 100644 index ac18e3b6c..000000000 --- a/www/syndigator/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# ex:ts=8 -# Ports collection Makefile for: syndigator -# Date created: Apr 20, 2004 -# Whom: ijliao -# -# $FreeBSD$ -# $MCom$ - -PORTNAME= syndigator -PORTVERSION= 0.15.1 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= An RSS feed reader based on Gtk2 - -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \ - ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \ - ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ - ${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \ - ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \ - ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \ - ${SITE_PERL}/${PERL_ARCH}/Gnome2.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2 \ - ${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \ - ${SITE_PERL}/${PERL_ARCH}/Gtk2/Html2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2 - -USE_X_LIB= yes -USE_GNOME= gnomehier -USE_PERL5= yes -NO_BUILD= yes - -GNOMEDIR= ${PREFIX}/share/gnome - -post-patch: - @${PERL} -pi -e 's|./lib|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}|g' \ - ${WRKSRC}/syndigator - @${PERL} -pi -e 's|./images/|${GNOMEDIR}/pixmaps/${PORTNAME}/|g' \ - ${WRKSRC}/lib/RSSReader/Gtk2UI/IconFactory.pm - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/syndigator ${PREFIX}/bin - @${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME} - cd ${WRKSRC}/lib && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME} - @${MKDIR} ${GNOMEDIR}/applications - ${INSTALL_DATA} ${WRKSRC}/syndigator.desktop ${GNOMEDIR}/applications - @${MKDIR} ${GNOMEDIR}/pixmaps - ${INSTALL_DATA} ${WRKSRC}/icons/*.* ${GNOMEDIR}/pixmaps - @${MKDIR} ${GNOMEDIR}/pixmaps/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/images/*.* ${GNOMEDIR}/pixmaps/${PORTNAME} - -.include <bsd.port.mk> diff --git a/www/syndigator/distinfo b/www/syndigator/distinfo deleted file mode 100644 index c78cc74c6..000000000 --- a/www/syndigator/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (syndigator-0.15.1.tar.gz) = 6c2bb81e6df331ef51c879c9ce304345 -SHA256 (syndigator-0.15.1.tar.gz) = 47674ff3ca7796acd626ba82c6923bc67ac51c87b3dbbd0aa191fadbdf6215f9 -SIZE (syndigator-0.15.1.tar.gz) = 82474 diff --git a/www/syndigator/pkg-descr b/www/syndigator/pkg-descr deleted file mode 100644 index eb0ed5c53..000000000 --- a/www/syndigator/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Syndigator is an RSS feed reader based on Gtk. - -WWW: http://syndigator.sourceforge.net/ diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist deleted file mode 100644 index 447333940..000000000 --- a/www/syndigator/pkg-plist +++ /dev/null @@ -1,90 +0,0 @@ -bin/syndigator -%%SITE_PERL%%/syndigator/RSSReader/Category.pm -%%SITE_PERL%%/syndigator/RSSReader/Configuration.pm -%%SITE_PERL%%/syndigator/RSSReader/Exporter/CSV.pm -%%SITE_PERL%%/syndigator/RSSReader/Exporter/OPML.pm -%%SITE_PERL%%/syndigator/RSSReader/Exporter.pm -%%SITE_PERL%%/syndigator/RSSReader/Feed/Message.pm -%%SITE_PERL%%/syndigator/RSSReader/Feed.pm -%%SITE_PERL%%/syndigator/RSSReader/Fetcher/FindFeed.pm -%%SITE_PERL%%/syndigator/RSSReader/Fetcher.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/AddACategory.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/AddAFeedToCategory.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category/InfoPane.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category/MessageList.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DeleteACategory.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DeleteAFeed.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Dialog.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DiscoverFeed.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DiscoverFeedSilent.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/ExporterDruid.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed/InfoPane.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed/MessageList.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed/Properties.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Fetcher.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/GeneralProperties.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/IconFactory.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/ImporterDruid.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/MainWindow.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Message.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/MessageList.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers/PopUpWindow.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers/TrayIcon.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Preferences.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/RenameCategoryWindow.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/SaveConfiguration.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Tree.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/UrlTester.pm -%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI.pm -%%SITE_PERL%%/syndigator/RSSReader/Importer/BottomFeeder.pm -%%SITE_PERL%%/syndigator/RSSReader/Importer/Evolution.pm -%%SITE_PERL%%/syndigator/RSSReader/Importer/OPML.pm -%%SITE_PERL%%/syndigator/RSSReader/Importer.pm -%%SITE_PERL%%/syndigator/RSSReader/Logger.pm -%%SITE_PERL%%/syndigator/RSSReader/Notifier.pm -%%SITE_PERL%%/syndigator/RSSReader/Parser/RSS.pm -%%SITE_PERL%%/syndigator/RSSReader/Parser.pm -%%SITE_PERL%%/syndigator/RSSReader/UI/Preferences.pm -%%SITE_PERL%%/syndigator/RSSReader.pm -share/gnome/applications/syndigator.desktop -share/gnome/pixmaps/syndigator.png -share/gnome/pixmaps/syndigator/closed.png -share/gnome/pixmaps/syndigator/comment-gs.png -share/gnome/pixmaps/syndigator/comment.png -share/gnome/pixmaps/syndigator/fetches_failed.png -share/gnome/pixmaps/syndigator/fetches_failed_16.png -share/gnome/pixmaps/syndigator/item-gtk2.png -share/gnome/pixmaps/syndigator/item-notify-gtk2.png -share/gnome/pixmaps/syndigator/item-notify.xpm -share/gnome/pixmaps/syndigator/item.xpm -share/gnome/pixmaps/syndigator/logo-124x22.xpm -share/gnome/pixmaps/syndigator/logo-simple.gif -share/gnome/pixmaps/syndigator/logo-simple.xpm -share/gnome/pixmaps/syndigator/not_to_keep.xpm -share/gnome/pixmaps/syndigator/offline.png -share/gnome/pixmaps/syndigator/online.png -share/gnome/pixmaps/syndigator/opened.png -share/gnome/pixmaps/syndigator/post-comment.png -share/gnome/pixmaps/syndigator/to_keep.png -share/gnome/pixmaps/syndigator/tokeep-gtk2.png -share/gnome/pixmaps/syndigator/trayicon-notify.gif -share/gnome/pixmaps/syndigator/trayicon.gif -@dirrm share/gnome/pixmaps/syndigator -@dirrm %%SITE_PERL%%/syndigator/RSSReader/UI -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Parser -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Importer -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Fetcher -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Feed -@dirrm %%SITE_PERL%%/syndigator/RSSReader/Exporter -@dirrm %%SITE_PERL%%/syndigator/RSSReader -@dirrm %%SITE_PERL%%/syndigator -@dirrmtry %%SITE_PERL%% -@dirrmtry lib/perl5/site_perl -@dirrmtry lib/perl5 diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile deleted file mode 100644 index 998214ba9..000000000 --- a/www/xulrunner/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# New ports collection makefile for: xulrunner -# Date created: 2006-02-20 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/xulrunner/Makefile,v 1.12 2006/10/12 09:35:57 ahze Exp $ - -PORTNAME= xulrunner -PORTVERSION= 1.8.0.4 -PORTREVISION?= 4 -CATEGORIES?= www devel -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-source - -MAINTAINER?= gnome@FreeBSD.org -COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps - -WANT_GNOME= yes -ALL_TARGET= default -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GCC= 3.4+ - -PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig -MOZ_OPTIONS?= --disable-javaxpcom --enable-canvas \ - --enable-system-cairo -MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS= # Empty, used for generic gecko OPTIONS -USE_GECKO_OPTIONS= java debug logging optimized_cflags - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/Makefile.common" - -.if ${OSVERSION} < 500000 -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> diff --git a/www/xulrunner/distinfo b/www/xulrunner/distinfo deleted file mode 100644 index f96347037..000000000 --- a/www/xulrunner/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xulrunner-1.8.0.4-source.tar.bz2) = 4dc09831aa4e94fda5182a4897ed08e9 -SHA256 (xulrunner-1.8.0.4-source.tar.bz2) = 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9 -SIZE (xulrunner-1.8.0.4-source.tar.bz2) = 33846136 diff --git a/www/xulrunner/files/patch-build_unix_run-mozilla.sh b/www/xulrunner/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 6d8cb1585..000000000 --- a/www/xulrunner/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Sat Oct 1 01:36:47 2005 -+++ build/unix/run-mozilla.sh Thu Dec 22 17:51:10 2005 -@@ -328,7 +328,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -415,6 +415,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/xulrunner/files/patch-config-mkdepend-imakemdep.h b/www/xulrunner/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e6644..000000000 --- a/www/xulrunner/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/xulrunner/files/patch-config_autoconf.mk.in b/www/xulrunner/files/patch-config_autoconf.mk.in deleted file mode 100644 index c4fa0b516..000000000 --- a/www/xulrunner/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/xulrunner/files/patch-config_mkdepend_Makefile.in b/www/xulrunner/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 8da7e48ab..000000000 --- a/www/xulrunner/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/xulrunner/files/patch-config_rules.mk b/www/xulrunner/files/patch-config_rules.mk deleted file mode 100644 index 16cb6ae11..000000000 --- a/www/xulrunner/files/patch-config_rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Sun May 18 16:10:18 2003 -+++ config/rules.mk Sun Jul 20 18:07:26 2003 -@@ -448,7 +448,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/www/xulrunner/files/patch-configure b/www/xulrunner/files/patch-configure deleted file mode 100644 index a973ee058..000000000 --- a/www/xulrunner/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Thu Dec 22 17:54:43 2005 -@@ -10016,7 +10016,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10022 "configure" - #include "confdefs.h" -@@ -10047,7 +10047,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10063 "configure" - #include "confdefs.h" -@@ -10088,7 +10088,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi -@@ -12518,7 +12518,7 @@ - MOZ_SUITE=1 - MOZ_PROFILESHARING= - MOZ_APP_VERSION=$SEAMONKEY_VERSION -- MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" -+ MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" - cat >> confdefs.h <<\EOF - #define MOZ_SUITE 1 - EOF diff --git a/www/xulrunner/files/patch-extensions_transformiix_source_base_Double.cpp b/www/xulrunner/files/patch-extensions_transformiix_source_base_Double.cpp deleted file mode 100644 index 38ce7ec12..000000000 --- a/www/xulrunner/files/patch-extensions_transformiix_source_base_Double.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006 -+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/www/xulrunner/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/xulrunner/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index bc141062f..000000000 --- a/www/xulrunner/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include <gdk/gdkx.h> - #include <freetype/tttables.h> --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" diff --git a/www/xulrunner/files/patch-libm b/www/xulrunner/files/patch-libm deleted file mode 100644 index 7de64b2a5..000000000 --- a/www/xulrunner/files/patch-libm +++ /dev/null @@ -1,25 +0,0 @@ ---- js/src/Makefile.in Thu Aug 4 22:26:52 2005 -+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 -@@ -148,5 +148,4 @@ - endif - --FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) - JSMATH_PRELINK = jsmathtemp.o - JS_SAFE_ARENA = 1 -@@ -320,7 +319,4 @@ - endif - @$(RM) -f $(JSMATH_PRELINK) --else --# Create dependency so we build fdlibm --jsmath.o: $(FDLIBM_LIBRARY) Makefile.in - endif - ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/xulrunner/files/patch-nsISidebar b/www/xulrunner/files/patch-nsISidebar deleted file mode 100644 index 64cbbe0bd..000000000 --- a/www/xulrunner/files/patch-nsISidebar +++ /dev/null @@ -1,218 +0,0 @@ -Index: dom/public/idl/sidebar/Makefile.in -=================================================================== -RCS file: dom/public/idl/sidebar/Makefile.in -diff -N dom/public/idl/sidebar/Makefile.in ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dom/public/idl/sidebar/Makefile.in 4 Nov 2005 02:35:53 -0000 -@@ -0,0 +1,53 @@ -+# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Sidebar IDL Makefile code. -+# -+# The Initial Developer of the Original Code is -+# Robert O'Callahan (rocallahan@novell.com) -+# Portions created by the Initial Developer are Copyright (C) 2005 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either of the GNU General Public License Version 2 or later (the "GPL"), -+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+DEPTH = ../../../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+include $(DEPTH)/config/autoconf.mk -+ -+MODULE = dom -+XPIDL_MODULE = dom_sidebar -+GRE_MODULE = 1 -+ -+XPIDLSRCS = \ -+ nsISidebar.idl \ -+ $(NULL) -+ -+include $(topsrcdir)/config/rules.mk -Index: dom/public/idl/sidebar/nsISidebar.idl -=================================================================== -RCS file: dom/public/idl/sidebar/nsISidebar.idl -diff -N dom/public/idl/sidebar/nsISidebar.idl ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dom/public/idl/sidebar/nsISidebar.idl 10 Feb 2005 15:58:02 -0000 -@@ -0,0 +1,70 @@ -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+ * -+ * ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org Code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* -+ -+ The Sidebar API for 3rd parties -+ -+*/ -+ -+#include "nsISupports.idl" -+ -+[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)] -+interface nsISidebar : nsISupports -+{ -+ void addPanel(in wstring aTitle, in string aContentURL, -+ in string aCustomizeURL); -+ void addPersistentPanel(in wstring aTitle, in string aContentURL, -+ in string aCustomizeURL); -+ void addSearchEngine(in string engineURL, in string iconURL, -+ in wstring suggestedTitle, in wstring suggestedCategory); -+}; -+ -+%{ C++ -+// {577CB744-8CAF-11d3-AAEF-00805F8A4905} -+#define NS_SIDEBAR_CID \ -+{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } } -+ -+#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1" -+%} -+ -+/* -+ var isidebar = Components.interfaces.nsISidebar; -+ var csidebar = Components.classes['@mozilla.org/sidebar;1']; -+ var sidebar = csidebar.createInstance(isidebar); -+*/ -Index: xpinstall/packager/packages-static-unix -=================================================================== -RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/xpinstall/packager/packages-static-unix,v -retrieving revision 1.87 -diff -u -t -p -1 -2 -r1.87 packages-static-unix ---- xpinstall/packager/packages-static-unix 19 Aug 2005 23:09:31 -0000 1.87 -+++ xpinstall/packager/packages-static-unix 4 Nov 2005 02:39:13 -0000 -@@ -89,24 +89,25 @@ bin/components/caps.xpt - bin/components/cookie.xpt - bin/components/jsdservice.xpt - bin/components/libjsd.so - bin/components/dom.xpt - bin/components/dom_base.xpt - bin/components/dom_canvas.xpt - bin/components/dom_core.xpt - bin/components/dom_css.xpt - bin/components/dom_events.xpt - bin/components/dom_loadsave.xpt - bin/components/dom_html.xpt - bin/components/dom_range.xpt -+bin/components/dom_sidebar.xpt - bin/components/dom_stylesheets.xpt - bin/components/dom_traversal.xpt - bin/components/dom_views.xpt - bin/components/dom_xbl.xpt - bin/components/dom_xpath.xpt - bin/components/dom_xul.xpt - bin/components/editor.xpt - bin/components/find.xpt - bin/components/gfx.xpt - bin/components/gfx2.xpt - bin/components/gksvgrenderer.xpt - bin/components/intl.xpt -Index: xpinstall/packager/packages-unix -=================================================================== -RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/xpinstall/packager/packages-unix,v -retrieving revision 1.314 -diff -u -t -p -1 -2 -r1.314 packages-unix ---- xpinstall/packager/packages-unix 31 Oct 2005 13:21:31 -0000 1.314 -+++ xpinstall/packager/packages-unix 4 Nov 2005 02:38:56 -0000 -@@ -106,24 +106,25 @@ bin/components/nsComposerCmdLineHandler. - bin/components/cookie.xpt - bin/components/libjsd.so - bin/components/jsdservice.xpt - bin/components/dom.xpt - bin/components/dom_base.xpt - bin/components/dom_canvas.xpt - bin/components/dom_core.xpt - bin/components/dom_css.xpt - bin/components/dom_events.xpt - bin/components/dom_html.xpt - bin/components/dom_loadsave.xpt - bin/components/dom_range.xpt -+bin/components/dom_sidebar.xpt - bin/components/dom_stylesheets.xpt - bin/components/dom_traversal.xpt - bin/components/dom_views.xpt - bin/components/dom_xbl.xpt - bin/components/dom_xpath.xpt - bin/components/dom_xul.xpt - bin/components/editor.xpt - bin/components/find.xpt - bin/components/gfx.xpt - bin/components/gksvgrenderer.xpt - bin/components/intl.xpt - bin/components/imglib2.xpt -Index: dom/public/idl/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/dom/public/idl/Makefile.in,v -retrieving revision 1.13 -diff -u -p -r1.13 Makefile.in ---- dom/public/idl/Makefile.in 18 Apr 2005 06:33:17 -0000 1.13 -+++ dom/public/idl/Makefile.in 7 Nov 2005 08:39:01 -0000 -@@ -51,6 +51,7 @@ DIRS = \ - stylesheets \ - views \ - css \ -+ sidebar \ - traversal \ - range \ - xbl \ diff --git a/www/xulrunner/files/patch-security_coreconf_FreeBSD.mk b/www/xulrunner/files/patch-security_coreconf_FreeBSD.mk deleted file mode 100644 index 5c76b5af5..000000000 --- a/www/xulrunner/files/patch-security_coreconf_FreeBSD.mk +++ /dev/null @@ -1,37 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+CCC = ${CXX} - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +73,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/www/xulrunner/files/patch-sysnss b/www/xulrunner/files/patch-sysnss deleted file mode 100644 index a9154ce9a..000000000 --- a/www/xulrunner/files/patch-sysnss +++ /dev/null @@ -1,156 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 -+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 -@@ -117,5 +117,5 @@ - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ - $(NULL) - ---- config/config.mk Tue Oct 12 00:11:11 2004 -+++ config/config.mk Tue Aug 2 09:19:18 2005 -@@ -170,5 +170,4 @@ - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - -lsmime3 \ - -lssl3 \ -@@ -189,11 +188,5 @@ - endif - --NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ -- $(NULL) -+NSS_DEP_LIBS = - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 -+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 -@@ -88,4 +88,8 @@ - } - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <errno.h> -+ - #ifdef PR_LOGGING - PRLogModuleInfo* gPIPNSSLog = nsnull; -@@ -406,4 +410,5 @@ - const char *possible_ckbi_locations[] = { - NS_GRE_DIR, -+ NS_UNIX_LIB_DIR, - NS_XPCOM_CURRENT_PROCESS_DIR - }; -@@ -419,5 +424,5 @@ - } - -- char *fullModuleName = nsnull; -+ char *fullModuleName; - #ifdef XP_MAC - nsCAutoString nativePath; -@@ -431,4 +436,12 @@ - fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); - #endif -+ if (fullModuleName == nsnull) -+ continue; -+ struct stat sb; -+ if (stat(fullModuleName, &sb)) { -+ if (errno != ENOENT) -+ perror(fullModuleName); -+ continue; -+ } - /* If a module exists with the same name, delete it. */ - NS_ConvertUCS2toUTF8 modNameUTF8(modName); ---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005 -+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005 -@@ -52,18 +52,9 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_MODULES \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) - ifeq (,$(filter i86pc ia64,$(OS_TEST))) - ifndef HAVE_64BIT_OS -@@ -151,11 +142,6 @@ - - .nss.cleaned: .nss.checkout - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - - .nss.checkout: -@@ -176,10 +162,10 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+# $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - ifndef SKIP_CHK -@@ -203,20 +189,6 @@ - endif - - install:: -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_MODULES -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -232,11 +204,6 @@ - $(MAKE) -C pki $@ - endif - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - - echo-requires-recursive:: - $(MAKE) -C boot $@ diff --git a/www/xulrunner/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/xulrunner/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f53..000000000 --- a/www/xulrunner/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/xulrunner/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/www/xulrunner/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca..000000000 --- a/www/xulrunner/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/xulrunner/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/xulrunner/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index dbdc47b6f..000000000 --- a/www/xulrunner/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/xulrunner/files/patch-xptcall-alpha b/www/xulrunner/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e..000000000 --- a/www/xulrunner/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/xulrunner/files/patch-xptcall-amd64 b/www/xulrunner/files/patch-xptcall-amd64 deleted file mode 100644 index 3227cad02..000000000 --- a/www/xulrunner/files/patch-xptcall-amd64 +++ /dev/null @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ diff --git a/www/xulrunner/files/patch-xptcall-ia64 b/www/xulrunner/files/patch-xptcall-ia64 deleted file mode 100644 index 7d33a8693..000000000 --- a/www/xulrunner/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Fri Sep 16 15:50:20 2005 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments diff --git a/www/xulrunner/files/patch-xptcall-sparc64 b/www/xulrunner/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71..000000000 --- a/www/xulrunner/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/xulrunner/files/patch-xulrunner_app_mozilla.in b/www/xulrunner/files/patch-xulrunner_app_mozilla.in deleted file mode 100644 index 1839a79d7..000000000 --- a/www/xulrunner/files/patch-xulrunner_app_mozilla.in +++ /dev/null @@ -1,18 +0,0 @@ ---- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006 -+++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006 -@@ -193,12 +193,12 @@ - done #others arg - - #???: needs check if othersopt begin with -* ? --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -+if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then - # Last argument seems to be a local file/directory - # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) - # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before... -+ [ `expr -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" -+elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before... - _NEW_WINDOW=1 - fi - diff --git a/www/xulrunner/pkg-descr b/www/xulrunner/pkg-descr deleted file mode 100644 index a4c33d7df..000000000 --- a/www/xulrunner/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications -that are as rich as Firefox and Thunderbird. It will provide mechanisms for -installing, upgrading, and uninstalling these applications. XULRunner will -also provide libxul, a solution which allows the embedding of Mozilla -technologies in other projects and products. - -WWW: http://developer.mozilla.org/en/docs/XULRunner |