From owner-freebsd-chromium@FreeBSD.ORG Sun Apr 3 08:29:10 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 2B721106564A for ; Sun, 3 Apr 2011 08:29:10 +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 9AECD8FC14 for ; Sun, 3 Apr 2011 08:29:09 +0000 (UTC) Received: from regency.nsu.ru ([193.124.210.26]) by mx.nsu.ru with esmtp (Exim 4.69) (envelope-from ) id 1Q5qaR-0003rf-Of for chromium@FreeBSD.org; Sat, 02 Apr 2011 09:29:15 +0700 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id p322TKup042035 for ; Sat, 2 Apr 2011 09:29:20 +0700 (NOVST) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.14.2/8.14.2/Submit) id p322TA02041908 for chromium@FreeBSD.org; Sat, 2 Apr 2011 09:29:10 +0700 (NOVST) (envelope-from danfe) Date: Sat, 2 Apr 2011 09:29:10 +0700 From: Alexey Dokuchaev To: chromium@FreeBSD.org Message-ID: <20110402022910.GA37541@regency.nsu.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="qMm9M+Fa2AknHoGS" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i Cc: Subject: 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: Sun, 03 Apr 2011 08:29:10 -0000 --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, 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 ./danfe --qMm9M+Fa2AknHoGS Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cr.diff" Index: Makefile =================================================================== RCS file: /home/danfe/fbsd/FreeBSD-CVS/ports/www/chromium/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 1 Apr 2011 17:25:31 -0000 1.17 +++ Makefile 2 Apr 2011 02:21:56 -0000 @@ -12,27 +12,27 @@ MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ http://files.etoilebsd.net/goodking/ -DISTNAME= chromium-${DISTVERSIONPREFIX}${DISTVERSION} +DISTNAME= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= chromium@FreeBSD.org COMMENT= A mostly BSD-licensed web browser based on WebKit and Gtk+ -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 \ +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 -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ - 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 \ +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + 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 \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ @@ -68,10 +68,10 @@ #GYP_DEFINES+= use_system_zlib=1 GYP_DEFINES+= python_ver=${PYTHON_VER} -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 +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 @@ -125,9 +125,9 @@ @${ECHO_MSG} post-patch: - @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ - ${WRKSRC}/base/base.gypi \ - ${WRKSRC}/build/common.gypi \ + @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ + ${WRKSRC}/base/base.gypi \ + ${WRKSRC}/build/common.gypi \ ${WRKSRC}/third_party/libvpx/libvpx.gyp \ ${WRKSRC}/third_party/WebKit/Source/WebCore/plugins/PluginDatabase.cpp \ ${WRKSRC}/v8/tools/gyp/v8.gyp @@ -139,17 +139,17 @@ ${WRKSRC}/third_party/WebKit/Source/WebCore/bindings/scripts/IDLParser.pm \ ${WRKSRC}/third_party/WebKit/Source/WebCore/dom/make_names.pl @${REINPLACE_CMD} -e "s|'flex'|'${LOCALBASE}/bin/flex'|" \ - ${WRKSRC}/third_party/angle/src/build_angle.gyp \ + ${WRKSRC}/third_party/angle/src/build_angle.gyp \ ${WRKSRC}/third_party/WebKit/Source/WebCore/WebCore.gyp/scripts/action_maketokenizer.py @${REINPLACE_CMD} -e 's|gperf --key-positions|${LOCALBASE}/bin/gperf --key-positions|' \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makeprop.pl \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makevalues.pl \ + ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makeprop.pl \ + ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makevalues.pl \ ${WRKSRC}/third_party/WebKit/Source/WebCore/make-hash-tools.pl - # kludges just to make it progress for now - @${REINPLACE_CMD} -e "s|/usr/lib|${LOCALBASE}/lib|" \ +# kludges just to make it progress for now + @${REINPLACE_CMD} -e "s|/usr/lib|${LOCALBASE}/lib|" \ -e "s|'python_ver%': '2.5'|'python_ver%': '2.6'|" \ - -e "s|.so.1.0|.so.1|" \ - ${WRKSRC}/build/common.gypi + -e "s|.so.1.0|.so.1|" \ + ${WRKSRC}/build/common.gypi @${REINPLACE_CMD} -e "s|'-ldl',|'-lc',|" \ ${WRKSRC}/app/app_base.gypi \ ${WRKSRC}/build/linux/system.gyp \ @@ -158,25 +158,29 @@ do-configure: cd ${WRKSRC} && \ - GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} ./build/gyp_chromium chrome/chrome.gyp --depth ./ + GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \ + ./build/gyp_chromium chrome/chrome.gyp --depth . do-install: - ${MKDIR} ${DATADIR} + @${MKDIR} ${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/chrome.pak ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources.pak ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/chrome.pak \ + ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png \ + ${WRKSRC}/out/${BUILDTYPE}/resources.pak ${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ + ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${DATADIR} .for f in chrome ffmpegsumo_nolink libffmpegsumo.so mksnapshot protoc ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${DATADIR} .endfor - cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} "locales resources" ${DATADIR} - ${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin/ + cd ${WRKSRC}/out/${BUILDTYPE} && \ + ${COPYTREE_SHARE} "locales resources" ${DATADIR} + ${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin post-install: .if ${OSVERSION} < 900000 + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .endif .include --qMm9M+Fa2AknHoGS--