diff options
| author | marcus <marcus@FreeBSD.org> | 2005-03-25 13:55:27 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2005-03-25 13:55:27 +0800 |
| commit | b3b8e49e45b1c31a7e980ddc669684a97361544d (patch) | |
| tree | 70173d1628dd1cb78d292fc030166245c964ffbb /www/flock | |
| parent | a3ff86d6b0c2a6bb4dad3094d070d3584549e5af (diff) | |
| download | freebsd-ports-graphics-b3b8e49e45b1c31a7e980ddc669684a97361544d.tar.gz freebsd-ports-graphics-b3b8e49e45b1c31a7e980ddc669684a97361544d.tar.zst freebsd-ports-graphics-b3b8e49e45b1c31a7e980ddc669684a97361544d.zip | |
* Update to 1.0.2 to fix security issues (see
http://www.vuxml.org/freebsd/7d2aac52-9c6b-11d9-99a7-000a95bc6fae.html and
http://www.vuxml.org/freebsd/741f8841-9c6b-11d9-9dbe-000a95bc6fae.html for
more details)
* Fix some minor cosmetic issues with the startup script
Submitted by: Jose M Rodriguez (freebsd) <josemi@freebsd.jazztel.es>
Approved by: portmgr (implicit)
Diffstat (limited to 'www/flock')
| -rw-r--r-- | www/flock/Makefile | 11 | ||||
| -rw-r--r-- | www/flock/distinfo | 4 | ||||
| -rw-r--r-- | www/flock/files/patch-browser_app_mozilla.in | 10 |
3 files changed, 14 insertions, 11 deletions
diff --git a/www/flock/Makefile b/www/flock/Makefile index d4a4abd8755..e074d253a98 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -6,13 +6,12 @@ # PORTNAME= firefox -PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTVERSION= 1.0.2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/1.0.1/source -DISTNAME= ${PORTNAME}-1.0.1-source +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/1.0.2/source +DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla @@ -227,8 +226,8 @@ pre-install: ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${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 update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec update-desktop-database > /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} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} diff --git a/www/flock/distinfo b/www/flock/distinfo index 2ce601d09de..8118b7249f8 100644 --- a/www/flock/distinfo +++ b/www/flock/distinfo @@ -1,2 +1,2 @@ -MD5 (firefox-1.0.1-source.tar.bz2) = ebaea974fea9460ab7050fff76b41cb1 -SIZE (firefox-1.0.1-source.tar.bz2) = 32671529 +MD5 (firefox-1.0.2-source.tar.bz2) = fd1a0dec3e763e93eb45c0c34b399712 +SIZE (firefox-1.0.2-source.tar.bz2) = 32760074 diff --git a/www/flock/files/patch-browser_app_mozilla.in b/www/flock/files/patch-browser_app_mozilla.in index 492dacc527e..6389a61b5e8 100644 --- a/www/flock/files/patch-browser_app_mozilla.in +++ b/www/flock/files/patch-browser_app_mozilla.in @@ -1,5 +1,5 @@ --- browser/app/mozilla.in.orig Tue Oct 26 11:26:11 2004 -+++ browser/app/mozilla.in Mon Feb 28 23:32:14 2005 ++++ browser/app/mozilla.in Wed Mar 23 20:43:07 2005 @@ -29,51 +29,83 @@ ## the mozilla-bin binary to work. ## @@ -123,7 +123,7 @@ # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,149 +114,217 @@ +@@ -82,149 +114,221 @@ curdir=`dirname "$progname"` progbase=`basename "$progname"` run_moz="$curdir/run-mozilla.sh" @@ -421,8 +421,12 @@ + # 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 -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && exit 0 +fi + +# fallback to direct invocation |