From owner-svn-ports-all@FreeBSD.ORG  Wed Feb 19 13:19:31 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 1C6AC1CC;
 Wed, 19 Feb 2014 13:19:31 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0720815F9;
 Wed, 19 Feb 2014 13:19:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JDJUCI042736;
 Wed, 19 Feb 2014 13:19:30 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JDJUHj042734;
 Wed, 19 Feb 2014 13:19:30 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201402191319.s1JDJUHj042734@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 19 Feb 2014 13:19:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345090 - 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: Wed, 19 Feb 2014 13:19:31 -0000

Author: tijl
Date: Wed Feb 19 13:19:30 2014
New Revision: 345090
URL: http://svnweb.freebsd.org/changeset/ports/345090
QAT: https://qat.redports.org/buildarchive/r345090/

Log:
  Fix installation of cups-base when libiconv is installed: do not descend
  into the cups subdirectory.  That directory is already installed by the
  cups-client port and it requires USES=iconv.
  
  Reported by:	Mark Knight <markk@knigma.org>

Modified:
  head/print/cups-base/Makefile

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Wed Feb 19 12:52:05 2014	(r345089)
+++ head/print/cups-base/Makefile	Wed Feb 19 13:19:30 2014	(r345090)
@@ -325,6 +325,7 @@ post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|cups test|test|' \
 		-e 's|cups filter driver|driver|' \
+		-e '/cd cups/d' \
 		-e 's|$$.INSTALL_SCRIPT. cups-config|echo skip: cups-config|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} \