Remove the no_cups FLAVOR and always depend on cups,-libs.

x11/freerdp/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2012/04/04 00:52:21 merdely Exp $
+# $OpenBSD: Makefile,v 1.12 2012/08/04 14:47:00 ajacoutot Exp $
 
 SHARED_ONLY =		Yes
 
 COMMENT =		open source client for Windows Terminal Server
 DISTNAME =		freerdp-1.0.1
 CATEGORIES =		x11 net
+REVISION =		0
 
 SHARED_LIBS +=  freerdp-cache             0.0 # 1.0
 SHARED_LIBS +=  freerdp-channels          0.0 # 1.0
@@ -25,32 +26,22 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-FLAVORS =	no_cups
-FLAVOR ?=
-
 WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto
-WANTLIB += pthread ssl xkbfile z
+WANTLIB += pthread ssl xkbfile z cups
 
 MASTER_SITES =		https://github.com/downloads/FreeRDP/FreeRDP/ \
 			http://spacehopper.org/mirrors/
 
-MODULES =		converters/libiconv \
-			devel/cmake
+MODULES =		devel/cmake
 
 BUILD_DEPENDS =		textproc/docbook \
 			textproc/xmlto
 
-LIB_DEPENDS =		graphics/ffmpeg
+LIB_DEPENDS =		graphics/ffmpeg \
+			print/cups,-libs
 
 CONFIGURE_ARGS +=	-DWITH_ALSA=Off
 
-.if ${FLAVOR:Mno_cups}
-CONFIGURE_ARGS +=	-DWITH_CUPS=Off
-.else
-LIB_DEPENDS +=		print/cups
-WANTLIB +=		cups
-.endif
-
 post-patch:
 	perl -pi -e 's,/usr/local,${LOCALBASE},g; s,/usr/X11R6,${X11BASE},g;' \
 	    ${WRKSRC}/CMakeLists.txt

x11/freerdp/pkg/DESCR

@@ -2,6 +2,3 @@ freerdp is a fork of the rdesktop project and is an open source client
 for Windows NT and 2000 Terminal Server, capable of natively speaking
 the Remote Desktop Protocol (RDP) in order to present the user's Windows
 desktop.
-
-Flavors:
-	no_cups		Don't build CUPS support.

x11/freerdp/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/03/24 18:53:27 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/08/04 14:47:00 ajacoutot Exp $
+@pkgpath x11/freerdp,no_cups
 @bin bin/xfreerdp
 include/freerdp/
 include/freerdp/altsec.h