CVS commit: pkgsrc/net/freerdp

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Jun 24 11:33:59 UTC 2016

Modified Files:
        pkgsrc/net/freerdp: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/freerdp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/freerdp/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freerdp/Makefile
diff -u pkgsrc/net/freerdp/Makefile:1.14 pkgsrc/net/freerdp/Makefile:1.15
--- pkgsrc/net/freerdp/Makefile:1.14    Sat Mar  5 11:29:04 2016
+++ pkgsrc/net/freerdp/Makefile Fri Jun 24 11:33:59 2016
@@ -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/
 

Index: pkgsrc/net/freerdp/options.mk
diff -u pkgsrc/net/freerdp/options.mk:1.5 pkgsrc/net/freerdp/options.mk:1.6
--- pkgsrc/net/freerdp/options.mk:1.5   Mon Aug 11 23:09:46 2014
+++ pkgsrc/net/freerdp/options.mk       Fri Jun 24 11:33:59 2016
@@ -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 @@ CMAKE_ARGS+=  -DWITH_ALSA=OFF
 ### 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