From owner-freebsd-ports@FreeBSD.ORG Wed Oct 30 13:23:29 2013 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 34633526; Wed, 30 Oct 2013 13:23:29 +0000 (UTC) (envelope-from Cy.Schubert@komquats.com) Received: from smtp-out-02.shaw.ca (smtp-out-02.shaw.ca [64.59.136.138]) by mx1.freebsd.org (Postfix) with ESMTP id EF5EA20C8; Wed, 30 Oct 2013 13:23:28 +0000 (UTC) X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=UbGOdjJMTOnDdlSKs4VLEv47Nwxh2hlhayjdFxkzNJk= c=1 sm=1 a=nG2sYfqMFioA:10 a=QrugwKR0C_UA:10 a=wAGQQ9Az6v0A:10 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10 a=kj9zAlcOel0A:10 a=IbtKDeXwb2+SRU442/pi3A==:17 a=Kv-aVqhhAAAA:8 a=NMM7OKYrAAAA:8 a=BWvPGDcYAAAA:8 a=6I5d2MoRAAAA:8 a=wTPKgbUkYhTfemBv4rsA:9 a=CjuIK1q_8ugA:10 a=tfbXepPFHE8A:10 a=ZBfBvALOrwAA:10 a=V7tsTZBp22UA:10 a=SV7veod9ZcQA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119]) by smtp-out-02.shaw.ca with ESMTP; 30 Oct 2013 07:23:27 -0600 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id EC07DE7; Wed, 30 Oct 2013 06:23:26 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.7/8.14.7) with ESMTP id r9UDNQcS055433; Wed, 30 Oct 2013 06:23:26 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201310301323.r9UDNQcS055433@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.5 From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: Cy Schubert Subject: Re: net/vnc r327755 does not build in /head In-Reply-To: Message from Cy Schubert of "Tue, 29 Oct 2013 15:30:22 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 30 Oct 2013 06:23:26 -0700 Cc: Matthias Apitz , freebsd-ports@freebsd.org, cy@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Cy Schubert List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 13:23:29 -0000 Cy Schubert writes: > In message <20131029212647.GA1211=40tiny-r255948>, Matthias Apitz writes:= > > > El d=EDa Tuesday, October 29, 2013 a las 07:52:14AM -0700, Cy Schubert = > escribi=F3: > >=20 > > > In message <20131029084836.GA19333=40sh4-5.1blu.de>, Matthias Apitz w= > rites: > > > >=20 > > > > Hello, > > > >=20 > > > > The vnc client only build in /head (anyway if with clang or gcc46) = > if > > > > one adds an=20 > > > >=20 > > > > =23include to the following three files: > > > >=20 > > > > ./work/vnc-4_1_3-unixsrc/common/network/TcpSocket.cxx > > > > ./work/vnc-4_1_3-unixsrc/unix/tx/TXImage.cxx > > > > ./work/vnc-4_1_3-unixsrc/unix/x0vncserver/Image.cxx > > > >=20 > > > > The server part stops building in: > > > >=20 > > > > ... > > > > cc -c -O -I../../include -I../../imports/x11/include/X11 =60./ccim= > ake=60 ima > > ke.c > > > > cc -o imake -O -I../../include -I../../imports/x11/include/X11 ima= > ke.o > > > > rm -f ./config/makedepend/Makefile.proto > > > > ./config/imake/imake -I./config/cf -s ./config/makedepend/Makefile= > .proto > > -f=20 > > > > ./config/makedepend/Imakefile -DTOPDIR=3D../.. -DCURDIR=3D./config/= > makedepend > > > > objformat: not found > > > > In file included from Imakefile.c:16: > > > > In file included from ./config/cf/Imake.tmpl:104: > > > > ./config/cf/FreeBSD.cf:477:35: error: '=23' is not followed by a ma= > cro para > > mete > > > > r > > >=20 > > > I haven't looked at it completely but it appears vnc needs a few patc= > hes to > > =20 > > > add includes for stdlib.h. It's on my plate of things to do. > >=20 > > The missing includes for stdlib.h is an easy one, but the imake problem= > is > > more complex; see also our exchange in June: > >=20 > > Date: Fri, 7 Jun 2013 10:57:30 +0200 > > To: Niclas Zeising , freebsd-ports=40freebsd.o= > rg, cy=40fre > > ebsd.org > > Subject: Re: ports && 10-CURRENT > > Message-ID: <20130607085730.GA8414=40sh4-5.1blu.de> > > References: <20130525185649.GA932=40tiny.Sisis.de> <51A11350.8050700= > =40freebsd. > > org> <20130526155022.GA2665=40sh4-5.1blu.de> > > I'm aware of that one too. In time it will be fixed. Patches are always=20 > welcome though. As a user of vnc I too am impacted by this but one thing = > at=20 > a time. Try the following. I haven't tested it under a 9.X system yet. I'll try to test it under 9.X later today and if it passes this will be committed. Index: Makefile =================================================================== --- Makefile (revision 330913) +++ Makefile (working copy) @@ -54,11 +54,16 @@ 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-al ias - EXTRA_PATCHES+= ${WRKSRC}/xc.patch \ ${PATCHDIR}/vnc.def-patch \ ${PATCHDIR}/FreeBSD.cf-patch \ @@ -93,8 +98,12 @@ .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} Index: files/patch-common-network-TcpSocket.cxx =================================================================== --- files/patch-common-network-TcpSocket.cxx (revision 0) +++ files/patch-common-network-TcpSocket.cxx (working copy) @@ -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 Index: files/patch-unix-tx-TXImage.cxx =================================================================== --- files/patch-unix-tx-TXImage.cxx (revision 0) +++ files/patch-unix-tx-TXImage.cxx (working copy) @@ -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 Index: files/patch-unix-x0vncserver-Image.cxx =================================================================== --- files/patch-unix-x0vncserver-Image.cxx (revision 0) +++ files/patch-unix-x0vncserver-Image.cxx (working copy) @@ -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 -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org