From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 22 19:21:44 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5ED50A8E;
 Sun, 22 Mar 2015 19:21:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4AC9E93B;
 Sun, 22 Mar 2015 19:21:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MJLi0b066596;
 Sun, 22 Mar 2015 19:21:44 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MJLiE1066595;
 Sun, 22 Mar 2015 19:21:44 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201503221921.t2MJLiE1066595@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 22 Mar 2015 19:21:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381948 - head/cad/cider
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.18-1
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: Sun, 22 Mar 2015 19:21:44 -0000

Author: bdrewery
Date: Sun Mar 22 19:21:43 2015
New Revision: 381948
URL: https://svnweb.freebsd.org/changeset/ports/381948
QAT: https://qat.redports.org/buildarchive/r381948/

Log:
  Unreak.
  
  This does not require fmake. It just has bad return values which
  don't build with clang. The build is using 'make -k' so the errors
  are ignored. I did not fix that though.

Modified:
  head/cad/cider/Makefile

Modified: head/cad/cider/Makefile
==============================================================================
--- head/cad/cider/Makefile	Sun Mar 22 19:19:07 2015	(r381947)
+++ head/cad/cider/Makefile	Sun Mar 22 19:21:43 2015	(r381948)
@@ -18,16 +18,9 @@ USE_XORG=	xt xaw xmu
 
 OPTIONS_DEFINE=	EXAMPLES
 
-.include <bsd.port.options.mk>
+CFLAGS+=	-Wno-return-type
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000100
-# cider has a generated makefile that is passed to make via stdin.
-# bmake doesn't understand its generic static library targets, but
-# continues on failure.  The result is several programs aren't built.
-# Using USE+=fmake even with patching won't fix it on FreeBSD 10.  make
-# must be hardcoded somewhere because fmake ends up calling make.
-BROKEN=		Will not build with bmake and USES=fmake will not solve the issue
-.endif
+.include <bsd.port.options.mk>
 
 pre-patch:
 	@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt \
@@ -44,8 +37,8 @@ post-patch:
 	@${CP} -f ${FILESDIR}/FreeBSD ${WRKSRC}/cider/common/conf
 
 do-build:
-	@(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
-	@(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
+	@(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) && \
+	    (cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/spice3/helpdir \