svn commit: r517341 - head/x11-wm/e16

[Tobias Kortkamp]

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
> 
> Log:
>   x11-wm/e16: update to 1.0.21, rework OPTIONS
>   
>   Announcement: https://sourceforge.net/p/enlightenment/mailman/message/36792261/
>   Changelog: https://git.enlightenment.org/e16/e16.git/commit/ChangeLog?h=v1.0.21
> 
> Modified:
>   head/x11-wm/e16/Makefile
>   head/x11-wm/e16/distinfo
> 
> Modified: head/x11-wm/e16/Makefile
> ==============================================================================
> --- 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$
>  
>  PORTNAME=	e16
> -PORTVERSION=	1.0.20
> +PORTVERSION=	1.0.21
>  PORTREVISION=	0
>  CATEGORIES=	x11-wm enlightenment
>  MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}/
> @@ -17,16 +17,26 @@ LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
>  		libfontconfig.so:x11-fonts/fontconfig \
>  		libfreetype.so:print/freetype2
>  
> +USES=		autoreconf gmake iconv libtool gnome perl5 pkgconfig \
> +		shebangfix xorg
> +
>  INSTALL_TARGET=	install-strip
>  
> -OPTIONS_DEFINE=		DOCS NLS PANGO SOUND
> +OPTIONS_DEFINE=		DOCS NLS PANGO
> +OPTIONS_RADIO=		SOUND SOUNDLOADER
> +OPTIONS_RADIO_SOUND=	PULSEAUDIO SNDIO
> +OPTIONS_RADIO_SOUNDLOADER=	SNDFILE AUDIOFILE
>  OPTIONS_SUB=		yes
> -SOUND_LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
> -			libsndfile.so:audio/libsndfile
> -SOUND_CONFIGURE_ON=	--enable-sound=pulseaudio \
> -			--with-sndldr=sndfile
> -SOUND_CONFIGURE_OFF=	--disable-sound \
> -			--with-sndldr=none
> +OPTIONS_DEFAULT=	PULSEAUDIO SNDFILE
> +
> +PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> +PULSEAUDIO_CONFIGURE_ON=--enable-sound=pulseaudio
> +SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
> +SNDIO_CONFIGURE_ON=	--enable-sound=sndio
> +SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
> +SNDFILE_CONFIGURE_ON=	--with-sndldr=sndfile
> +AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
> +AUDIOFILE_CONFIGURE_ON=	--with-sndldr=audiofile
>  NLS_USES=		gettext
>  NLS_CONFIGURE_OFF=	--disable-nls
>  PANGO_USE=		GNOME=pango
> @@ -34,18 +44,32 @@ PANGO_CONFIGURE_ENABLE=	pango
>  DOCS_CONFIGURE_ON=	--enable-docs=yes
>  DOCS_CONFIGURE_OFF=	--enable-docs=no
>  
> +.include <bsd.port.options.mk>
>  USES=		autoreconf gmake iconv libtool gnome perl5 pkgconfig \
>  		shebangfix xorg
>  
> -USE_XORG=	ice sm xorgproto x11 xbitmaps \
> -		xcomposite xdamage xext xfixes xft xinerama xrandr xrender \
> -		xxf86vm
> +# Double check SOUND and SOUNDLOADER
> +E16_SOUND=	${PORT_OPTIONS:MPULSEAUDIO}${PORT_OPTIONS:MSNDIO}
> +E16_SNDLDR=	${PORT_OPTIONS:MSNDFILE}${PORT_OPTIONS:MAUDIOFILE}
> +.if !empty(E16_SOUND) && empty(E16_SNDLDR)
> +IGNORE=	sound support requires a sound loader
> +.endif
> +.if empty(E16_SOUND) && !empty(E16_SNDLDR)
> +IGNORE=	sound loader only makes sense with sound support
> +.endif
> +
> +USE_XORG=	ice sm xorgproto x11 xbitmaps xcomposite xdamage xext xfixes \
> +		xft xinerama xrandr xrender xxf86vm
>  SHEBANG_FILES=	scripts/e_gen_menu
>  CFLAGS+=	-Wno-unused-parameter -I${LOCALBASE}/include
>  LDFLAGS+=	-L${LOCALBASE}/lib
>  GNU_CONFIGURE=	yes
> -CONFIGURE_ARGS=	--disable-dependency-tracking \
> -		--disable-rpath --enable-mans SHELL=/bin/sh
> +CONFIGURE_ARGS=	--disable-dependency-tracking  --disable-rpath \
> +		--enable-mans SHELL=/bin/sh
> +
> +.if empty(E16_SOUND) && empty(E16_SNDLDR)
> +CONFIGURE_ARGS+=--enable-sound=no --with-sndldr=none
> +.endif
>  
>  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:

===>  Configuring for e16-1.0.21
Can't exec "autopoint": No such file or directory at /usr/local/share/autoconf-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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20191113/0171cd87/attachment.sig>