From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 10 09:44:01 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AB702D27;
 Sat, 10 Nov 2012 09:44:01 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 921C38FC16;
 Sat, 10 Nov 2012 09:44:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAA9i1RH075323;
 Sat, 10 Nov 2012 09:44:01 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAA9i1aM075322;
 Sat, 10 Nov 2012 09:44:01 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201211100944.qAA9i1aM075322@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 10 Nov 2012 09:44:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307265 - head/multimedia/xmms
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 09:44:01 -0000

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.
  
  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."