From owner-svn-ports-head@freebsd.org  Tue Oct 18 11:11:52 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1842C1681E;
 Tue, 18 Oct 2016 11:11:52 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 58808CDE;
 Tue, 18 Oct 2016 11:11:52 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IBBpxD045506;
 Tue, 18 Oct 2016 11:11:51 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IBBpKU045505;
 Tue, 18 Oct 2016 11:11:51 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201610181111.u9IBBpKU045505@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 18 Oct 2016 11:11:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424155 - in head/print/kde4-print-manager: . 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Oct 2016 11:11:52 -0000

Author: tijl
Date: Tue Oct 18 11:11:51 2016
New Revision: 424155
URL: https://svnweb.freebsd.org/changeset/ports/424155

Log:
  - Fix build with CUPS 2.2.x.
  - Fix printing test page.

Added:
  head/print/kde4-print-manager/files/
  head/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp   (contents, props changed)
Modified:
  head/print/kde4-print-manager/Makefile

Modified: head/print/kde4-print-manager/Makefile
==============================================================================
--- head/print/kde4-print-manager/Makefile	Tue Oct 18 10:58:49 2016	(r424154)
+++ head/print/kde4-print-manager/Makefile	Tue Oct 18 11:11:51 2016	(r424155)
@@ -2,7 +2,7 @@
 
 PORTNAME=	print-manager
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -11,10 +11,15 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Printer manager for KDE 4
 
 LIB_DEPENDS=	libcups.so:print/cups
+RUN_DEPENDS=	${LOCALBASE}/share/cups/data/testprint:print/cups-filters
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	designer network \
 		qmake_build moc_build uic_build rcc_build
 
+post-patch:
+	@${REINPLACE_CMD} 's,/usr/share/cups,${LOCALBASE}/share/cups,' \
+		${WRKSRC}/libkcups/KCupsRequest.cpp
+
 .include <bsd.port.mk>

Added: head/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp	Tue Oct 18 11:11:51 2016	(r424155)
@@ -0,0 +1,10 @@
+--- libkcups/KCupsRequest.cpp.orig	2014-10-16 19:09:36 UTC
++++ libkcups/KCupsRequest.cpp
+@@ -29,6 +29,7 @@
+ #include <QStringBuilder>
+ 
+ #include <cups/adminutil.h>
++#include <cups/ppd.h>
+ 
+ #define CUPS_DATADIR    "/usr/share/cups"
+