Date: Wed, 13 Nov 2019 10:25:34 +0100 From: Tobias Kortkamp <tobik@freebsd.org> To: Pietro Cerutti <gahr@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r517341 - head/x11-wm/e16 Message-ID: <20191113092534.GA61113@urd.tobik.me> In-Reply-To: <201911121700.xACH0fpg045907@repo.freebsd.org> References: <201911121700.xACH0fpg045907@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--17pEHd4RhPHOinZp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 12, 2019 at 05:00:41PM +0000, Pietro Cerutti wrote: > Author: gahr > Date: Tue Nov 12 17:00:40 2019 > New Revision: 517341 > URL: https://svnweb.freebsd.org/changeset/ports/517341 >=20 > Log: > x11-wm/e16: update to 1.0.21, rework OPTIONS > =20 > Announcement: https://sourceforge.net/p/enlightenment/mailman/message/3= 6792261/ > Changelog: https://git.enlightenment.org/e16/e16.git/commit/ChangeLog?h= =3Dv1.0.21 >=20 > Modified: > head/x11-wm/e16/Makefile > head/x11-wm/e16/distinfo >=20 > Modified: head/x11-wm/e16/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/x11-wm/e16/Makefile Tue Nov 12 16:53:42 2019 (r517340) > +++ head/x11-wm/e16/Makefile Tue Nov 12 17:00:40 2019 (r517341) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D e16 > -PORTVERSION=3D 1.0.20 > +PORTVERSION=3D 1.0.21 > PORTREVISION=3D 0 > CATEGORIES=3D x11-wm enlightenment > MASTER_SITES=3D SF/enlightenment/${PORTNAME}/${PORTVERSION}/ > @@ -17,16 +17,26 @@ LIB_DEPENDS=3D libImlib2.so:graphics/imlib2 \ > libfontconfig.so:x11-fonts/fontconfig \ > libfreetype.so:print/freetype2 > =20 > +USES=3D autoreconf gmake iconv libtool gnome perl5 pkgconfig \ > + shebangfix xorg > + > INSTALL_TARGET=3D install-strip > =20 > -OPTIONS_DEFINE=3D DOCS NLS PANGO SOUND > +OPTIONS_DEFINE=3D DOCS NLS PANGO > +OPTIONS_RADIO=3D SOUND SOUNDLOADER > +OPTIONS_RADIO_SOUND=3D PULSEAUDIO SNDIO > +OPTIONS_RADIO_SOUNDLOADER=3D SNDFILE AUDIOFILE > OPTIONS_SUB=3D yes > -SOUND_LIB_DEPENDS=3D libpulse.so:audio/pulseaudio \ > - libsndfile.so:audio/libsndfile > -SOUND_CONFIGURE_ON=3D --enable-sound=3Dpulseaudio \ > - --with-sndldr=3Dsndfile > -SOUND_CONFIGURE_OFF=3D --disable-sound \ > - --with-sndldr=3Dnone > +OPTIONS_DEFAULT=3D PULSEAUDIO SNDFILE > + > +PULSEAUDIO_LIB_DEPENDS=3D libpulse.so:audio/pulseaudio > +PULSEAUDIO_CONFIGURE_ON=3D--enable-sound=3Dpulseaudio > +SNDIO_LIB_DEPENDS=3D libsndio.so:audio/sndio > +SNDIO_CONFIGURE_ON=3D --enable-sound=3Dsndio > +SNDFILE_LIB_DEPENDS=3D libsndfile.so:audio/libsndfile > +SNDFILE_CONFIGURE_ON=3D --with-sndldr=3Dsndfile > +AUDIOFILE_LIB_DEPENDS=3D libaudiofile.so:audio/libaudiofile > +AUDIOFILE_CONFIGURE_ON=3D --with-sndldr=3Daudiofile > NLS_USES=3D gettext > NLS_CONFIGURE_OFF=3D --disable-nls > PANGO_USE=3D GNOME=3Dpango > @@ -34,18 +44,32 @@ PANGO_CONFIGURE_ENABLE=3D pango > DOCS_CONFIGURE_ON=3D --enable-docs=3Dyes > DOCS_CONFIGURE_OFF=3D --enable-docs=3Dno > =20 > +.include <bsd.port.options.mk> > USES=3D autoreconf gmake iconv libtool gnome perl5 pkgconfig \ > shebangfix xorg > =20 > -USE_XORG=3D ice sm xorgproto x11 xbitmaps \ > - xcomposite xdamage xext xfixes xft xinerama xrandr xrender \ > - xxf86vm > +# Double check SOUND and SOUNDLOADER > +E16_SOUND=3D ${PORT_OPTIONS:MPULSEAUDIO}${PORT_OPTIONS:MSNDIO} > +E16_SNDLDR=3D ${PORT_OPTIONS:MSNDFILE}${PORT_OPTIONS:MAUDIOFILE} > +.if !empty(E16_SOUND) && empty(E16_SNDLDR) > +IGNORE=3D sound support requires a sound loader > +.endif > +.if empty(E16_SOUND) && !empty(E16_SNDLDR) > +IGNORE=3D sound loader only makes sense with sound support > +.endif > + > +USE_XORG=3D ice sm xorgproto x11 xbitmaps xcomposite xdamage xext xfixes= \ > + xft xinerama xrandr xrender xxf86vm > SHEBANG_FILES=3D scripts/e_gen_menu > CFLAGS+=3D -Wno-unused-parameter -I${LOCALBASE}/include > LDFLAGS+=3D -L${LOCALBASE}/lib > GNU_CONFIGURE=3D yes > -CONFIGURE_ARGS=3D --disable-dependency-tracking \ > - --disable-rpath --enable-mans SHELL=3D/bin/sh > +CONFIGURE_ARGS=3D --disable-dependency-tracking --disable-rpath \ > + --enable-mans SHELL=3D/bin/sh > + > +.if empty(E16_SOUND) && empty(E16_SNDLDR) > +CONFIGURE_ARGS+=3D--enable-sound=3Dno --with-sndldr=3Dnone > +.endif > =20 > post-patch: > ${REINPLACE_CMD} -e 's|$$(USER)|${SHAREOWN}:${SHAREGRP}|g' \ > Hi, could you please look this over again: - USES is set twice which does not make sense - None of the *_CONFIGURE_{ENABLE,OFF,ON} or *_USES helpers do anything since CONFIGURE_ARGS and USES are overwritten again after including bsd.port.options.mk. The port fails to build in Poudriere as a consequence of the above: =3D=3D=3D> Configuring for e16-1.0.21 Can't exec "autopoint": No such file or directory at /usr/local/share/autoc= onf-2.69/Autom4te/FileUtils.pm line 345. autoreconf-2.69: failed to run autopoint: No such file or directory autoreconf-2.69: autopoint is needed because this package uses Gettext *** Error code 1 Thank you. --17pEHd4RhPHOinZp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEElXvTEJc6ePgdQuobpPCftzzFH2EFAl3LzAxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk1 N0JEMzEwOTczQTc4RjgxRDQyRUExQkE0RjA5RkI3M0NDNTFGNjEACgkQpPCftzzF H2E/AQf8CLe2U2Hqxu5k9NM9CQ5cJhTT2T7pPuCwovTV4c4LfAc/McL6zzRGLsSX ECd5XOaP0L7SgCNnc1/0HtpBbbXJyy/CxzLK8HRKUstHiHfIKT+prviMdsA8/m9e mXRN7sZIJq6rqO9UzghHIpWZ9LNFE9xiUBJVCFKYjnG9IfEaYnS6iFMOq4KyMD3u FjDiCYQX8SO0Hh0UsMWYuM0VY0azgqVosp6SCabqWE4EqpHvo/r1NMdq6nbeUXvL ah5B36nVkgpFLGYq2gay84Iy4RB7guJ0hltHbdBslPWF8hqrHTrgSs5COf6DzVAZ ejiYS1tguHn2FFeMQRNedIYr5+V4FA== =GP4i -----END PGP SIGNATURE----- --17pEHd4RhPHOinZp--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191113092534.GA61113>