From owner-freebsd-gnome@FreeBSD.ORG Thu May 22 08:32:43 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1750237B401; Thu, 22 May 2003 08:32:43 -0700 (PDT) Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC44F43FB1; Thu, 22 May 2003 08:32:41 -0700 (PDT) (envelope-from stijn@pcwin002.win.tue.nl) Received: from pcwin002.win.tue.nl (orb_rules@localhost [127.0.0.1]) by pcwin002.win.tue.nl (8.12.8/8.12.8) with ESMTP id h4MFVVVo059707; Thu, 22 May 2003 17:31:31 +0200 (CEST) (envelope-from stijn@pcwin002.win.tue.nl) Received: (from stijn@localhost) by pcwin002.win.tue.nl (8.12.8/8.12.8/Submit) id h4MFVVRa059706; Thu, 22 May 2003 17:31:31 +0200 (CEST) Date: Thu, 22 May 2003 17:31:31 +0200 From: Stijn Hoop To: gnome@freebsd.org, freebsd-ports@freebsd.org Message-ID: <20030522153131.GE57542@pcwin002.win.tue.nl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="i3lJ51RuaGWuFYNw" Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Bright-Idea: Let's abolish HTML mail! Subject: phoenix / firebird port X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2003 15:32:43 -0000 --i3lJ51RuaGWuFYNw Content-Type: multipart/mixed; boundary="ffoCPvUAPMgSXi6H" Content-Disposition: inline --ffoCPvUAPMgSXi6H Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, The attached diff produced a working firebird for me, after a cp -Rp phoenix firebird. I haven't really looked at the generated plist though, so packaging errors could have slipped in. Hope this diff is of some help though. --Stijn --=20 "Linux has many different distributions, meaning that you can probably find one that is exactly what you want (I even found one that looked like a Unix system)." -- Mike Meyer, from a posting at questions@freebsd.org --ffoCPvUAPMgSXi6H Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="firebird.patch" Content-Transfer-Encoding: quoted-printable diff -urN /usr/ports/www/phoenix/Makefile firebird/Makefile --- /usr/ports/www/phoenix/Makefile Tue Apr 22 09:17:27 2003 +++ firebird/Makefile Thu May 22 17:30:43 2003 @@ -7,15 +7,14 @@ # $FreeBSD: ports/www/phoenix/Makefile,v 1.43 2003/04/20 19:46:57 marcus E= xp $ # =20 -PORTNAME=3D phoenix -PORTVERSION=3D 0.5 -PORTREVISION=3D 4 -CATEGORIES=3D www # pita -MASTER_SITES=3D ${MASTER_SITE_LOCAL} ${BSD_WEBDIR} -MASTER_SITE_SUBDIR=3D alane +PORTNAME=3D firebird +PORTVERSION=3D 0.6 +CATEGORIES=3D www +MASTER_SITES=3D http://komodo.mozilla.org/pub/firebird/releases/${PORTVER= SION}/ +DISTNAME=3D MozillaFirebird-${PORTVERSION}-source =20 -MAINTAINER=3D phoenix@freebsd.org # alane@fbsd and trevor@fbsd -COMMENT=3D Phoenix is a fast, low-overhead browser from the Mozilla project +MAINTAINER=3D gnome@FreeBSD.org +COMMENT=3D Mozilla Firebird is the next generation browser from the mozill= a.org project =20 LIB_DEPENDS=3D jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ @@ -27,8 +26,6 @@ BUILD_DEPENDS=3D zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 =20 -BSD_WEBDIR=3Dhttp://people.freebsd.org/~${MASTER_SITE_SUBDIR}/ - USE_X_PREFIX=3D yes =20 USE_BZIP2=3D yes @@ -44,8 +41,7 @@ LOCAL_SUBDIR=3D lib/${PORTNAME} LOCAL_PREFIX=3D ${PREFIX}/${LOCAL_SUBDIR} JREDIR=3D ${LOCALBASE}/jdk1.3.1/jre -MOZVER=3D 1.3a -PLUGINSDIR=3D ${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/ +PLUGINSDIR=3D ${PREFIX}/lib/browser_plugins =20 .include =20 @@ -84,7 +80,7 @@ LDFLAGS+=3D -L${X11BASE}/lib LIBS+=3D ${PTHREAD_LIBS} =20 -EXTRA_SCRIPTS=3D phoenix.rb +EXTRA_SCRIPTS=3D firebird.rb =20 pre-extract:: @${ECHO_MSG} @@ -107,6 +103,7 @@ =20 pre-install: ${RM} -fr ${LOCAL_PREFIX} + -${MKDIR} -p ${PLUGINSDIR} =20 install-extra: .for i in ${EXTRA_SCRIPTS} @@ -114,12 +111,15 @@ .endfor # i in ${EXTRA_SCRIPTS} =20 link-bins: - ${RM} -f ${PREFIX}/bin/phoenix - ${LN} -s ${LOCAL_PREFIX}/bin/phoenix \ - ${PREFIX}/bin/phoenix - ${RM} -f ${PREFIX}/bin/phoenix-config + ${RM} -f ${PREFIX}/bin/firebird + ${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \ + ${PREFIX}/bin/firebird + ${RM} -f ${PREFIX}/bin/MozillaFirebird + ${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \ + ${PREFIX}/bin/MozillaFirebird + ${RM} -f ${PREFIX}/bin/firebird-config ${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \ - ${PREFIX}/bin/phoenix-config + ${PREFIX}/bin/firebird-config =20 # not used because of undefined symbol errors link-java: @@ -134,8 +134,9 @@ =20 cons-plist: -${RM} -f ${PLIST} - ${ECHO_CMD} bin/phoenix >>${PLIST} - ${ECHO_CMD} bin/phoenix-config >>${PLIST} + ${ECHO_CMD} bin/firebird >>${PLIST} + ${ECHO_CMD} bin/MozillaFirebird >>${PLIST} + ${ECHO_CMD} bin/firebird-config >>${PLIST} .for i in ${EXTRA_SCRIPTS} ${ECHO_CMD} bin/${i} >>${PLIST} .endfor # i in ${EXTRA_SCRIPTS} diff -urN /usr/ports/www/phoenix/distinfo firebird/distinfo --- /usr/ports/www/phoenix/distinfo Fri Dec 13 10:41:38 2002 +++ firebird/distinfo Thu May 22 16:39:10 2003 @@ -1 +1 @@ -MD5 (phoenix-0.5.tar.bz2) =3D fb99a5a866a99fbb15269699a1022b47 +MD5 (MozillaFirebird-0.6-source.tar.bz2) =3D de52dd03f8628724f14f517cd6346= 755 diff -urN /usr/ports/www/phoenix/files/firebird.rb firebird/files/firebird.= rb --- /usr/ports/www/phoenix/files/firebird.rb Thu Jan 1 01:00:00 1970 +++ firebird/files/firebird.rb Thu May 22 16:47:50 2003 @@ -0,0 +1,95 @@ +#!/usr/bin/env ruby +=3Dbegin -*-mode: ruby-*- + + MoZiLLa.in + + Copyright (c) 2002, Alan Eldridge + All rights reserved. + =20 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions=20 + are met: + =20 + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + =20 + * 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. + =20 + * 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. + =20 + 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 PURPO= SE + 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 T= HE + POSSIBILITY OF SUCH DAMAGE. + + $Id: MoZiLLa.in,v 1.18 2002/12/18 02:40:58 alane Exp $ + + 2002-12-16 Alan Eldridge + +=3Dend + +X11BIN =3D "/usr/X11R6/bin" +NAME =3D File::basename($0, ".rb") +APP_PATH =3D File::join(X11BIN, NAME) + +if !File::executable?(APP_PATH) + raise "File '#{APP_PATH}' not found. Giving up."=20 +elsif ($display =3D ENV["DISPLAY"]) =3D=3D nil + raise "Environment variable DISPLAY not found. Giving up." +end=20 + +if ARGV.size > 0 + if ARGV[0] =3D=3D "--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 =3D nil +else + $url =3D ARGV.pop + $url.sub!(/^ghelp:/, "file:")=20 +end + +IO::popen("xwininfo -display #{$display} -root -tree") { + |io| + if NAME !=3D "firebird" + $windows =3D io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) + else + $windows =3D io.grep(%r) + end +} + +if $windows.size > 0 + $id =3D $windows.map {=20 + |s| s.strip.split.first=20 + }.sort.first + $args =3D [ "-id", $id, "-raise", "-remote" ] + $args.push($url ? "\"openURL(#{$url},new-window)\"" :=20 + "\"xfeDoCommand(openBrowser)\"") +else + $args =3D ARGV + $args.push("\"#{$url}\"") if $url +end + +fork { + exec(([APP_PATH] + $args).join(" ")) +} +exit! + +#EOF diff -urN /usr/ports/www/phoenix/files/mkdistfile firebird/files/mkdistfile --- /usr/ports/www/phoenix/files/mkdistfile Tue Dec 10 09:57:05 2002 +++ firebird/files/mkdistfile Thu May 22 16:35:26 2003 @@ -1,7 +1,7 @@ #!/bin/sh # -*-shell-script-*- # -# mkdistfile -- maintainer's utility to make a phoenix distfile +# mkdistfile -- maintainer's utility to make a firebird distfile # # Copyright (c) 2002, Alan Eldridge # All rights reserved. @@ -165,7 +165,7 @@ test -d mozilla || die "No mozilla dir here." find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr rm -f $exfile -status "making phoenix-$REV.tar.bz2 ..." -tar -cjpf phoenix-$REV.tar.bz2 mozilla +status "making firebird-$REV.tar.bz2 ..." +tar -cjpf firebird-$REV.tar.bz2 mozilla status "done." #EOF diff -urN /usr/ports/www/phoenix/files/mozconfig.in firebird/files/mozconfi= g.in --- /usr/ports/www/phoenix/files/mozconfig.in Sat Dec 14 23:49:59 2002 +++ firebird/files/mozconfig.in Thu May 22 16:44:29 2003 @@ -46,6 +46,8 @@ ac_add_options --disable-ldap ac_add_options --disable-pedantic ac_add_options --disable-xinerama +ac_add_options --enable-extensions=3Ddefault,-inspector,-irc,-venkman,-con= tent-packs,-help +ac_add_options --enable-plaintext-editor-only ###################################################################### # conditional from port Makefile if test -n "$WITH_DEBUG"; then diff -urN /usr/ports/www/phoenix/files/patch-nsprpub-pr-src-misc-prtime.c f= irebird/files/patch-nsprpub-pr-src-misc-prtime.c --- /usr/ports/www/phoenix/files/patch-nsprpub-pr-src-misc-prtime.c Wed Dec= 18 06:02:34 2002 +++ firebird/files/patch-nsprpub-pr-src-misc-prtime.c Thu May 22 16:47:08 2= 003 @@ -1,18 +1,11 @@ ---- nsprpub/pr/src/misc/prtime.c.orig Sun Mar 31 12:17:46 2002 -+++ nsprpub/pr/src/misc/prtime.c Tue Dec 17 21:30:30 2002 -@@ -1666,12 +1666,13 @@ - * values for these two fields. +--- nsprpub/pr/src/misc/prtime.c.orig Thu Feb 27 01:01:02 2003 ++++ nsprpub/pr/src/misc/prtime.c Thu May 22 16:46:49 2003 +@@ -1666,7 +1666,7 @@ */ =20 --#if defined(SUNOS4) || (__GLIBC__ >=3D 2) || defined(XP_BEOS) -+#if defined(__FreeBSD__)|| defined(SUNOS4) \ -+ || (__GLIBC__ >=3D 2) || defined(XP_BEOS) - if (mktime(&a) =3D=3D -1) { - PR_snprintf(buf, buflen, "can't get timezone"); - return 0; - } --#endif -+#endif /* check for __FreeBSD__, too */ -=20 - return strftime(buf, buflen, fmt, &a); - } + #if defined(SUNOS4) || (__GLIBC__ >=3D 2) || defined(XP_BEOS) \ +- || defined(NETBSD) ++ || defined(NETBSD) || defined(__FreeBSD__) + a.tm_zone =3D NULL; + a.tm_gmtoff =3D tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_of= fset; + #endif diff -urN /usr/ports/www/phoenix/files/phoenix.rb firebird/files/phoenix.rb --- /usr/ports/www/phoenix/files/phoenix.rb Wed Dec 18 06:02:34 2002 +++ firebird/files/phoenix.rb Thu Jan 1 01:00:00 1970 @@ -1,95 +0,0 @@ -#!/usr/bin/env ruby -=3Dbegin -*-mode: ruby-*- - - MoZiLLa.in - - Copyright (c) 2002, Alan Eldridge - All rights reserved. - =20 - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions=20 - are met: - =20 - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - =20 - * 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. - =20 - * 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. - =20 - 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 PURPO= SE - 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 T= HE - POSSIBILITY OF SUCH DAMAGE. - - $Id: MoZiLLa.in,v 1.18 2002/12/18 02:40:58 alane Exp $ - - 2002-12-16 Alan Eldridge - -=3Dend - -X11BIN =3D "/usr/X11R6/bin" -NAME =3D File::basename($0, ".rb") -APP_PATH =3D File::join(X11BIN, NAME) - -if !File::executable?(APP_PATH) - raise "File '#{APP_PATH}' not found. Giving up."=20 -elsif ($display =3D ENV["DISPLAY"]) =3D=3D nil - raise "Environment variable DISPLAY not found. Giving up." -end=20 - -if ARGV.size > 0 - if ARGV[0] =3D=3D "--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 =3D nil -else - $url =3D ARGV.pop - $url.sub!(/^ghelp:/, "file:")=20 -end - -IO::popen("xwininfo -display #{$display} -root -tree") { - |io| - if NAME !=3D "phoenix" - $windows =3D io.grep(%r<"Mozilla"\s+"navigator:\s*browser">) - else - $windows =3D io.grep(%r) - end -} - -if $windows.size > 0 - $id =3D $windows.map {=20 - |s| s.strip.split.first=20 - }.sort.first - $args =3D [ "-id", $id, "-raise", "-remote" ] - $args.push($url ? "\"openURL(#{$url},new-window)\"" :=20 - "\"xfeDoCommand(openBrowser)\"") -else - $args =3D ARGV - $args.push("\"#{$url}\"") if $url -end - -fork { - exec(([APP_PATH] + $args).join(" ")) -} -exit! - -#EOF diff -urN /usr/ports/www/phoenix/pkg-descr firebird/pkg-descr --- /usr/ports/www/phoenix/pkg-descr Tue Oct 22 11:26:56 2002 +++ firebird/pkg-descr Thu May 22 17:27:25 2003 @@ -1,6 +1,6 @@ -Phoenix is a fast, low-overhead browser from the Mozilla project. See the -phoenix project page for more details. +Mozilla Firebird is the next generation browser from the Mozilla project. = See +the Mozilla Firebird project page for more details. =20 -WWW: http://www.mozilla.org/projects/phoenix/ +WWW: http://www.mozilla.org/projects/firebird/ =20 -- AlanE diff -urN /usr/ports/www/phoenix/pkg-message firebird/pkg-message --- /usr/ports/www/phoenix/pkg-message Wed Dec 18 06:02:33 2002 +++ firebird/pkg-message Thu May 22 16:50:13 2003 @@ -8,25 +8,29 @@ version of perl, please do this *first*. =20 Any bug reports should be addressed to the maintainers at: - phoenix@freebsd.org + firebird@freebsd.org You may also Cc: freebsd-ports@freebsd.org. Please do not send bug reports to any other addresses.=20 =20 Please include the following information with any bug report: * Output from 'uname -a'. -* Date/time stamp from www/phoenix/Makefile. +* Date/time stamp from www/firebird/Makefile. * Perl version used (/usr/bin/perl --version or=20 /usr/local/bin/perl --version for -current). * Where/when did the problem occur: configuring, building, or - running phoenix? + running firebird? * How can you reproduce the problem? =20 Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Phoenix. +enjoy using Firebird. The Maintainers (alane@ & trevor@) =20 Additional notes: =20 +0.6: +Update to 0.6 version, rename from phoenix to Mozilla Firebird, all +internal names updated accordingly. + 0.4_8: Add patch to fix network ops on -CURRENT. =20 @@ -67,6 +71,6 @@ a dependency because I don't want to require ruby + ruby-shim to run the browser. =20 --- AlanE +-- AlanE =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --ffoCPvUAPMgSXi6H-- --i3lJ51RuaGWuFYNw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+zO1TY3r/tLQmfWcRAtZ6AJ948rtk8TAsm7aKgKnZPzSvHBi0UACgpqQL XxOWJx1XLnU5VmZxxkryGeQ= =waOy -----END PGP SIGNATURE----- --i3lJ51RuaGWuFYNw--