From owner-svn-ports-head@freebsd.org Thu May 26 17:39:21 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FC07B4AD52; Thu, 26 May 2016 17:39:21 +0000 (UTC) (envelope-from duchateau.olivier@gmail.com) Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB99E1A9F; Thu, 26 May 2016 17:39:20 +0000 (UTC) (envelope-from duchateau.olivier@gmail.com) Received: by mail-wm0-x230.google.com with SMTP id a136so37974172wme.0; Thu, 26 May 2016 10:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I/8g+/vr98K+1FgMROrDlVnxl/2oo+KO+0VUhJ265ng=; b=eEW732cdCtXjmTiTAl/5BM0MCg9otBm6YXm8iWEMxlSLQfPNCpjKEJkfsXacgrPIjr uSkPrul56WIQ912tlxnB2Vho0Y9HQBoYii0Ur9SQS/UObyEDWniixXKCSp9SVEOpv65Z B6fSyGgnOh07yXCsrDPraoV6GrIPbtdWKR1pDElzsnqLe7Kj7iNwGqCuZmkOa2ZVN4gb GqI7hIBK/o8WZX32hyiF5rio6rciKJKllBwqwLDL+94X1ah7v4xPptoisq23dJjoZwtt 4R6mj7l5PpXJKAR96+b2SB0lnjScR6/dCs7QnqKbGgUui4f0f83l9eZm+fkrLDwXyX+c F9eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I/8g+/vr98K+1FgMROrDlVnxl/2oo+KO+0VUhJ265ng=; b=JysmQKPnQoTQYVGCXRZYFVoU9CEFo/I0R2j4gcB0/0juJq3LJBxOs7OaZiefpxjpKf iHbWPY+SwI2hTSf8u0qewcz0dGZ8HfhViFQh5zVllKbB/8us38/sEVhwnAaYQSucXRv9 P5AXKd7BSFTduWxkth1uRZD3pXVrSsQS0jGBcvvNLcuiA6lhLp6yd64WYv53q6WBmcSB 36UBCr7/PylwLtVrbyOvfV8TmJlyU2Iz7oWqD1m/4q6JzchevNsa2zovOBAJJ+g8kuKj rsoUgVJM7UWhrcQeNbW1TEOfUnFTwqx2IjiEpKiRH7FryX1q4nR+bUASxjjTFylx7Cis q4uQ== X-Gm-Message-State: ALyK8tLT8F/NMeTijtqRNu8qIsMkMrAsMrkGFVF3iaYQYtu5czPDt/ARQeyCBF4m1QHp+Q== X-Received: by 10.28.194.4 with SMTP id s4mr4867463wmf.68.1464284359229; Thu, 26 May 2016 10:39:19 -0700 (PDT) Received: from tuborg (AMarseille-655-1-713-104.w92-150.abo.wanadoo.fr. [92.150.102.104]) by smtp.gmail.com with ESMTPSA id cz3sm15386659wjb.14.2016.05.26.10.39.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 May 2016 10:39:18 -0700 (PDT) Sender: Olivier Duchateau Date: Thu, 26 May 2016 19:36:53 +0000 From: Olivier Duchateau To: Dmitry Marakasov Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r415903 - head/x11/lxpanel Message-Id: <20160526193653.20746fd01e4936b5f27b4ab6@freebsd.org> In-Reply-To: <201605261629.u4QGTi0R018827@repo.freebsd.org> References: <201605261629.u4QGTi0R018827@repo.freebsd.org> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.29; i386-portbld-freebsd9.3) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 17:39:21 -0000 On Thu, 26 May 2016 16:29:44 +0000 (UTC) Dmitry Marakasov wrote: > Author: amdmi3 > Date: Thu May 26 16:29:44 2016 > New Revision: 415903 > URL: https://svnweb.freebsd.org/changeset/ports/415903 > > Log: > - Fix build for disabled NLS case > - Switch to options helpers > - Simplify stripping > - Simplify plist handling > > PR: 202076 > Reported by: sascha@root-login.org > Approved by: maintainer timeout (horia@racoviceanu.com, 9 months) I'm working to update LXpanel to 0.8.2 [1], and for me ALSA option is bogus 1. If ALSA is not set it's OSS (Open Sound System), so I think it's better to distinguish two sound systems. Moreover sound support is a panel widget plugin, we must also check --with-plugins= option. Panel plugins can be disabled with prefix '-'. ALSA: CONFIGURE_ARGS should be --enable-alsa --with-plugins=-volume,volumealsa,... OSS (we can use OPTIONS_SINGLE macro): CONFIGURE_ARGS must be --disable-alsa --with-plugins=volume,-volumealsa,... Why still keep USE_AUTOTOOLS? It's deprecated [1] https://bitbucket.org/olivierduchateau/ports/src/434988b9ed6c5d5199be5c960cd7aee358aa1fba/x11/lxpanel/?at=default > > Modified: > head/x11/lxpanel/Makefile > head/x11/lxpanel/pkg-plist > > Modified: head/x11/lxpanel/Makefile > ============================================================================== > --- head/x11/lxpanel/Makefile Thu May 26 16:25:39 2016 (r415902) > +++ head/x11/lxpanel/Makefile Thu May 26 16:29:44 2016 (r415903) > @@ -26,7 +26,7 @@ USES= gmake pathfix pkgconfig > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --prefix="${PREFIX}" \ > --with-plugins=netstatus,volume,volumealsa,deskno,batt,kbled,xkb,thermal,cpu,cpufreq,monitors,wnckpager \ > - --with-x \ > + --with-x --disable-silent-rules \ > CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > CFLAGS+= -I${WRKSRC} > @@ -41,14 +41,7 @@ ALSA_LIB_DEPENDS= libasound.so:audio/als > ALSA_CONFIGURE_ENABLE= alsa > NLS_CONFIGURE_ENABLE= nls > NLS_USES= gettext > - > -.include > - > -.if ${PORT_OPTIONS:MALSA} > -PLIST_SUB+= VOLUME="@comment " > -.else > -PLIST_SUB+= VOLUME="" > -.endif > +NLS_USES_OFF= gettext-tools > > post-patch: > @${REINPLACE_CMD} -e '/g_thread_create/ \ > @@ -105,22 +98,14 @@ post-patch: > @${REINPLACE_CMD} -e 's|linux|sys|' \ > ${WRKSRC}/src/plugins/volume/volume-impl.c > > -.if ! ${PORT_OPTIONS:MNLS} > +post-patch-NLS-off: > @${REINPLACE_CMD} -e 's|po man|man|' \ > ${WRKSRC}/Makefile.in > -.endif > > post-install: > -.for l in netstatus deskno batt kbled xkb thermal cpu cpufreq monitors wnckpager > - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/${l}.so > -.endfor > - > -.if ${PORT_OPTIONS:MALSA} > - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/volumealsa.so > -.else > - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/volume.so > -.endif > + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/*.so > > +post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} > > > Modified: head/x11/lxpanel/pkg-plist > ============================================================================== > --- head/x11/lxpanel/pkg-plist Thu May 26 16:25:39 2016 (r415902) > +++ head/x11/lxpanel/pkg-plist Thu May 26 16:29:44 2016 (r415903) > @@ -9,7 +9,7 @@ lib/lxpanel/plugins/kbled.so > lib/lxpanel/plugins/monitors.so > lib/lxpanel/plugins/netstatus.so > lib/lxpanel/plugins/thermal.so > -%%VOLUME%%lib/lxpanel/plugins/volume.so > +%%NO_ALSA%%lib/lxpanel/plugins/volume.so > %%ALSA%%lib/lxpanel/plugins/volumealsa.so > lib/lxpanel/plugins/xkb.so > lib/lxpanel/plugins/wnckpager.so > -- Olivier Duchateau