- Update firefox to 1.5
- Add Makefile.common
o A new build/install system for gecko ports, Makefile.common
includes many generic routines and common tasks.
o Fix ld-run-path in all gecko's by using -Wl,-rpath,${moz_libdir}
thus removing the need to have a startup script for ports that
depend on gecko. [2]
o Use system libm, nss, nspr in all gecko ports
- Add bsd.gecko.mk
o This is the predecessor to WITH_MOZILLA=[mozilla|firefox|...]
with a more robust way of detecting a gecko a end user wishs to
use.
o 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.
Port Makefile example:
USE_GECKO=firefox mozilla seamonkey thunderbird
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
End user example:
WITH_GECKO=seamonkey firefox
We highly recommend moving away from using WITH_MOZILLA and switching to
USE/WITH_GECKO.
PR: 89052 [2]
Submitted by: vs [2]
Obtained from: www/firefox
Thanks to: adamw, marcus, and mezz for ideas, bug squashing, and more
sajd from irc.freenode.org/#FreeBSD-Gnome for
pointing out many bugs
This commit is contained in:
Michael Johnson
parent
e8f2893f6e
commit
36353c589f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=149945
239 changed files with 1871 additions and 10697 deletions
|
|
@ -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+
|
||||
WANT_GNOME= yes
|
||||
ALL_TARGET= default
|
||||
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
|
||||
HAS_CONFIGURE= yes
|
||||
USE_BZIP2= yes
|
||||
USE_GMAKE= yes
|
||||
USE_ICONV= yes
|
||||
USE_PERL5= yes
|
||||
USE_REINPLACE= yes
|
||||
HAS_CONFIGURE= yes
|
||||
NO_MTREE= yes
|
||||
PLIST= ${WRKDIR}/plist
|
||||
ALL_TARGET= default
|
||||
USE_GNOME= gtk20 libidl
|
||||
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
|
||||
FAKEDIR= ${WRKDIR}/fake
|
||||
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>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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"}
|
||||
|
|
|
|||
18
mail/thunderbird-devel/files/patch-config_autoconf.mk.in
Normal file
18
mail/thunderbird-devel/files/patch-config_autoconf.mk.in
Normal file
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
25
mail/thunderbird-devel/files/patch-libm
Normal file
25
mail/thunderbird-devel/files/patch-libm
Normal file
|
|
@ -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
|
||||
20
mail/thunderbird-devel/files/patch-nopangoxft
Normal file
20
mail/thunderbird-devel/files/patch-nopangoxft
Normal file
|
|
@ -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);
|
||||
|
|
@ -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
|
||||
178
mail/thunderbird-devel/files/patch-sysnss
Normal file
178
mail/thunderbird-devel/files/patch-sysnss
Normal file
|
|
@ -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);
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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"}
|
||||
|
|
|
|||
18
mail/thunderbird-esr/files/patch-config_autoconf.mk.in
Normal file
18
mail/thunderbird-esr/files/patch-config_autoconf.mk.in
Normal file
|
|
@ -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
|
||||
|
||||
|
|
@ -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=""
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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"}
|
||||
|
|
|
|||
18
mail/thunderbird/files/patch-config_autoconf.mk.in
Normal file
18
mail/thunderbird/files/patch-config_autoconf.mk.in
Normal file
|
|
@ -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
|
||||
|
||||
|
|
@ -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=""
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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"}
|
||||
|
|
|
|||
18
mail/thunderbird3/files/patch-config_autoconf.mk.in
Normal file
18
mail/thunderbird3/files/patch-config_autoconf.mk.in
Normal file
|
|
@ -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
|
||||
|
||||
|
|
@ -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=""
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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>)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
USE_GCC= 3.4+
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
|
||||
SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
|
||||
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
|
||||
|
||||
PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \
|
||||
${PORTNAME}-plugin
|
||||
|
||||
JPI_LIST?=\
|
||||
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
|
||||
${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
|
||||
|
||||
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
|
||||
|
||||
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}
|
||||
.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
|
||||
.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
|
||||
@${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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
@ -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}
|
||||
|
|
@ -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"}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
18
www/firefox-esr/files/patch-config_autoconf.mk.in
Normal file
18
www/firefox-esr/files/patch-config_autoconf.mk.in
Normal file
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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);
|
||||
20
www/firefox-esr/files/patch-nopangoxft
Normal file
20
www/firefox-esr/files/patch-nopangoxft
Normal file
|
|
@ -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);
|
||||
|
|
@ -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: */
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
USE_GCC= 3.4+
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
|
||||
SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
|
||||
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
|
||||
|
||||
PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \
|
||||
${PORTNAME}-plugin
|
||||
|
||||
JPI_LIST?=\
|
||||
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
|
||||
${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
|
||||
|
||||
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
|
||||
|
||||
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}
|
||||
.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
|
||||
.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
|
||||
@${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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
@ -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}
|
||||
|
|
@ -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"}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
18
www/firefox/files/patch-config_autoconf.mk.in
Normal file
18
www/firefox/files/patch-config_autoconf.mk.in
Normal file
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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);
|
||||
20
www/firefox/files/patch-nopangoxft
Normal file
20
www/firefox/files/patch-nopangoxft
Normal file
|
|
@ -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);
|
||||
|
|
@ -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: */
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
USE_GCC= 3.4+
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
|
||||
SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
|
||||
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
|
||||
|
||||
PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \
|
||||
${PORTNAME}-plugin
|
||||
|
||||
JPI_LIST?=\
|
||||
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
|
||||
${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
|
||||
|
||||
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
|
||||
|
||||
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}
|
||||
.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
|
||||
.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
|
||||
@${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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
######################################################################
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue