Update to freerdp 1.0.1; various improvements, notably with certificate

handling. Add a no_cups flavour while there. ok merdely@

x11/freerdp/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2012/02/24 09:41:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2012/03/24 18:53:27 sthen Exp $
 
 SHARED_ONLY =		Yes
 
 COMMENT =		open source client for Windows Terminal Server
-DISTNAME =		freerdp-1.0.0
-WRKDIST =		${WRKDIR}/FreeRDP-FreeRDP-cd43ba1
+DISTNAME =		freerdp-1.0.1
 CATEGORIES =		x11 net
 
 SHARED_LIBS +=  freerdp-cache             0.0 # 1.0
@@ -26,22 +25,32 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto
-WANTLIB += cups gsm m mp3lame ogg orc-0.4 pthread schroedinger-1.0
-WANTLIB += speex ssl theoradec theoraenc vorbis vorbisenc vpx x264 xkbfile z
+FLAVORS =	no_cups
+FLAVOR ?=
 
-MASTER_SITES =		https://github.com/downloads/FreeRDP/FreeRDP/
+WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto
+WANTLIB += pthread ssl xkbfile z
+
+MASTER_SITES =		https://github.com/downloads/FreeRDP/FreeRDP/ \
+			http://spacehopper.org/mirrors/
 
 MODULES =		converters/libiconv \
 			devel/cmake
 
-BUILD_DEPENDS =		textproc/xmlto
+BUILD_DEPENDS =		textproc/docbook \
+			textproc/xmlto
 
-LIB_DEPENDS =		print/cups \
-			graphics/ffmpeg
+LIB_DEPENDS =		graphics/ffmpeg
 
 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/distinfo

@@ -1,5 +1,5 @@
-MD5 (freerdp-1.0.0.tar.gz) = U7ChLDZ7mzqNvmDn+g+I6Q==
-RMD160 (freerdp-1.0.0.tar.gz) = X8T0gIf1ab4NovmpAilQdx8C7oQ=
-SHA1 (freerdp-1.0.0.tar.gz) = 8lj0L+Eo66/nczZeKo4XunsBEhM=
-SHA256 (freerdp-1.0.0.tar.gz) = jauCrCq5AZhA3TLQb2IhS9/XxR3L62MuAStc/aYX68A=
-SIZE (freerdp-1.0.0.tar.gz) = 3490829
+MD5 (freerdp-1.0.1.tar.gz) = yEMYXg/yLOhAmVRlFxjzOA==
+RMD160 (freerdp-1.0.1.tar.gz) = QdrL1XjT5GU1u6NtopnFmqBo6ts=
+SHA1 (freerdp-1.0.1.tar.gz) = wTmJcF6Ydvz0jXIB8QCPSBmmFUw=
+SHA256 (freerdp-1.0.1.tar.gz) = FEF15Gpr0B7qbx9Pj8nzP4AnM7sGwfBbUIPVixHfeeA=
+SIZE (freerdp-1.0.1.tar.gz) = 3502100

x11/freerdp/patches/patch-CMakeLists_txt

@@ -1,22 +1,22 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2012/02/24 09:56:51 sthen Exp $
---- CMakeLists.txt.orig	Mon Jan 16 17:52:14 2012
-+++ CMakeLists.txt	Fri Feb 24 09:55:40 2012
-@@ -64,9 +64,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
- 	if(Wno-unused-but-set-variable)
- 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
+$OpenBSD: patch-CMakeLists_txt,v 1.3 2012/03/24 18:53:27 sthen Exp $
+--- CMakeLists.txt.orig	Fri Feb 10 02:01:42 2012
++++ CMakeLists.txt	Fri Mar 23 14:23:22 2012
+@@ -66,7 +66,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
  	endif()
--	if(CMAKE_BUILD_TYPE STREQUAL "Release")
+ 	if(CMAKE_BUILD_TYPE STREQUAL "Release")
+ 		set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
 -		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
--	endif()
+ 	endif()
  	if(WITH_SSE2_TARGET)
  		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
- 	endif()
-@@ -106,6 +103,8 @@ if(APPLE)
- endif()
+@@ -132,6 +131,10 @@ set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMA
+ # Include directories
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_SOURCE_DIR}/include)
++
++# Done after dirs in freerdp tree to avoid failure when freerdp is installed
++include_directories(/usr/local/include)
++link_directories(/usr/local/lib)
  
- if(NOT WIN32)
-+	include_directories(/usr/X11R6/include)
-+	link_directories(/usr/local/lib)
- 	find_required_package(ZLIB)
- 	find_optional_package(PulseAudio)
- 	find_optional_package(PCSC)
+ # Configure files
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

x11/freerdp/pkg/DESCR

@@ -2,3 +2,6 @@ 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,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/02/24 09:41:43 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/03/24 18:53:27 sthen Exp $
 @bin bin/xfreerdp
 include/freerdp/
 include/freerdp/altsec.h
@@ -67,7 +67,6 @@ include/freerdp/utils/
 include/freerdp/utils/args.h
 include/freerdp/utils/bitmap.h
 include/freerdp/utils/blob.h
-include/freerdp/utils/certstore.h
 include/freerdp/utils/debug.h
 include/freerdp/utils/dsp.h
 include/freerdp/utils/event.h