From owner-freebsd-chromium@FreeBSD.ORG Thu Apr 7 10:24:13 2011 Return-Path: Delivered-To: chromium@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDDF1106564A; Thu, 7 Apr 2011 10:24:12 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mx.nsu.ru (r2b9.nsu.ru [212.192.164.39]) by mx1.freebsd.org (Postfix) with ESMTP id 8944B8FC13; Thu, 7 Apr 2011 10:24:12 +0000 (UTC) Received: from regency.nsu.ru ([193.124.210.26]) by mx.nsu.ru with esmtp (Exim 4.69) (envelope-from ) id 1Q7mNg-0003xx-QD; Thu, 07 Apr 2011 17:24:04 +0700 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id p37AO5At063632; Thu, 7 Apr 2011 17:24:06 +0700 (NOVST) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.14.2/8.14.2/Submit) id p37AO0Rb063554; Thu, 7 Apr 2011 17:24:00 +0700 (NOVST) (envelope-from danfe) Date: Thu, 7 Apr 2011 17:24:00 +0700 From: Alexey Dokuchaev To: Rene Ladan Message-ID: <20110407102400.GA60050@regency.nsu.ru> References: <20110402022910.GA37541@regency.nsu.ru> <4D9A2365.20101@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="wac7ysb48OaltWcw" Content-Disposition: inline In-Reply-To: <4D9A2365.20101@freebsd.org> User-Agent: Mutt/1.4.2.1i Cc: chromium@freebsd.org Subject: Re: www/chromium/Makefile cleanups X-BeenThere: freebsd-chromium@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Chromium issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2011 10:24:13 -0000 --wac7ysb48OaltWcw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Apr 04, 2011 at 10:00:37PM +0200, Rene Ladan wrote: > Op 02-04-2011 04:29, Alexey Dokuchaev schreef: > > Please consider attached diff I'd like to commit (or perhaps you want > > to do it yourself). Proposed commit log: > > > > - Consistently use spaces and tabs (get rid of utter mess thereof) > > - Use PORTNAME in DISTNAME > > - Wrap some overly long lines > > - Pad pkg-message with ECHO_CMD's to bring port behavior in line with > > that of the package > > > I committed the patch. Meanwhile, I have some more: - Convert two explicit dependencies to corresponding USE_GNOME and USE_XORG components - Remove SSE2 option and use proper detection when building instead - Use USE_PYTHON_BUILD as advised by comment - Sort knobs a bit while I'm here ./danfe --wac7ysb48OaltWcw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ch.diff" Index: Makefile =================================================================== RCS file: /mnt/fbsd/development/FreeBSD-CVS/ports/www/chromium/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 4 Apr 2011 19:45:48 -0000 1.18 +++ Makefile 7 Apr 2011 05:11:17 -0000 @@ -20,7 +20,6 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ - pkg-config:${PORTSDIR}/devel/pkg-config \ yasm:${PORTSDIR}/devel/yasm \ nss>=3.12:${PORTSDIR}/security/nss # minimal version of nss, LIB_DEPENDS does not enforce this @@ -29,7 +28,6 @@ cairo.2:${PORTSDIR}/graphics/cairo \ dbus-1.3:${PORTSDIR}/devel/dbus \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - Xss.1:${PORTSDIR}/x11/libXScrnSaver \ asound.2:${PORTSDIR}/audio/alsa-lib \ freetype.9:${PORTSDIR}/print/freetype2 \ nss3.1:${PORTSDIR}/security/nss \ @@ -41,12 +39,12 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes USE_BISON= build -USE_PYTHON= 2.6+ # only needed at build time -USE_PERL5_BUILD=yes USE_GMAKE= yes +USE_PERL5_BUILD= yes +USE_PYTHON_BUILD= 2.6+ +USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst +USE_GNOME= glib20 gtk20 dconf libxslt pkgconfig MAN1= chrome.1 -USE_XORG= scrnsaverproto x11 xproto xtst -USE_GNOME= glib20 gtk20 dconf libxslt LICENSE_COMB= multi LICENSE= BSD LGPL21 MPL @@ -70,7 +68,6 @@ OPTIONS= CODECS "Compile and enable patented codecs like H.264" off \ GCONF "Use GConf2 for preferences" on \ - SSE2 "Use SSE2, disable this for PIII or older" on \ VPX "Use system libvpx for VP8 codec" on .include @@ -95,7 +92,7 @@ GYP_DEFINES+= use_gconf=0 .endif -.if defined(WITHOUT_SSE2) +.if ! ${MACHINE_CPU:Msse2} GYP_DEFINES+= disable_sse2=1 .endif --wac7ysb48OaltWcw--