From owner-svn-ports-all@FreeBSD.ORG  Wed Nov 14 14:49:52 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 05919ACF;
 Wed, 14 Nov 2012 14:49:52 +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 DFA588FC14;
 Wed, 14 Nov 2012 14:49:51 +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 qAEEnpli089583;
 Wed, 14 Nov 2012 14:49:51 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAEEnp2h089582;
 Wed, 14 Nov 2012 14:49:51 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201211141449.qAEEnp2h089582@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 14 Nov 2012 14:49:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307418 - head/misc/xosd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 14:49:52 -0000

Author: danfe
Date: Wed Nov 14 14:49:51 2012
New Revision: 307418
URL: http://svnweb.freebsd.org/changeset/ports/307418

Log:
  Conditionalize previous fix, it should only be applied for Xft patch.
  
  Feature safe:	yes

Modified:
  head/misc/xosd/Makefile

Modified: head/misc/xosd/Makefile
==============================================================================
--- head/misc/xosd/Makefile	Wed Nov 14 14:41:42 2012	(r307417)
+++ head/misc/xosd/Makefile	Wed Nov 14 14:49:51 2012	(r307418)
@@ -74,9 +74,10 @@ post-patch:
 		${WRKSRC}/src/xmms_plugin/Makefile.in
 	@${REINPLACE_CMD} -e 's,specified time,& (${DELAY_UNITS}),' \
 		${WRKSRC}/src/osd_cat.c
-# Unbreak against Clang
+.if ${PORT_OPTIONS:MXFT}	# unbreak against Clang
 	@${REINPLACE_CMD} -e '52s,^,void xosd_xypos(xosd *osd);,' \
 		${WRKSRC}/src/libxosd/xosd.c
+.endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}