From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 28 12:41:33 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 619081065674 for ; Sun, 28 Nov 2010 12:41:33 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id ED37C8FC08 for ; Sun, 28 Nov 2010 12:41:32 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oASCfVLg090327 for ; Sun, 28 Nov 2010 12:41:31 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oASCfQiC090041 for freebsd-gecko@freebsd.org; Sun, 28 Nov 2010 12:41:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 28 Nov 2010 12:41:26 GMT Message-Id: <201011281241.oASCfQiC090041@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r443 - branches/experimental/www/firefox trunk/www/firefox X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 12:41:33 -0000 Author: beat Date: Sun Nov 28 12:41:26 2010 New Revision: 443 Log: - Using cairo 1.10.0 results in not correct rendered gif and svn images: https://bugzilla.mozilla.org/show_bug.cgi?id=597174 https://bugzilla.mozilla.org/show_bug.cgi?id=610107 Until a proper fix is available use bundled cairo. - Bump PORTREVISION PR: ports/152545 Submitted by: Zach Thompson Modified: branches/experimental/www/firefox/Makefile trunk/www/firefox/Makefile Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Fri Nov 26 09:44:26 2010 (r442) +++ branches/experimental/www/firefox/Makefile Sun Nov 28 12:41:26 2010 (r443) @@ -7,6 +7,7 @@ PORTNAME= firefox DISTVERSION= 3.6.12 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -21,7 +22,7 @@ USE_AUTOTOOLS= autoconf:213 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Fri Nov 26 09:44:26 2010 (r442) +++ trunk/www/firefox/Makefile Sun Nov 28 12:41:26 2010 (r443) @@ -7,6 +7,7 @@ PORTNAME= firefox DISTVERSION= 3.6.12 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -21,7 +22,7 @@ USE_AUTOTOOLS= autoconf:213 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 28 12:50:06 2010 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CCC19106566B for ; Sun, 28 Nov 2010 12:50:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9B03C8FC18 for ; Sun, 28 Nov 2010 12:50:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oASCo6Ox089468 for ; Sun, 28 Nov 2010 12:50:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oASCo6FP089467; Sun, 28 Nov 2010 12:50:06 GMT (envelope-from gnats) Date: Sun, 28 Nov 2010 12:50:06 GMT Message-Id: <201011281250.oASCo6FP089467@freefall.freebsd.org> To: gecko@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/152545: commit references a PR X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 12:50:06 -0000 The following reply was made to PR ports/152545; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/152545: commit references a PR Date: Sun, 28 Nov 2010 12:45:50 +0000 (UTC) beat 2010-11-28 12:45:45 UTC FreeBSD ports repository Modified files: www/firefox Makefile Log: - Using cairo 1.10.0 results in not correct rendered gif and svn images: https://bugzilla.mozilla.org/show_bug.cgi?id=597174 https://bugzilla.mozilla.org/show_bug.cgi?id=610107 Until a proper fix is available use bundled cairo. - Bump PORTREVISION PR: ports/152545 Submitted by: Zach Thompson Revision Changes Path 1.233 +2 -1 ports/www/firefox/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 28 14:36:45 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CADDD106566C for ; Sun, 28 Nov 2010 14:36:45 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 481B08FC0C for ; Sun, 28 Nov 2010 14:36:44 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oASEaiS3079478 for ; Sun, 28 Nov 2010 14:36:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oASEadLC078509 for freebsd-gecko@freebsd.org; Sun, 28 Nov 2010 14:36:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 28 Nov 2010 14:36:39 GMT Message-Id: <201011281436.oASEadLC078509@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r444 - branches/experimental/www/seamonkey2 trunk/www/seamonkey2 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 14:36:45 -0000 Author: beat Date: Sun Nov 28 14:36:38 2010 New Revision: 444 Log: - Using cairo 1.10.0 results in not correctly rendered gif and svg images: https://bugzilla.mozilla.org/show_bug.cgi?id=597174 https://bugzilla.mozilla.org/show_bug.cgi?id=610107 Until a proper fix is available use bundled cairo. - Bump PORTREVISION PR: ports/152545 Submitted by: Zach Thompson Modified: branches/experimental/www/seamonkey2/Makefile trunk/www/seamonkey2/Makefile Modified: branches/experimental/www/seamonkey2/Makefile ============================================================================== --- branches/experimental/www/seamonkey2/Makefile Sun Nov 28 12:41:26 2010 (r443) +++ branches/experimental/www/seamonkey2/Makefile Sun Nov 28 14:36:38 2010 (r444) @@ -7,6 +7,7 @@ PORTNAME= seamonkey DISTVERSION= 2.0.10 +PORTREVISION= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -37,9 +38,8 @@ --enable-svg \ --enable-application=suite \ --enable-svg-renderer=cairo \ - --enable-system-cairo \ --enable-canvas -USE_MOZILLA= -png -dbm -jpeg -xft +USE_MOZILLA= -png -dbm -jpeg -xft -cairo MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= Modified: trunk/www/seamonkey2/Makefile ============================================================================== --- trunk/www/seamonkey2/Makefile Sun Nov 28 12:41:26 2010 (r443) +++ trunk/www/seamonkey2/Makefile Sun Nov 28 14:36:38 2010 (r444) @@ -7,6 +7,7 @@ PORTNAME= seamonkey DISTVERSION= 2.0.10 +PORTREVISION= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -37,9 +38,8 @@ --enable-svg \ --enable-application=suite \ --enable-svg-renderer=cairo \ - --enable-system-cairo \ --enable-canvas -USE_MOZILLA= -png -dbm -jpeg -xft +USE_MOZILLA= -png -dbm -jpeg -xft -cairo MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 28 15:03:40 2010 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5494C10656A8; Sun, 28 Nov 2010 15:03:40 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2A7158FC12; Sun, 28 Nov 2010 15:03:40 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oASF3ejQ072124; Sun, 28 Nov 2010 15:03:40 GMT (envelope-from beat@freefall.freebsd.org) Received: (from beat@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oASF3dNa072120; Sun, 28 Nov 2010 15:03:39 GMT (envelope-from beat) Date: Sun, 28 Nov 2010 15:03:39 GMT Message-Id: <201011281503.oASF3dNa072120@freefall.freebsd.org> To: hideo@lastamericanempire.com, beat@FreeBSD.org, gecko@FreeBSD.org From: beat@FreeBSD.org Cc: Subject: Re: ports/152545: graphics/cairo (cairo-1.10.0_3) breaks some animated gifs in firefox X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 15:03:40 -0000 Synopsis: graphics/cairo (cairo-1.10.0_3) breaks some animated gifs in firefox State-Changed-From-To: open->closed State-Changed-By: beat State-Changed-When: Sun Nov 28 15:03:39 UTC 2010 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=152545 From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 28 15:10:14 2010 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6677C106564A for ; Sun, 28 Nov 2010 15:10:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3B4F78FC1A for ; Sun, 28 Nov 2010 15:10:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oASFAEWK072278 for ; Sun, 28 Nov 2010 15:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oASFAEkV072277; Sun, 28 Nov 2010 15:10:14 GMT (envelope-from gnats) Date: Sun, 28 Nov 2010 15:10:14 GMT Message-Id: <201011281510.oASFAEkV072277@freefall.freebsd.org> To: gecko@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/152545: commit references a PR X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 15:10:14 -0000 The following reply was made to PR ports/152545; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/152545: commit references a PR Date: Sun, 28 Nov 2010 15:03:06 +0000 (UTC) beat 2010-11-28 15:03:02 UTC FreeBSD ports repository Modified files: www/seamonkey2 Makefile Log: - Using cairo 1.10.0 results in not correctly rendered gif and svg images: https://bugzilla.mozilla.org/show_bug.cgi?id=597174 https://bugzilla.mozilla.org/show_bug.cgi?id=610107 Until a proper fix is available use bundled cairo. - Bump PORTREVISION PR: ports/152545 Submitted by: Zach Thompson Revision Changes Path 1.314 +2 -2 ports/www/seamonkey2/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 29 11:07:19 2010 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B434110656E0 for ; Mon, 29 Nov 2010 11:07:19 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A17298FC18 for ; Mon, 29 Nov 2010 11:07:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oATB7Jtx053334 for ; Mon, 29 Nov 2010 11:07:19 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oATB7J9R053332 for gecko@FreeBSD.org; Mon, 29 Nov 2010 11:07:19 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 29 Nov 2010 11:07:19 GMT Message-Id: <201011291107.oATB7J9R053332@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Cc: Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2010 11:07:19 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/150631 gecko www/firefox 3.6.9 does not build if you have previousl o ports/148475 gecko [patch] Mk/bsd.gecko.mk: use tar(1) for copying trees o ports/146231 gecko [feature request] [patch] www/firefox: use port libs o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order o ports/142807 gecko www/firefox35-i18n does not depend on www/firefox35 5 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 29 15:06:04 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 066121065673 for ; Mon, 29 Nov 2010 15:06:04 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 60A358FC18 for ; Mon, 29 Nov 2010 15:06:02 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oATF620q095108 for ; Mon, 29 Nov 2010 15:06:02 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oATF5v2X094637 for freebsd-gecko@freebsd.org; Mon, 29 Nov 2010 15:05:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 29 Nov 2010 15:05:57 GMT Message-Id: <201011291505.oATF5v2X094637@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r445 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2010 15:06:04 -0000 Author: beat Date: Mon Nov 29 15:05:56 2010 New Revision: 445 Log: - Update USE_FIREFOX section to the current Firefox layout - Add USE_SEAMONKEY and related options to bsd.gecko.mk - Add USE_THUNDERBIRD and related options to bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sun Nov 28 14:36:38 2010 (r444) +++ branches/experimental/Mk/bsd.gecko.mk Mon Nov 29 15:05:56 2010 (r445) @@ -14,7 +14,7 @@ # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 36+ 35+ 30+ 36 35 30 +# Available values: yes 36+ 35+ 36 35 # NOTE: # default value 36 is used in case of USE_FIREFOX=yes # @@ -23,13 +23,55 @@ # # INVALID_FIREFOX_VER - This variable contains a list of Firefox versions # not supported by the port. This setting is effective -# only when USE_FIREFOX is set to a range (e.g. 30+) +# only when USE_FIREFOX is set to a range (e.g. 35+) # # WITH_FIREFOX_VER - User defined global variable to set Firefox version # This variable is effective only if USE_FIREFOX is -# set to a range (e.g. 30+) and WITH_FIREFOX_VER +# set to a range (e.g. 35+) and WITH_FIREFOX_VER # points inside that range. # NOTE: INVALID_FIREFOX_VER takes precedence +# +# USE_SEAMONKEY - Add runtime dependency on SeaMonkey. If no +# version is given by the maintainer via the port +# or by the user via defined variable try to find +# the highest stable installed version. +# Available values: yes 11+ 20+ 11 20 +# NOTE: +# default value 20 is used in case of USE_SEAMONKEY=yes +# +# USE_SEAMONKEY_BUILD - Add buildtime dependency on SeaMonkey. +# Available values: see USE_SEAMONKEY +# +# INVALID_SEAMONKEY_VER - This variable contains a list of SeaMonkey versions +# not supported by the port. This setting is effective +# only when USE_SEAMONKEY is set to a range (e.g. 11+) +# +# WITH_SEAMONKEY_VER - User defined global variable to set SeaMonkey version +# This variable is effective only if USE_SEAMONKEY is +# set to a range (e.g. 11+) and WITH_SEAMONKEY_VER +# points inside that range. +# NOTE: INVALID_SEAMONKEY_VER takes precedence +# +# USE_THUNDERBIRD - Add runtime dependency on Thunderbird. If no +# version is given by the maintainer via the port +# or by the user via defined variable try to find +# the highest stable installed version. +# Available values: yes 31+ 30+ 31 30 +# NOTE: +# default value 31 is used in case of USE_THUNDERBIRD=yes +# +# USE_THUNDERBIRD_BUILD - Add buildtime dependency on Thunderbird. +# Available values: see USE_THUNDERBIRD +# +# INVALID_THUNDERBIRD_VER - This variable contains a list of Thunderbird versions +# not supported by the port. This setting is effective +# only when USE_THUNDERBIRD is set to a range (e.g. 30+) +# +# WITH_THUNDERBIRD_VER - User defined global variable to set Thunderbird version +# This variable is effective only if USE_THUNDERBIRD is +# set to a range (e.g. 30+) and WITH_THUNDERBIRD_VER +# points inside that range. +# NOTE: INVALID_THUNDERBIRD_VER takes precedence # # Firefox part @@ -45,11 +87,10 @@ .endif _FIREFOX_DEFAULT_VERSION= 36 -_FIREFOX_VERSIONS= 36 35 30 -_FIREFOX_RANGE_VERSIONS= 36+ 35+ 30+ +_FIREFOX_VERSIONS= 36 35 +_FIREFOX_RANGE_VERSIONS= 36+ 35+ # For specifying [36, 35, ..]+ -_FIREFOX_30P= 30 ${_FIREFOX_35P} _FIREFOX_35P= 35 ${_FIREFOX_36P} _FIREFOX_36P= 36 @@ -89,7 +130,9 @@ .endif # Setting/finding Firefox version we want. -.if exists(${LOCALBASE}/bin/firefox3) +.if exists(${LOCALBASE}/bin/firefox) +_FIREFOX_VER!= ${LOCALBASE}/bin/firefox --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/' +.elif exists(${LOCALBASE}/bin/firefox3) _FIREFOX_VER!= ${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif @@ -102,7 +145,6 @@ # Dependence lines for different Firefox versions 36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox 35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 -30_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox3 # Add dependencies .if defined(USE_FIREFOX) @@ -114,6 +156,168 @@ .endif .endif # defined(USE_FIREFOX) +# +# SeaMonkey part +# +.if defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) + +# Process USE_SEAMONKEY_BUILD +.if !defined(USE_SEAMONKEY) +.if defined(USE_SEAMONKEY_BUILD) +USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD} +_SEAMONKEY_BUILD_DEPENDS= yes +.endif +.endif + +_SEAMONKEY_DEFAULT_VERSION= 20 +_SEAMONKEY_VERSIONS= 11 20 +_SEAMONKEY_RANGE_VERSIONS= 11+ 20+ + +# For specifying [20, 11, ..]+ +_SEAMONKEY_11P= 11 ${_SEAMONKEY_20P} +_SEAMONKEY_20P= 20 + +# Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given +.if ${USE_SEAMONKEY} == "yes" +USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION} +.endif + +.if !defined(_SEAMONKEY_${USE_SEAMONKEY}P) +IGNORE:= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} +.endif + +# Check if we have user-defined WITH_SEAMONKEY_VER and if it matches +# the range specified in port's USE_SEAMONKEY +.if defined(WITH_SEAMONKEY_VER) +.for ver in ${_SEAMONKEY_RANGE_VERSIONS} +.if ${USE_SEAMONKEY} == "${ver}" +_MATCHED_SEAMONKEY_VER:= ${USE_SEAMONKEY:S/+//} +.for seamonkey in ${_SEAMONKEYL_${_MATCHED_SEAMONKEY_VER}P} +.if ${WITH_SEAMONKEY_VER} == ${seamonkey} +# Check if user supplied WITH_SEAMONKEY is in the INVALID_SEAMONKEY_VER list +_BRKSEAMONKEY= no +.for iver in ${INVALID_SEAMONKEY_VER} +.if ${WITH_SEAMONKEY_VER} == ${iver} +_BRKSEAMONKEY= yes +.endif +.endfor +# If WITH_SEAMONKEY is not in the INVALID_SEAMONKEY_VER list, use it +# otherwise take default from port +.if ${_BRKSEAMONKEY} == "no" +USE_SEAMONKEY= ${WITH_SEAMONKEY_VER} +.endif +.endif +.endfor +.endif +.endfor +.endif + +# Setting/finding SeaMonkey version we want. +.if exists(${LOCALBASE}/bin/seamonkey) +_FIREFOX_VER!= ${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/' +.endif + +.if defined(_SEAMONKEY_VER) +.if ${_SEAMONKEY_VER} != ${USE_SEAMONKEY} +IGNORE= cannot install: SeaMonkey versions mismatch: seamonkey-${_SEAMONKEY_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} +.endif +.endif + +# Dependence lines for different SeaMonkey versions +11_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +20_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2 + +# Add dependencies +.if defined(USE_SEAMONKEY) +.if defined(_SEAMONKEY_BUILD_DEPENDS) +BUILD_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS} +.else +RUN_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS} +.endif +.endif + +.endif # defined(USE_SEAMONKEY) +# +# Thunderbird part +# +.if defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD) + +# Process USE_THUNDERBIRD_BUILD +.if !defined(USE_THUNDERBIRD) +.if defined(USE_THUNDERBIRD_BUILD) +USE_THUNDERBIRD:= ${USE_THUNDERBIRD_BUILD} +_THUNDERBIRD_BUILD_DEPENDS= yes +.endif +.endif + +_THUNDERBIRD_DEFAULT_VERSION= 31 +_THUNDERBIRD_VERSIONS= 31 30 +_THUNDERBIRD_FIREFOX_RANGE_VERSIONS= 31+ 30+ + +# For specifying [31, 30, ..]+ +_FIREFOX_30P= 30 ${_THUNDERBIRD_31P} +_FIREFOX_31P= 31 + +# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given +.if ${USE_THUNDERBIRD} == "yes" +USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION} +.endif + +.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD}P) +IGNORE:= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} +.endif + +# Check if we have user-defined WITH_THUNDERBIRD_VER and if it matches +# the range specified in port's USE_THUNDERBIRD +.if defined(WITH_THUNDERBIRD_VER) +.for ver in ${_THUNDERBIRD_RANGE_VERSIONS} +.if ${USE_THUNDERBIRD} == "${ver}" +_MATCHED_THUNDERBIRD_VER:= ${USE_THUNDERBIRD:S/+//} +.for thunderbird in ${_THUNDERBIRDL_${_MATCHED_THUNDERBIRD_VER}P} +.if ${WITH_THUNDERBIRD_VER} == ${thunderbird} +# Check if user supplied WITH_THUNDERBIRD is in the INVALID_THUNDERBIRD_VER list +_BRKTHUNDERBIRD= no +.for iver in ${INVALID_THUNDERBIRD_VER} +.if ${WITH_THUNDERBIRD_VER} == ${iver} +_BRKTHUNDERBIRD= yes +.endif +.endfor +# If WITH_THUNDERBIRD is not in the INVALID_THUNDERBIRD_VER list, use it +# otherwise take default from port +.if ${_BRKTHUNDERBIRD} == "no" +USE_THUNDERBIRD= ${WITH_THUNDERBIRD_VER} +.endif +.endif +.endfor +.endif +.endfor +.endif + +# Setting/finding Thunderbird version we want. +.if exists(${LOCALBASE}/bin/thunderbird) +_FIREFOX_VER!= ${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/' +.endif + +.if defined(_THUNDERBIRD_VER) +.if ${_THUNDERBIRD_VER} != ${USE_THUNDERBIRD} +IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_THUNDERBIRD_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} +.endif +.endif + +# Dependence lines for different Thunderbird versions +31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird +30_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3 + +# Add dependencies +.if defined(USE_THUNDERBIRD) +.if defined(_THUNDERBIRD_BUILD_DEPENDS) +BUILD_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS} +.else +RUN_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS} +.endif +.endif + +.endif # defined(USE_THUNDERBIRD) .endif # ======================= USERS ================================= From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 29 20:49:52 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E16091065672 for ; Mon, 29 Nov 2010 20:49:51 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 7128B8FC1B for ; Mon, 29 Nov 2010 20:49:51 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oATKnohm005087 for ; Mon, 29 Nov 2010 20:49:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oATKnjOo004407 for freebsd-gecko@freebsd.org; Mon, 29 Nov 2010 20:49:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 29 Nov 2010 20:49:45 GMT Message-Id: <201011292049.oATKnjOo004407@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r446 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2010 20:49:52 -0000 Author: beat Date: Mon Nov 29 20:49:44 2010 New Revision: 446 Log: - Hook USE_SEAMONKEY(_BUILD) and USE_THUNDERBIRD(_BUILD) to bsd.port.mk Modified: branches/experimental/Mk/bsd.port.mk Modified: branches/experimental/Mk/bsd.port.mk ============================================================================== --- branches/experimental/Mk/bsd.port.mk Mon Nov 29 15:05:56 2010 (r445) +++ branches/experimental/Mk/bsd.port.mk Mon Nov 29 20:49:44 2010 (r446) @@ -1550,7 +1550,7 @@ .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif -.if defined(WANT_GECKO) || defined(USE_GECKO) || defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) +.if defined(WANT_GECKO) || defined(USE_GECKO) || defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) || defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) || defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD) .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 29 20:52:58 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CBB0106566B for ; Mon, 29 Nov 2010 20:52:58 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 34C548FC13 for ; Mon, 29 Nov 2010 20:52:57 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oATKqvp8012088 for ; Mon, 29 Nov 2010 20:52:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oATKqqra011650 for freebsd-gecko@freebsd.org; Mon, 29 Nov 2010 20:52:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 29 Nov 2010 20:52:52 GMT Message-Id: <201011292052.oATKqqra011650@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r447 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2010 20:52:58 -0000 Author: beat Date: Mon Nov 29 20:52:51 2010 New Revision: 447 Log: - Define Gecko_Pre_Include to fix bsd.gecko.mk logic Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Nov 29 20:49:44 2010 (r446) +++ branches/experimental/Mk/bsd.gecko.mk Mon Nov 29 20:52:51 2010 (r447) @@ -9,6 +9,7 @@ # 4 column tabs prevent hair loss and tooth decay! .if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) +Gecko_Pre_Include= bsd.gecko.mk # USE_FIREFOX - Add runtime dependency on Firefox. If no version # is given by the maintainer via the port or by the From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 29 22:20:41 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0276E1065675 for ; Mon, 29 Nov 2010 22:20:41 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9F1A28FC16 for ; Mon, 29 Nov 2010 22:20:40 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oATMKdR0029629 for ; Mon, 29 Nov 2010 22:20:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oATMKYUZ029444 for freebsd-gecko@freebsd.org; Mon, 29 Nov 2010 22:20:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 29 Nov 2010 22:20:34 GMT Message-Id: <201011292220.oATMKYUZ029444@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r448 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2010 22:20:41 -0000 Author: beat Date: Mon Nov 29 22:20:33 2010 New Revision: 448 Log: - Reorganize bsd.gecko.mk to really fix its logic Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Nov 29 20:52:51 2010 (r447) +++ branches/experimental/Mk/bsd.gecko.mk Mon Nov 29 22:20:33 2010 (r448) @@ -8,9 +8,171 @@ # # 4 column tabs prevent hair loss and tooth decay! -.if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) -Gecko_Pre_Include= bsd.gecko.mk +# ======================= USERS ================================= +# To specify which gecko-based backend you prefer, use something like: +# +# WITH_GECKO= libxul +# +# The valid backends are: +# libxul seamonkey +# +# See below for more details. +# ======================= /USERS ================================ + +# bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users +# and porters to support any available gecko backend without needing to build +# many conditional tests. ${USE_GECKO} is the list of backends that your port +# can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. +# Users set ${WITH_GECKO} to the list of gecko backends they want on their +# system. + +.if defined(USE_GECKO) && ${USE_GECKO}!="gecko" + +.if !defined(Gecko_Pre_Include) +# Please make sure all changes to this file are passed through the maintainer. +# Do not commit them yourself (unless of course you're the Port's Wraith ;). +Gecko_Include_MAINTAINER= gecko@FreeBSD.org +Gecko_Pre_Include= bsd.gecko.mk + +# Users should use the following syntax: +# +# WITH_GECKO= libxul seamonkey +# Use libxul whenever a port supports it, falling back on seamonkey. +# WITH_GECKO= libxul +# Sets your preferred backend. With this example, libxul will always +# be chosen, unless the port doesn't support a libxul backend. In that +# case, you get whatever the porter chose as the default. Better to use +# the first example. +# +# +# Ports should use the following: +# +# USE_GECKO= libxul seamonkey +# The list of gecko backends that the port supports. Unless the user +# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO +# will be the default. In the above example, www/libxul will be used +# as a gecko backend unless WITH_GECKO=seamonkey is defined by the user. +# +# USE_GECKO= libxul-devel<->libxul +# This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure +# if ${GECKO}=="libxul-devel" +# +# Example: +# USE_GECKO= libxul seamonkey +# +# post-patch: +# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ +# ${MOZSRC}/configure +# +# If you want your port to check the ${GECKO} variable to see which backend +# has been chosen. +# +# Example: +# USE_GECKO= libxul seamonkey +# +# post-patch: +# .if ${GECKO}=="seamonkey" +# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ +# ${MOZSRC}/configure +# .endif + +_GECKO_ALL= seamonkey libxul + +libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so + +.for gecko in ${_GECKO_ALL} +${gecko}_PORTSDIR?= www +${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} +${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so +.endfor +# Figure out which mozilla to use +# Weed out bad options in USE_GECKO +.for badgecko in ${USE_GECKO} +. if ${_GECKO_ALL:M${badgecko:C/^([^<->]+).*/\1/}}!="" +GOOD_USE_GECKO+= ${badgecko:C/^([^<->]+).*/\1/} +. endif +. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}" +${badgecko:C/^([^<->]+).*/\1/}_HACK= s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g +. endif +.endfor + +.undef GECKO_FALLTHROUGH +.undef _FOUND_WITH_GECKO +# Figure out which gecko to use and weed out the bad ones +.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) +. for badgecko in ${WITH_GECKO} +. if ${GOOD_USE_GECKO:M${badgecko}}!="" +GOOD_WITH_GECKO+= ${badgecko} +. endif +. endfor +. if defined(GOOD_WITH_GECKO) +. for gecko in ${GOOD_WITH_GECKO} +. if !defined(GECKO_FALLTHROUGH) +GECKO= ${gecko} +GECKO_FALLTHROUGH= ${TRUE} +_FOUND_WITH_GECKO= ${TRUE} +. endif +. endfor +. endif +.endif + +.if !defined(GECKO) && defined(GOOD_USE_GECKO) +. for gecko in ${GOOD_USE_GECKO} +. if !defined(GECKO_FALLTRHOUGH) +GECKO= ${gecko} +GECKO_FALLTRHOUGH= ${TRUE} +. endif +. endfor +.endif + +# Generic defines +GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config +XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl +XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` + +.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" +BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} +RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} +.else +IGNORE= Unable to find a supported gecko, please check USE_GECKO +.endif + +pre-everything:: _gecko-pre-everything + +_gecko-pre-everything:: + @${ECHO_CMD} "" +.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO) + @${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you" + @${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}." + @${ECHO_CMD} " \"${GECKO}\" will be used" + @${ECHO_CMD} "" + @${ECHO_CMD} " for gecko support, but you can change that by using one of" + @${ECHO_CMD} " the following values:" +.else + @${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can" + @${ECHO_CMD} " change that by defining WITH_GECKO to the following values:" +.endif + @${ECHO_CMD} "" +.for gecko in ${GOOD_USE_GECKO} + @${ECHO_CMD} " ${gecko} " +.endfor + @${ECHO_CMD} "" + +post-patch: gecko-post-patch + +gecko-post-patch: +.if defined(${GECKO}_HACK) + ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ + ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} +.endif +.endif + +.elif !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) && (defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) || defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) || defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD)) +Gecko_Pre_Include= bsd.gecko.mkl + +# Ports can use the following: +# # USE_FIREFOX - Add runtime dependency on Firefox. If no version # is given by the maintainer via the port or by the # user via defined variable try to find the highest @@ -319,167 +481,6 @@ .endif .endif # defined(USE_THUNDERBIRD) -.endif - -# ======================= USERS ================================= -# To specify which gecko-based backend you prefer, use something like: -# -# WITH_GECKO= libxul -# -# The valid backends are: -# libxul seamonkey -# -# See below for more details. -# ======================= /USERS ================================ - -# bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users -# and porters to support any available gecko backend without needing to build -# many conditional tests. ${USE_GECKO} is the list of backends that your port -# can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. -# Users set ${WITH_GECKO} to the list of gecko backends they want on their -# system. - -.if defined(USE_GECKO) && ${USE_GECKO}!="gecko" - -.if !defined(Gecko_Pre_Include) -# Please make sure all changes to this file are passed through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gecko_Include_MAINTAINER= gecko@FreeBSD.org -Gecko_Pre_Include= bsd.gecko.mk - -# Users should use the following syntax: -# -# WITH_GECKO= libxul seamonkey -# Use libxul whenever a port supports it, falling back on seamonkey. -# WITH_GECKO= libxul -# Sets your preferred backend. With this example, libxul will always -# be chosen, unless the port doesn't support a libxul backend. In that -# case, you get whatever the porter chose as the default. Better to use -# the first example. -# -# -# Ports should use the following: -# -# USE_GECKO= libxul seamonkey -# The list of gecko backends that the port supports. Unless the user -# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO -# will be the default. In the above example, www/libxul will be used -# as a gecko backend unless WITH_GECKO=seamonkey is defined by the user. -# -# USE_GECKO= libxul-devel<->libxul -# This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure -# if ${GECKO}=="libxul-devel" -# -# Example: -# USE_GECKO= libxul seamonkey -# -# post-patch: -# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ -# ${MOZSRC}/configure -# -# If you want your port to check the ${GECKO} variable to see which backend -# has been chosen. -# -# Example: -# USE_GECKO= libxul seamonkey -# -# post-patch: -# .if ${GECKO}=="seamonkey" -# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ -# ${MOZSRC}/configure -# .endif - -_GECKO_ALL= seamonkey libxul - -libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so - -.for gecko in ${_GECKO_ALL} -${gecko}_PORTSDIR?= www -${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} -${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so -.endfor - -# Figure out which mozilla to use -# Weed out bad options in USE_GECKO -.for badgecko in ${USE_GECKO} -. if ${_GECKO_ALL:M${badgecko:C/^([^<->]+).*/\1/}}!="" -GOOD_USE_GECKO+= ${badgecko:C/^([^<->]+).*/\1/} -. endif -. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}" -${badgecko:C/^([^<->]+).*/\1/}_HACK= s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g -. endif -.endfor - -.undef GECKO_FALLTHROUGH -.undef _FOUND_WITH_GECKO -# Figure out which gecko to use and weed out the bad ones -.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) -. for badgecko in ${WITH_GECKO} -. if ${GOOD_USE_GECKO:M${badgecko}}!="" -GOOD_WITH_GECKO+= ${badgecko} -. endif -. endfor -. if defined(GOOD_WITH_GECKO) -. for gecko in ${GOOD_WITH_GECKO} -. if !defined(GECKO_FALLTHROUGH) -GECKO= ${gecko} -GECKO_FALLTHROUGH= ${TRUE} -_FOUND_WITH_GECKO= ${TRUE} -. endif -. endfor -. endif -.endif - -.if !defined(GECKO) && defined(GOOD_USE_GECKO) -. for gecko in ${GOOD_USE_GECKO} -. if !defined(GECKO_FALLTRHOUGH) -GECKO= ${gecko} -GECKO_FALLTRHOUGH= ${TRUE} -. endif -. endfor -.endif - -# Generic defines -GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config -XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl -XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` - -.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" -BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} -RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} -.else -IGNORE= Unable to find a supported gecko, please check USE_GECKO -.endif - -pre-everything:: _gecko-pre-everything - -_gecko-pre-everything:: - @${ECHO_CMD} "" -.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO) - @${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you" - @${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}." - @${ECHO_CMD} " \"${GECKO}\" will be used" - @${ECHO_CMD} "" - @${ECHO_CMD} " for gecko support, but you can change that by using one of" - @${ECHO_CMD} " the following values:" -.else - @${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can" - @${ECHO_CMD} " change that by defining WITH_GECKO to the following values:" -.endif - @${ECHO_CMD} "" -.for gecko in ${GOOD_USE_GECKO} - @${ECHO_CMD} " ${gecko} " -.endfor - @${ECHO_CMD} "" - -post-patch: gecko-post-patch - -gecko-post-patch: -.if defined(${GECKO}_HACK) - ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ - ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} -.endif -.endif .else # split From owner-freebsd-gecko@FreeBSD.ORG Tue Nov 30 08:23:11 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07571106564A for ; Tue, 30 Nov 2010 08:23:11 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 950F98FC17 for ; Tue, 30 Nov 2010 08:23:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oAU8N97h078155 for ; Tue, 30 Nov 2010 08:23:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oAU8N4ZA077876 for freebsd-gecko@freebsd.org; Tue, 30 Nov 2010 08:23:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 30 Nov 2010 08:23:04 GMT Message-Id: <201011300823.oAU8N4ZA077876@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r449 - trunk/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2010 08:23:11 -0000 Author: beat Date: Tue Nov 30 08:23:03 2010 New Revision: 449 Log: - Switch substitution example to libxul-devel<->libxul although this functionality is not used as the ports tree does not have libxul-devel at the moment. Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Mon Nov 29 22:20:33 2010 (r448) +++ trunk/Mk/bsd.gecko.mk Tue Nov 30 08:23:03 2010 (r449) @@ -53,9 +53,9 @@ # will be the default. In the above example, www/libxul will be used # as a gecko backend unless WITH_GECKO=seamonkey is defined by the user. # -# USE_GECKO= firefox-devel<->firefox -# This will sed -e 's/firefox/firefox-devel/' on Makefile.in's and configure -# if ${GECKO}=="firefox-devel" +# USE_GECKO= libxul-devel<->libxul +# This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure +# if ${GECKO}=="libxul-devel" # # Example: # USE_GECKO= libxul seamonkey From owner-freebsd-gecko@FreeBSD.ORG Wed Dec 1 09:35:14 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4633F106566C for ; Wed, 1 Dec 2010 09:35:14 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id D2A7E8FC1A for ; Wed, 1 Dec 2010 09:35:13 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB19ZC66047903 for ; Wed, 1 Dec 2010 09:35:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB19ZCmW047394 for freebsd-gecko@freebsd.org; Wed, 1 Dec 2010 09:35:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 1 Dec 2010 09:35:12 GMT Message-Id: <201012010935.oB19ZCmW047394@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r450 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 09:35:14 -0000 Author: beat Date: Wed Dec 1 09:35:11 2010 New Revision: 450 Log: - Fix typo Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Tue Nov 30 08:23:03 2010 (r449) +++ branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 09:35:11 2010 (r450) @@ -169,7 +169,7 @@ .endif .elif !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) && (defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) || defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) || defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD)) -Gecko_Pre_Include= bsd.gecko.mkl +Gecko_Pre_Include= bsd.gecko.mk # Ports can use the following: # From owner-freebsd-gecko@FreeBSD.ORG Wed Dec 1 10:26:35 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 376FB106564A for ; Wed, 1 Dec 2010 10:26:35 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id C22738FC0C for ; Wed, 1 Dec 2010 10:26:33 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB1AQW3p064648 for ; Wed, 1 Dec 2010 10:26:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB1AQRnq064289 for freebsd-gecko@freebsd.org; Wed, 1 Dec 2010 10:26:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 1 Dec 2010 10:26:27 GMT Message-Id: <201012011026.oB1AQRnq064289@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r451 - branches/experimental/www/firefox-devel X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 10:26:35 -0000 Author: beat Date: Wed Dec 1 10:26:27 2010 New Revision: 451 Log: - Allow build on tinderbox using a virtual X11 environment with Xvfb. Submitted by: swills@ via IRC Modified: branches/experimental/www/firefox-devel/Makefile Modified: branches/experimental/www/firefox-devel/Makefile ============================================================================== --- branches/experimental/www/firefox-devel/Makefile Wed Dec 1 09:35:11 2010 (r450) +++ branches/experimental/www/firefox-devel/Makefile Wed Dec 1 10:26:27 2010 (r451) @@ -80,7 +80,7 @@ .if defined(WITH_PGO) BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 USE_PYTHON_BUILD= yes -IS_INTERACTIVE= yes +USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" MAKEFILE= client.mk From owner-freebsd-gecko@FreeBSD.ORG Wed Dec 1 21:56:48 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B573106570D for ; Wed, 1 Dec 2010 21:56:48 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9811C8FC23 for ; Wed, 1 Dec 2010 21:56:47 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB1LukKd009349 for ; Wed, 1 Dec 2010 21:56:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB1LufVE008815 for freebsd-gecko@freebsd.org; Wed, 1 Dec 2010 21:56:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 1 Dec 2010 21:56:41 GMT Message-Id: <201012012156.oB1LufVE008815@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r452 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 21:56:48 -0000 Author: beat Date: Wed Dec 1 21:56:40 2010 New Revision: 452 Log: - Fix copy-paste failure to make USE_THUNDERBIRD working Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 10:26:27 2010 (r451) +++ branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 21:56:40 2010 (r452) @@ -418,8 +418,8 @@ _THUNDERBIRD_FIREFOX_RANGE_VERSIONS= 31+ 30+ # For specifying [31, 30, ..]+ -_FIREFOX_30P= 30 ${_THUNDERBIRD_31P} -_FIREFOX_31P= 31 +_THUNDERBIRD_30P= 30 ${_THUNDERBIRD_31P} +_THUNDERBIRD_31P= 31 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given .if ${USE_THUNDERBIRD} == "yes" From owner-freebsd-gecko@FreeBSD.ORG Wed Dec 1 22:04:32 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 771CC1065670 for ; Wed, 1 Dec 2010 22:04:32 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 100AF8FC08 for ; Wed, 1 Dec 2010 22:04:31 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB1M4UQD033100 for ; Wed, 1 Dec 2010 22:04:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB1M4PAU032649 for freebsd-gecko@freebsd.org; Wed, 1 Dec 2010 22:04:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 1 Dec 2010 22:04:25 GMT Message-Id: <201012012204.oB1M4PAU032649@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r453 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 22:04:32 -0000 Author: beat Date: Wed Dec 1 22:04:25 2010 New Revision: 453 Log: - Fix some more copy-paste failures to make version checks and thunderbird range working Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 21:56:40 2010 (r452) +++ branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 22:04:25 2010 (r453) @@ -377,7 +377,7 @@ # Setting/finding SeaMonkey version we want. .if exists(${LOCALBASE}/bin/seamonkey) -_FIREFOX_VER!= ${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/' +_SEAMONKEY_VER!= ${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif .if defined(_SEAMONKEY_VER) @@ -415,7 +415,7 @@ _THUNDERBIRD_DEFAULT_VERSION= 31 _THUNDERBIRD_VERSIONS= 31 30 -_THUNDERBIRD_FIREFOX_RANGE_VERSIONS= 31+ 30+ +_THUNDERBIRD_RANGE_VERSIONS= 31+ 30+ # For specifying [31, 30, ..]+ _THUNDERBIRD_30P= 30 ${_THUNDERBIRD_31P} @@ -458,7 +458,7 @@ # Setting/finding Thunderbird version we want. .if exists(${LOCALBASE}/bin/thunderbird) -_FIREFOX_VER!= ${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/' +_THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif .if defined(_THUNDERBIRD_VER) From owner-freebsd-gecko@FreeBSD.ORG Wed Dec 1 23:22:31 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 999971065675 for ; Wed, 1 Dec 2010 23:22:31 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 2ADF98FC16 for ; Wed, 1 Dec 2010 23:22:30 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB1NMULf026341 for ; Wed, 1 Dec 2010 23:22:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB1NMO2Q025786 for freebsd-gecko@freebsd.org; Wed, 1 Dec 2010 23:22:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 1 Dec 2010 23:22:24 GMT Message-Id: <201012012322.oB1NMO2Q025786@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r454 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2010 23:22:31 -0000 Author: beat Date: Wed Dec 1 23:22:24 2010 New Revision: 454 Log: - Fix typo in for loop - Fix version check for ranges - Style nits Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 22:04:25 2010 (r453) +++ branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 23:22:24 2010 (r454) @@ -262,8 +262,8 @@ USE_FIREFOX= ${_FIREFOX_DEFAULT_VERSION} .endif -.if !defined(_FIREFOX_${USE_FIREFOX}P) -IGNORE:= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} +.if !defined(_FIREFOX_${USE_FIREFOX:S/+//}P) +IGNORE:= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} .endif # Check if we have user-defined WITH_FIREFOX_VER and if it matches @@ -272,7 +272,7 @@ .for ver in ${_FIREFOX_RANGE_VERSIONS} .if ${USE_FIREFOX} == "${ver}" _MATCHED_FIREFOX_VER:= ${USE_FIREFOX:S/+//} -.for firefox in ${_FIREFOXL_${_MATCHED_FIREFOX_VER}P} +.for firefox in ${_FIREFOX_${_MATCHED_FIREFOX_VER}P} .if ${WITH_FIREFOX_VER} == ${firefox} # Check if user supplied WITH_FIREFOX is in the INVALID_FIREFOX_VER list _BRKFIREFOX= no @@ -328,7 +328,7 @@ .if !defined(USE_SEAMONKEY) .if defined(USE_SEAMONKEY_BUILD) USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD} -_SEAMONKEY_BUILD_DEPENDS= yes +_SEAMONKEY_BUILD_DEPENDS= yes .endif .endif @@ -345,8 +345,8 @@ USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION} .endif -.if !defined(_SEAMONKEY_${USE_SEAMONKEY}P) -IGNORE:= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} +.if !defined(_SEAMONKEY_${USE_SEAMONKEY:S/+//}P) +IGNORE:= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} .endif # Check if we have user-defined WITH_SEAMONKEY_VER and if it matches @@ -355,7 +355,7 @@ .for ver in ${_SEAMONKEY_RANGE_VERSIONS} .if ${USE_SEAMONKEY} == "${ver}" _MATCHED_SEAMONKEY_VER:= ${USE_SEAMONKEY:S/+//} -.for seamonkey in ${_SEAMONKEYL_${_MATCHED_SEAMONKEY_VER}P} +.for seamonkey in ${_SEAMONKEY_${_MATCHED_SEAMONKEY_VER}P} .if ${WITH_SEAMONKEY_VER} == ${seamonkey} # Check if user supplied WITH_SEAMONKEY is in the INVALID_SEAMONKEY_VER list _BRKSEAMONKEY= no @@ -426,7 +426,7 @@ USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION} .endif -.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD}P) +.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P) IGNORE:= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} .endif @@ -436,7 +436,7 @@ .for ver in ${_THUNDERBIRD_RANGE_VERSIONS} .if ${USE_THUNDERBIRD} == "${ver}" _MATCHED_THUNDERBIRD_VER:= ${USE_THUNDERBIRD:S/+//} -.for thunderbird in ${_THUNDERBIRDL_${_MATCHED_THUNDERBIRD_VER}P} +.for thunderbird in ${_THUNDERBIRD_${_MATCHED_THUNDERBIRD_VER}P} .if ${WITH_THUNDERBIRD_VER} == ${thunderbird} # Check if user supplied WITH_THUNDERBIRD is in the INVALID_THUNDERBIRD_VER list _BRKTHUNDERBIRD= no From owner-freebsd-gecko@FreeBSD.ORG Thu Dec 2 10:44:12 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 877851065672 for ; Thu, 2 Dec 2010 10:44:12 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 2FDFC8FC12 for ; Thu, 2 Dec 2010 10:44:11 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB2AiAG7085355 for ; Thu, 2 Dec 2010 10:44:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB2Ai5vX085000 for freebsd-gecko@freebsd.org; Thu, 2 Dec 2010 10:44:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 2 Dec 2010 10:44:05 GMT Message-Id: <201012021044.oB2Ai5vX085000@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r455 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2010 10:44:12 -0000 Author: beat Date: Thu Dec 2 10:44:04 2010 New Revision: 455 Log: - Fix check of wanted version against installed one if the wanted version is a range. Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Dec 1 23:22:24 2010 (r454) +++ branches/experimental/Mk/bsd.gecko.mk Thu Dec 2 10:44:04 2010 (r455) @@ -299,8 +299,26 @@ _FIREFOX_VER!= ${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif +# Check if installed Firefox version matches the wanted one .if defined(_FIREFOX_VER) -.if ${_FIREFOX_VER} != ${USE_FIREFOX} +_SUPFIREFOX= no +.if ${USE_FIREFOX:C/[0-9][0-9]//} == "+" +.for ver in ${_FIREFOX_RANGE_VERSIONS} +.if ${USE_FIREFOX} == "${ver}" +_MATCHED_FIREFOX_VER:= ${ver:S/+//} +.for firefox in ${_FIREFOX_${_MATCHED_FIREFOX_VER}P} +.if ${_FIREFOX_VER} == ${firefox} +_SUPFIREFOX= yes +.endif +.endfor +.endif +.endfor +.else +.if ${_FIREFOX_VER} == ${USE_FIREFOX} +_SUPFIREFOX= yes +.endif +.endif +.if ${_SUPFIREFOX} == no IGNORE= cannot install: Firefox versions mismatch: firefox-${_FIREFOX_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} .endif .endif @@ -380,8 +398,26 @@ _SEAMONKEY_VER!= ${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif +# Check if installed SeaMonkey version matches the wanted one .if defined(_SEAMONKEY_VER) -.if ${_SEAMONKEY_VER} != ${USE_SEAMONKEY} +_SUPSEAMONKEY= no +.if ${USE_SEAMONKEY:C/[0-9][0-9]//} == "+" +.for ver in ${_SEAMONKEY_RANGE_VERSIONS} +.if ${USE_SEAMONKEY} == "${ver}" +_MATCHED_SEAMONKEY_VER:= ${ver:S/+//} +.for seamonkey in ${_SEAMONKEY_${_MATCHED_SEAMONKEY_VER}P} +.if ${_SEAMONKEY_VER} == ${seamonkey} +_SUPSEAMONKEY= yes +.endif +.endfor +.endif +.endfor +.else +.if ${_SEAMONKEY_VER} == ${USE_SEAMONKEY} +_SUPSEAMONKEY= yes +.endif +.endif +.if ${_SUPSEAMONKEY} == no IGNORE= cannot install: SeaMonkey versions mismatch: seamonkey-${_SEAMONKEY_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} .endif .endif @@ -461,8 +497,26 @@ _THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/' .endif +# Check if installed Thunderbird version matches the wanted one .if defined(_THUNDERBIRD_VER) -.if ${_THUNDERBIRD_VER} != ${USE_THUNDERBIRD} +_SUPTHUNDERBIRD= no +.if ${USE_THUNDERBIRD:C/[0-9][0-9]//} == "+" +.for ver in ${_THUNDERBIRD_RANGE_VERSIONS} +.if ${USE_THUNDERBIRD} == "${ver}" +_MATCHED_THUNDERBIRD_VER:= ${ver:S/+//} +.for thunderbird in ${_THUNDERBIRD_${_MATCHED_THUNDERBIRD_VER}P} +.if ${_THUNDERBIRD_VER} == ${thunderbird} +_SUPTHUNDERBIRD= yes +.endif +.endfor +.endif +.endfor +.else +.if ${_THUNDERBIRD_VER} == ${USE_THUNDERBIRD} +_SUPTHUNDERBIRD= yes +.endif +.endif +.if ${_SUPTHUNDERBIRD} != yes IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_THUNDERBIRD_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} .endif .endif From owner-freebsd-gecko@FreeBSD.ORG Thu Dec 2 10:58:15 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A44351065670 for ; Thu, 2 Dec 2010 10:58:15 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 327B38FC12 for ; Thu, 2 Dec 2010 10:58:14 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oB2AwEqd013320 for ; Thu, 2 Dec 2010 10:58:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oB2Aw9DQ013295 for freebsd-gecko@freebsd.org; Thu, 2 Dec 2010 10:58:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 2 Dec 2010 10:58:09 GMT Message-Id: <201012021058.oB2Aw9DQ013295@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r456 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2010 10:58:15 -0000 Author: beat Date: Thu Dec 2 10:58:08 2010 New Revision: 456 Log: - Relocate unknown version check. Otherwise this check is always superseeded by the installed version check. Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Dec 2 10:44:04 2010 (r455) +++ branches/experimental/Mk/bsd.gecko.mk Thu Dec 2 10:58:08 2010 (r456) @@ -262,10 +262,6 @@ USE_FIREFOX= ${_FIREFOX_DEFAULT_VERSION} .endif -.if !defined(_FIREFOX_${USE_FIREFOX:S/+//}P) -IGNORE:= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} -.endif - # Check if we have user-defined WITH_FIREFOX_VER and if it matches # the range specified in port's USE_FIREFOX .if defined(WITH_FIREFOX_VER) @@ -323,6 +319,10 @@ .endif .endif +.if !defined(_FIREFOX_${USE_FIREFOX:S/+//}P) +IGNORE= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} +.endif + # Dependence lines for different Firefox versions 36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox 35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 @@ -363,10 +363,6 @@ USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION} .endif -.if !defined(_SEAMONKEY_${USE_SEAMONKEY:S/+//}P) -IGNORE:= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} -.endif - # Check if we have user-defined WITH_SEAMONKEY_VER and if it matches # the range specified in port's USE_SEAMONKEY .if defined(WITH_SEAMONKEY_VER) @@ -422,6 +418,10 @@ .endif .endif +.if !defined(_SEAMONKEY_${USE_SEAMONKEY:S/+//}P) +IGNORE= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/} +.endif + # Dependence lines for different SeaMonkey versions 11_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey 20_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2 @@ -462,10 +462,6 @@ USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION} .endif -.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P) -IGNORE:= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} -.endif - # Check if we have user-defined WITH_THUNDERBIRD_VER and if it matches # the range specified in port's USE_THUNDERBIRD .if defined(WITH_THUNDERBIRD_VER) @@ -521,6 +517,10 @@ .endif .endif +.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P) +IGNORE= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} +.endif + # Dependence lines for different Thunderbird versions 31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird 30_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3 From owner-freebsd-gecko@FreeBSD.ORG Fri Dec 3 19:37:13 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7684106566B for ; Fri, 3 Dec 2010 19:37:13 +0000 (UTC) (envelope-from amarat@ksu.ru) Received: from mx7.ksu.ru (honey.ksu.ru [193.232.252.54]) by mx1.freebsd.org (Postfix) with ESMTP id 730C48FC15 for ; Fri, 3 Dec 2010 19:37:11 +0000 (UTC) Received: from mail.ksu.ru (HELO ruby.ksu.ru) ([193.232.252.56]) by iport2.ksu.ru with ESMTP; 03 Dec 2010 22:36:55 +0300 X-Pass-Through: Kazan State University Network Received: from zealot.ksu.ru ([194.85.245.161]) by ksu.ru (8.13.4/8.13.4) with ESMTP id oB3Jamdc020416; Fri, 3 Dec 2010 19:36:48 GMT Received: from zealot.ksu.ru (localhost.lnet [127.0.0.1]) by zealot.ksu.ru (8.14.4/8.14.4) with ESMTP id oB3JafTW091148; Fri, 3 Dec 2010 22:36:41 +0300 (MSK) (envelope-from amarat@ksu.ru) Message-ID: <4CF946C9.2040007@ksu.ru> Date: Fri, 03 Dec 2010 22:36:41 +0300 From: "Marat N.Afanasyev" User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.13) Gecko/20101001 SeaMonkey/2.0.8 MIME-Version: 1.0 To: "Marat N.Afanasyev" References: <4CD32E29.6050305@ksu.ru> <4CECDE92.8040109@ksu.ru> In-Reply-To: <4CECDE92.8040109@ksu.ru> Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090700070403050503080501" X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-gecko@freebsd.org Subject: Re: problem building seamonkey-2.1b1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2010 19:37:13 -0000 This is a cryptographically signed message in MIME format. --------------ms090700070403050503080501 Content-Type: multipart/mixed; boundary="------------030302010407020105050902" This is a multi-part message in MIME format. --------------030302010407020105050902 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: quoted-printable Marat N.Afanasyev wrote: > Marat N.Afanasyev wrote: >> I'm trying to build seamonkey 2.1b1, but I have the following problem:= >> >> tier_platform: ./../directory/c-sdk xpcom modules/libreg modules/libpr= ef >> intl netwerk extensions/auth jpeg gfx/qcms js/src/xpconnect intl/chard= et >> widget/src/gtkxtbin modules/libjar db extensions/cookie >> extensions/permissions storage rdf media/libvorbis media/libnestegg >> media/libvpx media/libogg media/libtheora media/libsydneyaudio uriload= er >> modules/libimg caps parser gfx modules/libpr0n modules/plugin dom view= >> widget content editor layout docshell webshell embedding xpfe/appshell= >> extensions/universalchardet accessible profile xpfe/components >> widget/src/xremoteclient extensions/spellcheck toolkit security/manage= r >> extensions/pref embedding/browser/gtk startupcache >> ./../mozilla/xpfe/components/autocomplete ./../directory/xpcom >> ./../mailnews/base ./../mailnews/mime/public ./../mailnews >> ./../suite/components toolkit/library xpcom/stub toolkit/system/gnome >> toolkit/system/dbus >> gmake[3]: Entering directory >> `/usr/home/tmp/usr/ports/local/seamonkey2-devel/work/comm-central/dire= ctory/c-sdk' >> >> >> Makefile:42: config/autoconf.mk: No such file or directory >> ../../config/config.mk:57: /config/autoconf.mk: No such file or direct= ory >> Makefile:55: *** target file `depend' has both : and :: entries. Stop.= >> gmake[3]: Leaving directory >> `/usr/home/tmp/usr/ports/local/seamonkey2-devel/work/comm-central/dire= ctory/c-sdk' >> >> >> gmake[2]: *** [tier_platform] Error 2 >> gmake[2]: Leaving directory >> `/usr/home/tmp/usr/ports/local/seamonkey2-devel/work/comm-central/mozi= lla' >> >> gmake[1]: *** [default] Error 2 >> gmake[1]: Leaving directory >> `/usr/home/tmp/usr/ports/local/seamonkey2-devel/work/comm-central/mozi= lla' >> >> gmake: *** [default] Error 2 >> *** Error code 1 >> >> in >> /usr/home/tmp/usr/ports/local/seamonkey2-devel/work/comm-central/direc= tory/c-sdk >> >> autoconf.mk.in exists, but autoconf.mk does not. is there correct way = to >> create this file? >> >> # uname -a >> FreeBSD xxx.xxx.xx 8.1-STABLE FreeBSD 8.1-STABLE #3: Sat Jul 24 15:48:= 00 >> MSD 2010 root@xxx.xxx.xx:/usr/obj/usr/src/sys/ZEALOT amd64 >> > > can anybody help me with this issue? please-please ;) > Solution is in attached patch Seamonkey 2.1 doesn't build without LDAP support. --=20 SY, Marat --------------030302010407020105050902 Content-Type: text/plain; name="Makefile.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="Makefile.diff" *** Makefile.orig 2010-12-02 19:19:09.000000000 +0300 --- Makefile 2010-12-02 19:20:42.000000000 +0300 *************** *** 120,123 **** --- 120,128 ---- .endif =20 + .if defined(WITHOUT_LDAP) + # doesn't build + BROKEN=3DDoes not builds without LDAP + .endif +=20 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ --------------030302010407020105050902-- --------------ms090700070403050503080501--