sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Remove WITH_NEW_ICON knob

Browse source 
- Mozilla license team has approved the FreeBSD Gnome team to
  use official branding for firefox and thunderbird [1]
  o Add  --enable-official-branding to mozconfig
  o Install official thunderbird/firefox icon as default.xpm icon
- Fix error when running firefox/thunderbird -v [2]
- Bump PORTREVISION

References:
	http://www.mozilla.org/foundation/licensing.html [1]
	http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt [1]
PR:		ports/75262 [2]
Submitted by:	girgen [2]
This commit is contained in:
Michael Johnson 2004-12-28 00:51:58 +00:00
parent 5387a16e23
commit b18bfe2076
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=125299
39 changed files with 316 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mail/thunderbird-devel/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source
@ -50,8 +51,7 @@ THUNDERBIRD_ICON_SRC= ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
OPTIONS= DEBUG "Build a debugging image" off \ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on
NEW_ICON "Install the new Thunderbird branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -201,15 +201,9 @@ post-install:
${LOCAL_PREFIX}/bin/thunderbird-config ${LOCAL_PREFIX}/bin/thunderbird-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g'
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON} ${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
mail/thunderbird-devel/files/mozconfig.in
View file

@ -18,6 +18,9 @@ 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-necko-protocols=http,file,jar,viewsource,res,data
ac_add_options --enable-image-decoders=default,-xbm ac_add_options --enable-image-decoders=default,-xbm
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
mail/thunderbird-devel/files/patch-mail_app_mozilla.in
View file

@ -1,5 +1,21 @@
--- mail/app/mozilla.in.orig Thu Nov 11 23:14:17 2004 --- mail/app/mozilla.in.orig Sat Jul 24 19:58:06 2004
+++ mail/app/mozilla.in Thu Nov 11 23:15:43 2004 +++ mail/app/mozilla.in Mon Dec 27 18:40:04 2004
@@ -167,12 +167,12 @@
done #others arg
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
@@ -218,12 +218,31 @@ @@ -218,12 +218,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2

14
mail/thunderbird-esr/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source
@ -50,8 +51,7 @@ THUNDERBIRD_ICON_SRC= ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
OPTIONS= DEBUG "Build a debugging image" off \ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on
NEW_ICON "Install the new Thunderbird branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -201,15 +201,9 @@ post-install:
${LOCAL_PREFIX}/bin/thunderbird-config ${LOCAL_PREFIX}/bin/thunderbird-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g'
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON} ${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
mail/thunderbird-esr/files/mozconfig.in
View file

@ -18,6 +18,9 @@ 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-necko-protocols=http,file,jar,viewsource,res,data
ac_add_options --enable-image-decoders=default,-xbm ac_add_options --enable-image-decoders=default,-xbm
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
mail/thunderbird-esr/files/patch-mail_app_mozilla.in
View file

@ -1,5 +1,21 @@
--- mail/app/mozilla.in.orig Thu Nov 11 23:14:17 2004 --- mail/app/mozilla.in.orig Sat Jul 24 19:58:06 2004
+++ mail/app/mozilla.in Thu Nov 11 23:15:43 2004 +++ mail/app/mozilla.in Mon Dec 27 18:40:04 2004
@@ -167,12 +167,12 @@
done #others arg
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
@@ -218,12 +218,31 @@ @@ -218,12 +218,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2

14
mail/thunderbird/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source
@ -50,8 +51,7 @@ THUNDERBIRD_ICON_SRC= ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
OPTIONS= DEBUG "Build a debugging image" off \ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on
NEW_ICON "Install the new Thunderbird branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -201,15 +201,9 @@ post-install:
${LOCAL_PREFIX}/bin/thunderbird-config ${LOCAL_PREFIX}/bin/thunderbird-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g'
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON} ${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
mail/thunderbird/files/mozconfig.in
View file

@ -18,6 +18,9 @@ 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-necko-protocols=http,file,jar,viewsource,res,data
ac_add_options --enable-image-decoders=default,-xbm ac_add_options --enable-image-decoders=default,-xbm
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
mail/thunderbird/files/patch-mail_app_mozilla.in
View file

@ -1,5 +1,21 @@
--- mail/app/mozilla.in.orig Thu Nov 11 23:14:17 2004 --- mail/app/mozilla.in.orig Sat Jul 24 19:58:06 2004
+++ mail/app/mozilla.in Thu Nov 11 23:15:43 2004 +++ mail/app/mozilla.in Mon Dec 27 18:40:04 2004
@@ -167,12 +167,12 @@
done #others arg
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
@@ -218,12 +218,31 @@ @@ -218,12 +218,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2

14
mail/thunderbird3/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= thunderbird PORTNAME= thunderbird
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source
@ -50,8 +51,7 @@ THUNDERBIRD_ICON_SRC= ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
OPTIONS= DEBUG "Build a debugging image" off \ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on
NEW_ICON "Install the new Thunderbird branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -201,15 +201,9 @@ post-install:
${LOCAL_PREFIX}/bin/thunderbird-config ${LOCAL_PREFIX}/bin/thunderbird-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g'
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow.xpm
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON} ${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
mail/thunderbird3/files/mozconfig.in
View file

@ -18,6 +18,9 @@ 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-necko-protocols=http,file,jar,viewsource,res,data
ac_add_options --enable-image-decoders=default,-xbm ac_add_options --enable-image-decoders=default,-xbm
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
mail/thunderbird3/files/patch-mail_app_mozilla.in
View file

@ -1,5 +1,21 @@
--- mail/app/mozilla.in.orig Thu Nov 11 23:14:17 2004 --- mail/app/mozilla.in.orig Sat Jul 24 19:58:06 2004
+++ mail/app/mozilla.in Thu Nov 11 23:15:43 2004 +++ mail/app/mozilla.in Mon Dec 27 18:40:04 2004
@@ -167,12 +167,12 @@
done #others arg
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
@@ -218,12 +218,31 @@ @@ -218,12 +218,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2

11
www/firefox-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox-devel/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox-devel/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox-esr/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox-esr/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox-esr/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox10/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox10/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox10/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox15/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox15/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox15/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox3-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox3-devel/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox3-devel/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox35/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox35/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox35/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/firefox36/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/firefox36/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/firefox36/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;

11
www/flock/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox PORTNAME= firefox
PORTVERSION= 1.0 PORTVERSION= 1.0
PORTREVISION= 5 PORTREVISION= 6
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \
LOGGING "Enable additional log messages" off \ LOGGING "Enable additional log messages" off \
OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
XFT "Enable support for anti-aliased fonts" on \ XFT "Enable support for anti-aliased fonts" on \
SMB "Enable smb:// URI support using gnomevfs" off \ SMB "Enable smb:// URI support using gnomevfs" off
NEW_ICON "Install the new Firefox branding icon" off
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -237,11 +236,9 @@ post-install:
.for i in ${EXTRA_SCRIPTS} .for i in ${EXTRA_SCRIPTS}
${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
.endfor .endfor
.if defined(WITH_NEW_ICON)
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

3
www/flock/files/mozconfig.in
View file

@ -9,6 +9,9 @@ ac_add_options --disable-tests
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-composer ac_add_options --disable-composer
ac_add_options --enable-default-toolkit=gtk2 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 # FBSD specific
export CPPFLAGS="@CPPFLAGS@" export CPPFLAGS="@CPPFLAGS@"

20
www/flock/files/patch-browser_app_mozilla.in
View file

@ -1,5 +1,5 @@
--- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 --- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004
+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
@ -8,7 +8,21 @@
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find mozilla runtime directory. Exiting."
exit 1 exit 1
@@ -207,12 +207,31 @@ @@ -160,11 +161,11 @@
_optLast="${i}"
done #last arg
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+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}"
+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
fi
################################################################ Parse Arguments
@@ -207,12 +208,31 @@
script_args="$script_args -d $2" script_args="$script_args -d $2"
shift 2 shift 2
;; ;;