From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 11 11:45:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A8DFCF2;
 Fri, 11 Apr 2014 11:45:14 +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 6736F1C0A;
 Fri, 11 Apr 2014 11:45:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BBjEDq006492;
 Fri, 11 Apr 2014 11:45:14 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BBjEAB006491;
 Fri, 11 Apr 2014 11:45:14 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201404111145.s3BBjEAB006491@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Fri, 11 Apr 2014 11:45:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350926 - head/print/cups-base
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.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: Fri, 11 Apr 2014 11:45:14 -0000

Author: bsam
Date: Fri Apr 11 11:45:13 2014
New Revision: 350926
URL: http://svnweb.freebsd.org/changeset/ports/350926
QAT: https://qat.redports.org/buildarchive/r350926/

Log:
  . fix cross-building;  [1];
  . refine comment.
  
  Reported by:	gjb [1]
  Suggested by:	bdrewery [1]
  MFH:		2014Q2

Modified:
  head/print/cups-base/Makefile

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Fri Apr 11 11:44:05 2014	(r350925)
+++ head/print/cups-base/Makefile	Fri Apr 11 11:45:13 2014	(r350926)
@@ -57,11 +57,13 @@ PORTREVISION=	0
 LICENSE=	LGPL21
 CUPS_SUFFIX=	-client
 OPTIONS_DEFINE=	GNUTLS
+USES+=		compiler
 .elif defined(CUPS_IMAGE)
 PORTREVISION=	0
 CUPS_SUFFIX=	-image
 LICENSE=	LGPL21
 OPTIONS_DEFINE=	GNUTLS
+USES+=		compiler
 .else
 INSTALLS_ICONS=	yes
 PORTREVISION=	0
@@ -298,11 +300,12 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/
 .endif
 
-# 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).
+# This is to workaround a CUPS bug. Should be fixed by 1.7.3.
+# pfg@ filed a bug report upstream: https://www.cups.org/str.php?L4397
 #
 .include <bsd.port.pre.mk>
-.if (defined(CUPS_CLIENT) || defined(CUPS_IMAGE)) && ${OPSYS} == "FreeBSD" && ${OSVERSION} > 1000000
+.if (defined(CUPS_CLIENT) || defined(CUPS_IMAGE)) && ${OPSYS} == "FreeBSD" && \
+	${OSVERSION} > 1000000 && ${COMPILER_TYPE} == clang
 CFLAGS+=	-fno-blocks
 .endif