From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 26 18:43:45 2014 Return-Path: Delivered-To: svn-ports-branches@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 463E6932; Sat, 26 Apr 2014 18:43:45 +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 31FC9189C; Sat, 26 Apr 2014 18:43:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QIhjWt090707; Sat, 26 Apr 2014 18:43:45 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QIhiq7090705; Sat, 26 Apr 2014 18:43:44 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404261843.s3QIhiq7090705@svn.freebsd.org> From: Boris Samorodov Date: Sat, 26 Apr 2014 18:43:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352366 - in branches/2014Q2/print/cups-base: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 18:43:45 -0000 Author: bsam Date: Sat Apr 26 18:43:44 2014 New Revision: 352366 URL: http://svnweb.freebsd.org/changeset/ports/352366 QAT: https://qat.redports.org/buildarchive/r352366/ Log: MFH: r351878 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 Approved by: portmgr (bapt) Added: branches/2014Q2/print/cups-base/files/patch-cups-cups.h - copied unchanged from r351878, head/print/cups-base/files/patch-cups-cups.h 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 26 18:38:50 2014 (r352365) +++ branches/2014Q2/print/cups-base/Makefile Sat Apr 26 18:43:44 2014 (r352366) @@ -4,7 +4,7 @@ PORTNAME= cups PORTVERSION= 1.7.1 DISTVERSIONSUFFIX= -source -PORTREVISION= 1 +#PORTREVISION= defined further CATEGORIES= print MASTER_SITES= http://www.cups.org/software/${DISTVERSION}/ \ EASYSW/${PORTNAME}/${DISTVERSION} @@ -54,18 +54,18 @@ USERS= cups # 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 @@ -299,12 +299,4 @@ 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). -# -.include -.if defined(CUPS_CLIENT) && ${OPSYS} == "FreeBSD" && ${OSVERSION} > 1000000 -CFLAGS+= -fno-blocks -.endif - -.include +.include Copied: branches/2014Q2/print/cups-base/files/patch-cups-cups.h (from r351878, head/print/cups-base/files/patch-cups-cups.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/print/cups-base/files/patch-cups-cups.h Sat Apr 26 18:43:44 2014 (r352366, copy of r351878, head/print/cups-base/files/patch-cups-cups.h) @@ -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"