Date: Thu, 26 May 2016 19:36:53 +0000 From: Olivier Duchateau <olivierd@freebsd.org> To: Dmitry Marakasov <amdmi3@FreeBSD.org> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 26 May 2016 16:29:44 +0000 (UTC) Dmitry Marakasov <amdmi3@FreeBSD.org> 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 <bsd.port.options.mk> > - > -.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 <olivierd@freebsd.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160526193653.20746fd01e4936b5f27b4ab6>