svn commit: r307265 - head/multimedia/xmms

[Jason E. Hale]

On Saturday, November 10, 2012 09:44:01 Alexey Dokuchaev wrote:
> Author: danfe
> Date: Sat Nov 10 09:44:01 2012
> New Revision: 307265
> URL: http://svnweb.freebsd.org/changeset/ports/307265
> 
> Log:
>   Apparently, in some cases (per what I observe here) using empty(...) for
>   testing specific PORT_OPTIONS instead of kosher ! breaks the build.  Fix
>   this.  While here, move the test below the target.
> 
That's because it should just be:
.if empty(PORT_OPTIONS:MSIMD)

The ${...} should be removed.  The ! works too, but isn't any more kosher.

>   Approved by:	maintainer
>   Feature safe:	yes
> 
> Modified:
>   head/multimedia/xmms/Makefile
> 
> Modified: head/multimedia/xmms/Makefile
> ============================================================================
> == --- head/multimedia/xmms/Makefile	Sat Nov 10 09:41:47 2012	(r307264) 
+++
> head/multimedia/xmms/Makefile	Sat Nov 10 09:44:01 2012	(r307265) @@ 
-111,8
> +111,8 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-V
>  PLIST_SUB+=	SPEC="@comment "
>  .endif
> 
> -.if empty(${PORT_OPTIONS:MSIMD})
>  post-extract:
> +.if ! ${PORT_OPTIONS:MSIMD}
>  	(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
>  	  cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
>  	${REINPLACE_CMD} -e 's:\.s :.S :g' -e 's:\.s$$:.S:g' \
> @@ -129,7 +129,7 @@ pre-extract:
>  	@${ECHO_MSG} ""
>  .endif
> 
> -.if empty(${PORT_OPTIONS:MRUSXMMS_PATCHES})
> +.if ! ${PORT_OPTIONS:MRUSXMMS_PATCHES}
>  	@${ECHO_MSG} ""
>  	@${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251"
>  	@${ECHO_MSG} "encoding by setting the RUSXMMS_PATCHES option."
-- 
Jason E. Hale - jhale@
FreeBSD Ports Committer
KDE/FreeBSD Team