[pkgsrc/trunk]: pkgsrc/net/freerdp Pull in cups instead of cups15, so that it...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fac875a15698
branches:  trunk
changeset: 349027:fac875a15698
user:      he <he%pkgsrc.org@localhost>
date:      Fri Jun 24 11:33:59 2016 +0000

description:
Pull in cups instead of cups15, so that it is possible to install
this package where other packages are installed which depend on cups.
Discussed with wiz@
Bump PKGREVISION.

diffstat:

 net/freerdp/Makefile   |  4 ++--
 net/freerdp/options.mk |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r aea40ee8da8c -r fac875a15698 net/freerdp/Makefile
--- a/net/freerdp/Makefile      Thu Jun 23 20:12:55 2016 +0000
+++ b/net/freerdp/Makefile      Fri Jun 24 11:33:59 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/03/05 11:29:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/24 11:33:59 he Exp $
 
 DISTNAME=      freerdp-1.0.2
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    net
 MASTER_SITES=  http://pub.freerdp.com/releases/
 
diff -r aea40ee8da8c -r fac875a15698 net/freerdp/options.mk
--- a/net/freerdp/options.mk    Thu Jun 23 20:12:55 2016 +0000
+++ b/net/freerdp/options.mk    Fri Jun 24 11:33:59 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2014/08/11 23:09:46 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2016/06/24 11:33:59 he Exp $
 #
 PKG_OPTIONS_VAR=       PKG_OPTIONS.freerdp
 PKG_SUPPORTED_OPTIONS= alsa cups ffmpeg pcsc pulseaudio debug
@@ -25,7 +25,7 @@
 ### CUPS support
 ###
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 CMAKE_ARGS+=   -DWITH_CUPS=ON
 PLIST.cups=    yes
 .else