svn commit: r381948 - head/cad/cider

[Bryan Drewery]

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 \