Fri Jun 24 11:33:59 2016 UTC ()
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.


(he)
diff -r1.14 -r1.15 pkgsrc/net/freerdp/Makefile
diff -r1.5 -r1.6 pkgsrc/net/freerdp/options.mk
cvs diff -r1.14 -r1.15 pkgsrc/net/freerdp/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/freerdp/Attic/Makefile 2016/03/05 11:29:04 1.14
+++ pkgsrc/net/freerdp/Attic/Makefile 2016/06/24 11:33:59 1.15
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.14 2016/03/05 11:29:04 jperkin Exp $ 1# $NetBSD: Makefile,v 1.15 2016/06/24 11:33:59 he Exp $
2 2
3DISTNAME= freerdp-1.0.2 3DISTNAME= freerdp-1.0.2
4PKGREVISION= 13 4PKGREVISION= 14
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://pub.freerdp.com/releases/ 6MASTER_SITES= http://pub.freerdp.com/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.freerdp.com/ 9HOMEPAGE= http://www.freerdp.com/
10COMMENT= Free implementation of the Remote Desktop Protocol 10COMMENT= Free implementation of the Remote Desktop Protocol
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 13TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17USE_OLD_DES_API=yes 17USE_OLD_DES_API=yes
cvs diff -r1.5 -r1.6 pkgsrc/net/freerdp/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/freerdp/Attic/options.mk 2014/08/11 23:09:46 1.5
+++ pkgsrc/net/freerdp/Attic/options.mk 2016/06/24 11:33:59 1.6
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: options.mk,v 1.5 2014/08/11 23:09:46 wiz Exp $ 1# $NetBSD: options.mk,v 1.6 2016/06/24 11:33:59 he Exp $
2# 2#
3PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp 3PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp
4PKG_SUPPORTED_OPTIONS= alsa cups ffmpeg pcsc pulseaudio debug 4PKG_SUPPORTED_OPTIONS= alsa cups ffmpeg pcsc pulseaudio debug
5PKG_SUGGESTED_OPTIONS= alsa cups ffmpeg 5PKG_SUGGESTED_OPTIONS= alsa cups ffmpeg
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= alsa ffmpeg pcsc pulseaudio 9PLIST_VARS+= alsa ffmpeg pcsc pulseaudio
10 10
11# Package-specific option-handling 11# Package-specific option-handling
12 12
13### 13###
14### ALSA support 14### ALSA support
15### 15###
16.if !empty(PKG_OPTIONS:Malsa) 16.if !empty(PKG_OPTIONS:Malsa)
17. include "../../audio/alsa-lib/buildlink3.mk" 17. include "../../audio/alsa-lib/buildlink3.mk"
18CMAKE_ARGS+= -DWITH_ALSA=ON 18CMAKE_ARGS+= -DWITH_ALSA=ON
19PLIST.alsa= yes 19PLIST.alsa= yes
20.else 20.else
21CMAKE_ARGS+= -DWITH_ALSA=OFF 21CMAKE_ARGS+= -DWITH_ALSA=OFF
22.endif 22.endif
23 23
24### 24###
25### CUPS support 25### CUPS support
26### 26###
27.if !empty(PKG_OPTIONS:Mcups) 27.if !empty(PKG_OPTIONS:Mcups)
28. include "../../print/cups15/buildlink3.mk" 28. include "../../print/cups/buildlink3.mk"
29CMAKE_ARGS+= -DWITH_CUPS=ON 29CMAKE_ARGS+= -DWITH_CUPS=ON
30PLIST.cups= yes 30PLIST.cups= yes
31.else 31.else
32CMAKE_ARGS+= -DWITH_CUPS=OFF 32CMAKE_ARGS+= -DWITH_CUPS=OFF
33.endif 33.endif
34 34
35### 35###
36### FFmpeg support 36### FFmpeg support
37### 37###
38.if !empty(PKG_OPTIONS:Mffmpeg) 38.if !empty(PKG_OPTIONS:Mffmpeg)
39. include "../../multimedia/ffmpeg1/buildlink3.mk" 39. include "../../multimedia/ffmpeg1/buildlink3.mk"
40CMAKE_ARGS+= -DWITH_FFMPEG=ON 40CMAKE_ARGS+= -DWITH_FFMPEG=ON
41PLIST.ffmpeg= yes 41PLIST.ffmpeg= yes