From owner-svn-ports-all@FreeBSD.ORG Tue Apr 22 19:32:07 2014 Return-Path: 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 B7FB31DA; Tue, 22 Apr 2014 19:32: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 98BDD11EB; Tue, 22 Apr 2014 19:32: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 s3MJW73M094839; Tue, 22 Apr 2014 19:32:07 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3MJW7fN094837; Tue, 22 Apr 2014 19:32:07 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404221932.s3MJW7fN094837@svn.freebsd.org> From: Boris Samorodov Date: Tue, 22 Apr 2014 19:32:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351878 - in head/print/cups-base: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 19:32:07 -0000 Author: bsam Date: Tue Apr 22 19:32:06 2014 New Revision: 351878 URL: http://svnweb.freebsd.org/changeset/ports/351878 QAT: https://qat.redports.org/buildarchive/r351878/ Log: print/cups-base: remove BLOCKS detection from cups/cups.h It appears to be the best option here, i.e. just remove BLOCKS detection from cups/cups.h: there are some other ports which use cups/cups.h and get broken by a BLOCKS detection. So: . patch cups/cups.h to remove the offending code; . remove traces of previous attempts to fix cups-* ports; . bump PORTREVISION; . at PORTNAME block add a note that PORTREVISION is defined later for all ports. Discussed at: freebsd-ports Suggested by: tijl MFH: 2014Q2 Added: head/print/cups-base/files/patch-cups-cups.h (contents, props changed) Modified: head/print/cups-base/Makefile Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Tue Apr 22 19:32:02 2014 (r351877) +++ head/print/cups-base/Makefile Tue Apr 22 19:32:06 2014 (r351878) @@ -4,7 +4,7 @@ PORTNAME= cups PORTVERSION= 1.7.1 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 +#PORTREVISION= defined further CATEGORIES= print MASTER_SITES= http://www.cups.org/software/${DISTVERSION}/ \ EASYSW/${PORTNAME}/${DISTVERSION} @@ -51,22 +51,20 @@ CUPSSYSGRP= wheel GROUPS= cups USERS= cups -USES+= compiler - # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included .if defined(CUPS_CLIENT) -PORTREVISION= 0 +PORTREVISION= 1 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_DEFINE= GNUTLS .elif defined(CUPS_IMAGE) -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -image LICENSE= LGPL21 OPTIONS_DEFINE= GNUTLS .else INSTALLS_ICONS= yes -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -base OPTIONS_DEFINE= GNUTLS LIBPAPER PHP PYTHON PAM DBUS LIBUSB XDG_OPEN AVAHI MDNSRESPONDER OPTIONS_DEFAULT= LIBPAPER @@ -300,13 +298,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/ .endif -# 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 -.if (defined(CUPS_CLIENT) || defined(CUPS_IMAGE)) && ${OPSYS} == "FreeBSD" && \ - ${OSVERSION} > 1000000 && ${COMPILER_TYPE} == clang -CFLAGS+= -fno-blocks -.endif - -.include +.include Added: head/print/cups-base/files/patch-cups-cups.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups-base/files/patch-cups-cups.h Tue Apr 22 19:32:06 2014 (r351878) @@ -0,0 +1,16 @@ +# 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 +# +--- cups/cups.h.orig 2014-04-04 14:02:34.056258164 +0400 ++++ cups/cups.h 2014-04-04 14:02:46.828258878 +0400 +@@ -30,10 +30,6 @@ + typedef off_t ssize_t; /* @private@ */ + # endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */ + +-# ifdef __BLOCKS__ +-# include +-# endif /* __BLOCKS__ */ +- + # include "file.h" + # include "ipp.h" + # include "language.h"