From owner-svn-ports-all@FreeBSD.ORG  Sat Apr  5 07:13:07 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AA612DF6;
 Sat,  5 Apr 2014 07:13:07 +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 9709A9AC;
 Sat,  5 Apr 2014 07:13:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s357D7Be045508;
 Sat, 5 Apr 2014 07:13:07 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s357D7FB045507;
 Sat, 5 Apr 2014 07:13:07 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201404050713.s357D7FB045507@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sat, 5 Apr 2014 07:13:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r350199 - branches/2014Q2/print/cups-base
X-SVN-Group: ports-branches
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.17
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: Sat, 05 Apr 2014 07:13:07 -0000

Author: bsam
Date: Sat Apr  5 07:13:07 2014
New Revision: 350199
URL: http://svnweb.freebsd.org/changeset/ports/350199
QAT: https://qat.redports.org/buildarchive/r350199/

Log:
  MFH: r350154
  
  Use CFLAGS+=-fno-blocks to unbreak systems with default gcc compiler.
  This is a band-aid that should be reworked for systems with blocks
  and libdispatch support.
  
  Reported by:	Anton Shterenlikht <mexas@bris.ac.uk>
  Discussed at:	freebsd-ports@
  Approved by:	portmgr (bapt)

Modified:
  branches/2014Q2/print/cups-base/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/print/cups-base/Makefile
==============================================================================
--- branches/2014Q2/print/cups-base/Makefile	Sat Apr  5 06:34:54 2014	(r350198)
+++ branches/2014Q2/print/cups-base/Makefile	Sat Apr  5 07:13:07 2014	(r350199)
@@ -299,4 +299,12 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/
 .endif
 
-.include <bsd.port.mk>
+# This is just a band-aid to unbreak print/cups-client at systems with default gcc compiler,
+# should be reworked to build with blocks and libdispatch support (via options).
+#
+.include <bsd.port.pre.mk>
+.if defined(CUPS_CLIENT) && ${OPSYS} == "FreeBSD" && ${OSVERSION} > 1000000
+CFLAGS+=	-fno-blocks
+.endif
+
+.include <bsd.port.post.mk>