From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 13:52:17 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B81B672; Wed, 30 Oct 2013 13:52:17 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 98838230C; Wed, 30 Oct 2013 13:52:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UDqHbH094479; Wed, 30 Oct 2013 13:52:17 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UDqG1w094470; Wed, 30 Oct 2013 13:52:16 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201310301352.r9UDqG1w094470@svn.freebsd.org> From: Cy Schubert Date: Wed, 30 Oct 2013 13:52:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332109 - in head/net/vnc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 13:52:17 -0000 Author: cy Date: Wed Oct 30 13:52:16 2013 New Revision: 332109 URL: http://svnweb.freebsd.org/changeset/ports/332109 Log: Fix under 10-STABLE and 11-CURRENT. Added: head/net/vnc/files/patch-common-network-TcpSocket.cxx (contents, props changed) head/net/vnc/files/patch-unix-tx-TXImage.cxx (contents, props changed) head/net/vnc/files/patch-unix-x0vncserver-Image.cxx (contents, props changed) Modified: head/net/vnc/Makefile Modified: head/net/vnc/Makefile ============================================================================== --- head/net/vnc/Makefile Wed Oct 30 13:34:36 2013 (r332108) +++ head/net/vnc/Makefile Wed Oct 30 13:52:16 2013 (r332109) @@ -54,11 +54,16 @@ DISTFILES+= X430src-1.tgz:x \ X430src-2.tgz:x \ X430src-3.tgz:x +.if ${OSVERSION} > 1000000 +USE_GCC= 4.6+ +MAKE_ENV= IMAKECPP="${CPP}" +MAKE_ARGS= AR='ar rc' +.endif + RUN_DEPENDS+= xauth:${PORTSDIR}/x11/xauth \ ${PREFIX}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \ ${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias - EXTRA_PATCHES+= ${WRKSRC}/xc.patch \ ${PATCHDIR}/vnc.def-patch \ ${PATCHDIR}/FreeBSD.cf-patch \ @@ -93,8 +98,12 @@ post-build: .if ! ${PORT_OPTIONS:MSERVER} @${ECHO_MSG} "Skipping build of VNC server." .else +.if ${OSVERSION} > 1000000 + cd ${WRKSRC}/xc && ${MAKE_ENV} make CC=${CC} CXX=${CXX} ${MAKE_ARGS} World +.else cd ${WRKSRC}/xc && make CC=${CC} CXX=${CXX} World .endif +.endif pre-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} Added: head/net/vnc/files/patch-common-network-TcpSocket.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vnc/files/patch-common-network-TcpSocket.cxx Wed Oct 30 13:52:16 2013 (r332109) @@ -0,0 +1,10 @@ +--- ../common/network/TcpSocket.cxx.orig 2008-10-16 08:16:20.000000000 -0700 ++++ ../common/network/TcpSocket.cxx 2013-10-29 09:29:55.935208477 -0700 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #endif + + #include Added: head/net/vnc/files/patch-unix-tx-TXImage.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vnc/files/patch-unix-tx-TXImage.cxx Wed Oct 30 13:52:16 2013 (r332109) @@ -0,0 +1,10 @@ +--- tx/TXImage.cxx.orig 2008-10-16 08:16:21.000000000 -0700 ++++ tx/TXImage.cxx 2013-10-29 09:32:04.015562191 -0700 +@@ -21,6 +21,7 @@ + + + #include ++#include + #include + #include + #include Added: head/net/vnc/files/patch-unix-x0vncserver-Image.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vnc/files/patch-unix-x0vncserver-Image.cxx Wed Oct 30 13:52:16 2013 (r332109) @@ -0,0 +1,10 @@ +--- x0vncserver/Image.cxx.orig 2008-10-16 08:16:21.000000000 -0700 ++++ x0vncserver/Image.cxx 2013-10-29 09:34:58.346041892 -0700 +@@ -21,6 +21,7 @@ + + + #include ++#include + #include + #include + #include