diff options
239 files changed, 1871 insertions, 10697 deletions
diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile index f7347c599657..00a44fbdff49 100644 --- a/mail/thunderbird-devel/Makefile +++ b/mail/thunderbird-devel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/thunderbird-devel/Makefile,v 1.11 2005/10/11 03:28:04 marcus Exp $ +# $MCom: ports/mail/thunderbird-devel/Makefile,v 1.15 2005/11/23 04:54:58 ahze Exp $ # PORTNAME= thunderbird @@ -17,54 +17,31 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - Xft.2:${PORTSDIR}/x11-fonts/libXft -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - -USE_X_PREFIX= yes - -USE_GCC= 3.4+ -USE_BZIP2= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_PERL5= yes -USE_REINPLACE= yes -HAS_CONFIGURE= yes -NO_MTREE= yes -PLIST= ${WRKDIR}/plist +WANT_GNOME= yes ALL_TARGET= default -USE_GNOME= gtk20 libidl CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -FAKEDIR= ${WRKDIR}/fake +HAS_CONFIGURE= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_X_PREFIX= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */package/* \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST +MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices +MOZ_PROTOCOLS= http,file,jar,viewsource,res,data +MOZ_GRAPHICS= default,-xbm +MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ + --enable-application=mail -enable-official-branding +MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 +MOZ_EXPORT= MOZ_THUNDERBIRD=1 -NO_MTREE= yes -WRKSRC= ${WRKDIR}/mozilla -LOCAL_SUBDIR= lib/${PORTNAME} -LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR} +PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm -THUNDERBIRD= ${PORTNAME} -THUNDERBIRD_VER= 1.5 -THUNDERBIRD_ICON_SRC= ${LOCAL_PREFIX}/lib/${THUNDERBIRD}-${THUNDERBIRD_VER}/icons/default.xpm -THUNDERBIRD_ICON= ${PORTNAME}.xpm -MOZ_PIS_SCRIPTS= S50cleanhome -SCRIPTS_DIR= ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${THUNDERBIRD_VER} -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js +MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off +CONFLICTS= thunderbird-1.0* .include <bsd.port.pre.mk> +.include "${.CURDIR}/../../www/mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps at runtime @@ -74,147 +51,30 @@ IGNORE= core dumps at runtime EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif # ${PERL_LEVEL} < 500600 -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: -# FAKEDIR is here so that nsinstall will install under FAKEDIR, not -# under PREFIX. See pre-install and do-install for details. - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@PREFIX@|${FAKEDIR}/lib/thunderbird|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig + @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ + <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/nsprpub/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/nsprpub/configure \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${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.no|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/modules/libpref/src/init/all.js \ - ${WRKSRC}/extensions/sroaming/resources/content/prefs/all.js \ - ${WRKSRC}/modules/libpref/src/init/all.js + @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ + -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ + ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp + @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ + '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ + /dom.disable_window_open_feature.toolbar/s/false/true/' @${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|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \ - < ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${THUNDERBIRD}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - -pre-configure: - @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 pre-install: - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${THUNDERBIRD_VER}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${THUNDERBIRD_VER}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -# Overview: the program installs itself in FAKEDIR, then a list is made of the -# files and directories in there. This is the PLIST (packing list) for the -# package, replacing the traditional pkg-plist file. - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${RM} -rf ${FAKEDIR}/lib/${THUNDERBIRD}/lib/${THUNDERBIRD}-${THUNDERBIRD_VER}/extensions -.for ii in mac win -.for jj in / .jar - @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} -.endfor -.endfor - @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include -.for ii in thunderbird thunderbird-config - @${ECHO_CMD} bin/${ii} >> ${PLIST} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ - "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ - "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ - ${GREP} / >> ${PLIST} - ${ECHO_CMD} 'share/applications/thunderbird.desktop' >> ${PLIST} - ${ECHO_CMD} 'share/pixmaps/${THUNDERBIRD_ICON}' >> ${PLIST} - ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} - -do-install: -# This is the actual installation. First, the contents of FAKEDIR are -# just copied to PREFIX. - cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} + ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${MKDIR} ${PREFIX}/bin - ${RM} -f ${PREFIX}/bin/thunderbird - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird \ - ${PREFIX}/bin/thunderbird - ${RM} -f ${PREFIX}/bin/thunderbird-config - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird-config \ - ${PREFIX}/bin/thunderbird-config - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${LOCAL_PREFIX}/bin/thunderbird \ - ${LOCAL_PREFIX}/bin/thunderbird-config - ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/applications - ${LN} -sf ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${THUNDERBIRD_ICON} + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ + ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm .include <bsd.port.post.mk> diff --git a/mail/thunderbird-devel/files/mozconfig.in b/mail/thunderbird-devel/files/mozconfig.in deleted file mode 100644 index 08c357be6731..000000000000 --- a/mail/thunderbird-devel/files/mozconfig.in +++ /dev/null @@ -1,76 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -# $MCom: ports/mail/thunderbird-devel/files/mozconfig.in,v 1.5 2005/06/28 05:40:07 adamw Exp $ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-application=mail -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@PREFIX@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh index 28bbd1a1154e..7e038a39d310 100644 --- a/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh @@ -5,7 +5,7 @@ ## ## 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:${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"} diff --git a/mail/thunderbird-devel/files/patch-config_autoconf.mk.in b/mail/thunderbird-devel/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/mail/thunderbird-devel/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/mail/thunderbird-devel/files/patch-configure b/mail/thunderbird-devel/files/patch-configure deleted file mode 100644 index 9e60372adb33..000000000000 --- a/mail/thunderbird-devel/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,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 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,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 -@@ -9222,7 +9222,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 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,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/mail/thunderbird-devel/files/patch-libm b/mail/thunderbird-devel/files/patch-libm new file mode 100644 index 000000000000..7de64b2a5068 --- /dev/null +++ b/mail/thunderbird-devel/files/patch-libm @@ -0,0 +1,25 @@ +--- 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/mail/thunderbird-devel/files/patch-nopangoxft b/mail/thunderbird-devel/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/mail/thunderbird-devel/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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/mail/thunderbird-devel/files/patch-nspr-unix.c b/mail/thunderbird-devel/files/patch-nspr-unix.c deleted file mode 100644 index 6bb4ed08fb40..000000000000 --- a/mail/thunderbird-devel/files/patch-nspr-unix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 -+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 -@@ -65,7 +65,8 @@ - * PRInt32* pointer to a _PRSockLen_t* pointer. - */ - #if defined(HAVE_SOCKLEN_T) \ -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ -+ || defined(FREEBSD) - #define _PRSockLen_t socklen_t - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ -@@ -73,7 +74,7 @@ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) - #define _PRSockLen_t int --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ -+#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ - || defined(DGUX) || defined(VMS) || defined(NTO) - #define _PRSockLen_t size_t diff --git a/mail/thunderbird-devel/files/patch-sysnss b/mail/thunderbird-devel/files/patch-sysnss new file mode 100644 index 000000000000..d854cabc053a --- /dev/null +++ b/mail/thunderbird-devel/files/patch-sysnss @@ -0,0 +1,178 @@ +--- 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/mail/thunderbird-devel/pkg-deinstall.in b/mail/thunderbird-devel/pkg-deinstall.in index 8d4995f057fa..c921e64d63d8 100644 --- a/mail/thunderbird-devel/pkg-deinstall.in +++ b/mail/thunderbird-devel/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.6 2005/09/12 21:01:45 marcus Exp $ +# $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.9 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -16,12 +16,13 @@ PATH=/bin:/usr/bin MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo +rm -rf ${MOZDIR}/chrome/icons/default/default.xpm rm -f ${MOZDIR}/chrome/*.rdf ${MOZDIR}/chrome/app-chrome.manifest rm -f ${MOZDIR}/component.reg rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions +#rm -rf ${MOZDIR}/extensions rm -rf ${MOZDIR}/updates exit 0 diff --git a/mail/thunderbird-devel/pkg-install.in b/mail/thunderbird-devel/pkg-install.in index b70c93e4b394..39e08dad1695 100644 --- a/mail/thunderbird-devel/pkg-install.in +++ b/mail/thunderbird-devel/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.5 2005/06/28 05:40:07 adamw Exp $ +# $MCom: ports/mail/thunderbird-devel/pkg-install.in,v 1.7 2005/11/18 10:05:25 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 72b75f3eb7d9..5138cc9459fa 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/mail/thunderbird/Makefile,v 1.11 2005/08/20 20:56:53 mezz Exp $ +# $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $ # PORTNAME= thunderbird PORTVERSION= 1.0.7 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source @@ -17,86 +17,30 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake -USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl -USE_ICONV= yes -USE_PERL5_BUILD=yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST +MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices +MOZ_PROTOCOLS= http,file,jar,viewsource,res,data +MOZ_GRAPHICS= default,-xbm +MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ + --enable-official-branding +MOZ_EXPORT= MOZ_THUNDERBIRD=1 +MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin - SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on +CONFLICTS= thunerbird*-1.5* .include <bsd.port.pre.mk> - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} +.include "${.CURDIR}/../../www/mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps at runtime @@ -106,54 +50,11 @@ IGNORE= core dumps at runtime EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif # ${PERL_LEVEL} < 500600 -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp @@ -165,81 +66,11 @@ post-patch: ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp -pre-configure: - @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 - pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} - -do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ diff --git a/mail/thunderbird-esr/files/mozconfig.in b/mail/thunderbird-esr/files/mozconfig.in deleted file mode 100644 index d99ebe20a3da..000000000000 --- a/mail/thunderbird-esr/files/mozconfig.in +++ /dev/null @@ -1,75 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh index 28bbd1a1154e..37af6d18a089 100644 --- a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh @@ -5,7 +5,7 @@ ## ## 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:${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_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"} diff --git a/mail/thunderbird-esr/files/patch-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/mail/thunderbird-esr/files/patch-configure b/mail/thunderbird-esr/files/patch-configure index 9e60372adb33..cdf04c84af86 100644 --- a/mail/thunderbird-esr/files/patch-configure +++ b/mail/thunderbird-esr/files/patch-configure @@ -1,38 +1,17 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,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 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,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 -@@ -9222,7 +9222,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 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,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 +--- configure.orig Wed Nov 23 13:17:02 2005 ++++ configure Wed Nov 23 13:17:20 2005 +@@ -11417,12 +11417,12 @@ + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 + echo "configure:11420: 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:11425: 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="" diff --git a/mail/thunderbird-esr/pkg-deinstall.in b/mail/thunderbird-esr/pkg-deinstall.in index b9b0ca220fbc..c34ce2411f39 100644 --- a/mail/thunderbird-esr/pkg-deinstall.in +++ b/mail/thunderbird-esr/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/mail/thunderbird-esr/pkg-install.in b/mail/thunderbird-esr/pkg-install.in index 0413486236fe..1c3cfd284ce2 100644 --- a/mail/thunderbird-esr/pkg-install.in +++ b/mail/thunderbird-esr/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 72b75f3eb7d9..5138cc9459fa 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/mail/thunderbird/Makefile,v 1.11 2005/08/20 20:56:53 mezz Exp $ +# $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $ # PORTNAME= thunderbird PORTVERSION= 1.0.7 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source @@ -17,86 +17,30 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake -USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl -USE_ICONV= yes -USE_PERL5_BUILD=yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST +MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices +MOZ_PROTOCOLS= http,file,jar,viewsource,res,data +MOZ_GRAPHICS= default,-xbm +MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ + --enable-official-branding +MOZ_EXPORT= MOZ_THUNDERBIRD=1 +MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin - SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on +CONFLICTS= thunerbird*-1.5* .include <bsd.port.pre.mk> - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} +.include "${.CURDIR}/../../www/mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps at runtime @@ -106,54 +50,11 @@ IGNORE= core dumps at runtime EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif # ${PERL_LEVEL} < 500600 -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp @@ -165,81 +66,11 @@ post-patch: ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp -pre-configure: - @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 - pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} - -do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ diff --git a/mail/thunderbird/files/mozconfig.in b/mail/thunderbird/files/mozconfig.in deleted file mode 100644 index d99ebe20a3da..000000000000 --- a/mail/thunderbird/files/mozconfig.in +++ /dev/null @@ -1,75 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird/files/patch-build_unix_run-mozilla.sh index 28bbd1a1154e..37af6d18a089 100644 --- a/mail/thunderbird/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird/files/patch-build_unix_run-mozilla.sh @@ -5,7 +5,7 @@ ## ## 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:${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_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"} diff --git a/mail/thunderbird/files/patch-config_autoconf.mk.in b/mail/thunderbird/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/mail/thunderbird/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/mail/thunderbird/files/patch-configure b/mail/thunderbird/files/patch-configure index 9e60372adb33..cdf04c84af86 100644 --- a/mail/thunderbird/files/patch-configure +++ b/mail/thunderbird/files/patch-configure @@ -1,38 +1,17 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,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 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,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 -@@ -9222,7 +9222,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 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,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 +--- configure.orig Wed Nov 23 13:17:02 2005 ++++ configure Wed Nov 23 13:17:20 2005 +@@ -11417,12 +11417,12 @@ + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 + echo "configure:11420: 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:11425: 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="" diff --git a/mail/thunderbird/pkg-deinstall.in b/mail/thunderbird/pkg-deinstall.in index b9b0ca220fbc..c34ce2411f39 100644 --- a/mail/thunderbird/pkg-deinstall.in +++ b/mail/thunderbird/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/mail/thunderbird/pkg-install.in b/mail/thunderbird/pkg-install.in index 0413486236fe..1c3cfd284ce2 100644 --- a/mail/thunderbird/pkg-install.in +++ b/mail/thunderbird/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index 72b75f3eb7d9..5138cc9459fa 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/mail/thunderbird/Makefile,v 1.11 2005/08/20 20:56:53 mezz Exp $ +# $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $ # PORTNAME= thunderbird PORTVERSION= 1.0.7 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source @@ -17,86 +17,30 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake -USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl -USE_ICONV= yes -USE_PERL5_BUILD=yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST +MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices +MOZ_PROTOCOLS= http,file,jar,viewsource,res,data +MOZ_GRAPHICS= default,-xbm +MOZ_OPTIONS= --enable-single-profile --disable-profilesharing \ + --enable-official-branding +MOZ_EXPORT= MOZ_THUNDERBIRD=1 +MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin - SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on +CONFLICTS= thunerbird*-1.5* .include <bsd.port.pre.mk> - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} +.include "${.CURDIR}/../../www/mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps at runtime @@ -106,54 +50,11 @@ IGNORE= core dumps at runtime EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif # ${PERL_LEVEL} < 500600 -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp @@ -165,81 +66,11 @@ post-patch: ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp -pre-configure: - @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 - pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} - -do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ diff --git a/mail/thunderbird3/files/mozconfig.in b/mail/thunderbird3/files/mozconfig.in deleted file mode 100644 index d99ebe20a3da..000000000000 --- a/mail/thunderbird3/files/mozconfig.in +++ /dev/null @@ -1,75 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh index 28bbd1a1154e..37af6d18a089 100644 --- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh @@ -5,7 +5,7 @@ ## ## 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:${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_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"} diff --git a/mail/thunderbird3/files/patch-config_autoconf.mk.in b/mail/thunderbird3/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/mail/thunderbird3/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/mail/thunderbird3/files/patch-configure b/mail/thunderbird3/files/patch-configure index 9e60372adb33..cdf04c84af86 100644 --- a/mail/thunderbird3/files/patch-configure +++ b/mail/thunderbird3/files/patch-configure @@ -1,38 +1,17 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,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 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,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 -@@ -9222,7 +9222,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 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,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 +--- configure.orig Wed Nov 23 13:17:02 2005 ++++ configure Wed Nov 23 13:17:20 2005 +@@ -11417,12 +11417,12 @@ + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 + echo "configure:11420: 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:11425: 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="" diff --git a/mail/thunderbird3/pkg-deinstall.in b/mail/thunderbird3/pkg-deinstall.in index b9b0ca220fbc..c34ce2411f39 100644 --- a/mail/thunderbird3/pkg-deinstall.in +++ b/mail/thunderbird3/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/mail/thunderbird3/pkg-install.in b/mail/thunderbird3/pkg-install.in index 0413486236fe..1c3cfd284ce2 100644 --- a/mail/thunderbird3/pkg-install.in +++ b/mail/thunderbird3/pkg-install.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 98f662a80a43..7d0c9a0ece3b 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,126 +3,46 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $ # PORTNAME= firefox -PORTVERSION= 1.0.7 -PORTREVISION= 4 +DISTVERSION= 1.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +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 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +USE_X_PREFIX= yes +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist -PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl gnomehier desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -KRB5_HOME?= /usr - -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST - -PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin +USE_GCC= 3.4+ -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +FIREFOX_ICON= ${MOZILLA}.xpm +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEWTAB "Open external links in a new tab" on -# CJK "Enable CJK font family support" off +OPTIONS= NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> - -# Enable CJK Font Familyname support -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bbs.ilc.edu.tw/~chinsan/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ \ -# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ -#PATCHFILES+= mozilla-1.7.10-cjkfamilyname-20050731.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -CONFIGURE_ENV+= WITH_SMB=yes -.endif # defined(WITH_SMB) - -CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -EXTRA_SCRIPTS= ${PORTNAME}.rb +.include "${.CURDIR}/../mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on alpha during post-build @@ -132,137 +52,36 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ - <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} +.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 - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ - -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ - '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' - -pre-configure: - @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 pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - for i in ${EXTRA_SCRIPTS}; do \ - ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ - done - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${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) - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} +# Dirty hack to make sure stuff gets removed right. + ${SORT} -r ${PLIST} > ${PLIST}.tmp + ${MV} -f ${PLIST}.tmp ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -272,32 +91,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.for i in ${EXTRA_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ - ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - @-update-desktop-database + ${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 <bsd.port.post.mk> diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index dc846093ea0d..fcf2eb8bbb61 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -SHA256 (firefox-1.0.7-source.tar.bz2) = 10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/firefox-esr/files/firefox.desktop.in b/www/firefox-esr/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/firefox-esr/files/firefox.desktop.in +++ b/www/firefox-esr/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox-esr/files/firefox.rb b/www/firefox-esr/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/firefox-esr/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/firefox-esr/files/mkdistfile b/www/firefox-esr/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/firefox-esr/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/firefox-esr/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/firefox-esr/files/patch-Double.cpp b/www/firefox-esr/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/firefox-esr/files/patch-Double.cpp +++ b/www/firefox-esr/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox-esr/files/patch-browser_app_mozilla.in b/www/firefox-esr/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/firefox-esr/files/patch-browser_app_mozilla.in +++ b/www/firefox-esr/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- 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. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ 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` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ 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 -- # 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 -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# 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 - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ 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 firefox -+ 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 -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -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}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# 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 -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -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 --done -+# 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 - --export MRE_HOME -+# 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/firefox-esr/files/patch-bugzilla149334 b/www/firefox-esr/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox-esr/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/firefox-esr/files/patch-bugzilla243151 b/www/firefox-esr/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/firefox-esr/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/firefox-esr/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox-esr/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/firefox-esr/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/firefox-esr/files/patch-build_unix_run-mozilla.sh b/www/firefox-esr/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/firefox-esr/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox-esr/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## 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"} ++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"} diff --git a/www/firefox-esr/files/patch-config-mkdepend-imakemdep.h b/www/firefox-esr/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/firefox-esr/files/patch-config-mkdepend-imakemdep.h +++ b/www/firefox-esr/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/firefox-esr/files/patch-config-rules.mk b/www/firefox-esr/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/firefox-esr/files/patch-config-rules.mk +++ b/www/firefox-esr/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/firefox-esr/files/patch-config_autoconf.mk.in b/www/firefox-esr/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/firefox-esr/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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-esr/files/patch-config::mkdepend::Makefile.in b/www/firefox-esr/files/patch-config_mkdepend_Makefile.in index bace012a282e..bace012a282e 100644 --- a/www/firefox-esr/files/patch-config::mkdepend::Makefile.in +++ b/www/firefox-esr/files/patch-config_mkdepend_Makefile.in diff --git a/www/firefox-esr/files/patch-configure b/www/firefox-esr/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/firefox-esr/files/patch-configure +++ b/www/firefox-esr/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- 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 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -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 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/firefox-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox-esr/files/patch-jsosdep b/www/firefox-esr/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/firefox-esr/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/firefox-esr/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox-esr/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/firefox-esr/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/firefox-esr/files/patch-nopangoxft b/www/firefox-esr/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/firefox-esr/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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-esr/files/patch-oji-threads b/www/firefox-esr/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox-esr/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ diff --git a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 5276b54f0a1a..d3c1e463f5a0 100644 --- a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox-esr/files/patch-xptcall-alpha b/www/firefox-esr/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/firefox-esr/files/patch-xptcall-alpha +++ b/www/firefox-esr/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox-esr/files/patch-xptcall-ia64 b/www/firefox-esr/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/firefox-esr/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- 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/firefox-esr/files/patch-xptcall-sparc64 b/www/firefox-esr/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/firefox-esr/files/patch-xptcall-sparc64 +++ b/www/firefox-esr/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /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 diff --git a/www/firefox-esr/files/patch-xptcinvoke_x86_64_linux b/www/firefox-esr/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/firefox-esr/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int 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_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; diff --git a/www/firefox-esr/pkg-deinstall.in b/www/firefox-esr/pkg-deinstall.in index b9b0ca220fbc..f7ea61bf3963 100644 --- a/www/firefox-esr/pkg-deinstall.in +++ b/www/firefox-esr/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -17,9 +18,6 @@ MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/chrome/*.rdf rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions exit 0 diff --git a/www/firefox-esr/pkg-install.in b/www/firefox-esr/pkg-install.in deleted file mode 100644 index f25aa135197d..000000000000 --- a/www/firefox-esr/pkg-install.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -FIREFOX=${MOZDIR}/firefox-bin - -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 -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1 - -if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then - mkdir -p %%PREFIX%%/lib/browser_plugins -fi - -exit 0 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 98f662a80a43..7d0c9a0ece3b 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,126 +3,46 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $ # PORTNAME= firefox -PORTVERSION= 1.0.7 -PORTREVISION= 4 +DISTVERSION= 1.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +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 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +USE_X_PREFIX= yes +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist -PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl gnomehier desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -KRB5_HOME?= /usr - -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST - -PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin +USE_GCC= 3.4+ -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +FIREFOX_ICON= ${MOZILLA}.xpm +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEWTAB "Open external links in a new tab" on -# CJK "Enable CJK font family support" off +OPTIONS= NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> - -# Enable CJK Font Familyname support -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bbs.ilc.edu.tw/~chinsan/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ \ -# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ -#PATCHFILES+= mozilla-1.7.10-cjkfamilyname-20050731.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -CONFIGURE_ENV+= WITH_SMB=yes -.endif # defined(WITH_SMB) - -CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -EXTRA_SCRIPTS= ${PORTNAME}.rb +.include "${.CURDIR}/../mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on alpha during post-build @@ -132,137 +52,36 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ - <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} +.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 - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ - -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ - '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' - -pre-configure: - @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 pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - for i in ${EXTRA_SCRIPTS}; do \ - ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ - done - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${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) - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} +# Dirty hack to make sure stuff gets removed right. + ${SORT} -r ${PLIST} > ${PLIST}.tmp + ${MV} -f ${PLIST}.tmp ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -272,32 +91,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.for i in ${EXTRA_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ - ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - @-update-desktop-database + ${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 <bsd.port.post.mk> diff --git a/www/firefox/distinfo b/www/firefox/distinfo index dc846093ea0d..fcf2eb8bbb61 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -SHA256 (firefox-1.0.7-source.tar.bz2) = 10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/firefox/files/firefox.desktop.in b/www/firefox/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/firefox/files/firefox.desktop.in +++ b/www/firefox/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox/files/firefox.rb b/www/firefox/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/firefox/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/firefox/files/mkdistfile b/www/firefox/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/firefox/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/firefox/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/firefox/files/patch-Double.cpp b/www/firefox/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/firefox/files/patch-Double.cpp +++ b/www/firefox/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox/files/patch-browser_app_mozilla.in b/www/firefox/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/firefox/files/patch-browser_app_mozilla.in +++ b/www/firefox/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- 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. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ 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` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ 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 -- # 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 -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# 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 - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ 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 firefox -+ 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 -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -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}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# 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 -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -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 --done -+# 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 - --export MRE_HOME -+# 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/firefox/files/patch-bugzilla149334 b/www/firefox/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox/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/firefox/files/patch-bugzilla243151 b/www/firefox/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/firefox/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/firefox/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/firefox/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/firefox/files/patch-build_unix_run-mozilla.sh b/www/firefox/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/firefox/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## 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"} ++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"} diff --git a/www/firefox/files/patch-config-mkdepend-imakemdep.h b/www/firefox/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/firefox/files/patch-config-mkdepend-imakemdep.h +++ b/www/firefox/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/firefox/files/patch-config-rules.mk b/www/firefox/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/firefox/files/patch-config-rules.mk +++ b/www/firefox/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/firefox/files/patch-config_autoconf.mk.in b/www/firefox/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/firefox/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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 index bace012a282e..bace012a282e 100644 --- a/www/firefox/files/patch-config::mkdepend::Makefile.in +++ b/www/firefox/files/patch-config_mkdepend_Makefile.in diff --git a/www/firefox/files/patch-configure b/www/firefox/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/firefox/files/patch-configure +++ b/www/firefox/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- 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 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -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 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox/files/patch-gfx-src-gtk-Makefile.in b/www/firefox/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/firefox/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/firefox/files/patch-jsosdep b/www/firefox/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/firefox/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/firefox/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/firefox/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/firefox/files/patch-nopangoxft b/www/firefox/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/firefox/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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-oji-threads b/www/firefox/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ 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 index 5276b54f0a1a..d3c1e463f5a0 100644 --- 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 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox/files/patch-xptcall-alpha b/www/firefox/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/firefox/files/patch-xptcall-alpha +++ b/www/firefox/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox/files/patch-xptcall-ia64 b/www/firefox/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/firefox/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- 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/firefox/files/patch-xptcall-sparc64 b/www/firefox/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/firefox/files/patch-xptcall-sparc64 +++ b/www/firefox/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /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 diff --git a/www/firefox/files/patch-xptcinvoke_x86_64_linux b/www/firefox/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/firefox/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int 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_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; diff --git a/www/firefox/pkg-deinstall.in b/www/firefox/pkg-deinstall.in index b9b0ca220fbc..f7ea61bf3963 100644 --- a/www/firefox/pkg-deinstall.in +++ b/www/firefox/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -17,9 +18,6 @@ MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/chrome/*.rdf rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions exit 0 diff --git a/www/firefox/pkg-install.in b/www/firefox/pkg-install.in deleted file mode 100644 index f25aa135197d..000000000000 --- a/www/firefox/pkg-install.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -FIREFOX=${MOZDIR}/firefox-bin - -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 -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1 - -if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then - mkdir -p %%PREFIX%%/lib/browser_plugins -fi - -exit 0 diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 98f662a80a43..7d0c9a0ece3b 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -3,126 +3,46 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $ # PORTNAME= firefox -PORTVERSION= 1.0.7 -PORTREVISION= 4 +DISTVERSION= 1.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +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 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +USE_X_PREFIX= yes +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist -PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl gnomehier desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -KRB5_HOME?= /usr - -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST - -PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin +USE_GCC= 3.4+ -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +FIREFOX_ICON= ${MOZILLA}.xpm +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEWTAB "Open external links in a new tab" on -# CJK "Enable CJK font family support" off +OPTIONS= NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> - -# Enable CJK Font Familyname support -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bbs.ilc.edu.tw/~chinsan/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ \ -# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ -#PATCHFILES+= mozilla-1.7.10-cjkfamilyname-20050731.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -CONFIGURE_ENV+= WITH_SMB=yes -.endif # defined(WITH_SMB) - -CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -EXTRA_SCRIPTS= ${PORTNAME}.rb +.include "${.CURDIR}/../mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on alpha during post-build @@ -132,137 +52,36 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ - <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} +.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 - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ - -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ - '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' - -pre-configure: - @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 pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - for i in ${EXTRA_SCRIPTS}; do \ - ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ - done - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${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) - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} +# Dirty hack to make sure stuff gets removed right. + ${SORT} -r ${PLIST} > ${PLIST}.tmp + ${MV} -f ${PLIST}.tmp ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -272,32 +91,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.for i in ${EXTRA_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ - ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - @-update-desktop-database + ${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 <bsd.port.post.mk> diff --git a/www/firefox10/distinfo b/www/firefox10/distinfo index dc846093ea0d..fcf2eb8bbb61 100644 --- a/www/firefox10/distinfo +++ b/www/firefox10/distinfo @@ -1,3 +1,3 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -SHA256 (firefox-1.0.7-source.tar.bz2) = 10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/firefox10/files/firefox.desktop.in b/www/firefox10/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/firefox10/files/firefox.desktop.in +++ b/www/firefox10/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox10/files/firefox.rb b/www/firefox10/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/firefox10/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/firefox10/files/mkdistfile b/www/firefox10/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/firefox10/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/firefox10/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/firefox10/files/patch-Double.cpp b/www/firefox10/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/firefox10/files/patch-Double.cpp +++ b/www/firefox10/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox10/files/patch-browser_app_mozilla.in b/www/firefox10/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/firefox10/files/patch-browser_app_mozilla.in +++ b/www/firefox10/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- 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. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ 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` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ 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 -- # 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 -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# 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 - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ 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 firefox -+ 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 -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -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}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# 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 -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -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 --done -+# 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 - --export MRE_HOME -+# 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/firefox10/files/patch-bugzilla149334 b/www/firefox10/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox10/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/firefox10/files/patch-bugzilla243151 b/www/firefox10/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/firefox10/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/firefox10/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox10/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/firefox10/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/firefox10/files/patch-build_unix_run-mozilla.sh b/www/firefox10/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/firefox10/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox10/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## 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"} ++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"} diff --git a/www/firefox10/files/patch-config-mkdepend-imakemdep.h b/www/firefox10/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/firefox10/files/patch-config-mkdepend-imakemdep.h +++ b/www/firefox10/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/firefox10/files/patch-config-rules.mk b/www/firefox10/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/firefox10/files/patch-config-rules.mk +++ b/www/firefox10/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/firefox10/files/patch-config_autoconf.mk.in b/www/firefox10/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/firefox10/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/firefox10/files/patch-config::mkdepend::Makefile.in b/www/firefox10/files/patch-config_mkdepend_Makefile.in index bace012a282e..bace012a282e 100644 --- a/www/firefox10/files/patch-config::mkdepend::Makefile.in +++ b/www/firefox10/files/patch-config_mkdepend_Makefile.in diff --git a/www/firefox10/files/patch-configure b/www/firefox10/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/firefox10/files/patch-configure +++ b/www/firefox10/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- 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 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -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 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/firefox10/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox10/files/patch-gfx-src-gtk-Makefile.in b/www/firefox10/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/firefox10/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/firefox10/files/patch-jsosdep b/www/firefox10/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/firefox10/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/firefox10/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox10/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/firefox10/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/firefox10/files/patch-nopangoxft b/www/firefox10/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/firefox10/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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/firefox10/files/patch-oji-threads b/www/firefox10/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox10/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ diff --git a/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 5276b54f0a1a..d3c1e463f5a0 100644 --- a/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/firefox10/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox10/files/patch-xptcall-alpha b/www/firefox10/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/firefox10/files/patch-xptcall-alpha +++ b/www/firefox10/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox10/files/patch-xptcall-ia64 b/www/firefox10/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/firefox10/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- 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/firefox10/files/patch-xptcall-sparc64 b/www/firefox10/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/firefox10/files/patch-xptcall-sparc64 +++ b/www/firefox10/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /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 diff --git a/www/firefox10/files/patch-xptcinvoke_x86_64_linux b/www/firefox10/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/firefox10/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int 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_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; diff --git a/www/firefox10/pkg-deinstall.in b/www/firefox10/pkg-deinstall.in index b9b0ca220fbc..f7ea61bf3963 100644 --- a/www/firefox10/pkg-deinstall.in +++ b/www/firefox10/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -17,9 +18,6 @@ MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/chrome/*.rdf rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions exit 0 diff --git a/www/firefox10/pkg-install.in b/www/firefox10/pkg-install.in deleted file mode 100644 index f25aa135197d..000000000000 --- a/www/firefox10/pkg-install.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -FIREFOX=${MOZDIR}/firefox-bin - -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 -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1 - -if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then - mkdir -p %%PREFIX%%/lib/browser_plugins -fi - -exit 0 diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 98f662a80a43..7d0c9a0ece3b 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -3,126 +3,46 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $ # PORTNAME= firefox -PORTVERSION= 1.0.7 -PORTREVISION= 4 +DISTVERSION= 1.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +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 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +USE_X_PREFIX= yes +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist -PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl gnomehier desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -KRB5_HOME?= /usr - -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST - -PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin +USE_GCC= 3.4+ -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +FIREFOX_ICON= ${MOZILLA}.xpm +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEWTAB "Open external links in a new tab" on -# CJK "Enable CJK font family support" off +OPTIONS= NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> - -# Enable CJK Font Familyname support -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bbs.ilc.edu.tw/~chinsan/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ \ -# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ -#PATCHFILES+= mozilla-1.7.10-cjkfamilyname-20050731.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -CONFIGURE_ENV+= WITH_SMB=yes -.endif # defined(WITH_SMB) - -CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -EXTRA_SCRIPTS= ${PORTNAME}.rb +.include "${.CURDIR}/../mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on alpha during post-build @@ -132,137 +52,36 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ - <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} +.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 - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ - -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ - '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' - -pre-configure: - @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 pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - for i in ${EXTRA_SCRIPTS}; do \ - ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ - done - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${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) - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} +# Dirty hack to make sure stuff gets removed right. + ${SORT} -r ${PLIST} > ${PLIST}.tmp + ${MV} -f ${PLIST}.tmp ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -272,32 +91,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.for i in ${EXTRA_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ - ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - @-update-desktop-database + ${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 <bsd.port.post.mk> diff --git a/www/firefox15/distinfo b/www/firefox15/distinfo index dc846093ea0d..fcf2eb8bbb61 100644 --- a/www/firefox15/distinfo +++ b/www/firefox15/distinfo @@ -1,3 +1,3 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -SHA256 (firefox-1.0.7-source.tar.bz2) = 10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/firefox15/files/firefox.desktop.in b/www/firefox15/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/firefox15/files/firefox.desktop.in +++ b/www/firefox15/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox15/files/firefox.rb b/www/firefox15/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/firefox15/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/firefox15/files/mkdistfile b/www/firefox15/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/firefox15/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/firefox15/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/firefox15/files/patch-Double.cpp b/www/firefox15/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/firefox15/files/patch-Double.cpp +++ b/www/firefox15/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox15/files/patch-browser_app_mozilla.in b/www/firefox15/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/firefox15/files/patch-browser_app_mozilla.in +++ b/www/firefox15/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- 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. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ 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` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ 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 -- # 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 -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# 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 - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ 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 firefox -+ 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 -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -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}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# 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 -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -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 --done -+# 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 - --export MRE_HOME -+# 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/firefox15/files/patch-bugzilla149334 b/www/firefox15/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox15/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/firefox15/files/patch-bugzilla243151 b/www/firefox15/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/firefox15/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/firefox15/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox15/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/firefox15/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/firefox15/files/patch-build_unix_run-mozilla.sh b/www/firefox15/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/firefox15/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox15/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## 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"} ++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"} diff --git a/www/firefox15/files/patch-config-mkdepend-imakemdep.h b/www/firefox15/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/firefox15/files/patch-config-mkdepend-imakemdep.h +++ b/www/firefox15/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/firefox15/files/patch-config-rules.mk b/www/firefox15/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/firefox15/files/patch-config-rules.mk +++ b/www/firefox15/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/firefox15/files/patch-config_autoconf.mk.in b/www/firefox15/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/firefox15/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/firefox15/files/patch-config::mkdepend::Makefile.in b/www/firefox15/files/patch-config_mkdepend_Makefile.in index bace012a282e..bace012a282e 100644 --- a/www/firefox15/files/patch-config::mkdepend::Makefile.in +++ b/www/firefox15/files/patch-config_mkdepend_Makefile.in diff --git a/www/firefox15/files/patch-configure b/www/firefox15/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/firefox15/files/patch-configure +++ b/www/firefox15/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- 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 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -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 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/firefox15/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox15/files/patch-gfx-src-gtk-Makefile.in b/www/firefox15/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/firefox15/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/firefox15/files/patch-jsosdep b/www/firefox15/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/firefox15/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/firefox15/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox15/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/firefox15/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/firefox15/files/patch-nopangoxft b/www/firefox15/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/firefox15/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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/firefox15/files/patch-oji-threads b/www/firefox15/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox15/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ diff --git a/www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 5276b54f0a1a..d3c1e463f5a0 100644 --- a/www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/firefox15/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox15/files/patch-xptcall-alpha b/www/firefox15/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/firefox15/files/patch-xptcall-alpha +++ b/www/firefox15/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox15/files/patch-xptcall-ia64 b/www/firefox15/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/firefox15/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- 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/firefox15/files/patch-xptcall-sparc64 b/www/firefox15/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/firefox15/files/patch-xptcall-sparc64 +++ b/www/firefox15/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /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 diff --git a/www/firefox15/files/patch-xptcinvoke_x86_64_linux b/www/firefox15/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/firefox15/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int 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_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; diff --git a/www/firefox15/pkg-deinstall.in b/www/firefox15/pkg-deinstall.in index b9b0ca220fbc..f7ea61bf3963 100644 --- a/www/firefox15/pkg-deinstall.in +++ b/www/firefox15/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -17,9 +18,6 @@ MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/chrome/*.rdf rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions exit 0 diff --git a/www/firefox15/pkg-install.in b/www/firefox15/pkg-install.in deleted file mode 100644 index f25aa135197d..000000000000 --- a/www/firefox15/pkg-install.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -FIREFOX=${MOZDIR}/firefox-bin - -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 -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1 - -if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then - mkdir -p %%PREFIX%%/lib/browser_plugins -fi - -exit 0 diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 98f662a80a43..7d0c9a0ece3b 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -3,126 +3,46 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $ # PORTNAME= firefox -PORTVERSION= 1.0.7 -PORTREVISION= 4 +DISTVERSION= 1.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +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 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +USE_X_PREFIX= yes +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist -PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl gnomehier desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -KRB5_HOME?= /usr - -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST - -PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin +USE_GCC= 3.4+ -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +FIREFOX_ICON= ${MOZILLA}.xpm +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEWTAB "Open external links in a new tab" on -# CJK "Enable CJK font family support" off +OPTIONS= NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> - -# Enable CJK Font Familyname support -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bbs.ilc.edu.tw/~chinsan/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ \ -# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ -#PATCHFILES+= mozilla-1.7.10-cjkfamilyname-20050731.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -CONFIGURE_ENV+= WITH_SMB=yes -.endif # defined(WITH_SMB) - -CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -EXTRA_SCRIPTS= ${PORTNAME}.rb +.include "${.CURDIR}/../mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on alpha during post-build @@ -132,137 +52,36 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ - <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} +.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 - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ - -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ - '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' - -pre-configure: - @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 pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - for i in ${EXTRA_SCRIPTS}; do \ - ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ - done - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${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) - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} +# Dirty hack to make sure stuff gets removed right. + ${SORT} -r ${PLIST} > ${PLIST}.tmp + ${MV} -f ${PLIST}.tmp ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -272,32 +91,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.for i in ${EXTRA_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ - ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - @-update-desktop-database + ${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 <bsd.port.post.mk> diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo index dc846093ea0d..fcf2eb8bbb61 100644 --- a/www/firefox36/distinfo +++ b/www/firefox36/distinfo @@ -1,3 +1,3 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -SHA256 (firefox-1.0.7-source.tar.bz2) = 10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/firefox36/files/firefox.desktop.in b/www/firefox36/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/firefox36/files/firefox.desktop.in +++ b/www/firefox36/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox36/files/firefox.rb b/www/firefox36/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/firefox36/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/firefox36/files/mkdistfile b/www/firefox36/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/firefox36/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/firefox36/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/firefox36/files/patch-Double.cpp b/www/firefox36/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/firefox36/files/patch-Double.cpp +++ b/www/firefox36/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox36/files/patch-browser_app_mozilla.in b/www/firefox36/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/firefox36/files/patch-browser_app_mozilla.in +++ b/www/firefox36/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- 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. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ 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` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ 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 -- # 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 -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# 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 - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ 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 firefox -+ 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 -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -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}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# 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 -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -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 --done -+# 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 - --export MRE_HOME -+# 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/firefox36/files/patch-bugzilla149334 b/www/firefox36/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/firefox36/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/firefox36/files/patch-bugzilla243151 b/www/firefox36/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/firefox36/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/firefox36/files/patch-build_unix_mozilla-xpcom.pc.in b/www/firefox36/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/firefox36/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/firefox36/files/patch-build_unix_run-mozilla.sh b/www/firefox36/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/firefox36/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox36/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## 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"} ++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"} diff --git a/www/firefox36/files/patch-config-mkdepend-imakemdep.h b/www/firefox36/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/firefox36/files/patch-config-mkdepend-imakemdep.h +++ b/www/firefox36/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/firefox36/files/patch-config-rules.mk b/www/firefox36/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/firefox36/files/patch-config-rules.mk +++ b/www/firefox36/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/firefox36/files/patch-config_autoconf.mk.in b/www/firefox36/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/firefox36/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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/firefox36/files/patch-config::mkdepend::Makefile.in b/www/firefox36/files/patch-config_mkdepend_Makefile.in index bace012a282e..bace012a282e 100644 --- a/www/firefox36/files/patch-config::mkdepend::Makefile.in +++ b/www/firefox36/files/patch-config_mkdepend_Makefile.in diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/firefox36/files/patch-configure +++ b/www/firefox36/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- 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 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -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 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox36/files/patch-gfx-src-gtk-Makefile.in b/www/firefox36/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/firefox36/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/firefox36/files/patch-jsosdep b/www/firefox36/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/firefox36/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/firefox36/files/patch-nopangoxft b/www/firefox36/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/firefox36/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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/firefox36/files/patch-oji-threads b/www/firefox36/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox36/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ diff --git a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 5276b54f0a1a..d3c1e463f5a0 100644 --- a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox36/files/patch-xptcall-alpha b/www/firefox36/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/firefox36/files/patch-xptcall-alpha +++ b/www/firefox36/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/firefox36/files/patch-xptcall-ia64 b/www/firefox36/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/firefox36/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- 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/firefox36/files/patch-xptcall-sparc64 b/www/firefox36/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/firefox36/files/patch-xptcall-sparc64 +++ b/www/firefox36/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /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 diff --git a/www/firefox36/files/patch-xptcinvoke_x86_64_linux b/www/firefox36/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/firefox36/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int 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_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; diff --git a/www/firefox36/pkg-deinstall.in b/www/firefox36/pkg-deinstall.in index b9b0ca220fbc..f7ea61bf3963 100644 --- a/www/firefox36/pkg-deinstall.in +++ b/www/firefox36/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -17,9 +18,6 @@ MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/chrome/*.rdf rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions exit 0 diff --git a/www/firefox36/pkg-install.in b/www/firefox36/pkg-install.in deleted file mode 100644 index f25aa135197d..000000000000 --- a/www/firefox36/pkg-install.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -FIREFOX=${MOZDIR}/firefox-bin - -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 -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1 - -if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then - mkdir -p %%PREFIX%%/lib/browser_plugins -fi - -exit 0 diff --git a/www/flock/Makefile b/www/flock/Makefile index 98f662a80a43..7d0c9a0ece3b 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -3,126 +3,46 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.27 2005/11/28 19:28:49 ahze Exp $ # PORTNAME= firefox -PORTVERSION= 1.0.7 -PORTREVISION= 4 +DISTVERSION= 1.5 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source +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 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - nspr4:${PORTSDIR}/devel/nspr \ - png:${PORTSDIR}/graphics/png \ - nss3:${PORTSDIR}/security/nss -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - +USE_X_PREFIX= yes +WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -FAKEDIR= ${WRKDIR}/fake USE_REINPLACE= yes HAS_CONFIGURE= yes -PLIST= ${WRKDIR}/plist -PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gtk20 libidl gnomehier desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mozilla -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -KRB5_HOME?= /usr - -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */nsprpub/*\ - --exclude */package/* \ - --exclude */zlib/ \ - --exclude mozilla/modules/libimg/png \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/js/src/fdlibm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST - -PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ - ${PORTNAME}-plugin +USE_GCC= 3.4+ -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +FIREFOX_ICON= ${MOZILLA}.xpm +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_SCRIPTS=S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEWTAB "Open external links in a new tab" on -# CJK "Enable CJK font family support" off +OPTIONS= NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> - -# Enable CJK Font Familyname support -#.if defined(WITH_CJK) -#PATCH_SITES+= http://bbs.ilc.edu.tw/~chinsan/ \ -# http://bsdchat.com/dist/firefly-cjk-patchset/ \ -# ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ -#PATCHFILES+= mozilla-1.7.10-cjkfamilyname-20050731.patch.gz -#PATCH_DIST_STRIP+= -p1 -#.endif - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -CONFIGURE_ENV+= WITH_SMB=yes -.endif # defined(WITH_SMB) - -CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -EXTRA_SCRIPTS= ${PORTNAME}.rb +.include "${.CURDIR}/../mozilla/Makefile.common" .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on alpha during post-build @@ -132,137 +52,36 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - post-extract:: - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@FAKEDIR@|${FAKEDIR}|' \ - -e 's|@PERL@|${PERL5}|' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ - <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - @${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 - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} -.for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} +.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 - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ - -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ - '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' - -pre-configure: - @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 pre-install: - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ - ${FAKEDIR}/bin/${PORTNAME} \ - ${FAKEDIR}/bin/${PORTNAME}-config - for i in ${EXTRA_SCRIPTS}; do \ - ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ - done - ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${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) - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ - s|${FAKEDIR}|${PREFIX}|g ; \ - s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ - ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} + ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} +# Dirty hack to make sure stuff gets removed right. + ${SORT} -r ${PLIST} > ${PLIST}.tmp + ${MV} -f ${PLIST}.tmp ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -272,32 +91,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} - cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} - ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} - cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.for i in ${EXTRA_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ - ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm - @-update-desktop-database + ${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 <bsd.port.post.mk> diff --git a/www/flock/distinfo b/www/flock/distinfo index dc846093ea0d..fcf2eb8bbb61 100644 --- a/www/flock/distinfo +++ b/www/flock/distinfo @@ -1,3 +1,3 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -SHA256 (firefox-1.0.7-source.tar.bz2) = 10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +SHA256 (firefox-1.5-source.tar.bz2) = 3cdbd0929b1f92c60b3fb27601f621975fefea23465d5253238c6e120360d36b +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/flock/files/firefox.desktop.in b/www/flock/files/firefox.desktop.in index 8d288dc574f4..509bd7b89aa0 100644 --- a/www/flock/files/firefox.desktop.in +++ b/www/flock/files/firefox.desktop.in @@ -182,8 +182,8 @@ Comment[vi]=Duyệt web Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 -Exec=firefox %U -Icon=@PORTNAME_ICON@ +Exec=firefox@FF_SUFX@ %U +Icon=@FIREFOX_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/flock/files/firefox.rb b/www/flock/files/firefox.rb deleted file mode 100644 index 69e9bacdea1e..000000000000 --- a/www/flock/files/firefox.rb +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=begin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the copyright owner nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - $Id: firefox.rb,v 1.1 2005/03/05 01:49:02 marcus Exp $ - - 2002-12-16 Alan Eldridge <alane@geeksrus.net> - -=end - -X11BIN = "/usr/X11R6/bin" -NAME = File::basename($0, ".rb") -APP_PATH = File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up." -elsif ($display = ENV["DISPLAY"]) == nil - raise "Environment variable DISPLAY not found. Giving up." -end - -if ARGV.size > 0 - if ARGV[0] == "--debug" - ARGV.shift - else - $stdin.reopen(File::open("/dev/null", "r")) - $stdout.reopen(File::open("/dev/null", "w")) - $stderr.reopen(File::open("/dev/null", "w")) - end -end - -if ARGV.size < 1 - $url = nil -else - $url = ARGV.pop - $url.sub!(/^ghelp:/, "file:") -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME != "firefox" - $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows = io.grep(%r<Firefox-bin.*>) - end -} - -if $windows.size > 0 - $id = $windows.map { - |s| s.strip.split.first - }.sort.first - $args = [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" : - "\"xfeDoCommand(openBrowser)\"") -else - $args = ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff --git a/www/flock/files/mkdistfile b/www/flock/files/mkdistfile deleted file mode 100644 index 3c3ae1744c4c..000000000000 --- a/www/flock/files/mkdistfile +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/sh -# -*-shell-script-*- -# -# mkdistfile -- maintainer's utility to make a firefox distfile -# -# Copyright (c) 2002, Alan Eldridge -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the copyright owner nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ -# -# 2002/10/21 alane@geeksrus.net -# - -ORIGDIR=$(/bin/pwd); export ORIGDIR -APPNAME=${0##*/};APPNAME=${APPNAME#-}; export APPNAME -test -z "$TMPDIR" && TMPDIR=/tmp; export TMPDIR -test -z "$HOSTNAME" && HOSTNAME=$(hostname); export HOSTNAME -warn() { echo "[$APPNAME:$$]" "****" "$@";} -status() { echo "[$APPNAME:$$]" "===>" "$@";} -error() { echo "[$APPNAME:$$]" "ERROR:" "$@";} -die() { echo "[$APPNAME:$$]" "FATAL:" "$@"; exit 1;} -unset echo_n; test "X`echo -n`" = "X-n" \ - && echo_n() { echo "$@\c"; } || echo_n() { echo -n "$@"; } -status_n() { echo_n "[$APPNAME:$$]" "===>" "$@";} -log() { local cmd=$1;shift;echo_n $(date "+%Y%m%d.%T") "";$cmd "$@";} -qexpr() { expr "$@" >/dev/null 2>&1;} -qw() { echo \""$@"\"; } -listfiles() { ls -1 ${1:+"$@"} 2>/dev/null; } -whichre() { local n=$#; local s="$1"; shift; while test $# -ge 1; do - qexpr "$s" : "$1"&& echo $(($n - $#)) && return 0; shift; done; - echo 0; return 1;} -matchre() { test $(whichre "$@") -gt 0; } -streq() { local s="$1"; shift; while test $# -ge 1; do - test "X$s" = "X$1" && return 0; shift; done; return 1;} -strupper() { - echo "$@"|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} -strlower() { - echo "$@"|tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} -chdir() { cd "$1" || die cd $(qw $1) failed; } -absdir() { chdir "$1" && pwd; } -abspath() { local p=''; case "$1" in /*);; *)p="$(pwd)/";; esac; echo "$p$1"; } -tmpfile() { mktemp -t .$APPNAME ${1:+"$@"}; } -############################################################ -# show usage and exit -############################################################ -usage() { - cat <<EOF -Usage: $APPNAME [options] [--] rev[.yyyymmdd] -Options: - -h,--help Show this help. - -V,--version Show version number. - -v,--verbose Produce more verbose output. - -x,--debug Turn on shell command tracing. - -- Stop option processing. -EOF - exit $1 -} -############################################################ -# show version and exit -############################################################ -VERSION='$Revision: 1.1 $' -VERSION=${VERSION#* }; VERSION=${VERSION% *} -version() { echo "$APPNAME $VERSION" \ - "Copyright (c) 2002 Alan Eldridge"; exit $1;} -############################################################ -# set default vars here -############################################################ -DEBUG=0 -VERBOSE=0; VFLG='' -DATETIME=$(date +%Y%m%d.%H%M) -DATE=${DATETIME%.*} -TIME=${DATETIME#*.} -############################################################ -# do command line options -############################################################ -while test $# -gt 0; do - n=1; case "$1" in - -h|--help) usage 0;; - -V|--version) version 0;; - -v|--verbose) VERBOSE=1;VFLG='-v';; - -x|--debug) set -x;DEBUG=1;; - --) shift; break;; -*) usage 1;; *) break;; - esac; shift $n -done - -############################################################ -# main(): script execution begins here -############################################################ - -test $# -eq 1 || usage 1 - -REV=$1 -test ${REV##*.} = today && REV=${REV%.*}.$DATE - -status "pruning tree..." -exfile=$(tmpfile) -cat >>$exfile <<'EOF' -^.*/CVS($|/) -^.*/macbuild($|/) -^.*/package($|/) -^.*/.cvsignore($|/) -^.*/windows($|/) -^.*/activex($|/) -^.*/os2($|/) -^.*/solaris($|/) -^.*/gc($|/) -^mozilla/apache($|/) -^mozilla/calendar($|/) -^mozilla/cck($|/) -^mozilla/chimera($|/) -^mozilla/ef($|/) -^mozilla/embed.mak($|/) -^mozilla/embed.mk($|/) -^mozilla/gconfig($|/) -^mozilla/gfx2($|/) -^mozilla/grendel($|/) -^mozilla/java($|/) -^mozilla/js2($|/) -^mozilla/mail($|/) -^mozilla/mailnews($|/) -^mozilla/mozilla($|/) -^mozilla/mozilla.kdevprj($|/) -^mozilla/mozilla.lsm($|/) -^mozilla/msgsdk($|/) -^mozilla/mstone($|/) -^mozilla/nglayout.mac($|/) -^mozilla/nunet($|/) -^mozilla/other-licenses($|/) -^mozilla/privacy($|/) -^mozilla/silentdl($|/) -^mozilla/timer($|/) -^mozilla/trex.mak($|/) -^mozilla/trex.mk($|/) -^mozilla/webtools($|/) -EOF -test -d mozilla || die "No mozilla dir here." -find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr -rm -f $exfile -status "making firefox-$REV.tar.bz2 ..." -tar -cjpf firefox-$REV.tar.bz2 mozilla -status "done." -#EOF diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in deleted file mode 100644 index 0ca3dff21f93..000000000000 --- a/www/flock/files/mozconfig.in +++ /dev/null @@ -1,82 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 -ac_add_options --enable-crypto -ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-composer -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@FAKEDIR@ -ac_add_options --x-includes=@X11BASE@/include -ac_add_options --x-libraries=@X11BASE@/lib -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --with-system-nspr -ac_add_options --with-gssapi=@KRB5_HOME@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# disable unneeded/unavailable -ac_add_options --disable-auto-deps -ac_add_options --disable-bidi -ac_add_options --disable-dtd-debug -ac_add_options --disable-jsd -ac_add_options --disable-ldap -ac_add_options --disable-pedantic -ac_add_options --disable-profilesharing -ac_add_options --disable-installer -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=all -ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs,negotiateauth" -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -if test -z "$WITH_SMB"; then - ac_add_options --disable-gnomevfs -fi # test -z "$WITH_SMB" -###################################################################### diff --git a/www/flock/files/patch-Double.cpp b/www/flock/files/patch-Double.cpp index 26a1fa56337a..06d16060503c 100644 --- a/www/flock/files/patch-Double.cpp +++ b/www/flock/files/patch-Double.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/flock/files/patch-browser_app_mozilla.in b/www/flock/files/patch-browser_app_mozilla.in index 414bc881e492..c815a4780038 100644 --- a/www/flock/files/patch-browser_app_mozilla.in +++ b/www/flock/files/patch-browser_app_mozilla.in @@ -1,6 +1,6 @@ ---- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 -@@ -29,51 +29,83 @@ +--- 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. ## @@ -123,349 +123,3 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,151 +114,221 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ 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` -- run_moz="$dist_bin/run-mozilla.sh" -- found=1 -- break -- fi -- done -- cd "$here" -+ 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 -- # 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 -- --script_args="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# 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 - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openBrowser)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ 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 firefox -+ 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 -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --if [ `expr "${_optLast}" : '.*:/.*'` -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}" --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _remote_cmd="openURL(${_optLast})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# 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 -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- exit $? -+ # an former URI, don't use openFile -+ use_openFile= # null - fi -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --pass_arg_count=0 --while [ $# -gt $pass_arg_count ] --do -- case "$1" in -- -p | --pure | -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 --done -+# 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 - --export MRE_HOME -+# 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/flock/files/patch-bugzilla149334 b/www/flock/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/www/flock/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/flock/files/patch-bugzilla243151 b/www/flock/files/patch-bugzilla243151 deleted file mode 100644 index e1a2a77acc20..000000000000 --- a/www/flock/files/patch-bugzilla243151 +++ /dev/null @@ -1,10 +0,0 @@ -Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 - ---- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 -+++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 -@@ -374,5 +374,4 @@ - status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); - if (status != PR_SUCCESS) return NS_ERROR_FAILURE; -- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); - } - diff --git a/www/flock/files/patch-build_unix_mozilla-xpcom.pc.in b/www/flock/files/patch-build_unix_mozilla-xpcom.pc.in deleted file mode 100644 index 4e982a5443e8..000000000000 --- a/www/flock/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/flock/files/patch-build_unix_run-mozilla.sh b/www/flock/files/patch-build_unix_run-mozilla.sh index c357e97ce8f9..9b72375be0d6 100644 --- a/www/flock/files/patch-build_unix_run-mozilla.sh +++ b/www/flock/files/patch-build_unix_run-mozilla.sh @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.8 2005/11/14 19:17:12 ahze Exp $ --- 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 @@ -7,7 +8,7 @@ $FreeBSD$ ## ## 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"} ++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"} diff --git a/www/flock/files/patch-config-mkdepend-imakemdep.h b/www/flock/files/patch-config-mkdepend-imakemdep.h index d8b6e0b049e1..1761d513f04f 100644 --- a/www/flock/files/patch-config-mkdepend-imakemdep.h +++ b/www/flock/files/patch-config-mkdepend-imakemdep.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 +++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 diff --git a/www/flock/files/patch-config-rules.mk b/www/flock/files/patch-config-rules.mk index db3009d37ee3..61c1b1503d4e 100644 --- a/www/flock/files/patch-config-rules.mk +++ b/www/flock/files/patch-config-rules.mk @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- config/rules.mk.orig Tue Aug 26 13:28:47 2003 +++ config/rules.mk Sun Feb 1 15:11:41 2004 diff --git a/www/flock/files/patch-config_autoconf.mk.in b/www/flock/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/www/flock/files/patch-config_autoconf.mk.in @@ -0,0 +1,18 @@ +--- 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 index bace012a282e..bace012a282e 100644 --- a/www/flock/files/patch-config::mkdepend::Makefile.in +++ b/www/flock/files/patch-config_mkdepend_Makefile.in diff --git a/www/flock/files/patch-configure b/www/flock/files/patch-configure index 9e60372adb33..923cf5065f18 100644 --- a/www/flock/files/patch-configure +++ b/www/flock/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- 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 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -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 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp index 0a2fa7daac00..1afef24a4ef0 100644 --- a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ b/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h index 809531f726bc..80dd4ba7a8e8 100644 --- a/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ b/www/flock/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/flock/files/patch-gfx-src-gtk-Makefile.in b/www/flock/files/patch-gfx-src-gtk-Makefile.in deleted file mode 100644 index ff8b699841a3..000000000000 --- a/www/flock/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/flock/files/patch-jsosdep b/www/flock/files/patch-jsosdep deleted file mode 100644 index 7f54845657ed..000000000000 --- a/www/flock/files/patch-jsosdep +++ /dev/null @@ -1,9 +0,0 @@ ---- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 -+++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 -@@ -102,5 +102,5 @@ - #define JS_HAVE_LONG_LONG - --#elif defined(FREEBSD) -+#elif defined(FREEBSD) || defined(__FreeBSD__) - #define JS_HAVE_LONG_LONG - diff --git a/www/flock/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/flock/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c deleted file mode 100644 index 9e58b51864f2..000000000000 --- a/www/flock/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c +++ /dev/null @@ -1,12 +0,0 @@ ---- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 -+++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 -@@ -168,7 +168,9 @@ - - drawingarea = MOZ_DRAWINGAREA(object); - -+ gdk_window_set_user_data(drawingarea->inner_window, NULL); - gdk_window_destroy(drawingarea->inner_window); -+ gdk_window_set_user_data(drawingarea->clip_window, NULL); - gdk_window_destroy(drawingarea->clip_window); - - (* parent_class->finalize) (object); diff --git a/www/flock/files/patch-nopangoxft b/www/flock/files/patch-nopangoxft new file mode 100644 index 000000000000..5a11c8c4864e --- /dev/null +++ b/www/flock/files/patch-nopangoxft @@ -0,0 +1,20 @@ +--- 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-oji-threads b/www/flock/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/flock/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ 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 index 5276b54f0a1a..d3c1e463f5a0 100644 --- 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 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/flock/files/patch-xptcall-alpha b/www/flock/files/patch-xptcall-alpha index 6052f3ecf6dc..e89460e6e544 100644 --- a/www/flock/files/patch-xptcall-alpha +++ b/www/flock/files/patch-xptcall-alpha @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- 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 diff --git a/www/flock/files/patch-xptcall-ia64 b/www/flock/files/patch-xptcall-ia64 deleted file mode 100644 index 65e17ebb6c12..000000000000 --- a/www/flock/files/patch-xptcall-ia64 +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - ---- 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/flock/files/patch-xptcall-sparc64 b/www/flock/files/patch-xptcall-sparc64 index 13745acf9f4f..7d0faf06fa54 100644 --- a/www/flock/files/patch-xptcall-sparc64 +++ b/www/flock/files/patch-xptcall-sparc64 @@ -1,4 +1,5 @@ $FreeBSD$ + $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.7 2005/11/11 00:15:48 ahze Exp $ --- /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 diff --git a/www/flock/files/patch-xptcinvoke_x86_64_linux b/www/flock/files/patch-xptcinvoke_x86_64_linux deleted file mode 100644 index 724e24089803..000000000000 --- a/www/flock/files/patch-xptcinvoke_x86_64_linux +++ /dev/null @@ -1,17 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 -@@ -82,11 +82,11 @@ - PRUint64 value; - -- for (uint32 i = 0; i < paramCount; i++, s++) { -+ for (unsigned int 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_FLOAT: -+ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; - case nsXPTType::T_I8: value = s->val.i8; break; - case nsXPTType::T_I16: value = s->val.i16; break; diff --git a/www/flock/pkg-deinstall.in b/www/flock/pkg-deinstall.in index b9b0ca220fbc..f7ea61bf3963 100644 --- a/www/flock/pkg-deinstall.in +++ b/www/flock/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/www/firefox/pkg-deinstall.in,v 1.8 2005/11/22 21:29:14 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) @@ -17,9 +18,6 @@ MOZDIR=%%MOZDIR%% rm -rf ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/chrome/*.rdf rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions exit 0 diff --git a/www/flock/pkg-install.in b/www/flock/pkg-install.in deleted file mode 100644 index f25aa135197d..000000000000 --- a/www/flock/pkg-install.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -FIREFOX=${MOZDIR}/firefox-bin - -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 -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1 - -if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then - mkdir -p %%PREFIX%%/lib/browser_plugins -fi - -exit 0 diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 1e97fdab459d..8d71725431ac 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,288 +3,119 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.23 2005/10/27 00:08:39 marcus Exp $ +# $MCom: ports/www/mozilla/Makefile,v 1.31 2005/11/24 01:43:42 ahze Exp $ # PORTNAME= mozilla PORTVERSION= 1.7.12 -PORTREVISION?= 1 +PORTREVISION?= 3 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} +DISTFILES= ${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \ + libart_lgpl-1${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png - -WRKSRC= ${WRKDIR}/${PORTNAME} -MOZILLA?= mozilla -MOZ_SUFX?= -LATEST_LINK= ${MOZILLA} -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/*\ - --exclude */package/* \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST -USE_GNOME= gtk20 libidl desktopfileutils +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/dist/bin +USE_GMAKE= yes USE_BZIP2= yes USE_X_PREFIX= yes -USE_PERL5= yes -USE_ICONV= yes -USE_GMAKE= yes WANT_GNOME= yes USE_REINPLACE= yes HAS_CONFIGURE= yes MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin ALL_TARGET= default -FAKEDIR= ${WRKDIR}/fake -MOZ_PIS_DIR= ${FAKEDIR}/lib/${MOZILLA}/init.d -MOZ_PIS_SCRIPTS= # No default -CONFIGURE_ARGS= \ - --disable-auto-deps \ - --enable-chrome-format=jar \ - --disable-cpp-exceptions \ - --disable-cpp-rtti \ - --enable-crypto \ - --disable-gtktest \ - --disable-freetypetest \ - --disable-installer \ - --disable-glibtest \ - --enable-double-buffer \ - --enable-mathml \ - --disable-md \ - --disable-pedantic \ - --disable-bidi \ - --disable-plaintext-editor-only \ - --enable-svg \ - --disable-tests \ - --disable-xterm-updates \ - --enable-xinerama \ - --with-system-zlib \ - --with-system-jpeg=${LOCALBASE} \ - --with-system-png=${LOCALBASE} \ - --with-gssapi=/usr \ - --prefix=${FAKEDIR} \ - --with-pthreads \ - --enable-default-toolkit=gtk2 -PLIST= ${WRKDIR}/pkg-plist -MOZ_EXTENSIONS= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -FREETYPE_LIB= libfreetype.so.9 -PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ - mozilla-nspr mozilla-nss mozilla-plugin -# JPI stuff. List paths to Java Plug-ins here in the order to try. -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so +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 -OPTIONS=XFT "Enable Xft font anti-aliasing" on \ - CALENDAR "Enable the Calendar module" off \ +OPTIONS=CALENDAR "Enable the Calendar module" off \ MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ - DEBUG "Enable debugging (i.e. gdb) support" off \ 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 \ - OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ - SMB "Enable smb:// URI support via gnomevfs" off -# CAIRO_RENDER "Enable SVG rendering with Cairo" off + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> -#.if !defined(WITH_CAIRO_RENDER) -DISTFILES+= libart_lgpl-1${EXTRACT_SUFX}:local -#.endif - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= core dumps on ${ARCH} during post-build -.endif - -.if exists(${LOCALBASE}/include/freetype/freetype.h) -BROKEN= "You must upgrade your freetype port to 1.3.1_2 or higher before \ - installing Mozilla. If you have 1.3.1_2 installed, please remove \ - ${LOCALBASE}/include/freetype, then build Mozilla" -.endif - -.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ - defined(WITHOUT_COMPOSER)) -BROKEN= "Calendar requires Composer and Mailnews support." -.endif - -#.if defined(WITH_CAIRO_RENDER) -#LIB_DEPENDS+= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo -#BUILD_DEPENDS+= ${LOCALBASE}/include/cairo/cairo-xlib.h:${PORTSDIR}/graphics/cairo - -#CONFIGURE_ARGS+= --enable-svg-renderer-cairo \ -# --disable-svg-renderer-libart -#CONFIGURE_ENV+= MOZ_SVG_RENDERER_CAIRO=1 -#.else -CONFIGURE_ARGS+= --enable-svg-renderer-libart \ - --disable-svg-renderer-cairo -CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 -MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 +# libart patches .if ${OSVERSION} < 500035 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp .else EXTRA_PATCHES+= ${FILESDIR}/extra-patch2-nsSVGLibartGlyphMetricsFT.cpp .endif -#.endif -.if !defined(WITHOUT_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -CONFIGURE_ARGS+=--enable-xft -.if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) -BROKEN= "Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \ - illegibly. Please remove the mozilla-fonts package." -.endif -.else -CONFIGURE_ARGS+=--disable-xft -.endif +LATEST_LINK= ${MOZILLA} -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug \ - --disable-strip -.else -CONFIGURE_ARGS+=--disable-debug \ - --enable-strip +.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 +IGNORE= core dumps on ${ARCH} during post-build .endif -# LDAP is only used by mail and news so disable both together +.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ + defined(WITHOUT_COMPOSER)) +BROKEN= "Calendar requires Composer and Mailnews support." +.endif .if defined(WITHOUT_MAILNEWS) -CONFIGURE_ARGS+= --disable-ldap --disable-mailnews +MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) -CONFIGURE_ARGS+= --disable-ldap --enable-mailnews +MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else -CONFIGURE_ARGS+= --enable-ldap --enable-mailnews +MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .endif + .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif -.if !defined(WITHOUT_XMLTERM) + +.if !defined(WITHOUT_XMLTERM) && defined(WITH_JAVASCRIPT_DEBUGGER) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm .endif -CONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} .if defined(WITH_JAVASCRIPT_DEBUGGER) -CONFIGURE_ARGS+= --enable-jsd \ - --enable-dtd-debug +MOZ_OPTIONS+= --enable-jsd \ + --enable-dtd-debug .else -CONFIGURE_ARGS+= --disable-jsd \ - --disable-dtd-debug +MOZ_OPTIONS+= --disable-jsd \ + --disable-dtd-debug .endif .if defined(WITH_CALENDAR) -CONFIGURE_ARGS+= --enable-calendar +MOZ_OPTIONS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) -CONFIGURE_ARGS+= --disable-composer -.endif - -#.if ${ARCH} == "i386" -#CONFIGURE_ARGS+= --enable-reorder -#.endif - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -.else -CONFIGURE_ARGS+=--disable-gnomevfs -.endif - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS+= -O2 -CONFIGURE_ARGS+= --enable-optimize=-O2 +MOZ_OPTIONS+= --disable-composer .endif post-patch: - @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g' \ - ${WRKSRC}/build/unix/mozilla-config.in - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ - ${WRKSRC}/config/autoconf.mk.in @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ ${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|/usr/X11R6|${X11BASE}|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/nsprpub/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/nsprpub/configure \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp @${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 - @${REINPLACE_CMD} -E -e 's|libfreetype\.so\.[0-9]+|${FREETYPE_LIB}|g' \ - ${WRKSRC}/modules/libpref/src/init/all.js - @for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ - s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ - ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ - done - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g ; \ - s|%%PREFIX%%|${PREFIX}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ < ${FILESDIR}/mozilla.desktop.in > \ ${WRKDIR}/mozilla.desktop -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - -pre-configure: - @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 pre-install: - ${RM} -rf ${FAKEDIR} ${PLIST} - ${TOUCH} -f ${PLIST} - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - ${MKDIR} ${MOZ_PIS_DIR} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${FAKEDIR}/bin/mozilla \ - ${FAKEDIR}/bin/mozilla-config - if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ - ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ - fi - if [ "${MOZILLA}" != "mozilla" ]; then \ - ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} ; \ - fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -293,56 +124,13 @@ pre-install: fi; \ done; \ fi - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST} - ${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor .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} - cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/mozilla && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${MOZILLA}-${PORTVERSION} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${MOZILLA}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${MOZILLA}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${MOZILLA} - ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/lib/${MOZILLA} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla-config ${PREFIX}/lib/${MOZILLA} - cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/mozilla ${PREFIX}/bin - if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ - ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ - fi - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -352,29 +140,12 @@ do-install: fi; \ done; \ fi - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${WRKSRC}/build/unix/$${pcfile}.pc; \ - ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ - done - -${RM} -fr ${PREFIX}/include/${MOZILLA} - ${MKDIR} ${PREFIX}/include/${MOZILLA} - ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} - cd ${FAKEDIR}/include/mozilla && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \ ${PREFIX}/share/applications - ${MKDIR} ${PREFIX}/share/idl/${MOZILLA} - cd ${FAKEDIR}/share/idl/${MOZILLA}-${PORTVERSION} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA} post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - @-update-desktop-database +.include "${.CURDIR}/Makefile.common" .include <bsd.port.post.mk> diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common new file mode 100644 index 000000000000..ecbfe0ec8def --- /dev/null +++ b/www/mozilla/Makefile.common @@ -0,0 +1,357 @@ +# 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.17 2005/11/29 08:40:08 ahze Exp $ + +# Ports can use the following: +# +# NOGECKO_INSTALL +# NOGECKO_PLIST Do not auto-create plist +# NOMOZCONFIG Use CONFIGURE_ARGS instead of .mozconfig +# +# MOZILLA_PLIST_DIRS Listing of directories to create plist and/or +# install +# MOZ_PIS_SCRIPTS List scripts listed in ${FILESDIR} to filter +# through MOZCONFIG_SED and install with mozilla +# PIS scripts. +# MOZ_SED_ARGS Add or replace to MOZ_SED_ARGS +# +# MOZ_OPTIONS Add more configure arguments to .mozconfig +# MOZ_MK_OPTIONS Add more make arguments to .mozconfig +# MOZ_EXPORT Add export variables to .mozconfig +# MOZ_EXTENSIONS Override "default" extensions +# MOZ_GRAPHICS Override "default" graphics decoders +# MOZ_PROTOCOLS Override "default" protocols +# +# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can +# be set to a generic mozconfig included with +# the port + +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 + +OPTIONS+= DEBUG "Build a debugging image" off \ + LOGGING "Enable additional log messages" off \ + OPTIMIZED_CFLAGS "Enable some additional optimizations" off + +MAINTAINER?= gnome@FreeBSD.org + +MOZILLA?= ${PORTNAME} +MOZILLA_VER?= ${PORTVERSION} +MOZ_RPATH?= ${MOZILLA} +USE_GNOME+= gtk20 libidl desktopfileutils +USE_ICONV= yes +USE_PERL5_BUILD=yes +USE_X_PREFIX= yes +USE_REINPLACE= yes + +WRKSRC?= ${WRKDIR}/mozilla +FAKEDIR?= ${WRKDIR}/fake +PLIST?= ${WRKDIR}/plist + +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 + +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/js/src/fdlibm \ + --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 + +# 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} +#MOZ_EXPORT+= CPPFLAGS=${CPPFLAGS} \ +# CFLAGS=$$CFLAGS \ +# LIBS=$$LIBS \ +# LDFLAGS=$$LDFLAGS \ +# CONFIG_SH=$$SH \ +# XP_UNIX=1 \ +# PERL=$$PERL5 + +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} +WITH_OPTIMIZE?= -O2 +.else +CFLAGS:= ${CFLAGS:N-O*:N-m*} -O +WITH_OPTIMIZE?= -O +.endif + +.if defined(WITH_SMB) +USE_GNOME+= gnomevfs2 +MOZ_OPTIONS+= --disable-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_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|%%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(${.CURDIR}/pkg-install.in) + @${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL} +.endif +.if exists(${.CURDIR}/pkg-deinstall.in) + @${MOZCONFIG_SED} < ${.CURDIR}/pkg-deinstall.in > ${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}/gfx/src/gtk/nsDeviceContextSpecG.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-build: gecko-post-build + +gecko-post-build: + @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \ + ${WRKSRC}/build/unix/*.pc + +pre-install: gecko-pre-install gecko-moz-pis-pre-install gecko-create-plist + +gecko-pre-install: + @${DO_NADA} # Empty for now + +gecko-create-plist: +.if !defined(NOGECKO_PLIST) + @${RM} -rf ${FAKEDIR} ${PLIST} + @${TOUCH} -f ${PLIST} + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} + @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ + ${FAKEDIR}/bin/${MOZILLA} \ + ${FAKEDIR}/bin/${MOZILLA}-config + ${RM} -f ${FAKEDIR}/bin/*.bak +# Create the plist + ${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} +.if ${MOZILLA_PLIST_DIRS:Mshare/idl}!="" + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}" >> ${PLIST} +.endif +.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(PAKCAGE_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 new file mode 100644 index 000000000000..8a31aebc541a --- /dev/null +++ b/www/mozilla/bsd.gecko.mk @@ -0,0 +1,152 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.9 2005/11/29 20:30:06 adamw 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 shoud use the following: +# +# USE_GECKO= mozilla 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. +# +# Your port should check the ${GECKO} variable to see which backend +# has been chosen. +# +# Example: +# USE_GECKO= mozilla firefox seamonkey +# post-patch: +# .if ${GECKO}=="seamonkey" +# @${REINPALCE_CMD} -e 's|mozilla-|seamonkey-|' \ +# ${WRKSRC}/configure +# .endif + + +_GECKO_ALL= firefox mozilla nvu seamonkey sunbird thunderbird + +_NEW_GCC_GECKO= firefox seamonkey sunbird + +sunbird_PORTSDIR= deskutils + +thunderbird_PORTSDIR= mail + +.for gecko in ${_GECKO_ALL} +${gecko}_PORTSDIR?= www +${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} +${gecko}_PLIST?= ${X11BASE}/lib/${gecko}/libgtkembedmoz.so +.endfor + +# Figure out which mozilla to use +# Weed out bad options in USE_GECKO +.for badgecko in ${USE_GECKO} +. if ${_GECKO_ALL:M${badgecko}}!="" +GOOD_USE_GECKO+= ${badgecko} +. 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 + +# Use new gcc on new geckos +.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" +. if ${_NEW_GCC_GECKO:M${GECKO}}!="" +USE_GCC?= 3.4+ +. endif +.endif + +# Generic defines +BROWSER_LINUX_PLUGINS_DIR?= ${X11BASE}/lib/browser_linux_plugins +BROWSER_PLUGINS_DIR?= ${X11BASE}/lib/browser_plugins + +GECKO_CONFIG?= ${X11BASE}/bin/${GECKO}-config +XPIDL?= ${X11BASE}/lib/${GECKO}/xpidl +XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` + +.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" +BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} +RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} +.else +BROKEN="Incorrect use of 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} " 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} "" + +#.endif # end it all +.endif +# HERE THERE BE TACOS diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in new file mode 100644 index 000000000000..9af187e48d2f --- /dev/null +++ b/www/mozilla/files/mozconfig-generic.in @@ -0,0 +1,8 @@ +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/patch-config_autoconf.mk.in b/www/mozilla/files/patch-config_autoconf.mk.in index 9c7c471bec3c..c4fa0b516d1d 100644 --- a/www/mozilla/files/patch-config_autoconf.mk.in +++ b/www/mozilla/files/patch-config_autoconf.mk.in @@ -5,7 +5,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/mozilla%%HEADERS_SUFX%% ++includedir = @includedir@/%%MOZILLA%% libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ diff --git a/www/firefox-esr/files/patch-gfx-src-gtk-Makefile.in b/www/mozilla/files/patch-gfx-src-gtk-Makefile.in index ff8b699841a3..ff8b699841a3 100644 --- a/www/firefox-esr/files/patch-gfx-src-gtk-Makefile.in +++ b/www/mozilla/files/patch-gfx-src-gtk-Makefile.in diff --git a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoCanvas.cpp b/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoCanvas.cpp deleted file mode 100644 index bb55059a04e0..000000000000 --- a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoCanvas.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp.orig Thu Mar 10 12:22:22 2005 -+++ layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp Thu Mar 10 12:22:59 2005 -@@ -50,6 +50,7 @@ - #include "nsRenderingContextGTK.h" - #include <gdk/gdkx.h> - #include <cairo.h> -+#include <cairo-xlib.h> - - /** - * \addtogroup cairo_renderer Cairo Rendering Engine diff --git a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoGlyphMetrics.cpp b/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoGlyphMetrics.cpp deleted file mode 100644 index 9e5f793f1706..000000000000 --- a/www/mozilla/files/patch-layout_svg_renderer_src_cairo_nsSVGCairoGlyphMetrics.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp.orig Thu Mar 10 12:24:44 2005 -+++ layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp Thu Mar 10 12:25:25 2005 -@@ -51,6 +51,7 @@ - #include "nsSVGTypeCIDs.h" - #include "nsIComponentManager.h" - #include <cairo.h> -+#include <stdlib.h> - - /** - * \addtogroup gdiplus_renderer Cairo Rendering Engine diff --git a/www/mozilla/files/patch-libm b/www/mozilla/files/patch-libm new file mode 100644 index 000000000000..7de64b2a5068 --- /dev/null +++ b/www/mozilla/files/patch-libm @@ -0,0 +1,25 @@ +--- 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-nsprpub-pr-include-md-_pth.h b/www/mozilla/files/patch-nsprpub-pr-include-md-_pth.h deleted file mode 100644 index 1f8159c70b1f..000000000000 --- a/www/mozilla/files/patch-nsprpub-pr-include-md-_pth.h +++ /dev/null @@ -1,11 +0,0 @@ ---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004 -+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004 -@@ -90,7 +90,7 @@ - #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init - #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy - #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) - #if defined(DARWIN) - #define _PT_PTHREAD_CONDATTR_INIT(x) 0 - #else diff --git a/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c b/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c deleted file mode 100644 index f9949d6d9c96..000000000000 --- a/www/mozilla/files/patch-nsprpub-pr-src-io-prprf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004 -+++ nsprpub/pr/src/io/prprf.c Fri Mar 19 15:26:55 2004 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__x86_64__)) -+#if defined(__amd64__) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg deleted file mode 100644 index b66fea57cd33..000000000000 --- a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg +++ /dev/null @@ -1,124 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig Sat Nov 15 15:36:12 2003 -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 13:36:44 2004 -@@ -91,7 +91,7 @@ - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - --#elif defined(__alpha) -+#elif defined(__alpha__) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -@@ -138,8 +138,7 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - --#elif defined(__sparc__) -- -+#elif defined(__sparc64__) - #undef IS_LITTLE_ENDIAN - #define IS_BIG_ENDIAN 1 - #define HAVE_LONG_LONG -@@ -185,6 +184,102 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__ia64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__amd64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS - #else - - #error "Unknown CPU architecture" diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h deleted file mode 100644 index fca34102ffb0..000000000000 --- a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 18:36:13 2003 -+++ nsprpub/pr/include/md/_freebsd.h Sun Dec 14 11:40:08 2003 -@@ -50,6 +50,10 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" -+#elif defined(__ia64__) -+#define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__amd64__) -+#define _PR_SI_ARCHITECTURE "amd64" - #else - #error "Unknown CPU architecture" - #endif diff --git a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c deleted file mode 100644 index 08346f235416..000000000000 --- a/www/mozilla/files/patch-nsprpub::pr::src::pthreads::ptio.c +++ /dev/null @@ -1,29 +0,0 @@ ---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003 -+++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003 -@@ -189,7 +189,7 @@ - #endif - #endif - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - static PRBool _pr_ipv6_v6only_on_by_default; - /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ - #ifndef IPV6_V6ONLY -@@ -1154,7 +1154,7 @@ - _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); - PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option - * is turned on by default, contrary to what RFC 3493, Section - * 5.3 says. So we have to turn it off. Find out whether we -@@ -3462,7 +3462,7 @@ - if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); - else - { --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) - { - int on = 0; diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index 6b72f3f007ae..d1cb9f9f7ece 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -1,15 +1,15 @@ ---- configure.orig Tue Apr 20 21:39:17 2004 -+++ configure Thu Apr 29 14:01:52 2004 -@@ -9362,7 +9362,7 @@ +--- 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 9368 "configure" + #line 9374 "configure" #include "confdefs.h" -@@ -9393,7 +9393,7 @@ +@@ -9399,7 +9399,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9403,7 +9403,7 @@ +@@ -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 9409 "configure" + #line 9415 "configure" #include "confdefs.h" -@@ -9434,7 +9434,7 @@ +@@ -9440,7 +9440,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -36,7 +36,22 @@ else echo "$ac_t""no" 1>&6 fi -@@ -12298,9 +12298,9 @@ +@@ -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 @@ diff --git a/www/mozilla/files/patch-sysnspr b/www/mozilla/files/patch-sysnspr new file mode 100644 index 000000000000..19e2703b4b38 --- /dev/null +++ b/www/mozilla/files/patch-sysnspr @@ -0,0 +1,21 @@ +--- 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 new file mode 100644 index 000000000000..d854cabc053a --- /dev/null +++ b/www/mozilla/files/patch-sysnss @@ -0,0 +1,178 @@ +--- 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-xpcom::reflect::xptcall::src::md::unix::Makefile.in b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in index dbdc47b6f8e4..dbdc47b6f8e4 100644 --- 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 diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in index b9457eff010c..7d0d70f5da02 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.7 2005/07/13 08:45:47 ahze Exp $ +# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.9 2005/11/13 19:07:58 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/www/mozilla/pkg-descr b/www/mozilla/pkg-descr index d91ac6c1d832..37a7a64039b1 100644 --- a/www/mozilla/pkg-descr +++ b/www/mozilla/pkg-descr @@ -7,7 +7,4 @@ 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. -This version has been built with GTK+-2 bindings for use with applications -such as Galeon 2. - WWW: http://www.mozilla.org/ diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in index 2b196acaf42c..057d80bf594b 100644 --- a/www/mozilla/pkg-install.in +++ b/www/mozilla/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/www/mozilla/pkg-install.in,v 1.7 2005/07/13 08:45:47 ahze Exp $ +# $MCom: ports/www/mozilla/pkg-install.in,v 1.9 2005/11/13 19:07:58 ahze Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/www/seamonkey/files/mozconfig-generic.in b/www/seamonkey/files/mozconfig-generic.in new file mode 100644 index 000000000000..9af187e48d2f --- /dev/null +++ b/www/seamonkey/files/mozconfig-generic.in @@ -0,0 +1,8 @@ +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@" |