From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 00:03:07 2013 Return-Path: Delivered-To: ports@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 BA4204BA; Sun, 8 Sep 2013 00:03:07 +0000 (UTC) (envelope-from qat@redports.org) Received: from qat.redports.org (unknown [IPv6:2610:1c1:1:6420::233:0]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A8692BF6; Sun, 8 Sep 2013 00:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=redports.org; s=04012012; h=Sender:Message-Id:To:Subject:Reply-To:Date:To:Cc:From:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=q7JNu7xgUxtA/61ppWNHoaH+Sg8VaEzAzbQVFbBRqWQ=; b=Ay7n1x2ExpmmjPRgOc/IeNMV6bWTslM7j5O0I0YTP9Tu0ipF+9G6DH9nsUT6OEJKakrP8VdyzydXePWBKPUOT2XTxE65/GN0DAbrRd4O2GjGsZYwvP/c0XGQlwpqGOn8CzLvlWzTuGH9ZdBIB337T5CX5na0CoJv2R/Th41wfUE=; Received: from www by qat.redports.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VIST4-000Occ-Jr; Sun, 08 Sep 2013 00:03:06 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: "Ports-QAT" X-Trac-Version: 0.12.5 Precedence: bulk Auto-Submitted: auto-generated X-Mailer: Trac 0.12.5, by Edgewall Software To: bsam@FreeBSD.org X-Trac-Project: redports Date: Sun, 08 Sep 2013 00:03:06 -0000 X-URL: https://qat.redports.org/ Subject: [QAT] r326683: 4x leftovers, 4x ignored: not for the general public. maintainer only supports developers of apr, 44x success To: bsam@FreeBSD.org X-Trac-Build-URL: https://qat.redports.org/buildarchive/20130907195001-54899 X-Trac-Build-ID: 20130907195001-54899 Message-Id: Sender: World Wide Web Owner Cc: ports@FreeBSD.org, decke@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Reply-To: qat@redports.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 00:03:07 -0000 Introduce variable ICONV_PREFIX at Mk/Uses/iconv.mk. The default for pre 100043 is ${LOCALBASE} and /usr otherwise. Convert all ports to new variable usage. Approved by: portmgr (bapt, implicit) --------------------------------------------------------------------- Build ID: 20130907195001-54899 Job owner: bsam@FreeBSD.org Buildtime: 4 hours Enddate: Sun, 08 Sep 2013 00:03:03 GMT Revision: r326683 Repository: https://svnweb.freebsd.org/ports?view=revision&revision=326683 --------------------------------------------------------------------- Port: devel/apr1 1.4.8.1.5.2 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183520/apr-1.4.8.1.5.2.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183521/apr-1.4.8.1.5.2.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183522/apr-1.4.8.1.5.2.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183523/apr-1.4.8.1.5.2.log --------------------------------------------------------------------- Port: devel/apr2 2.0.20110821151329_2 Buildgroup: 9.1-QAT/amd64 Buildstatus: IGNORED: NOT FOR THE GENERAL PUBLIC. MAINTAINER ONLY SUPPORTS DEVELOPERS OF APR Buildgroup: 9.1-QAT/i386 Buildstatus: IGNORED: NOT FOR THE GENERAL PUBLIC. MAINTAINER ONLY SUPPORTS DEVELOPERS OF APR Buildgroup: 8.4-QAT/amd64 Buildstatus: IGNORED: NOT FOR THE GENERAL PUBLIC. MAINTAINER ONLY SUPPORTS DEVELOPERS OF APR Buildgroup: 8.4-QAT/i386 Buildstatus: IGNORED: NOT FOR THE GENERAL PUBLIC. MAINTAINER ONLY SUPPORTS DEVELOPERS OF APR --------------------------------------------------------------------- Port: devel/git 1.8.4 Buildgroup: 9.1-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183528/git-1.8.4.log Buildgroup: 9.1-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183529/git-1.8.4.log Buildgroup: 8.4-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183530/git-1.8.4.log Buildgroup: 8.4-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183531/git-1.8.4.log --------------------------------------------------------------------- Port: irc/epic5 1.1.6 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183532/epic5-1.1.6.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183533/epic5-1.1.6.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183534/epic5-1.1.6.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183535/epic5-1.1.6.log --------------------------------------------------------------------- Port: lang/gauche 0.9.3.3_1 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183536/gauche-0.9.3.3_1.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183537/gauche-0.9.3.3_1.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183538/gauche-0.9.3.3_1.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183539/gauche-0.9.3.3_1.log --------------------------------------------------------------------- Port: net-mgmt/ettercap 0.7.4.1_3,1 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183540/ettercap-gtk2-0.7.4.1_3,1.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183541/ettercap-gtk2-0.7.4.1_3,1.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183542/ettercap-gtk2-0.7.4.1_3,1.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183543/ettercap-gtk2-0.7.4.1_3,1.log --------------------------------------------------------------------- Port: net/ssltunnel-client 1.18_1 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183544/ssltunnel-client-1.18_1.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183545/ssltunnel-client-1.18_1.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183546/ssltunnel-client-1.18_1.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183547/ssltunnel-client-1.18_1.log --------------------------------------------------------------------- Port: net/yaz 4.2.65 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183548/yaz-4.2.65.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183549/yaz-4.2.65.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183550/yaz-4.2.65.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183551/yaz-4.2.65.log --------------------------------------------------------------------- Port: net/zebra-server 2.0.45 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183552/zebra-server-2.0.45.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183553/zebra-server-2.0.45.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183554/zebra-server-2.0.45.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183555/zebra-server-2.0.45.log --------------------------------------------------------------------- Port: textproc/libxml2 2.8.0_2 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183556/libxml2-2.8.0_2.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183557/libxml2-2.8.0_2.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183558/libxml2-2.8.0_2.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183559/libxml2-2.8.0_2.log --------------------------------------------------------------------- Port: textproc/py-libxml2 2.8.0 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183560/py27-libxml2-2.8.0.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183561/py27-libxml2-2.8.0.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183562/py27-libxml2-2.8.0.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183563/py27-libxml2-2.8.0.log --------------------------------------------------------------------- Port: www/apache22 2.2.25 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183564/apache22-2.2.25.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183565/apache22-2.2.25.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183566/apache22-2.2.25.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183567/apache22-2.2.25.log --------------------------------------------------------------------- Port: www/apache24 2.4.6 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183568/apache24-2.4.6.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183569/apache24-2.4.6.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183570/apache24-2.4.6.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~bsam@FreeBSD.org/20130907195001-54899-183571/apache24-2.4.6.log -- Buildarchive URL: redports From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 00:19:59 2013 Return-Path: Delivered-To: freebsd-ports@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 704EF88C for ; Sun, 8 Sep 2013 00:19:59 +0000 (UTC) (envelope-from 3p8IrUgEWDXIvjhVWXdUhVVW.coWRYp.SecVhUURiT-fehjiVhUURiT.ehW@photos-server.bounces.google.com) Received: from mail-we0-f201.google.com (mail-we0-f201.google.com [74.125.82.201]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EB7EE2C85 for ; Sun, 8 Sep 2013 00:19:58 +0000 (UTC) Received: by mail-we0-f201.google.com with SMTP id u57so3911wes.2 for ; Sat, 07 Sep 2013 17:19:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:reply-to:message-id:date:subject:from:to:content-type; bh=QAWwOo44IDXe680q3uiNs0HyaoxXUI5BFHF1oDUgzJU=; b=cxZcb5b8/jzA1N785F1OlC0wx8VxoMF6gAqEr59Cy43S7cypiiqtX1FBHn9aOx3Wef QQ5B4rKkThIQGV1cTAZEd2DKzT4IvmFsN6BT6znDDC3FFalx5n4o34lenfwYw2T37v5N ccGBaoV2RF5Mf45z9hiMVL96Ic9yeZbzP6wHrHam88u1v4bpGJcFJM+TYFZO5Whzbj6r zxkopOARk7XFRrSTU5vdjiCpBTcKqnqP219t1gN7Mog5arxzlaxAtNSPVaR1CVl9e6uL yRxBGoCsxeZbZNzb1Cew/LtFXLmN7H/xllUjrWzbp4W6Xg/ta8A3ylSOVRq6+nJjxCZy EMzg== MIME-Version: 1.0 X-Received: by 10.112.125.234 with SMTP id mt10mr1929365lbb.0.1378599591517; Sat, 07 Sep 2013 17:19:51 -0700 (PDT) Message-ID: <089e01160d62f09fb304e5d43ac8@google.com> Date: Sun, 08 Sep 2013 00:19:51 +0000 Subject: Paper cup,Drinking straws, fork, Knife and Other cutlery Supply shared an album with you. From: "Paper cup, Drinking straws, fork, Knife and Other cutlery Supply" <5@trfghnerffg.mygbiz.com> To: freebsd-ports@freebsd.org Content-Type: multipart/related; boundary=089e01160d62f09fa704e5d43ac6 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: "Paper cup, Drinking straws, fork, Knife and Other cutlery Supply" <5@trfghnerffg.mygbiz.com> List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 00:19:59 -0000 --089e01160d62f09fa704e5d43ac6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes Dear Manager: We are a company focused on food package. and What we do is Just Helping you to save your cost. Now we can supply : 1. Single wall paper cup. Double PE .Hot Paper cups. Double Wall paper cups. Cold Drinking cups, Ripple Wall cups. Paper box. 2. Drinking straws , Flexible straws. Straight straws. 3. Plastic cups. PET cold cups 4. Plastic spoon. fork, Knife and Other cutlery. We know that buiness include: Quality. Price. Delivery time. Payment Terms. And Service. We welcome you to do customized cups and any enquiries. samples for free. Best Regards Jeff https://picasaweb.google.com/lh/sredir?uname=107068765394658469133&target=ALBUM&id=5920136760001545889&authkey=Gv1sRgCKjL8YWKybHW2gE&invite=CKKUp68M&feat=email --089e01160d62f09fa704e5d43ac6-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 06:14:53 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 53A9EFCC; Sun, 8 Sep 2013 06:14:53 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B25CB2B84; Sun, 8 Sep 2013 06:14:52 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VIYGp-003Ao2-60>; Sun, 08 Sep 2013 08:14:51 +0200 Received: from g225186224.adsl.alicedsl.de ([92.225.186.224] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VIYGp-00284I-1D>; Sun, 08 Sep 2013 08:14:51 +0200 Date: Sun, 8 Sep 2013 08:14:45 +0200 From: "O. Hartmann" To: rakuco@FreeBSD.org Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous Message-ID: <20130908081445.242f77c7@thor.walstatt.dyndns.org> In-Reply-To: <201309072249.r87MnsLP052803@freefall.freebsd.org> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/5kI5W1PsqicJ9pw3Dt5w5KU"; protocol="application/pgp-signature" X-Originating-IP: 92.225.186.224 Cc: freebsd-current@freebsd.org, kde@FreeBSD.org, freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 06:14:53 -0000 --Sig_/5kI5W1PsqicJ9pw3Dt5w5KU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sat, 7 Sep 2013 22:49:54 GMT rakuco@FreeBSD.org wrote: > Synopsis: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: > error: call to 'swap' is ambiguous >=20 > State-Changed-From-To: open->patched > State-Changed-By: rakuco > State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 > State-Changed-Why:=20 > I don't think the previous version worked. >=20 > From your description, it looks like you've switched to building with > libc++ whereas libstdc++ was being used before. >=20 > The upcoming Qt 4.8.5 plus a few patches which only made it to 4.8.6 > (but we've backported) will finally make Qt build with libc++. >=20 > We've just sent an exp-run request for Qt 4.8.5, and will hopefully > fix all these errors once it is committed. >=20 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D181913 I build the world/kernel since early this year with=20 CXXFLAGS+=3D -stdlib=3Dlibc++ CXXFLAGS+=3D -std=3Dc++11 in /etc/src.conf. I do not use those flags in /etc/make.conf! /etc/src.conf is supposed to target ONLY the /usr/src world, not the ports - this is as I interpret the man page for /etc/src.conf and it would be logical. But this rule/thinking seems to be broken by some includes from /usr/ports/Mk ingredients. I can assure that I didn't switch anything to build the ports but rebuilding world and then restarting building. Something must have changed since then in the logic of how libc++ slipped in instead of of libstdc++. What I did was a "make delete-old-files", which deleted several GNU gcc stuff on all CURRENT boxes. I did not see that any lib got killed after I tried "make delete-old-libs". And I did not check whether libstdc++ is still being built. There are many other occasions where now c++ errors occur and I guess those ports need to be reported in one by one via PR? --Sig_/5kI5W1PsqicJ9pw3Dt5w5KU Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLBXaAAoJEOgBcD7A/5N8BnAH/1BGvJpkbCIYfUV8T5Dsfw7y bHEmkEpO/DwokYVQ2DU8/q/xGPcFwAeJDozkX26Fbmi0+GJDMWrrlx/hcUInSBnL VlasAMGtH7u6UhGnLEhAW+e7pBMUEmTuDMhhYcoXcvKmdZSvmrHiReCbMyiWWZPD x8q6I1Thy2fqUZf6rmTw6dEoa8eTr0qQyVgnM4cAozw6JMlpzW9L0aj2tU0qbGpc Rc1l1DXTTGFyvoT/m//NGtClz+F1srAxr+9nR+VmrVLOLb2mEGh4eIRTgveXnbfZ AuO014D5qyY4DtNEqHn64mC/GCWLY7DIgH/Mdz8UB1A/KaP0y9Ik8b3wNA5i6ak= =Ti0P -----END PGP SIGNATURE----- --Sig_/5kI5W1PsqicJ9pw3Dt5w5KU-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 06:36:27 2013 Return-Path: Delivered-To: freebsd-ports@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 CE3FD4F6 for ; Sun, 8 Sep 2013 06:36:27 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8C6022C5E for ; Sun, 8 Sep 2013 06:36:27 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtp (envelope-from ) id <1VIYbh-003ET9-Sb>; Sun, 08 Sep 2013 08:36:25 +0200 Received: from g225186224.adsl.alicedsl.de ([92.225.186.224] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtpsa (envelope-from ) id <1VIYbh-0029Dx-No>; Sun, 08 Sep 2013 08:36:25 +0200 Date: Sun, 8 Sep 2013 08:36:25 +0200 From: "O. Hartmann" To: FreeBSD Ports Subject: net/openldap24-server: libtool: compile: gcc -g -O2 -Wall -DDO_SAMBA -I../../../inc [...] eval: gcc: not found *** Error code 1 Message-ID: <20130908083625.77c59245@thor.walstatt.dyndns.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/aKsYa2l4nNCZm0.bgS1S0Yx"; protocol="application/pgp-signature" X-Originating-IP: 92.225.186.224 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 06:36:28 -0000 --Sig_/aKsYa2l4nNCZm0.bgS1S0Yx Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable After having built a world on CURRENT r255356 and having done "make delete-old" the outdated gnuish compiler stuff gets deleted. After that, port net/openldap[-sasl]-server rejects to compile due to the shown error. Somehwere the compiler seems to be hardcoded. [...]=20 --- all-common --- for page in slapacl.8 slapadd.8 slapauth.8 slapcat.8 slapd.8 slapdn.8 slapindex.8 slappasswd.8 slapschema.8 slaptest.8; do sed -e "s%LDVERSION%2.4.36%" -e 's%ETCDIR%/usr/local/etc/openldap%g' -e 's%LOCALSTATEDIR%/var/db%' -e 's%SYSCONFDIR%/usr/local/etc/openldap%' -e 's%DATADIR%/usr/local/share/openldap%' -e 's%SBINDIR%/usr/local/sbin%' -e 's%BINDIR%/usr/local/bin%' -e 's%LIBDIR%/usr/local/lib%' -e 's%LIBEXECDIR%/usr/local/libexec%' -e 's%MODULEDIR%/usr/local/libexec/openldap%' -e 's%RELEASEDATE%2013/08/17%' ./$page | (cd .; soelim -) > $page.tmp; done /usr/local/bin/libtool --mode=3Dcompile gcc -g -O2 -Wall -DDO_SAMBA -I../../../include -I../../../include -I../../../servers/slapd -I/usr/heimdal/include -c smbk5pwd.c libtool: compile: gcc -g -O2 -Wall -DDO_SAMBA -I../../../include -I../../../include -I../../../servers/slapd -I/usr/heimdal/include -c smbk5pwd.c -fPIC -DPIC -o .libs/smbk5pwd.o eval: gcc: not found *** Error code 1 Stop. make[2]: stopped in /usr/ports/net/openldap24-server/work/openldap-2.4.36/contrib/slapd-modu= les/smbk5pwd *** Error code 1 Stop. make[1]: stopped in /usr/ports/net/openldap24-server *** Error code 1 Stop. make: stopped in /usr/ports/net/openldap24-server =3D=3D=3D>>> make failed for net/openldap24-server =3D=3D=3D>>> Aborting update =3D=3D=3D>>> Killing background jobs --Sig_/aKsYa2l4nNCZm0.bgS1S0Yx Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLBrpAAoJEOgBcD7A/5N8xR4H/jH0zaGb6AkXV3yvSLEopavG Qxl3KO78GStDRs95PZEcx2NBDdG5n63v/g+Tc+t1KeUCMmNXu5alJhWpbKIddIy0 CSZPyUQMeVswnBhWESGlof934a5Gz0GcQYFVayfXjn6b/0++Mj1RwO8fUv1Q9iUK gndKV3CU7qYqKvHc7dBMAK5rEfuSMgt1C8+gQk6+jrrF7JZQvL8qRnSIONoxDWLD cKpxVLrfERXUtdD/U96nVakzS2UKkrE9IBp0uPOp+Qp77bqY85mZVmMJfVaJi71B GGIVBwgalacEuvpDsTrMp81+opyY7gTh9jaiLn3T9tmORh3Dgn23tmxHKfYBXaY= =05M1 -----END PGP SIGNATURE----- --Sig_/aKsYa2l4nNCZm0.bgS1S0Yx-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 06:41:36 2013 Return-Path: Delivered-To: freebsd-ports@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 D20C85C7; Sun, 8 Sep 2013 06:41:36 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward2h.mail.yandex.net (forward2h.mail.yandex.net [IPv6:2a02:6b8:0:f05::2]) by mx1.freebsd.org (Postfix) with ESMTP id 85D522CA9; Sun, 8 Sep 2013 06:41:36 +0000 (UTC) Received: from smtp4h.mail.yandex.net (smtp4h.mail.yandex.net [84.201.186.21]) by forward2h.mail.yandex.net (Yandex) with ESMTP id ABEC5701A82; Sun, 8 Sep 2013 10:41:33 +0400 (MSK) Received: from smtp4h.mail.yandex.net (localhost [127.0.0.1]) by smtp4h.mail.yandex.net (Yandex) with ESMTP id C4AE02C1169; Sun, 8 Sep 2013 10:41:32 +0400 (MSK) Received: from 93.91.3.70.tel.ru (93.91.3.70.tel.ru [93.91.3.70]) by smtp4h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id pWeqFt8YB4-fVdaBZWI; Sun, 8 Sep 2013 10:41:32 +0400 Message-ID: <522C1C1B.6050809@passap.ru> Date: Sun, 08 Sep 2013 10:41:31 +0400 From: Boris Samorodov Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130806 Thunderbird/17.0.7 MIME-Version: 1.0 To: "O. Hartmann" Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> In-Reply-To: <20130908081445.242f77c7@thor.walstatt.dyndns.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: freebsd-current@freebsd.org, kde@FreeBSD.org, freebsd-ports@freebsd.org, rakuco@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 06:41:36 -0000 08.09.2013 10:14, O. Hartmann пишет: > I can assure that I didn't switch anything to build the ports but > rebuilding world and then restarting building. Something must have > changed since then in the logic of how libc++ slipped in instead of > of libstdc++. > > What I did was a "make delete-old-files", which deleted several GNU gcc > stuff on all CURRENT boxes. I did not see that any lib got killed after > I tried "make delete-old-libs". And I did not check whether libstdc++ > is still being built. Yes, recently gcc was switched off by default at CURRENT, so libc++ is used both for the system and ports. > There are many other occasions where now c++ errors occur and I guess > those ports need to be reported in one by one via PR? Guess so. Preferrable with a patch. ;-) -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 06:43:48 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 8E8FB77A for ; Sun, 8 Sep 2013 06:43:48 +0000 (UTC) (envelope-from bsd-src@helfman.org) Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66C4F2CC6 for ; Sun, 8 Sep 2013 06:43:48 +0000 (UTC) Received: by mail-pd0-f179.google.com with SMTP id v10so4902906pde.38 for ; Sat, 07 Sep 2013 23:43:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ONmWKr2sABZZEtBN7oq9m1rsv3J7wnpmY832/PBab4Y=; b=dJ9kdleazhDn30I2nKLBDhY1cYJC4laSEOu/qbBOiIH2XWl26MgNwk8E8ZzUfXNgOb Jr+Js4HDsk92oHxDK1HDuBWIWFyQ34x9BkzrogtEQ1m6WHtPM7xNa6Dt5AEI9ez0wZSQ nAPuVYBTQgVrmtDwolZtykz0oGLRn7IIozbPQcRTQfrNYLy5k0PNI+4yszDAnvPm7LRe S1lYiVebKA9oAAgg+Ii2v8EI08+iFdNaQxmvD8aeJhZ8bqz4lsFaSOKg5TUeLscgvGRk u72DibXxRxZXYNU6enWJI8YKAFHBFOQnBMg7FEGaPKU/ITfwkoU8ZSyMbe4CmiCqKJDV 9cRQ== X-Gm-Message-State: ALoCoQktNctI9NkjpBWq+O84lGu1orRNoIt2hZzVcEvxKOCkR1AxHq9QEwcTStUJllaoUWGd3ccM MIME-Version: 1.0 X-Received: by 10.68.169.161 with SMTP id af1mr12285326pbc.22.1378622622575; Sat, 07 Sep 2013 23:43:42 -0700 (PDT) Sender: bsd-src@helfman.org Received: by 10.70.100.165 with HTTP; Sat, 7 Sep 2013 23:43:42 -0700 (PDT) In-Reply-To: References: Date: Sat, 7 Sep 2013 23:43:42 -0700 X-Google-Sender-Auth: 5zR5Uc5pBo66t9_edhCrUYTpQTg Message-ID: Subject: Re: bsd.port.pre.mk vs bsd.port.options.mk From: Jason Helfman To: Christian Weisgerber Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: FreeBSD Ports List X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 06:43:48 -0000 On Sat, Sep 7, 2013 at 2:42 PM, Christian Weisgerber wrote: > I have port that does something like > > .include > > .if ${ARCH} == ... > ... > .endif > > .include > > A while back somebody submitted a PR asking me to replace bsd.port.pre.mk > with bsd.port.options.mk, because it also makes ARCH available and > is far less expensive. > > Now, a priori it is not clear to me that including options.mk is > actually cheaper than pre.mk. And it seems odd to include options.mk > but then not use any part of the options framework. The Porter's > Handbook explicitly mentions ARCH as one of the variables provided > by pre.mk. > > What's the preferred way to handle this? > > -- > Christian "naddy" Weisgerber naddy@mips.inka.de > > It is preferred to evaluate ARCH with bsd.port.options.mk. -jgh -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 07:09:40 2013 Return-Path: Delivered-To: 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 75399A29 for ; Sun, 8 Sep 2013 07:09:40 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D60FA2D9D for ; Sun, 8 Sep 2013 07:09:39 +0000 (UTC) Received: by mail-lb0-f173.google.com with SMTP id o14so4050252lbi.18 for ; Sun, 08 Sep 2013 00:09:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:date:message-id:subject:from :to:content-type; bh=d4z8b9XA2Emr3l9fOzXqR5yIZAiBTUJuNHIITejWfa4=; b=iH/UABbcxtLEKWgLn5YkuQTFmj6NKRXiQclA162xAgDlvD/T6uqUnnUh+ER3ePfY0/ vKDMod8YiA680ipXtsbLD1Zvt6O1Eb586GeZhLcZbdy2TZwTaELzX+SRZ7KKe/4TCx0I EMlA0i1puLSTg3nALt3Me0chuM8qwapfCDYoOyT6oT0wsDVxQbdaCN/qfsmzC5VZqIms Q7ZbtUAdS2TmtUMbkN/o6GK0/tsKvv7KK6loGJqeQx2mqAC7nxCa3t9jn6salX9Nf+Lw nER9xrPMxwypyWd3p8GZUid4EXU3K0NvBcszq4+oCoFwoG7DEbOD1jGScwu4e8lvenJN QcFQ== X-Gm-Message-State: ALoCoQkkSRHOhge5kPwqLKoqjXiZDskc72+46qXiygtGnkDfZj4QY59em4IBWt/r8f+ZUUoxaI9z MIME-Version: 1.0 X-Received: by 10.112.168.3 with SMTP id zs3mr10897234lbb.2.1378624172147; Sun, 08 Sep 2013 00:09:32 -0700 (PDT) Sender: sobomax@sippysoft.com Received: by 10.114.230.66 with HTTP; Sun, 8 Sep 2013 00:09:32 -0700 (PDT) Date: Sun, 8 Sep 2013 00:09:32 -0700 X-Google-Sender-Auth: 6OZPOMIpnTA_r_aJ8oOJ0wuzn7w Message-ID: Subject: Troubles with dependencies (file -L is broken?) From: Maxim Sobolev To: stable@freebsd.org, ports@freebsd.org, portmgr@freebsd.org Content-Type: multipart/mixed; boundary=001a11c33fe60f554c04e5d9f408 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 07:09:40 -0000 --001a11c33fe60f554c04e5d9f408 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi, I am trying to portupgrade my subversion and it keeps trying to install databases/db42 over already installed version (same version), missing the shared library dependency. Adding some debug into bsd.port.mk, I see: =3D=3D=3D> subversion-1.8.3 depends on package: libtool>=3D2.4 - found set -x; set -e ; for i in libdb-4.2.so:/usr/ports/databases/db42; do lib=3D${i%%:*} ; dir=3D${i#*:} ; target=3D"install"; depends_args=3D"";= echo -n "=3D=3D=3D> subversion-1.8.3 depends on shared library: ${lib}" ; fou= nd=3D0 ; dirs=3D"/lib /usr/lib /usr/local/lib `/bin/cat /usr/local/libdata/ldconfig/* 2>/dev/null || : `" ; for libdir in $dirs; do test -f ${libdir}/${lib} || continue; if [ -x /usr/bin/file ]; then [ `file -b -L --mime-type ${libdir}/${lib}` =3D "application/x-sharedlib" ] |= | continue ; fi ; found=3D1 ; echo " - found"; done ; if [ ${found} -eq = 0 ]; then echo " - not found"; echo "=3D=3D=3D> Verifying for $lib in $d= ir"; if [ ! -d "$dir" ] ; then echo " =3D> No directory for $lib. Skipping.."; else if [ -n "" -o -n "" ]; then subpkgfile=3D`(cd $dir; ma= ke $depends_args -V PKGFILE)`; subpkgname=3D${subpkgfile%-*} ; subpkgname=3D${subpkgname##*/} ; if [ -r "${subpkgfile}" -a "$target" =3D "install" ]; then echo "=3D=3D=3D> Installing existing package ${subpkgfile}"; if [ -n "" -a ${subpkgname} =3D "pkg" ]; then [ -d /usr/ports/devel/subversion/work ] || /bin/mkdir -p /usr/ports/devel/subversion/work ; /usr/bin/tar xf ${subpkgfile} -C /usr/ports/devel/subversion/work -s ",/.*/,,g" "*/pkg-static" ; /usr/ports/devel/subversion/work/pkg-static add ${subpkgfile}; /bin/rm -f /usr/ports/devel/subversion/work/pkg-static; else /usr/sbin/pkg_add ${subpkgfile}; fi; elif [ -n "" -a "${target}" =3D "install" ]; then ech= o "=3D=3D=3D> subversion-1.8.3 depends on package: ${subpkgfile} - not foun= d"; echo "=3D=3D=3D> USE_PACKAGE_DEPENDS_ONLY set - will not build from sourc= e"; exit 1; else (cd $dir; make -DINSTALLS_DEPENDS $target $depends_args) ; fi; else (cd $dir; make -DINSTALLS_DEPENDS $target $depends_args) ; fi; echo "=3D=3D=3D> Returning to build of subversion-1.8.3"; fi ; fi ; do= ne + set -e + lib=3Dlibdb-4.2.so + dir=3D/usr/ports/databases/db42 + target=3Dinstall + depends_args=3D'' + echo -n '=3D=3D=3D> subversion-1.8.3 depends on shared library: libdb-4= .2.so' =3D=3D=3D> subversion-1.8.3 depends on shared library: libdb-4.2.so+ foun= d=3D0 + /bin/cat /usr/local/libdata/ldconfig/compat7x /usr/local/libdata/ldconfig/mysql /usr/local/libdata/ldconfig/portupgrade /usr/local/libdata/ldconfig/pth + dirs=3D'/lib /usr/lib /usr/local/lib /usr/local/lib/compat /usr/local/lib/mysql /usr/local/lib/compat/pkg /usr/local/lib/pth' + test -f /lib/libdb-4.2.so + continue + test -f /usr/lib/libdb-4.2.so + continue + test -f /usr/local/lib/libdb-4.2.so + [ -x /usr/bin/file ] + file -b -L --mime-type /usr/local/lib/libdb-4.2.so + [ inode/symlink =3D application/x-sharedlib ] + continue + test -f /usr/local/lib/compat/libdb-4.2.so + continue + test -f /usr/local/lib/mysql/libdb-4.2.so + continue + test -f /usr/local/lib/compat/pkg/libdb-4.2.so + continue + test -f /usr/local/lib/pth/libdb-4.2.so + continue + [ 0 -eq 0 ] + echo ' - not found' - not found + echo '=3D=3D=3D> Verifying for libdb-4.2.so in /usr/ports/databases/db= 42' =3D=3D=3D> Verifying for libdb-4.2.so in /usr/ports/databases/db42 So, file(1) call is the culprit here. Trying to reproduce in the console: [sobomax@pioneer ~]$ file -b -L --mime-type /usr/local/lib/libdb-4.2.so inode/symlink However: [sobomax@pioneer ~]$ hexdump -C /usr/local/lib/libdb-4.2.so | head -n 20 00000000 7f 45 4c 46 02 01 01 09 00 00 00 00 00 00 00 00 |.ELF............| 00000010 03 00 3e 00 01 00 00 00 d0 40 02 00 00 00 00 00 |..>.....=D0=BF@......| 00000020 40 00 00 00 00 00 00 00 b8 a6 0e 00 00 00 00 00 |@.......=E2=95=A6=D1=96......| 00000030 00 00 00 00 40 00 38 00 05 00 40 00 1d 00 1a 00 |....@.8...@ .....| 00000040 01 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 |................| 00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000060 dc 45 0e 00 00 00 00 00 dc 45 0e 00 00 00 00 00 |=D1=8DE......=D1=8DE......| 00000070 00 00 20 00 00 00 00 00 01 00 00 00 06 00 00 00 |.. .............| 00000080 00 50 0e 00 00 00 00 00 00 50 2e 00 00 00 00 00 |.P.......P......| 00000090 00 50 2e 00 00 00 00 00 fc 36 00 00 00 00 00 00 |.P......=D0=AD6......| 000000a0 d8 3a 00 00 00 00 00 00 00 00 20 00 00 00 00 00 |=D1=8C:.......= . .....| 000000b0 02 00 00 00 06 00 00 00 e8 54 0e 00 00 00 00 00 |........=D0=A5T......| 000000c0 e8 54 2e 00 00 00 00 00 e8 54 2e 00 00 00 00 00 |=D0=A5T......=D0=A5T......| 000000d0 a0 01 00 00 00 00 00 00 a0 01 00 00 00 00 00 00 |=E2=95=90.......=E2=95=90.......| 000000e0 08 00 00 00 00 00 00 00 50 e5 74 64 04 00 00 00 |........P=D0=95td....| 000000f0 5c 39 0d 00 00 00 00 00 5c 39 0d 00 00 00 00 00 |\9......\9......| 00000100 5c 39 0d 00 00 00 00 00 b4 34 00 00 00 00 00 00 |\9......=D0=844......| 00000110 b4 34 00 00 00 00 00 00 04 00 00 00 00 00 00 00 |=D0=844..............| The culprit is that /usr/local/lib/libdb-4.2.so is a symlink to another symlink to another symlink etc, so that my guess is that file(1) stops at the first one. The issue can be resolved by using realpath(1), attached patch fixes it for me. [sobomax@pioneer ~]$ realpath /usr/local/lib/libdb-4.2.so /usr/local/lib/db42/libdb-4.2.so.2 [sobomax@pioneer ~]$ file -b -L --mime-type /usr/local/lib/db42/libdb-4.2.so.2 application/x-sharedlib [sobomax@pioneer ~]$ ls -l /usr/local/lib/libdb-4.2.so lrwxr-xr-x 1 root wheel 14 7 =D1=81=D0=B5=D0=BD 21:43 /usr/local/lib/li= bdb-4.2.so -> libdb-4.2.so.2 I am not sure what's the process to get bsd.port.mk adjusted these days. Should I open a PR and assign it to portmgr? -Maxim --001a11c33fe60f554c04e5d9f408 Content-Type: application/octet-stream; name="bsd.port.mk.diff" Content-Disposition: attachment; filename="bsd.port.mk.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hlbx6h7j0 LS0tIGJzZC5wb3J0Lm1rCTIwMTMvMDkvMDggMDc6MDQ6MjIJMS4xCisrKyBic2QucG9ydC5tawky MDEzLzA5LzA4IDA3OjA2OjAyCkBAIC01MDQ5LDcgKzUwNDksOCBAQAogCQlmb3IgbGliZGlyIGlu ICQkZGlyczsgZG8gXAogCQkJdGVzdCAtZiAkJHtsaWJkaXJ9LyQke2xpYn0gfHwgY29udGludWU7 IFwKIAkJCWlmIFsgLXggL3Vzci9iaW4vZmlsZSBdOyB0aGVuIFwKLQkJCQlbIGBmaWxlIC1iIC1M IC0tbWltZS10eXBlICQke2xpYmRpcn0vJCR7bGlifWAgPSAiYXBwbGljYXRpb24veC1zaGFyZWRs aWIiIF0gfHwgY29udGludWUgOyBcCisJCQkJX0xJQl9GSUxFPWByZWFscGF0aCAkJHtsaWJkaXJ9 LyQke2xpYn1gOyBcCisJCQkJWyBgZmlsZSAtYiAtTCAtLW1pbWUtdHlwZSAkJHtfTElCX0ZJTEV9 YCA9ICJhcHBsaWNhdGlvbi94LXNoYXJlZGxpYiIgXSB8fCBjb250aW51ZSA7IFwKIAkJCWZpIDsg XAogCQkJZm91bmQ9MSA7IFwKIAkJCSR7RUNIT19NU0d9ICIgLSBmb3VuZCI7IFwK --001a11c33fe60f554c04e5d9f408-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 07:28:35 2013 Return-Path: Delivered-To: ports@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 92EF136A for ; Sun, 8 Sep 2013 07:28:35 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 049892ED3 for ; Sun, 8 Sep 2013 07:28:34 +0000 (UTC) Received: by mail-lb0-f180.google.com with SMTP id q8so4101616lbi.11 for ; Sun, 08 Sep 2013 00:28:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type; bh=ew10/GkmT+FuMpBV6+qeOlSkpfEHUMgrOHnyJIoc21o=; b=EJB/V9YTn5q5+tJR6hwpt0UcoPkw99O+lCdExRagggBhEIZeDwLG2NSjE/rVftIoQn PIbmUgFG/+bOj6Cnl7KCqbTQskWiYon1X3GOGmCmWeYCpNQNRYbLYbx843HDmaHdtLGH WWzGNNdyOE9YO+vi7+WOM3Agjt2CqVKvef2aUyMZT9f7MmAAGH1FLB+L2v+cJFuPgIQs 7UNqk7J9WMmwWCK1YbpaguhMkvjcOWoGzX2Zn6UeaqfUW+0l2xAJ04sVsZdsCi1/4L9Z SN3R8Hj302mhh5j0jFH9ICupAmXTLmUkh5S1eLAmF7z2KZimHZ1OcrBR7aaBtcyh298r Im+g== X-Gm-Message-State: ALoCoQkRKr33HupRQjvs/XYBVq8iTCmQGj+lkR6erwtTUL+c4wdzkYCn8c9J6M97zsEuGpkjazue MIME-Version: 1.0 X-Received: by 10.152.8.115 with SMTP id q19mr10733542laa.16.1378625312397; Sun, 08 Sep 2013 00:28:32 -0700 (PDT) Received: by 10.114.230.66 with HTTP; Sun, 8 Sep 2013 00:28:32 -0700 (PDT) In-Reply-To: References: Date: Sun, 8 Sep 2013 00:28:32 -0700 Message-ID: Subject: Re: Troubles with dependencies (file -L is broken?) From: Maxim Sobolev To: stable@freebsd.org, ports@freebsd.org, portmgr@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 07:28:35 -0000 P.S. This is fresh 9.2-RC3 with /usr on ZFS. -Maxim On Sun, Sep 8, 2013 at 12:09 AM, Maxim Sobolev wrote: > Hi, > > I am trying to portupgrade my subversion and it keeps trying to install > databases/db42 over already installed version (same version), missing the > shared library dependency. > > Adding some debug into bsd.port.mk, I see: > > =3D=3D=3D> subversion-1.8.3 depends on package: libtool>=3D2.4 - found > set -x; set -e ; for i in libdb-4.2.so:/usr/ports/databases/db42; do > lib=3D${i%%:*} ; dir=3D${i#*:} ; target=3D"install"; depends_args=3D"= "; echo > -n "=3D=3D=3D> subversion-1.8.3 depends on shared library: ${lib}" ; f= ound=3D0 > ; dirs=3D"/lib /usr/lib /usr/local/lib `/bin/cat > /usr/local/libdata/ldconfig/* 2>/dev/null || : `" ; for libdir in $dirs; > do test -f ${libdir}/${lib} || continue; if [ -x /usr/bin/file ]; then = [ > `file -b -L --mime-type ${libdir}/${lib}` =3D "application/x-sharedlib" ]= || > continue ; fi ; found=3D1 ; echo " - found"; done ; if [ ${found} -e= q 0 > ]; then echo " - not found"; echo "=3D=3D=3D> Verifying for $lib in = $dir"; > if [ ! -d "$dir" ] ; then echo " =3D> No directory for $lib. > Skipping.."; else if [ -n "" -o -n "" ]; then subpkgfile=3D`(cd $dir; = make > $depends_args -V PKGFILE)`; subpkgname=3D${subpkgfile%-*} ; > subpkgname=3D${subpkgname##*/} ; if [ -r "${subpkgfile}" -a "$target" = =3D > "install" ]; then echo "=3D=3D=3D> Installing existing package > ${subpkgfile}"; if [ -n "" -a ${subpkgname} =3D "pkg" ]; then [ -d > /usr/ports/devel/subversion/work ] || /bin/mkdir -p > /usr/ports/devel/subversion/work ; /usr/bin/tar xf ${subpkgfile} -C > /usr/ports/devel/subversion/work -s ",/.*/,,g" "*/pkg-static" ; > /usr/ports/devel/subversion/work/pkg-static add ${subpkgfile}; /bin/rm -= f > /usr/ports/devel/subversion/work/pkg-static; else /usr/sbin/pkg_add > ${subpkgfile}; fi; elif [ -n "" -a "${target}" =3D "install" ]; then e= cho > "=3D=3D=3D> subversion-1.8.3 depends on package: ${subpkgfile} - not fo= und"; > echo "=3D=3D=3D> USE_PACKAGE_DEPENDS_ONLY set - will not build from sou= rce"; > exit 1; else (cd $dir; make -DINSTALLS_DEPENDS $target $depends_args) ; > fi; else (cd $dir; make -DINSTALLS_DEPENDS $target $depends_args) ; fi= ; > echo "=3D=3D=3D> Returning to build of subversion-1.8.3"; fi ; fi ; = done > + set -e > + lib=3Dlibdb-4.2.so > + dir=3D/usr/ports/databases/db42 > + target=3Dinstall > + depends_args=3D'' > + echo -n '=3D=3D=3D> subversion-1.8.3 depends on shared library: libdb= -4.2.so > ' > =3D=3D=3D> subversion-1.8.3 depends on shared library: libdb-4.2.so+ fo= und=3D0 > + /bin/cat /usr/local/libdata/ldconfig/compat7x > /usr/local/libdata/ldconfig/mysql /usr/local/libdata/ldconfig/portupgrade > /usr/local/libdata/ldconfig/pth > + dirs=3D'/lib /usr/lib /usr/local/lib /usr/local/lib/compat > /usr/local/lib/mysql > /usr/local/lib/compat/pkg > /usr/local/lib/pth' > + test -f /lib/libdb-4.2.so > + continue > + test -f /usr/lib/libdb-4.2.so > + continue > + test -f /usr/local/lib/libdb-4.2.so > + [ -x /usr/bin/file ] > + file -b -L --mime-type /usr/local/lib/libdb-4.2.so > + [ inode/symlink =3D application/x-sharedlib ] > + continue > + test -f /usr/local/lib/compat/libdb-4.2.so > + continue > + test -f /usr/local/lib/mysql/libdb-4.2.so > + continue > + test -f /usr/local/lib/compat/pkg/libdb-4.2.so > + continue > + test -f /usr/local/lib/pth/libdb-4.2.so > + continue > + [ 0 -eq 0 ] > + echo ' - not found' > - not found > + echo '=3D=3D=3D> Verifying for libdb-4.2.so in /usr/ports/databases/= db42' > =3D=3D=3D> Verifying for libdb-4.2.so in /usr/ports/databases/db42 > > So, file(1) call is the culprit here. Trying to reproduce in the console: > > [sobomax@pioneer ~]$ file -b -L --mime-type /usr/local/lib/libdb-4.2.so > inode/symlink > > However: > > [sobomax@pioneer ~]$ hexdump -C /usr/local/lib/libdb-4.2.so | head -n 20 > 00000000 7f 45 4c 46 02 01 01 09 00 00 00 00 00 00 00 00 > |.ELF............| > 00000010 03 00 3e 00 01 00 00 00 d0 40 02 00 00 00 00 00 > |..>.....=D0=BF@......| > 00000020 40 00 00 00 00 00 00 00 b8 a6 0e 00 00 00 00 00 > |@.......=E2=95=A6=D1=96......| > 00000030 00 00 00 00 40 00 38 00 05 00 40 00 1d 00 1a 00 |....@.8...@ > .....| > 00000040 01 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 > |................| > 00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > |................| > 00000060 dc 45 0e 00 00 00 00 00 dc 45 0e 00 00 00 00 00 > |=D1=8DE......=D1=8DE......| > 00000070 00 00 20 00 00 00 00 00 01 00 00 00 06 00 00 00 |.. > .............| > 00000080 00 50 0e 00 00 00 00 00 00 50 2e 00 00 00 00 00 > |.P.......P......| > 00000090 00 50 2e 00 00 00 00 00 fc 36 00 00 00 00 00 00 > |.P......=D0=AD6......| > 000000a0 d8 3a 00 00 00 00 00 00 00 00 20 00 00 00 00 00 |=D1=8C:.....= ... > .....| > 000000b0 02 00 00 00 06 00 00 00 e8 54 0e 00 00 00 00 00 > |........=D0=A5T......| > 000000c0 e8 54 2e 00 00 00 00 00 e8 54 2e 00 00 00 00 00 > |=D0=A5T......=D0=A5T......| > 000000d0 a0 01 00 00 00 00 00 00 a0 01 00 00 00 00 00 00 > |=E2=95=90.......=E2=95=90.......| > 000000e0 08 00 00 00 00 00 00 00 50 e5 74 64 04 00 00 00 > |........P=D0=95td....| > 000000f0 5c 39 0d 00 00 00 00 00 5c 39 0d 00 00 00 00 00 > |\9......\9......| > 00000100 5c 39 0d 00 00 00 00 00 b4 34 00 00 00 00 00 00 > |\9......=D0=844......| > 00000110 b4 34 00 00 00 00 00 00 04 00 00 00 00 00 00 00 > |=D0=844..............| > > The culprit is that /usr/local/lib/libdb-4.2.so is a symlink to another > symlink to another symlink etc, so that my guess is that file(1) stops at > the first one. The issue can be resolved by using realpath(1), attached > patch fixes it for me. > > [sobomax@pioneer ~]$ realpath /usr/local/lib/libdb-4.2.so > /usr/local/lib/db42/libdb-4.2.so.2 > [sobomax@pioneer ~]$ file -b -L --mime-type > /usr/local/lib/db42/libdb-4.2.so.2 > application/x-sharedlib > [sobomax@pioneer ~]$ ls -l /usr/local/lib/libdb-4.2.so > lrwxr-xr-x 1 root wheel 14 7 =D1=81=D0=B5=D0=BD 21:43 /usr/local/lib/= libdb-4.2.so -> > libdb-4.2.so.2 > > I am not sure what's the process to get bsd.port.mk adjusted these days. > Should I open a PR and assign it to portmgr? > > -Maxim > > --=20 Maksym Sobolyev Sippy Software, Inc. Internet Telephony (VoIP) Experts Tel (Canada): +1-778-783-0474 Tel (Toll-Free): +1-855-747-7779 Fax: +1-866-857-6942 Web: http://www.sippysoft.com MSN: sales@sippysoft.com Skype: SippySoft From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 08:44:12 2013 Return-Path: Delivered-To: freebsd-ports@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 5B56F382; Sun, 8 Sep 2013 08:44:12 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id AA04321EC; Sun, 8 Sep 2013 08:44:11 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3cXmJN0q6NzFTPg; Sun, 8 Sep 2013 10:44:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XLvfzQOVhuBQ; Sun, 8 Sep 2013 10:44:01 +0200 (CEST) Received: from marvin.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Sun, 8 Sep 2013 10:44:01 +0200 (CEST) Message-ID: <522C38D1.1040602@FreeBSD.org> Date: Sun, 08 Sep 2013 10:44:01 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130902 Thunderbird/17.0.8 MIME-Version: 1.0 To: "O. Hartmann" Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> <522B1BC4.4090304@FreeBSD.org> <20130907214610.69fabdff@thor.walstatt.dyndns.org> In-Reply-To: <20130907214610.69fabdff@thor.walstatt.dyndns.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: olli hauer , freebsd-current@freebsd.org, FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 08:44:12 -0000 On 09/07/13 21:46, O. Hartmann wrote: > On Sat, 07 Sep 2013 14:27:48 +0200 > Guido Falsi wrote: > >> On 09/07/13 14:10, olli hauer wrote: >>> There are 13 ports using --with-iconv=${LOCALBASE} >>> devel/apr1 >>> devel/apr2 >>> devel/git >>> irc/epic5 >>> lang/gauche >>> net-mgmt/ettercap >>> net/ssltunnel-client >>> net/yaz >>> net/zebra-server >>> textproc/libxml2 >>> textproc/py-libxml2 >>> www/apache22 >>> www/apache24 >>> >> >> Most of these do work anyway. I'm sure about various of these. I have >> them working on my PCs. This does not mean they don't need to be >> tweaked anyway, but they have lower priority. >> >> net-mgmt/ettercap is known broken and I have it in my pipe. I'm >> giving this all the time I can, but I can''t spend too much time on >> this right now. I'm going to check these and fix the broken ones asap. >> >> >>> >>> and devel/glib20, print/ghostscript8, print/ghostscript9 using >>> --with-libiconv=gnu >>> --with-libiconv=native >>> --with-libiconv=no >>> --with-libiconv=no >>> >> >> glib20 I already fixed in the big commit. uses native or gnu where >> appropriate. I'll also have a look at the ghostscript ports asap, but >> at least ghostscript9 I have seen it working on my PCs. >> >>> >>> Unfortunately Uses/iconv.mk defines only --with-libiconv(-prefix). >>> >>> If Uses/iconv.mk can be extended with something like ICON_PATH, then >>> the 13 ports can be changed quickly to use the right iconv. >>> >> >> Most of those will use the right iconv anyway if only one is found. >> Extending iconv.mk should be discussed with portmgr, adding a >> variable shouldn't be a problem though. >> > > > This happens in editors/abiword: > > > libtool: link: ( cd ".libs" && rm -f "libimp.la" && ln -s > "../libimp.la" "libimp.la" ) gmake[7]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument/imp' > gmake[6]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument/imp' > gmake[6]: Entering directory > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument' ../../doltlibtool > --tag=CXX --mode=link c++ -O2 -pipe -O3 -march=native > -fno-strict-aliasing -lgsf-1 -lgobject-2.0 -lglib-2.0 -lintl > -L/usr/local/lib -lxml2 -lgthread-2.0 -pthread -lgobject-2.0 > -L/usr/local/lib -lglib-2.0 -lintl -L../../src -labiword-2.8 -lz > -avoid-version -module -no-undefined -L/usr/local/lib -o > opendocument.la -rpath /usr/local/lib/abiword-2.8/plugins > common/libcommon.la exp/libexp.la imp/libimp.la -ljpeg > grep: /usr/local/lib/libiconv.la: No such file or directory > sed: /usr/local/lib/libiconv.la: No such file or directory libtool: > link: `/usr/local/lib/libiconv.la' is not a valid libtool archive > gmake[6]: *** [opendocument.la] Error 1 gmake[6]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument' > gmake[5]: *** [all-recursive] Error 1 gmake[5]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument' > gmake[4]: *** [all-recursive] Error 1 gmake[4]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins' gmake[3]: *** > [all-recursive] Error 1 gmake[3]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6' gmake[2]: *** [all] > Error 2 gmake[2]: Leaving directory > `/usr/ports/editors/abiword/work/abiword-2.8.6' ===> Compilation failed > unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and rebuild before > reporting the failure to the maintainer. *** Error code 1 > This one looks like you still have some old libtoool archive which references libiconv laying around. Can you try again this command line(I rewrite here for convenience): find /usr/local/lib -name '*.la' -exec grep -qi iconv {} \; -print | xargs -n 1 pkg which -oq | sort -u and force rebuild of any port which still shows up? If none shows up (which would be strange, but I can't exclude anything) Hope is not lost and there are still some things we can try. -- Guido Falsi From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 10:46:18 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 9E2F951C; Sun, 8 Sep 2013 10:46:18 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23E0E2756; Sun, 8 Sep 2013 10:46:17 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VIcVU-00412m-6q>; Sun, 08 Sep 2013 12:46:16 +0200 Received: from g225186224.adsl.alicedsl.de ([92.225.186.224] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VIcVU-002MfD-17>; Sun, 08 Sep 2013 12:46:16 +0200 Date: Sun, 8 Sep 2013 12:46:15 +0200 From: "O. Hartmann" To: Guido Falsi Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv Message-ID: <20130908124615.409f437b@thor.walstatt.dyndns.org> In-Reply-To: <522C38D1.1040602@FreeBSD.org> References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> <522B1BC4.4090304@FreeBSD.org> <20130907214610.69fabdff@thor.walstatt.dyndns.org> <522C38D1.1040602@FreeBSD.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/ybfK58P_qfbg_hjgIVwfdSm"; protocol="application/pgp-signature" X-Originating-IP: 92.225.186.224 Cc: olli hauer , freebsd-current@freebsd.org, FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 10:46:18 -0000 --Sig_/ybfK58P_qfbg_hjgIVwfdSm Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 08 Sep 2013 10:44:01 +0200 Guido Falsi wrote: > On 09/07/13 21:46, O. Hartmann wrote: > > On Sat, 07 Sep 2013 14:27:48 +0200 > > Guido Falsi wrote: > > > >> On 09/07/13 14:10, olli hauer wrote: > >>> There are 13 ports using --with-iconv=3D${LOCALBASE} > >>> devel/apr1 > >>> devel/apr2 > >>> devel/git > >>> irc/epic5 > >>> lang/gauche > >>> net-mgmt/ettercap > >>> net/ssltunnel-client > >>> net/yaz > >>> net/zebra-server > >>> textproc/libxml2 > >>> textproc/py-libxml2 > >>> www/apache22 > >>> www/apache24 > >>> > >> > >> Most of these do work anyway. I'm sure about various of these. I > >> have them working on my PCs. This does not mean they don't need to > >> be tweaked anyway, but they have lower priority. > >> > >> net-mgmt/ettercap is known broken and I have it in my pipe. I'm > >> giving this all the time I can, but I can''t spend too much time on > >> this right now. I'm going to check these and fix the broken ones > >> asap. > >> > >> > >>> > >>> and devel/glib20, print/ghostscript8, print/ghostscript9 using > >>> --with-libiconv=3Dgnu > >>> --with-libiconv=3Dnative > >>> --with-libiconv=3Dno > >>> --with-libiconv=3Dno > >>> > >> > >> glib20 I already fixed in the big commit. uses native or gnu where > >> appropriate. I'll also have a look at the ghostscript ports asap, > >> but at least ghostscript9 I have seen it working on my PCs. > >> > >>> > >>> Unfortunately Uses/iconv.mk defines only --with-libiconv(-prefix). > >>> > >>> If Uses/iconv.mk can be extended with something like ICON_PATH, > >>> then the 13 ports can be changed quickly to use the right iconv. > >>> > >> > >> Most of those will use the right iconv anyway if only one is found. > >> Extending iconv.mk should be discussed with portmgr, adding a > >> variable shouldn't be a problem though. > >> > > > > > > This happens in editors/abiword: > > > > > > libtool: link: ( cd ".libs" && rm -f "libimp.la" && ln -s > > "../libimp.la" "libimp.la" ) gmake[7]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument/imp' > > gmake[6]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument/imp' > > gmake[6]: Entering directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument' ..= /../doltlibtool > > --tag=3DCXX --mode=3Dlink c++ -O2 -pipe -O3 -march=3Dnative > > -fno-strict-aliasing -lgsf-1 -lgobject-2.0 -lglib-2.0 -lintl > > -L/usr/local/lib -lxml2 -lgthread-2.0 -pthread -lgobject-2.0 > > -L/usr/local/lib -lglib-2.0 -lintl -L../../src -labiword-2.8 -lz > > -avoid-version -module -no-undefined -L/usr/local/lib -o > > opendocument.la -rpath /usr/local/lib/abiword-2.8/plugins > > common/libcommon.la exp/libexp.la imp/libimp.la -ljpeg > > grep: /usr/local/lib/libiconv.la: No such file or directory > > sed: /usr/local/lib/libiconv.la: No such file or directory libtool: > > link: `/usr/local/lib/libiconv.la' is not a valid libtool archive > > gmake[6]: *** [opendocument.la] Error 1 gmake[6]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument' > > gmake[5]: *** [all-recursive] Error 1 gmake[5]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins/opendocument' > > gmake[4]: *** [all-recursive] Error 1 gmake[4]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6/plugins' gmake[3]: > > *** [all-recursive] Error 1 gmake[3]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6' gmake[2]: *** [all] > > Error 2 gmake[2]: Leaving directory > > `/usr/ports/editors/abiword/work/abiword-2.8.6' =3D=3D=3D> Compilation > > failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=3Dyes and rebuild > > before reporting the failure to the maintainer. *** Error code 1 > > >=20 > This one looks like you still have some old libtoool archive which=20 > references libiconv laying around. >=20 > Can you try again this command line(I rewrite here for convenience): >=20 > find /usr/local/lib -name '*.la' -exec grep -qi iconv {} \; -print | > xargs -n 1 pkg which -oq | sort -u >=20 > and force rebuild of any port which still shows up? >=20 > If none shows up (which would be strange, but I can't exclude > anything) Hope is not lost and there are still some things we can try. >=20 On one box, the command sequence (thanks for being redundant, I didn't find the previous email with the sequence within) reveals: converters/psiconv editors/abiword math/gnumeric Deleteing psiconv and gnumeric makes the sequence not showing both ports again, but then, installing gnumeric again, which reels in psiconv, the output of the command sequence is a s shown. Something is strange here ... Another prerequisite port with oldish iconv reliances? --Sig_/ybfK58P_qfbg_hjgIVwfdSm Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLFV3AAoJEOgBcD7A/5N8DQ8H/AmZBVrRFcuH8HHO882GLl9L R8HJ07ha1TGbvU9sUgB6DJ1WggBjfgZRPyYXy31XUwB2o2e4X+ddIsNjxoWjN0ID JBW9TAJ8JShlz9A13NfbxWRPmR9du8CLFUGHY0SDKzSkYfclj7659IXYv5WSzF0f /2JTEDNOGa6uWvfBoiv+wqH7gJNXCPsCSZJnwuAoC2cJY7lTJjfikMdSB8plFXVw VoLF1yV/KjAGIObSU1Zi6c+EuIoJXc25w5Svo9EhXGZHxQKM/7eYV5ZjPxAZlcRU 5PusheIrsGLs2dQXf5TFOExlQ6nXSfYxqO/avs/Ck0rno1/6lDDujsz4NwD2DLw= =fS2Y -----END PGP SIGNATURE----- --Sig_/ybfK58P_qfbg_hjgIVwfdSm-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 10:52:06 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 582E46DF; Sun, 8 Sep 2013 10:52:06 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from caravan.chchile.org (caravan.chchile.org [178.32.125.136]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 22D9E279E; Sun, 8 Sep 2013 10:52:05 +0000 (UTC) Received: by caravan.chchile.org (Postfix, from userid 1000) id 01EF5BC9C5; Sun, 8 Sep 2013 10:52:03 +0000 (UTC) Date: Sun, 8 Sep 2013 12:52:03 +0200 From: Jeremie Le Hen To: freebsd-ports@FreeBSD.org Subject: libiconv.a(iconv.o): relocation R_X86_64_32S against `a local symbol' can not be used when making a shared object Message-ID: <20130908105203.GM43281@caravan.chchile.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: jlh@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 10:52:06 -0000 Hi, (Please Cc: me when replying, I'm not subscribed.) I created a fresh FreeBSD 9.1-RELEASE amd64 jail. No installed ports. I cannot build devel/gettext. Does anyone experience the same problem? I invariably run into the following problem: libtool: link: cc -shared -fPIC -DPIC .libs/bindtextdom.o .libs/dcgettext.o .libs/dgettext.o .libs/gettext.o .libs/finddomain.o .libs/hash-string.o .libs/loadmsgcat.o .libs/localealias.o .libs/textdomain.o .libs/l10nflist.o .libs/explodename.o .libs/dcigettext.o .libs/dcngettext.o .libs/dngettext.o .libs/ngettext.o .libs/plural.o .libs/plural-exp.o .libs/localcharset.o .libs/threadlib.o .libs/lock.o .libs/relocatable.o .libs/langprefs.o .libs/localename.o .libs/log.o .libs/printf.o .libs/setlocale.o .libs/version.o .libs/xsize.o .libs/osdep.o .libs/intl-compat.o -L/usr/local/lib /usr/local/lib/libiconv.a -O2 -Wl,-soname -Wl,libintl.so.9 -o .libs/libintl.so.9 /usr/bin/ld: /usr/local/lib/libiconv.a(iconv.o): relocation R_X86_64_32S against `a local symbol' can not be used when making a shared object; recompile with -fPIC /usr/local/lib/libiconv.a: could not read symbols: Bad value Full typescript here: http://people.freebsd.org/~jlh/typescript.gettext.txt -- Jeremie Le Hen Scientists say the world is made up of Protons, Neutrons and Electrons. They forgot to mention Morons. From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 11:04:00 2013 Return-Path: Delivered-To: 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 C5391842; Sun, 8 Sep 2013 11:04:00 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-we0-x22f.google.com (mail-we0-x22f.google.com [IPv6:2a00:1450:400c:c03::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D92B7280F; Sun, 8 Sep 2013 11:03:59 +0000 (UTC) Received: by mail-we0-f175.google.com with SMTP id q59so4338246wes.20 for ; Sun, 08 Sep 2013 04:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=OfzKnw+ZXLFnMJ6LGxya211QBJy4856luclTo0+CGZk=; b=JhwjLtV+syttFYd9FkdLHtzlm4TGG/9uiBYeITslz6YVerHPSvqGUmA1KZedqFHgQ4 YvJR8ANjKzNn64r78/HkfDt+QyTN8nTyEdQqSktVWlbE3eTrBF4sqZjQm1TSqwmlMywP 6OS+nIDuEjAHCj1cXMa32C4nA7gOYbxkZO4UlXP0TWztwOsCX7uGH6CvSllfwSC715j5 yjys3gekukAhJBn19+0dTIuuHHvaJcsgXTCUo4QvP2+YNzq1QJGV0arjEtCa7mmIKydK /hmvGH7mytA4f8gLpzfm/kr+z8cPl3favF/VVYm8XXYe5ZaxEdNMCnWp/UVtpusPPJxS vyWg== X-Received: by 10.180.105.226 with SMTP id gp2mr4773257wib.6.1378638238323; Sun, 08 Sep 2013 04:03:58 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id a8sm9581395wie.6.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 08 Sep 2013 04:03:57 -0700 (PDT) Sender: Baptiste Daroussin Date: Sun, 8 Sep 2013 13:03:55 +0200 From: Baptiste Daroussin To: Maxim Sobolev Subject: Re: Troubles with dependencies (file -L is broken?) Message-ID: <20130908110354.GJ77141@ithaqua.etoilebsd.net> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="fKov5AqTsvseSZ0Z" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ports@freebsd.org, stable@freebsd.org, portmgr@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 11:04:00 -0000 --fKov5AqTsvseSZ0Z Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Sep 08, 2013 at 12:09:32AM -0700, Maxim Sobolev wrote: > Hi, >=20 > I am trying to portupgrade my subversion and it keeps trying to install > databases/db42 over already installed version (same version), missing the > shared library dependency. >=20 > Adding some debug into bsd.port.mk, I see: >=20 > =3D=3D=3D> subversion-1.8.3 depends on package: libtool>=3D2.4 - found > set -x; set -e ; for i in libdb-4.2.so:/usr/ports/databases/db42; do > lib=3D${i%%:*} ; dir=3D${i#*:} ; target=3D"install"; depends_args=3D"= "; echo > -n "=3D=3D=3D> subversion-1.8.3 depends on shared library: ${lib}" ; f= ound=3D0 > ; dirs=3D"/lib /usr/lib /usr/local/lib `/bin/cat > /usr/local/libdata/ldconfig/* 2>/dev/null || : `" ; for libdir in $dirs; > do test -f ${libdir}/${lib} || continue; if [ -x /usr/bin/file ]; then = [ > `file -b -L --mime-type ${libdir}/${lib}` =3D "application/x-sharedlib" ]= || > continue ; fi ; found=3D1 ; echo " - found"; done ; if [ ${found} -e= q 0 > ]; then echo " - not found"; echo "=3D=3D=3D> Verifying for $lib in = $dir"; > if [ ! -d "$dir" ] ; then echo " =3D> No directory for $lib. > Skipping.."; else if [ -n "" -o -n "" ]; then subpkgfile=3D`(cd $dir; = make > $depends_args -V PKGFILE)`; subpkgname=3D${subpkgfile%-*} ; > subpkgname=3D${subpkgname##*/} ; if [ -r "${subpkgfile}" -a "$target" =3D > "install" ]; then echo "=3D=3D=3D> Installing existing package > ${subpkgfile}"; if [ -n "" -a ${subpkgname} =3D "pkg" ]; then [ -d > /usr/ports/devel/subversion/work ] || /bin/mkdir -p > /usr/ports/devel/subversion/work ; /usr/bin/tar xf ${subpkgfile} -C > /usr/ports/devel/subversion/work -s ",/.*/,,g" "*/pkg-static" ; > /usr/ports/devel/subversion/work/pkg-static add ${subpkgfile}; /bin/rm -f > /usr/ports/devel/subversion/work/pkg-static; else /usr/sbin/pkg_add > ${subpkgfile}; fi; elif [ -n "" -a "${target}" =3D "install" ]; then e= cho > "=3D=3D=3D> subversion-1.8.3 depends on package: ${subpkgfile} - not fo= und"; > echo "=3D=3D=3D> USE_PACKAGE_DEPENDS_ONLY set - will not build from sou= rce"; > exit 1; else (cd $dir; make -DINSTALLS_DEPENDS $target $depends_args) ; > fi; else (cd $dir; make -DINSTALLS_DEPENDS $target $depends_args) ; fi; > echo "=3D=3D=3D> Returning to build of subversion-1.8.3"; fi ; fi ; = done > + set -e > + lib=3Dlibdb-4.2.so > + dir=3D/usr/ports/databases/db42 > + target=3Dinstall > + depends_args=3D'' > + echo -n '=3D=3D=3D> subversion-1.8.3 depends on shared library: libdb= -4.2.so' > =3D=3D=3D> subversion-1.8.3 depends on shared library: libdb-4.2.so+ fo= und=3D0 > + /bin/cat /usr/local/libdata/ldconfig/compat7x > /usr/local/libdata/ldconfig/mysql /usr/local/libdata/ldconfig/portupgrade > /usr/local/libdata/ldconfig/pth > + dirs=3D'/lib /usr/lib /usr/local/lib /usr/local/lib/compat > /usr/local/lib/mysql > /usr/local/lib/compat/pkg > /usr/local/lib/pth' > + test -f /lib/libdb-4.2.so > + continue > + test -f /usr/lib/libdb-4.2.so > + continue > + test -f /usr/local/lib/libdb-4.2.so > + [ -x /usr/bin/file ] > + file -b -L --mime-type /usr/local/lib/libdb-4.2.so > + [ inode/symlink =3D application/x-sharedlib ] > + continue > + test -f /usr/local/lib/compat/libdb-4.2.so > + continue > + test -f /usr/local/lib/mysql/libdb-4.2.so > + continue > + test -f /usr/local/lib/compat/pkg/libdb-4.2.so > + continue > + test -f /usr/local/lib/pth/libdb-4.2.so > + continue > + [ 0 -eq 0 ] > + echo ' - not found' > - not found > + echo '=3D=3D=3D> Verifying for libdb-4.2.so in /usr/ports/databases/= db42' > =3D=3D=3D> Verifying for libdb-4.2.so in /usr/ports/databases/db42 >=20 > So, file(1) call is the culprit here. Trying to reproduce in the console: >=20 > [sobomax@pioneer ~]$ file -b -L --mime-type /usr/local/lib/libdb-4.2.so > inode/symlink >=20 > However: >=20 > [sobomax@pioneer ~]$ hexdump -C /usr/local/lib/libdb-4.2.so | head -n 20 > 00000000 7f 45 4c 46 02 01 01 09 00 00 00 00 00 00 00 00 > |.ELF............| > 00000010 03 00 3e 00 01 00 00 00 d0 40 02 00 00 00 00 00 > |..>.....=D0=BF@......| > 00000020 40 00 00 00 00 00 00 00 b8 a6 0e 00 00 00 00 00 > |@.......=E2=95=A6=D1=96......| > 00000030 00 00 00 00 40 00 38 00 05 00 40 00 1d 00 1a 00 |....@.8...@ > .....| > 00000040 01 00 00 00 05 00 00 00 00 00 00 00 00 00 00 00 > |................| > 00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > |................| > 00000060 dc 45 0e 00 00 00 00 00 dc 45 0e 00 00 00 00 00 > |=D1=8DE......=D1=8DE......| > 00000070 00 00 20 00 00 00 00 00 01 00 00 00 06 00 00 00 |.. > .............| > 00000080 00 50 0e 00 00 00 00 00 00 50 2e 00 00 00 00 00 > |.P.......P......| > 00000090 00 50 2e 00 00 00 00 00 fc 36 00 00 00 00 00 00 > |.P......=D0=AD6......| > 000000a0 d8 3a 00 00 00 00 00 00 00 00 20 00 00 00 00 00 |=D1=8C:.....= =2E.. > .....| > 000000b0 02 00 00 00 06 00 00 00 e8 54 0e 00 00 00 00 00 > |........=D0=A5T......| > 000000c0 e8 54 2e 00 00 00 00 00 e8 54 2e 00 00 00 00 00 > |=D0=A5T......=D0=A5T......| > 000000d0 a0 01 00 00 00 00 00 00 a0 01 00 00 00 00 00 00 > |=E2=95=90.......=E2=95=90.......| > 000000e0 08 00 00 00 00 00 00 00 50 e5 74 64 04 00 00 00 > |........P=D0=95td....| > 000000f0 5c 39 0d 00 00 00 00 00 5c 39 0d 00 00 00 00 00 > |\9......\9......| > 00000100 5c 39 0d 00 00 00 00 00 b4 34 00 00 00 00 00 00 > |\9......=D0=844......| > 00000110 b4 34 00 00 00 00 00 00 04 00 00 00 00 00 00 00 > |=D0=844..............| >=20 > The culprit is that /usr/local/lib/libdb-4.2.so is a symlink to another > symlink to another symlink etc, so that my guess is that file(1) stops at > the first one. The issue can be resolved by using realpath(1), attached > patch fixes it for me. >=20 > [sobomax@pioneer ~]$ realpath /usr/local/lib/libdb-4.2.so > /usr/local/lib/db42/libdb-4.2.so.2 > [sobomax@pioneer ~]$ file -b -L --mime-type > /usr/local/lib/db42/libdb-4.2.so.2 > application/x-sharedlib > [sobomax@pioneer ~]$ ls -l /usr/local/lib/libdb-4.2.so > lrwxr-xr-x 1 root wheel 14 7 =D1=81=D0=B5=D0=BD 21:43 /usr/local/lib/= libdb-4.2.so -> > libdb-4.2.so.2 >=20 > I am not sure what's the process to get bsd.port.mk adjusted these days. > Should I open a PR and assign it to portmgr? The problem is file -L is resolving only one level of symlinks. Yes that is usually still the process, but given I got time right now to te= st it, please just commit :) Approved by: portmgr (bapt) regards, Bapt --fKov5AqTsvseSZ0Z Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlIsWZoACgkQ8kTtMUmk6EwCzgCguoQ+/9s4AFMUjZ34ngi382vJ 8AgAn1bSOu3PD8qj00/wMPSjV5Oi3SeD =/IXW -----END PGP SIGNATURE----- --fKov5AqTsvseSZ0Z-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 12:57:19 2013 Return-Path: Delivered-To: freebsd-ports@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 D8F68FC0; Sun, 8 Sep 2013 12:57:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82EA62C65; Sun, 8 Sep 2013 12:57:18 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::dd86:ea1:6752:b6ab] (unknown [IPv6:2001:7b8:3a7:0:dd86:ea1:6752:b6ab]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 670CB5C44; Sun, 8 Sep 2013 14:57:15 +0200 (CEST) Content-Type: multipart/signed; boundary="Apple-Mail=_C8BC834B-D4B4-499A-B3FB-15B8AF6524A7"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous From: Dimitry Andric In-Reply-To: <20130908081445.242f77c7@thor.walstatt.dyndns.org> Date: Sun, 8 Sep 2013 14:57:01 +0200 Message-Id: <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> To: O. Hartmann X-Mailer: Apple Mail (2.1508) Cc: freebsd-current@freebsd.org, kde@FreeBSD.org, freebsd-ports@freebsd.org, rakuco@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 12:57:19 -0000 --Apple-Mail=_C8BC834B-D4B4-499A-B3FB-15B8AF6524A7 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On Sep 8, 2013, at 08:14, O. Hartmann wrote: > On Sat, 7 Sep 2013 22:49:54 GMT > rakuco@FreeBSD.org wrote: > >> Synopsis: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: >> error: call to 'swap' is ambiguous >> >> State-Changed-From-To: open->patched >> State-Changed-By: rakuco >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 >> State-Changed-Why: >> I don't think the previous version worked. >> >> From your description, it looks like you've switched to building with >> libc++ whereas libstdc++ was being used before. >> >> The upcoming Qt 4.8.5 plus a few patches which only made it to 4.8.6 >> (but we've backported) will finally make Qt build with libc++. >> >> We've just sent an exp-run request for Qt 4.8.5, and will hopefully >> fix all these errors once it is committed. >> >> http://www.freebsd.org/cgi/query-pr.cgi?pr=181913 > > I build the world/kernel since early this year with > > CXXFLAGS+= -stdlib=libc++ > CXXFLAGS+= -std=c++11 > > > in /etc/src.conf. I do not use those flags > in /etc/make.conf! /etc/src.conf is supposed to target ONLY > the /usr/src world, not the ports - this is as I interpret the man page > for /etc/src.conf and it would be logical. But this rule/thinking seems > to be broken by some includes from /usr/ports/Mk ingredients. Since r255321, -stdlib=libc++ is effectively the default, at least when you haven't set gcc as the default compiler. So it also applies to ports, which unavoidably will lead to a bit of fallout. My personal experience is that most C++-based ports compile fine with libc++ instead of libstdc++, except for a few that rely on internal libstdc++ details. However, -std=c++11 is *not* yet the default, and C++11 has different rules here and there, so some ports might fail to compile due to this. For some ports, too much hacking may be required to make them work with C++11. So in case of trouble, try removing -std=, or setting it to different values (c++0x, c++98, gnu++98, etc), to get the port to compile. Note the base system should have no problems with -std=c++11, so please continue to use the option in src.conf, and report any problems if you encounter them, so we can fix them. :-) -Dimitry --Apple-Mail=_C8BC834B-D4B4-499A-B3FB-15B8AF6524A7 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.20 (Darwin) iEYEARECAAYFAlIsdCkACgkQsF6jCi4glqPYZACglByQgm4RM9TvDepRBC7a4YCt pSwAn0nuDJ0yz18iVzHCe0NBGs7AV3EQ =qYED -----END PGP SIGNATURE----- --Apple-Mail=_C8BC834B-D4B4-499A-B3FB-15B8AF6524A7-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 15:58:24 2013 Return-Path: Delivered-To: freebsd-ports@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 D0C29900; Sun, 8 Sep 2013 15:58:24 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B7FB2458; Sun, 8 Sep 2013 15:58:24 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VIhNW-000iGy-RH>; Sun, 08 Sep 2013 17:58:22 +0200 Received: from g225186224.adsl.alicedsl.de ([92.225.186.224] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VIhNW-002jaZ-M4>; Sun, 08 Sep 2013 17:58:22 +0200 Date: Sun, 8 Sep 2013 17:58:16 +0200 From: "O. Hartmann" To: Dimitry Andric Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous Message-ID: <20130908175816.1b9680c6@thor.walstatt.dyndns.org> In-Reply-To: <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/ZYZSQm5RiR9GFU6ZUZ0As2g"; protocol="application/pgp-signature" X-Originating-IP: 92.225.186.224 Cc: freebsd-current@freebsd.org, kde@FreeBSD.org, freebsd-ports@freebsd.org, rakuco@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 15:58:24 -0000 --Sig_/ZYZSQm5RiR9GFU6ZUZ0As2g Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 8 Sep 2013 14:57:01 +0200 Dimitry Andric wrote: > On Sep 8, 2013, at 08:14, O. Hartmann > wrote: > > On Sat, 7 Sep 2013 22:49:54 GMT > > rakuco@FreeBSD.org wrote: > >=20 > >> Synopsis: > >> devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: > >> call to 'swap' is ambiguous > >>=20 > >> State-Changed-From-To: open->patched > >> State-Changed-By: rakuco > >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 > >> State-Changed-Why:=20 > >> I don't think the previous version worked. > >>=20 > >> From your description, it looks like you've switched to building > >> with libc++ whereas libstdc++ was being used before. > >>=20 > >> The upcoming Qt 4.8.5 plus a few patches which only made it to > >> 4.8.6 (but we've backported) will finally make Qt build with > >> libc++. > >>=20 > >> We've just sent an exp-run request for Qt 4.8.5, and will hopefully > >> fix all these errors once it is committed. > >>=20 > >> http://www.freebsd.org/cgi/query-pr.cgi?pr=3D181913 > >=20 > > I build the world/kernel since early this year with=20 > >=20 > > CXXFLAGS+=3D -stdlib=3Dlibc++ > > CXXFLAGS+=3D -std=3Dc++11 > >=20 > >=20 > > in /etc/src.conf. I do not use those flags > > in /etc/make.conf! /etc/src.conf is supposed to target ONLY > > the /usr/src world, not the ports - this is as I interpret the man > > page for /etc/src.conf and it would be logical. But this > > rule/thinking seems to be broken by some includes > > from /usr/ports/Mk ingredients. >=20 > Since r255321, -stdlib=3Dlibc++ is effectively the default, at least > when you haven't set gcc as the default compiler. So it also applies > to ports, which unavoidably will lead to a bit of fallout. My > personal experience is that most C++-based ports compile fine with > libc++ instead of libstdc++, except for a few that rely on internal > libstdc++ details. >=20 > However, -std=3Dc++11 is *not* yet the default, and C++11 has different > rules here and there, so some ports might fail to compile due to this. > For some ports, too much hacking may be required to make them work > with C++11. So in case of trouble, try removing -std=3D, or setting it > to different values (c++0x, c++98, gnu++98, etc), to get the port to > compile. >=20 > Note the base system should have no problems with -std=3Dc++11, so > please continue to use the option in src.conf, and report any > problems if you encounter them, so we can fix them. :-) >=20 > -Dimitry >=20 Hello Dimitry. I ONLY use -std=3Dc++11 in /etc/src.conf. The base system had never problems so far since I use it. In /etc/make.conf, I avoid it. But, and this is obviously a logical incosistency, the ports system includes also /etc/src.conf, and I consider /etc/src.conf as base system only as the man page suggests. But the discussion has already been on the list. Somewhere in the basd.*.mk files, /etc/src.conf is included. And I guess therefore it comes to problems.=20 Oliver --Sig_/ZYZSQm5RiR9GFU6ZUZ0As2g Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLJ6eAAoJEOgBcD7A/5N8Sj8IAI9ka6C2ttIBi5QjUknmuv9C MRs+fAedC0FMssosmXx2r474fWm/lzxWor1boFheaN1bU36bshVRXvREXoDQWAFq R2jfh55NZaPVqozozNV7DdFHX3TAbjUeR01n/XyTxuTomzO6d7qxwvbsQTQFj5Ln B6hL7IZ42CM98LHGz9X/mLrQWQGDWnXQElckZ7pu+ssz910fOiESyWErtzDliAJf Yv/3+gmTkWjfxEaF3oUrFaF4zbFlrP7iUSElF4DBFnd/J7/7hAUGBUly/vQlhrH4 XMgIk5t/s5EnkvwIb2VDCpVZNWhQ7ycXkFdB6Zf1zkfwJ8MTbBql5KNXHZc8aSg= =K68D -----END PGP SIGNATURE----- --Sig_/ZYZSQm5RiR9GFU6ZUZ0As2g-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 17:12:59 2013 Return-Path: Delivered-To: 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 17E1C698; Sun, 8 Sep 2013 17:12:59 +0000 (UTC) (envelope-from qat@redports.org) Received: from qat.redports.org (unknown [IPv6:2610:1c1:1:6420::233:0]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DDB582793; Sun, 8 Sep 2013 17:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=redports.org; s=04012012; h=Sender:Message-Id:To:Subject:Reply-To:Date:To:Cc:From:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=HvRvU7IdzbmVp1giBEcm622JxDJJkmYo4g6RanrxPXU=; b=T377jIi51fR921dBA43A93IfgrVMgETF7d7u4C2JV3LuGOKlXWO7Uq8BYR2PvWqQL1HijzPsXCB4Kr1yQRmDFwqKAaCVS3NccoI0vzhCK4CS+e17y1YwViCyKcJEbBcm4tzJ27CAUsXPKV9RfPLNUOjowMaHee2l1q8QMDCxuaQ=; Received: from www by qat.redports.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VIiXh-000FcK-Tl; Sun, 08 Sep 2013 17:12:57 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: "Ports-QAT" X-Trac-Version: 0.12.5 Precedence: bulk Auto-Submitted: auto-generated X-Mailer: Trac 0.12.5, by Edgewall Software To: wg@FreeBSD.org X-Trac-Project: redports Date: Sun, 08 Sep 2013 17:12:57 -0000 X-URL: https://qat.redports.org/ Subject: [QAT] r326727: 4x leftovers To: wg@FreeBSD.org X-Trac-Build-URL: https://qat.redports.org/buildarchive/20130908135800-48145 X-Trac-Build-ID: 20130908135800-48145 Message-Id: Sender: World Wide Web Owner Cc: ports@FreeBSD.org, decke@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Reply-To: qat@redports.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 17:12:59 -0000 devel/py-mongoengine: update to 0.8.4 - Update to 0.8.4 - Use zip_safe=False - Remove leading article from COMMENT - Take maintainership Changes: http://docs.mongoengine.org/en/latest/changelog.html PR: ports/181486 Submitted by: wg (myself) Approved by: maintainer (timeout) --------------------------------------------------------------------- Build ID: 20130908135800-48145 Job owner: wg@FreeBSD.org Buildtime: 3 hours Enddate: Sun, 08 Sep 2013 17:12:53 GMT Revision: r326727 Repository: https://svnweb.freebsd.org/ports?view=revision&revision=326727 --------------------------------------------------------------------- Port: devel/py-mongoengine 0.8.4 Buildgroup: 9.1-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908135800-48145-184176/py27-mongoengine-0.8.4.log Buildgroup: 9.1-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908135800-48145-184177/py27-mongoengine-0.8.4.log Buildgroup: 8.4-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908135800-48145-184178/py27-mongoengine-0.8.4.log Buildgroup: 8.4-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908135800-48145-184179/py27-mongoengine-0.8.4.log -- Buildarchive URL: redports From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 20:33:04 2013 Return-Path: Delivered-To: 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 A0911822; Sun, 8 Sep 2013 20:33:04 +0000 (UTC) (envelope-from qat@redports.org) Received: from qat.redports.org (unknown [IPv6:2610:1c1:1:6420::233:0]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75A212FA0; Sun, 8 Sep 2013 20:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=redports.org; s=04012012; h=Sender:Message-Id:To:Subject:Reply-To:Date:To:Cc:From:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=jVe6+9knNZTFw47lbFQp22tYfohm/mj0ac3ZXAuaSac=; b=Mz7VbNvo4E9d9824uIGxozoT6ng6nevkx2AMYkDYoKGyKcfswLZa+OT+1CSHqR6FMnviKCdrLIxqrmYuKr4J3ar+ATpiz3ttEaRubeRzIyW3cF9GcJxOSu9N+TE6kzJkT6R+07AwYQt2nWuNf3E9fcde68UaAqTSQmqoRDTMC3M=; Received: from www by qat.redports.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VIlfL-0002qe-3l; Sun, 08 Sep 2013 20:33:03 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: "Ports-QAT" X-Trac-Version: 0.12.5 Precedence: bulk Auto-Submitted: auto-generated X-Mailer: Trac 0.12.5, by Edgewall Software To: wg@FreeBSD.org X-Trac-Project: redports Date: Sun, 08 Sep 2013 20:33:03 -0000 X-URL: https://qat.redports.org/ Subject: [QAT] r326740: 4x leftovers To: wg@FreeBSD.org X-Trac-Build-URL: https://qat.redports.org/buildarchive/20130908150401-39362 X-Trac-Build-ID: 20130908150401-39362 Message-Id: Sender: World Wide Web Owner Cc: ports@FreeBSD.org, decke@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Reply-To: qat@redports.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 20:33:04 -0000 devel/py-mongoengine: take maintainership - Take maintainership (forgot to do so in the last commit) PR: ports/181486 Approved by: maintainer (timeout) --------------------------------------------------------------------- Build ID: 20130908150401-39362 Job owner: wg@FreeBSD.org Buildtime: 5 hours Enddate: Sun, 08 Sep 2013 20:32:59 GMT Revision: r326740 Repository: https://svnweb.freebsd.org/ports?view=revision&revision=326740 --------------------------------------------------------------------- Port: devel/py-mongoengine 0.8.4 Buildgroup: 9.1-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908150401-39362-184400/py27-mongoengine-0.8.4.log Buildgroup: 9.1-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908150401-39362-184401/py27-mongoengine-0.8.4.log Buildgroup: 8.4-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908150401-39362-184402/py27-mongoengine-0.8.4.log Buildgroup: 8.4-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~wg@FreeBSD.org/20130908150401-39362-184403/py27-mongoengine-0.8.4.log -- Buildarchive URL: redports From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 20:33:35 2013 Return-Path: Delivered-To: freebsd-ports@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 2763A8C1; Sun, 8 Sep 2013 20:33:35 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from caravan.chchile.org (caravan.chchile.org [178.32.125.136]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E56B02FAF; Sun, 8 Sep 2013 20:33:34 +0000 (UTC) Received: by caravan.chchile.org (Postfix, from userid 1000) id E49ABBCB6D; Sun, 8 Sep 2013 20:33:26 +0000 (UTC) Date: Sun, 8 Sep 2013 22:33:26 +0200 From: Jeremie Le Hen To: freebsd-ports@FreeBSD.org Subject: Re: libiconv.a(iconv.o): relocation R_X86_64_32S against `a local symbol' can not be used when making a shared object Message-ID: <20130908203326.GC24473@caravan.chchile.org> References: <20130908105203.GM43281@caravan.chchile.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130908105203.GM43281@caravan.chchile.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: jlh@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 20:33:35 -0000 On Sun, Sep 08, 2013 at 12:52:03PM +0200, Jeremie Le Hen wrote: > Hi, > > (Please Cc: me when replying, I'm not subscribed.) > > I created a fresh FreeBSD 9.1-RELEASE amd64 jail. No installed ports. > > I cannot build devel/gettext. Does anyone experience the same problem? > I invariably run into the following problem: > > libtool: link: cc -shared -fPIC -DPIC .libs/bindtextdom.o .libs/dcgettext.o .libs/dgettext.o .libs/gettext.o .libs/finddomain.o .libs/hash-string.o .libs/loadmsgcat.o .libs/localealias.o .libs/textdomain.o .libs/l10nflist.o .libs/explodename.o .libs/dcigettext.o .libs/dcngettext.o .libs/dngettext.o .libs/ngettext.o .libs/plural.o .libs/plural-exp.o .libs/localcharset.o .libs/threadlib.o .libs/lock.o .libs/relocatable.o .libs/langprefs.o .libs/localename.o .libs/log.o .libs/printf.o .libs/setlocale.o .libs/version.o .libs/xsize.o .libs/osdep.o .libs/intl-compat.o -L/usr/local/lib /usr/local/lib/libiconv.a -O2 -Wl,-soname -Wl,libintl.so.9 -o .libs/libintl.so.9 > /usr/bin/ld: /usr/local/lib/libiconv.a(iconv.o): relocation R_X86_64_32S against `a local symbol' can not be used when making a shared object; recompile with -fPIC > /usr/local/lib/libiconv.a: could not read symbols: Bad value > > Full typescript here: > http://people.freebsd.org/~jlh/typescript.gettext.txt For the record, Gabor Pali pointed that inside the jail, uname(1) still returned the version from my host (10-CURRENT), so the port makes wrong assumptions. This is solved using environement variables as described in the uname(1) manpage. -- Jeremie Le Hen Scientists say the world is made up of Protons, Neutrons and Electrons. They forgot to mention Morons. From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 20:36:35 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 37E5EAAE; Sun, 8 Sep 2013 20:36:35 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C08292FD8; Sun, 8 Sep 2013 20:36:34 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VIlij-001ZCN-0t>; Sun, 08 Sep 2013 22:36:33 +0200 Received: from f052243160.adsl.alicedsl.de ([78.52.243.160] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VIlii-0034DU-RH>; Sun, 08 Sep 2013 22:36:33 +0200 Date: Sun, 8 Sep 2013 22:36:32 +0200 From: "O. Hartmann" To: Guido Falsi Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv Message-ID: <20130908223632.1f838d90@thor.walstatt.dyndns.org> In-Reply-To: <5229859C.4030208@FreeBSD.org> References: <5229859C.4030208@FreeBSD.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/dWyflkraYcJabUPBNpSd=Sr"; protocol="application/pgp-signature" X-Originating-IP: 78.52.243.160 Cc: AN , freebsd-ports@freebsd.org, freebsd-current@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 20:36:35 -0000 --Sig_/dWyflkraYcJabUPBNpSd=Sr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Fri, 06 Sep 2013 09:34:52 +0200 Guido Falsi wrote: > On 09/06/13 05:16, AN wrote: > > Hi: > > > > I am posting to both lists because this problem affects users of > > current and ports, and I didn't know which would be more > > appropriate so please forgive me. > > > > # uname -a > > FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #80 r255129: Sun > > Sep 1 16:01:36 CDT 2013 > > root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 > > > > I am trying to update my ports following the entry in updating, but > > it does not seem to be working correctly. I followed the directions > > exactly, and after 30 mins this is what has happened: > > > > # cat ports_to_update | xargs portupgrade -vf > > ---> Session started at: Thu, 05 Sep 2013 21:12:10 -0500 > > [Reading data from pkg(8) ... - 890 packages found - done] > > Shared object "libiconv.so.3" not found, required by "httpd" > > make: "/usr/ports/Mk/bsd.apache.mk" line 278: warning: Couldn't read > > shell's output for "/usr/local/sbin/httpd -V | /usr/bin/sed -ne > > 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'" > > Shared object "libiconv.so.3" not found, required by "httpd" >=20 > This is bsd.apache.mk trying to get the apache version. but the > apache's "httpd" binary cannot run because it can't find > libiconv.so.3. >=20 > > apxs:Error: Sorry, no shared object support for Apache. > > apxs:Error: available under your platform. Make sure. > > apxs:Error: the Apache module mod_so is compiled into. > > apxs:Error: your server binary `/usr/local/sbin/httpd'.. > > make: "/usr/ports/Mk/bsd.apache.mk" line 284: warning: > > "/usr/local/sbin/apxs -q MPM_NAME" returned non-zero status > > ** Port marked as IGNORE: www/mod_dnssd: > > is marked as broken: : Error from bsd.apache.mk. apache is > > installed (or APACHE_PORT is defined) and port requires apache22 at > > least > > > > > > Here is what I have done: > > # pkg query %ro libiconv >ports_to_update > > [root@FBSD10 ~]# cat ports_to_update > > > > ...lots of output > > > > # pkg delete -f libiconv > > pkg: You are trying to delete package(s) which has dependencies > > that are still required: > > ... delete these packages anyway in forced mode > > Deinstallation has been requested for the following 1 packages: > > > > libiconv-1.14_1 > > > > The deinstallation will free 2 MB > > > > Proceed with deinstalling packages [y/N]: y > > [1/1] Deleting libiconv-1.14_1... > > deleting anyway > > > > done > > > > Now the update process is stuck here: > > > > ** Port marked as IGNORE: www/mod_dnssd: > > is marked as broken: : Error from bsd.apache.mk. apache is > > installed (or APACHE_PORT is defined) and port requires apache22 at > > least > > > > there are 2 ruby processes running for a long time, but nothing is > > happening to the update. > > > > 43998 root 52 0 64912K 33368K piperd 5 2:21 5.96% > > ruby19{ruby19} > > 43998 root 52 0 64912K 33368K select 1 0:00 5.96% > > ruby19{ruby19} > > > > So, it seems my system is broken now. Did I do something wrong? > > How can the upgrade work if so many ports depend on iconv? What > > should I do now? Should I reinstall libiconv? > > >=20 > Good news is the update process did not really update anything, > judging from the output you sent. If you just reinstall libiconv > everything should go back to how it was, at least you get a working > system. >=20 > I admit I did not foresee this condition arising when I wrote the=20 > instructions, here is a modified procedure you can follow and report=20 > back about, so I can modify the UPDATING entry: >=20 > # pkg query %ro libiconv >ports_to_update > # cp /usr/local/lib/libiconv.so.3 /usr/local/lib/compat/pkg/ > # ldconfig -R > (1) # pkg delete -f libiconv > # cat ports_to_update | xargs portupgrade -f >=20 > (1) not sure if ldconfig -R is really needed, but It will not do any > harm >=20 > I added the step to preserve libiconv.so.3 > in /usr/local/lib/compat/pkg which is in the default library search > path. In this way libiconv and it's include file shouldn't be found > by configure scripts and the like and they should link to the system > one, while existing binaries should keep working linking to the > preserved one in lib/compat. >=20 > > Any help is appreciated. >=20 > I hope this helps you, just ask for any clarifications and further > help as needed on this matter. >=20 Just for the record: after three days of cleaning up this mess today two boxes got "ready", servers, without any GUI or fancy X11 stuff. They work. Two other development boxes reject compiling kdelibs and stuff. After the final update today on CURRENT r255398, ports like kdevelop, firefox, libreoffice(!) and others crash along with virtualbox-ose-kmod (coredump). Most of that stuff, including libreoffice, firefox was ready last night, including kdelibs and the stuff for kdevelop. It worked today - until now, r255398. I do not know what happened here, but I'm through with it. Two obviously independend processes, one from the ports side, another from the OS side, intertwined and messy as hell rendered the systems completely unusable.=20 As I reported on several occasions, after r255259 it wasn't possible to compile kdelibs an other ports anymore. I have not made a list of those, after three days wasting time and a lost weekendI lost the data, sorry. As far as I can see this, some changes corrupt the effords of two days bringing up the ports system. After updating the OS this evening most of the successfully updated, crucial working tools do not work anymore and dum cores, if ever. --Sig_/dWyflkraYcJabUPBNpSd=Sr Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLN/QAAoJEOgBcD7A/5N8kisIAKdOckBjSstTIdTtN2XjZ++v x5tSvHdJ8blxB1LFXLdlhpxwiJRsf42sMXXFKxKMaUtd55LwzofcQ6HVKDrucirP ZBHRzjCz/OzrwISnXqfEw/AzV2MrbHwJ9mlmEqT2fe+cHf1KGFXW1Fh/uX38+B0H OEKY6feOxAek3GxP+xt4jAfA36BBLG/Pt6R+X8K+TlEMwYVbJumTHs6rgS3tbCMP AxmQDJy4xA4sPvz6TNI3TSn6YIvF5H7oaaLRaHNJO1d5HqL+A/4O67jxTsETNS23 uoam8bXD7xkr6agOZZi59b6ZkbSZUvwmABYKIxJJ3fr0KLvJkUvmtl2d9zqvhk8= =M4PV -----END PGP SIGNATURE----- --Sig_/dWyflkraYcJabUPBNpSd=Sr-- From owner-freebsd-ports@FreeBSD.ORG Sun Sep 8 20:58:28 2013 Return-Path: Delivered-To: freebsd-ports@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 B03C9DA; Sun, 8 Sep 2013 20:58:28 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43AB920F4; Sun, 8 Sep 2013 20:58:27 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VIm3u-001cfz-JH>; Sun, 08 Sep 2013 22:58:26 +0200 Received: from f052243160.adsl.alicedsl.de ([78.52.243.160] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VIm3u-0036CM-EB>; Sun, 08 Sep 2013 22:58:26 +0200 Date: Sun, 8 Sep 2013 22:58:25 +0200 From: "O. Hartmann" To: Dimitry Andric Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous Message-ID: <20130908225825.6b120d6a@thor.walstatt.dyndns.org> In-Reply-To: <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/ZvONgQIOUP_y6_knjJdOwnq"; protocol="application/pgp-signature" X-Originating-IP: 78.52.243.160 Cc: freebsd-current@freebsd.org, kde@FreeBSD.org, rakuco@FreeBSD.org, freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 20:58:28 -0000 --Sig_/ZvONgQIOUP_y6_knjJdOwnq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 8 Sep 2013 14:57:01 +0200 Dimitry Andric wrote: > On Sep 8, 2013, at 08:14, O. Hartmann > wrote: > > On Sat, 7 Sep 2013 22:49:54 GMT > > rakuco@FreeBSD.org wrote: > >=20 > >> Synopsis: > >> devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: > >> call to 'swap' is ambiguous > >>=20 > >> State-Changed-From-To: open->patched > >> State-Changed-By: rakuco > >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 > >> State-Changed-Why:=20 > >> I don't think the previous version worked. > >>=20 > >> From your description, it looks like you've switched to building > >> with libc++ whereas libstdc++ was being used before. > >>=20 > >> The upcoming Qt 4.8.5 plus a few patches which only made it to > >> 4.8.6 (but we've backported) will finally make Qt build with > >> libc++. > >>=20 > >> We've just sent an exp-run request for Qt 4.8.5, and will hopefully > >> fix all these errors once it is committed. > >>=20 > >> http://www.freebsd.org/cgi/query-pr.cgi?pr=3D181913 > >=20 > > I build the world/kernel since early this year with=20 > >=20 > > CXXFLAGS+=3D -stdlib=3Dlibc++ > > CXXFLAGS+=3D -std=3Dc++11 > >=20 > >=20 > > in /etc/src.conf. I do not use those flags > > in /etc/make.conf! /etc/src.conf is supposed to target ONLY > > the /usr/src world, not the ports - this is as I interpret the man > > page for /etc/src.conf and it would be logical. But this > > rule/thinking seems to be broken by some includes > > from /usr/ports/Mk ingredients. >=20 > Since r255321, -stdlib=3Dlibc++ is effectively the default, at least > when you haven't set gcc as the default compiler. So it also applies > to ports, which unavoidably will lead to a bit of fallout. My > personal experience is that most C++-based ports compile fine with > libc++ instead of libstdc++, except for a few that rely on internal > libstdc++ details. >=20 > However, -std=3Dc++11 is *not* yet the default, and C++11 has different > rules here and there, so some ports might fail to compile due to this. > For some ports, too much hacking may be required to make them work > with C++11. So in case of trouble, try removing -std=3D, or setting it > to different values (c++0x, c++98, gnu++98, etc), to get the port to > compile. >=20 > Note the base system should have no problems with -std=3Dc++11, so > please continue to use the option in src.conf, and report any > problems if you encounter them, so we can fix them. :-) >=20 > -Dimitry >=20 Hello Dimitry, btw, see PR ports/181932. This is definitely NOT libc++ related. It came up since nearly all qt4-related clients (also kdelibs) fail and drop core on r255398 - they worked prior to the last update today. I tried recompiling qt4- and kdelibs4 to get my kdevelop environment as well as libreoffice back (the drop core, as well as firefox, out of the blue). I also tried compiling those ports without any settings of CXXFLAGS in /etc/src.conf, but it doens't help. I can not understand why two critical changes from different branches of the maintainig get the same time into the public (iconv/ports and libstdc++ vanishing). Maybe I'm wrong here, but after three days, two nights non-stop updating I'm through with this toy. --Sig_/ZvONgQIOUP_y6_knjJdOwnq Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLOTxAAoJEOgBcD7A/5N8Ql4IAJcMGV7u/b7bG5Lm154AEkql J4MauLfy+8JSbKBtvA6mArK1huxXmKbH+LP/o2Egao0vJgQlV8IBUTGzjegAHKFn 2Qt+vL2HfGA/C1Je5UuWTyNYpaZxylUDcGiufmcubVZSDPVqoegTKdmgHPA9+5Rk 6L8sa4+ySKLsHDvGHTS/nMJ/xXY5iJkTEkQeQZUCF7B7h00w8m9NixQ0536XzeH6 aOmQ/fMsLO3nAYP9QzagHrLNBY2GetRRcyA0OgTVH+fUewQEXa5oBYqUjC03vrW/ mi4sb2nx/3lsM1PSm975M5XFGhwWoS+IlQQPpmz3QEmZAZ2W9IpxY4nIhyVx8lc= =GxfI -----END PGP SIGNATURE----- --Sig_/ZvONgQIOUP_y6_knjJdOwnq-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 01:03:38 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 4978BB2B for ; Mon, 9 Sep 2013 01:03:38 +0000 (UTC) (envelope-from freebsd-ports@m.gmane.org) Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 09A7E2AB3 for ; Mon, 9 Sep 2013 01:03:37 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VIpt3-00049D-9v for freebsd-ports@freebsd.org; Mon, 09 Sep 2013 03:03:29 +0200 Received: from a91-154-115-217.elisa-laajakaista.fi ([91.154.115.217]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 09 Sep 2013 03:03:29 +0200 Received: from rakuco by a91-154-115-217.elisa-laajakaista.fi with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 09 Sep 2013 03:03:29 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-ports@freebsd.org From: Raphael Kubo da Costa Subject: Re: x11/kdelibs4: /usr/local/include/grantlee/typeaccessor.h:70:40: error: no matching function for call to 'distance' return Date: Mon, 09 Sep 2013 04:03:19 +0300 Lines: 32 Message-ID: <86vc2a24dk.fsf@orwell.Elisa> References: <20130907143720.47eecd0f@thor.walstatt.dyndns.org> <8661uc5lqj.fsf@orwell.Elisa> Mime-Version: 1.0 Content-Type: text/plain X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: a91-154-115-217.elisa-laajakaista.fi User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (berkeley-unix) Cancel-Lock: sha1:aaINi5KDrE2m1smfWEbXdfVPDXo= X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 01:03:38 -0000 Raphael Kubo da Costa writes: > "O. Hartmann" writes: > >> After a messy "iconv" orgy update session, I update yesterday >> x11/kdelib4 successfully. After updating the OS to >> >> FreeBSD 10.0-CURRENT #2 r255356: Sat Sep 7 13:04:03 CEST 2013 amd64 >> >> today, I run today surprisingly into this error: >> >> [...] >> In file included >> from /usr/ports/x11/kdelibs4/work/kdelibs-4.10.5/kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp:33: >> In file included from /usr/local/include/grantlee_core.h:24: In file >> included from /usr/local/include/grantlee_templates.h:34: In file >> included >> from /usr/local/include/grantlee/metatype.h:27: /usr/local/include/grantlee/typeaccessor.h:70:40: >> >> error: no matching function for call to 'distance' return >> QVariant::fromValue( std::distance( container.begin(), >> container.end() ) ); >> [...] >> >> grantlee has also been update successfully, I recompiled it today again >> successfulyy, but without any success. > > Are you using libc++ and is the error message much bigger than that? > I've fixed that one in Qt and the patch is part of 4.8.5. I'll see how > much work is left to bring in 4.8.5 into ports. Fixed in r326778. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 06:57:50 2013 Return-Path: Delivered-To: freebsd-ports@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 578F9F58 for ; Mon, 9 Sep 2013 06:57:50 +0000 (UTC) (envelope-from se@freebsd.org) Received: from nm25-vm1.bullet.mail.ird.yahoo.com (nm25-vm1.bullet.mail.ird.yahoo.com [212.82.109.202]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6457C2A45 for ; Mon, 9 Sep 2013 06:57:49 +0000 (UTC) Received: from [77.238.189.49] by nm25.bullet.mail.ird.yahoo.com with NNFMP; 09 Sep 2013 06:57:40 -0000 Received: from [46.228.39.80] by tm2.bullet.mail.ird.yahoo.com with NNFMP; 09 Sep 2013 06:57:40 -0000 Received: from [127.0.0.1] by smtp117.mail.ir2.yahoo.com with NNFMP; 09 Sep 2013 06:57:40 -0000 X-Yahoo-Newman-Id: 589673.13268.bm@smtp117.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: fXyHnlUVM1nYRD_I4XvrNOn.9JHgD0kVy13BqifvFRE6y1e b9stTTF6tc2m2DGgq7gjATqr3xG9tEmVcVlHO3JFkkObwPkgm.ZbYDHLLifd 5nLfgh8GFhvCrGv4YO1ibqE9oWyoCMn1PcpVsrUYOxy.Spiy2c7W3T6v3mep 8h_O.3E2kRTB0yYuT.dDXYfZis4314DzF0LZJVo0k5sPx7agbh5EZWpEybBC ySAtS8JjZnvwEIZqA6tewhqYGYZWOxOWABr7mtvEVxcI6qGcGMc42km6c.i_ VAP9YFzSJvEB6FckHYDTmxcU1fcrkCS6WPp64J2STfu3qAGOHWK655rh9r.x Vn26g5JhmlPumWDxUVggo3vjB0E_ujIXZF7Os6Le1QNccPEqnUJHzejdIs4u a83C5o9OaO9F.NW1Bh.a7IOy6QPjnqTwBGExN5Vg_u7CM5MjWSSSF0I8gsEd lah3MMw5p60IQQSc9z9y.dGQWtkppJhuJ.LznY7tmXWvFDCa5rS8UMC8tq7o LwYC_A.bJ8tzT8fAzbkav574Kp_og2uEgp1GjhrRcWPTUjyBBZDft6OwKtgR DI1v2wP_XQ8uPkMbqrwTgElbvVsXwRWFmBZzcNaMOR6f0i6i0aEiHAc7c X-Yahoo-SMTP: iDf2N9.swBDAhYEh7VHfpgq0lnq. X-Rocket-Received: from [192.168.119.11] (se@84.154.120.176 with ) by smtp117.mail.ir2.yahoo.com with SMTP; 09 Sep 2013 06:57:40 +0000 UTC Message-ID: <522D7162.5090806@freebsd.org> Date: Mon, 09 Sep 2013 08:57:38 +0200 From: Stefan Esser User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: "O. Hartmann" Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> In-Reply-To: <20130908081445.242f77c7@thor.walstatt.dyndns.org> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, kde@FreeBSD.org, freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 06:57:50 -0000 Am 08.09.2013 08:14, schrieb O. Hartmann: > On Sat, 7 Sep 2013 22:49:54 GMT rakuco@FreeBSD.org wrote: > >> Synopsis: devel/qt4-script: >> /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is >> ambiguous >> >> State-Changed-From-To: open->patched State-Changed-By: rakuco >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 >> State-Changed-Why: I don't think the previous version worked. >> >> From your description, it looks like you've switched to building >> with libc++ whereas libstdc++ was being used before. >> >> The upcoming Qt 4.8.5 plus a few patches which only made it to >> 4.8.6 (but we've backported) will finally make Qt build with >> libc++. >> >> We've just sent an exp-run request for Qt 4.8.5, and will >> hopefully fix all these errors once it is committed. >> >> http://www.freebsd.org/cgi/query-pr.cgi?pr=181913 > > > I build the world/kernel since early this year with > > CXXFLAGS+= -stdlib=libc++ CXXFLAGS+= > -std=c++11 > > > in /etc/src.conf. I do not use those flags in /etc/make.conf! > /etc/src.conf is supposed to target ONLY the /usr/src world, not > the ports - this is as I interpret the man page for /etc/src.conf > and it would be logical. But this rule/thinking seems to be broken > by some includes from /usr/ports/Mk ingredients. There are ports that use bsd.prog.mk instead of the Makefile supplied with the source files. Just grep for bsd.port.mk in the port's "files" sub directory, if you find that /etc/src.conf settings affect a port. I think these ports are in violation of POLA and had a longer mail exchange with a port maintainer, who told me that use of bsd.prog.mk was the preferred method to build binaries on FreeBSD, for base and for ports. So no file under /usr/ports/Mk is to blame, but some ports do implicitly reference /etc/src.conf via their use of bsd.prog.mk. Regards, STefan NB: I just performed the grep suggested above and found that the following ports mention bsd.prog.mk in files/*: archivers/parchive archivers/pixz archivers/zipmix audio/id3v2 audio/mp3gain benchmarks/raidtest comms/mlan comms/mlan3 comms/obexapp converters/chmview converters/iconv devel/bcc devel/calibrator devel/frink devel/libpasori devel/linux_kdump devel/opencvs devel/qmake devel/qmake4 devel/ruby-byaccr dns/dnsreflector editors/fb editors/hexpert editors/tamago editors/tweak emulators/cpmtools finance/libstocks ftp/bsdftpd-ssl ftp/ftpsesame games/cre games/xroach graphics/exiftran graphics/s10sh japanese/edyvalue japanese/kon2-16dot japanese/man japanese/suicavalue mail/althea mail/archivesmtp mail/biffer mail/dma math/moo misc/cpuid misc/team net-mgmt/choparp net-mgmt/icmpquery net-mgmt/ipv6mon net/ifdepd net/openntpd net/packetdrill net/pcnfsd net/pppd23 net/pxe-pdhcp net/sharity-light net/skyfish palm/mdbconv print/epsonepl print/mup security/ipv6toolkit security/isakmpd security/openssh-askpass security/sst shells/nologinmsg shells/v7sh sysutils/bsdmoted sysutils/freqsdwn sysutils/jfbterm sysutils/sb16config sysutils/sbniconfig sysutils/setquota textproc/hhm textproc/wordnet www/http_get www/http_load www/http_post www/mathopd www/mohawk x11-wm/vtwm x11/gpctool x11/wmxss From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 09:09:47 2013 Return-Path: Delivered-To: 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 276C49AA for ; Mon, 9 Sep 2013 09:09:47 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 15F51216D for ; Mon, 9 Sep 2013 09:09:47 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id r8999kkt064805 for ; Mon, 9 Sep 2013 09:09:46 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id r8999kuj064795; Mon, 9 Sep 2013 09:09:46 GMT (envelope-from portscout) Message-Id: <201309090909.r8999kuj064795@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Mon, 9 Sep 2013 09:09:46 +0000 From: portscout@FreeBSD.org To: ports@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 09:09:47 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/ports@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ science/gwyddion | 2.31 | 2.32 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 09:47:02 2013 Return-Path: Delivered-To: freebsd-ports@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 C9AC867B for ; Mon, 9 Sep 2013 09:47:02 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.grem.de (outcast.grem.de [213.239.217.27]) by mx1.freebsd.org (Postfix) with SMTP id EE2C6245B for ; Mon, 9 Sep 2013 09:47:01 +0000 (UTC) Received: (qmail 3096 invoked by uid 89); 9 Sep 2013 09:40:19 -0000 Received: from unknown (HELO bsd64.grem.de) (mg@grem.de@93.215.179.56) by mail.grem.de with ESMTPA; 9 Sep 2013 09:40:19 -0000 Date: Mon, 9 Sep 2013 11:40:18 +0200 From: Michael Gmelin To: Dimitry Andric Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous Message-ID: <20130909114018.50ddbb3d@bsd64.grem.de> In-Reply-To: <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> <0F2C94E4-A544-482F-A479-B7E70D49E615@FreeBSD.org> X-Mailer: Claws Mail 3.9.1 (GTK+ 2.24.18; amd64-portbld-freebsd9.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: kde@FreeBSD.org, freebsd-current@freebsd.org, "O. Hartmann" , rakuco@FreeBSD.org, freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 09:47:02 -0000 On Sun, 8 Sep 2013 14:57:01 +0200 Dimitry Andric wrote: > On Sep 8, 2013, at 08:14, O. Hartmann > wrote: > > On Sat, 7 Sep 2013 22:49:54 GMT > > rakuco@FreeBSD.org wrote: > > > >> Synopsis: > >> devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: > >> call to 'swap' is ambiguous > >> > >> State-Changed-From-To: open->patched > >> State-Changed-By: rakuco > >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 > >> State-Changed-Why: > >> I don't think the previous version worked. > >> > >> From your description, it looks like you've switched to building > >> with libc++ whereas libstdc++ was being used before. > >> > >> The upcoming Qt 4.8.5 plus a few patches which only made it to > >> 4.8.6 (but we've backported) will finally make Qt build with > >> libc++. > >> > >> We've just sent an exp-run request for Qt 4.8.5, and will hopefully > >> fix all these errors once it is committed. > >> > >> http://www.freebsd.org/cgi/query-pr.cgi?pr=181913 > > > > I build the world/kernel since early this year with > > > > CXXFLAGS+= -stdlib=libc++ > > CXXFLAGS+= -std=c++11 > > > > > > in /etc/src.conf. I do not use those flags > > in /etc/make.conf! /etc/src.conf is supposed to target ONLY > > the /usr/src world, not the ports - this is as I interpret the man > > page for /etc/src.conf and it would be logical. But this > > rule/thinking seems to be broken by some includes > > from /usr/ports/Mk ingredients. > > Since r255321, -stdlib=libc++ is effectively the default, at least > when you haven't set gcc as the default compiler. So it also applies > to ports, which unavoidably will lead to a bit of fallout. My > personal experience is that most C++-based ports compile fine with > libc++ instead of libstdc++, except for a few that rely on internal > libstdc++ details. > > However, -std=c++11 is *not* yet the default, and C++11 has different > rules here and there, so some ports might fail to compile due to this. > For some ports, too much hacking may be required to make them work > with C++11. So in case of trouble, try removing -std=, or setting it > to different values (c++0x, c++98, gnu++98, etc), to get the port to > compile. > > Note the base system should have no problems with -std=c++11, so > please continue to use the option in src.conf, and report any > problems if you encounter them, so we can fix them. :-) > I've been using clang and libc++ successfully on 9.1-RELEASE for quite some time now. Based on what I've learned, expect the following pitfalls that might hit you hard in production: - Bugs in in libc++: CURRENT is good about pulling in fixes, but there are still quite basic things getting fixed, e.g. cout/cerr not being thread safe (this was supposedly fixed in CURRENT and STABLE just a few weeks ago). Another example was handling std::vector incorrectly (ouch). Other problems only affect C++11/C++14 features and shouldn't be a big issue when porting. - Mixed C++ library linkage: For some ports autoconf/libtool might pull in libstdc++ by accident, you really don't want this to happen since std types don't match (e.g. std::exception and everything inheriting from it, which will break exception handling in client code). - Incompatibilities in corner cases of the language: A good example is the exception specification of destructors. Those are defaulting to noexcept(true) now, while in C++03 it's the opposite. Even though it's bad design in almost all cases, the language permits throwing from destructors in general. I got hit by that when porting devel/ice, which depends on databases/db5, which has no exception specification for destructors, but throws from them under certain circumstances (e.g. database close failed), in that specific case also from callbacks that were called from within db5. Overall the code was quite convoluted, but valid C++03. On top of that there are the usual incompatibilities between implementations (like iostreams in gcc 4.2's libstdc++ does some things differently then the imho more compliant libc++) and compile time problems (like the swap issue you experiences, those are easy to fix). So the bottom line is: When converting a port to use clang++ -std=c++11 -stdlib=libc++, the fact that it builds ok and runs a couple of unit tests without problems is not enough. Cheers, Michael -- Michael Gmelin From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 11:06:03 2013 Return-Path: Delivered-To: freebsd-ports@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 D237AC1B for ; Mon, 9 Sep 2013 11:06:03 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 B03892984 for ; Mon, 9 Sep 2013 11:06:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r89B63NB017709 for ; Mon, 9 Sep 2013 11:06:03 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r89B63Z8016892 for freebsd-ports@FreeBSD.org; Mon, 9 Sep 2013 11:06:03 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 9 Sep 2013 11:06:03 GMT Message-Id: <201309091106.r89B63Z8016892@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: FreeBSD ports list Subject: Current unassigned ports problem reports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 11:06:03 -0000 (Note: an HTML version of this report is available at http://www.freebsd.org/cgi/query-pr-summary.cgi?category=ports .) The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/181961 [MAINTAINER UPDATE] devel/tortoisehg2: Update 2.8.2 -> o ports/181959 New port: sysutils/zjail Management tool for ZFS based o ports/181949 [MAINTAINER] www/mitmproxy: Update to 0.9.2 o ports/181945 [ New Port] sysutils/jail-primer f ports/181944 games/iourbanterror: gcc not found o ports/181943 New port: finance/fixc simple Financial Information eX f ports/181927 [PATCH] fix net/fping Makefile comment f ports/181923 security/heimdal JOBS_UNSAFE and default prefix locati o ports/181919 [PATCH] x11-toolkits/Xaw3d has an overflow error in ge f ports/181912 x11-toolkits/swt-devel: bad zipfile offset (local head o ports/181904 [PATCH] graphics/libwmf: fix warning of make index whe o ports/181901 [MAINTAINER-UPDATE] games/assaultcube: using GCC to bu o ports/181870 [MAINTAINER] www/typo3: update to 6.1.4 o ports/181855 Port: sysutils/heartbeat: FreeBSD 10 Fixes o ports/181848 [NEW PORT] www/php-Twig: The flexible, fast, and secur f ports/181836 Port sysutils/smartmontools brocken for scsi discs o ports/181833 [MAINTAINER] databases/mariadb-server: [SUMMARIZE CHAN o ports/181832 [NEW PORT] net/py-gspreadsheet: Interface to Google sp f ports/181819 games/iourbanterror: Engine linkage error #31 o ports/181801 [MAINTAINER] Upgrade devel/gdb to 7.6.1 f ports/181774 USE_BDB 47+ fails to find installed databases/db47 o ports/181767 [PATCH] www/bozohttpd: update to 20130711 o ports/181752 [PATCH] devel/hub: change maintainer f ports/181746 graphics/ImageMagick makefile directly executes perl f ports/181735 mail/fetchmail system-wide install can't write fetch i o ports/181732 New port: www/redmine-sidebar_hide Redmine hide sideba o ports/181731 [patch] games/atris: unbreak with bmake f ports/181713 [patch] audio/cmus Fix compilation f ports/181711 port lang/ocaml does not build o ports/181691 [NEW PORT] Please import Tryton Application Platform 2 o ports/181676 New port: graphics/sxiv simple X image viewer f ports/181647 [PATCH] archivers/zip: fix OptionsNG o ports/181643 maintainership request for ports-mgmt/pkg_replace f ports/181642 [patch] security/fwknop new version f ports/181641 mail/ssmtp provide option for CRAM-MD5 support f ports/181633 [PATCH] update print/hplip-plugin to 3.13.8 o ports/181613 Mk/bsd.ocaml.mk has fbsd:nokeywords property f ports/181603 [patch] fix net/mediatomb f ports/181566 [update] security/sssd to 1.9.5 f ports/181564 print/cups: undefined reference to `libiconv_close` f ports/181557 www/mambo: DNS expired, unfetchable f ports/181555 sysutils/isomd5sum checksum mismatch f ports/181554 sysutils/mktool unfetchable f ports/181551 net/ftelnetd: master site disappeared, can't fetch f ports/181549 databases/mird checksum mismatch f ports/181547 cad/ldraw - checksum mismatch f ports/181530 Upgrade lang/abcl to 1.2.1 o ports/181529 sysutils/devcpu-data: Panic after CPU microcode update o ports/181527 New port: multimedia/mjpg-streamer HTTP video streamin f ports/181520 mplayer/mencoder failed to build with net/liveMedia 20 f ports/181507 [PATCH] security/pks: fix autostart o ports/181506 [maintainer-update] devel/eclipse-eclemma 2.2.1 o ports/181483 [PATCH] science/py27-h5py: update to 2.1.1_3 f ports/181481 [PATCH] irc/ircd-ratbox fix default options broken by o ports/181480 textproc/xerces-c2 and textproc/xerces-c2-devel missin o ports/181451 [NEW PORT] misc/auto-multiple-choice: Multiple Choice o ports/181450 [new port] www/linux-f10-flashplugin10 request, becase f ports/181423 [patch] databases/freetds-devel -- update to 0.92.79 f ports/181422 [PATCH] graphics/geos: update to 3.4.1 f ports/181413 [patch] emulators/visualboyadvance-m: unbreak build f ports/181399 Update converters/pdf2djvu port to 0.7.17 and unbreak f ports/181391 lang/itcl: fix REINPLACE usage o ports/181385 [patch] x11-drivers/xf86-video-vmware: a fix from a VM f ports/181345 net/tigervnc o ports/181334 [New Port] lang/yap-devel o ports/181332 Update databases/jasperreports to version 5.1.2 f ports/181324 [patch] fix net/istgt with options VBOXVD (VirtualBox f ports/181308 Update textproc/jakarta-poi to version 3.9 o ports/181301 New port: net/kamailio - A very fast and configurable f ports/181294 Missing dependency for www/glpi f ports/181291 [PATCH] mail/postgrey: make postgrey work with perl 5. f ports/181251 net-mgmt/mrtg: rateup constantly segfaulted because of f ports/181248 [PATCH] print/cups-base Disable INSTALLS_ICONS for non o ports/181244 New port: devel/ocl-icd OpenCL Installable Client Dri o ports/181243 New port: devel/opencl-icd Khronos OpenCL Installable f ports/181230 security/dirmngr fails to build after ld(1) update o ports/181137 x11-clocks/wmfuzzy updates far too frequently, chewing o ports/181133 [patch] x11-drivers/input-wacom: enabled support of wa f ports/181106 sysutils/logrotate bus error (core dumped) f ports/181104 audio/mumble: dubious patch to allow OSS device select f ports/181102 [PATCH] audio/mumble cannot find bundled libcelt o ports/181077 [patch] ports-mgmt/pkg_replace support pkgng f ports/181040 [patch] sysutils/conky "diskio" memory leak fix o ports/181038 print/acrobatviewer dies with null pointer exception w f ports/181021 x11-toolkits/open-motif fails to build because YY_MAIN o ports/180987 [NEW PORTs] audio/ardour3 and multimedia/harvid f ports/180984 math/openblas: Patch patch-exports+gensymbol failed t f ports/180959 [PATCH] x11/x3270: update to 3.3.12 o ports/180954 sysutils/pciutils (lspci) uses its own database and no o ports/180925 Can't compile sysutils/fusefs-smbnetfs on -current o ports/180887 New Port: databases/php5-mongodb f ports/180845 package creation fails for sysutils/bacula-bat f ports/180832 New version of news/nzbget (11.0) o ports/180828 [MAINTAINER] russian/MT: update to 5.2.7,1 f ports/180786 lang/lua52 lacks a pkgconfig file f ports/180753 [PATCH] devel/ocaml-opam: fix build error of util.ml f ports/180739 ports/sysutils/ezjail patch f ports/180736 net/torsocks: aclocal-1.14: error: couldn't open direc f ports/180734 games/iourbanterror: broken o ports/180668 japanese/mutt-devel update to 1.5.21-ja.2 o ports/180665 [new port] secturiy/rngtest: TRNG/PRNG test tool o ports/180654 [NEW PORT] devel/linux-f10-hal-libs: HAL libs (Linux F f ports/180651 net/scribe won't build with automake update to 1.14 f ports/180647 www/cherokee: build fails f ports/180642 [PATCH] astro/gpsman: update to 6.4.4.1 f ports/180634 security/ipsec-tools: ipsec-tools doesnt create contro f ports/180607 sysutils/zfsnap: grammar error(s) in pkg-descr o ports/180602 [NEW PORT] multimedia/xjadeo: A synced video player fo o ports/180595 unable to build net-p2p/mldonkey-core on i386 using cl o ports/180564 multimedia/mplayer compilation error with Clang (runni o ports/180524 games/crack-attack crashes o ports/180492 problem with /usr/ports/Mk/bsd.ldap.mk o ports/180475 audio/freeswitch-sounds: volume reduced to 20% of orig o ports/180452 New Port: devel/libbson: library providing useful rout o ports/180446 New port: print/p910nd A small printer daemon o ports/180409 ports/math/scilab trying to use F77 o ports/180408 ports/math/scilab missing a file to be installed o ports/180407 x11-fm/dolphin in kde-4.10.5 will cause reboot f ports/180350 textproc/sigil build problems when libzip installed f ports/180337 devel/tnt: tnt_sparse_matrix_csr.h:97:3: error: no mat o ports/180335 print/transfig: Can't find png header pngpriv.h o ports/180256 NEW PORT: www/twig-php which is a PHP template engine o ports/180237 [new port] devel/radare2-devel: Tools to disasm, debug o ports/180228 russian/fortuneru: port upgrade o ports/180195 [patch] upgrade games/minecraft-client to 1.6.1 f ports/180190 graphics/openshadinglanguage: liboslexec/llvm_ops.s:34 f ports/180159 Mk/Uses/jpeg.mk: Used to add dependancy on either jpe o ports/180151 update for print/cups-bjnp o ports/180144 [new port] textproc/fss: PHP5-Extension FastStringSear o ports/180070 New port: devel/kickassembler: Advanced MOS 65xx assem f ports/180050 mail/alpine should be updated to version 2.10 o ports/180034 audio/squeezeboxserver is now Logitech Media Server f ports/180033 databases/postgis20 gives in to processing text files o ports/180022 New port: textproc/extract_url Perl script that extrac o ports/179989 [ patch ] net/istgt broken linking, broken cast, broke o ports/179858 [NEW PORT] deskutils/lxshortcut: Small utility used to o ports/179855 New port: science/sigrok-cli o ports/179854 New port: science/pulseview o ports/179853 New port: devel/libsigrok o ports/179852 New port: devel/libsigrokdecode o ports/179843 emacs and texinfo collide o ports/179778 new port: net/fish-sync -- network file sync tool f ports/179738 port update: games/atanks f ports/179726 www/cherokee cannot be installed on FreeBSD 9.1 o ports/179724 new port: net-p2p/btsync f ports/179637 [patch] ports-mgmt/portupdate-scan: add the "-a [date] o ports/179611 running sysutils/pdumpfs fails with ruby19 o ports/179499 [patch] port sysutils/devcpu-data is unmaintained and f ports/179370 updating science/paraview o ports/179365 switch devel/gnustep-make dependency from lang/gcc42 t o ports/179321 New port: sysutils/storcli SAS MegaRAID FreeBSD StorCL f ports/179236 Build failure (lib-depends) for net/tigervnc when HPJP o ports/179180 devel/freeocl: Minor changes regarding upcoming POCL p o ports/179116 New port: graphics/xcftools Command-line tools for ext o ports/179065 Add RDRAND/F16C support to misc/cpuid f ports/179010 [PATCH] devel/doxygen: update to 1.8.4_1 f ports/179003 Port net-mgmt/nagios has lost dependency(textproc/php5 o ports/178998 New port: devel/sfml2: a multimedia library f ports/178973 [PATCH] net/scribe: Use USE_GITHUB framework to fetch o ports/178855 [maintainer update] games/armagetron o ports/178808 devel/wxGlade raises exception when generating XRC cod f ports/178785 mail/dracmail: adoption of optionsNG, and standardize o ports/178783 [NEW PORT] misc/auto-multiple-choice: Multiple Choice o ports/178780 [patch] updated databases/libdbi-drivers to 0.9.0 o ports/178772 Port update: net-mgmt/snmptt f ports/178766 science/hdf5: crt1.c:(.text+0x8a): undefined reference o ports/178757 devel/freeocl: Update o ports/178726 [PATCH] databases/mariadb55-server: multi-instances st o ports/178695 [new port] www/eaccelerator-devel Development version f ports/178616 ports-mgmt/porttools: port test does not handle pkgNG o ports/178557 Ports with USE_GCC=any don't respect local CC and CXX o ports/178497 [maintainer update] databases/datamodeler version upda f ports/178475 [UPDATE] graphics/gmt: New version 4.5.9 available o ports/178474 [NEW PORT] games/linux-dwarf-fortress: Dwarf Fortress o ports/178457 [New port]audio/hydrogen-devel o ports/178441 [NEW PORT] databases/memkeys: A tool to show memcache f ports/178431 graphics/geos hardcodes PHP 5.4 version s ports/178281 [new port] www/torbrowser: Request for a Native Torbro f ports/178251 [patch] converters/unix2dos implicit declaration of fu f ports/178246 mail/fetchyahoo: is BROKEN f ports/178245 [patch] mail/getlive: 3.0 has been released o ports/178229 devel/gnustep failed install - no objective c compiler o ports/178196 /usr/ports/www/trac-mercurial broken o ports/178160 emulators/sness9express: Fix build o ports/178126 [NEW PORT] databases/mysql56-server-cluster: MySQL Clu o ports/178125 [NEW PORT] databases/mysql56-client-cluster: Multithre o ports/178052 New port submission: dns/mDNSRedponder_nss f ports/178042 sysutils/ezjail: zsh completion does not work o ports/177906 [new port] x11-fonts/fpf Free Persian font o ports/177838 New port: multimedia/openstopmotion Webcam capture pro o ports/177771 maintainer update: math/dolfin-devel o ports/177753 New port: sysutils/slurm-devel o ports/177745 New port: science/lammps o ports/177744 New port: science/lammps-openmpi f ports/177741 net-mgmt/sipcalc cannot handle ipv6 zone index f ports/177721 multimedia/mplayer: Missing dependency o ports/177692 New port: science/openkim f ports/177669 news/nzbget - PostProcess script terminated with unkno o ports/177651 New port: security/openiked OpenBSD's IKEv2 daemon o ports/177643 Update port graphics/fotoxx to latest version f ports/177588 ports-mgmt/porttools: does not permit SVN diff mode ou o ports/177565 [NEW PORT] www/trac-keywordsecretticket: Adds ticket s o ports/177512 Make emulators/snes9express compile again f ports/177497 mail/dovecot startup script breaks onestart functional o ports/177492 [New Port] graphics/multiraw (replace prev) o ports/177490 [New Port] graphics/dcraw-m Modified dcraw o ports/177411 [NEW PORT] databases/mysql-udf-ipv6: MySQL UDFs provid f ports/177407 graphics/fotoxx: MASTER_SITES kornelix.squarespace.com f ports/177406 update port and add arch: lang/mlton f ports/177397 [patch] security/heimdal: fix conflict between heimdal f ports/177371 sysutils/smartmontools - triggers channel blocking o ports/177370 New port: audio/opusfile o ports/177364 [patch] math/scilab port build fails configuration ste o ports/177363 graphics/pqiv aborts when opening an image o ports/177211 net-mgmt/cflowd: cflowd CflowdPacketQueue.cc fix f ports/177193 audio/moc: please include FLAC support by default in p o ports/177182 audio/mixxx segmentation fault f ports/177152 sysutils/fusefs-kmod missing pkg-message file o ports/177074 [fix] audio/timidity and audio/guspat o ports/177071 editors/slime not working with emacs-24 o ports/177014 new port: databases/sqlayer f ports/176874 sysutils/fusefs-sshfs crashes on amd64 f ports/176816 www/privoxy+ipv6 is obsolete f ports/176805 rc scripts provided with security/heimdal haven't a co o ports/176767 [patch] net-im/ari-yahoo broken on freebsd-head o ports/176716 [patch] devel/boehm-gc update to 7.2d combining previo f ports/176676 [patch] net/ss5: syslog option is noisy o ports/176660 [ports] editors/pdfedit: build failure on ia64 -curren o ports/176651 NEW PORT: graphics/flashprojector - Adobe standalone S o ports/176625 New Port: ports-mgmt/prhistory-sync-perl Sync GNATS PR o ports/176509 [NEW PORT] www/dnssec-validator: DNSSEC Validator exte o ports/176507 [NEW PORT] www/xpi-dnssec: DNSSEC Validator extension o ports/176505 [NEW PORT] www/crx-dnssec: DNSSEC Validator extension o ports/176504 [NEW PORT] devel/crxmake: Make chromium extensions o ports/176468 www/sams can not use the mask /32, with authorization o ports/176456 NEW PORT: lang/jsawk - Command-line JSON parser o ports/176445 New port: audio/icecast-kh Streaming mp3/ogg-vorbis au s ports/176442 Port files with double-colons cannot exist on FAT part f ports/176438 net-mgmt/nrpe2 consuming cpu when handling new connect f ports/176383 sysutils/ipmitool cannot connect over SOL o ports/176378 [PATCH] Fix several typos in the ports tree o ports/176195 [PATCH] games/cre: Set NO_WRKSUBDIR and BUILD_WRKSRC i f ports/176172 graphics/povray37: /usr/local/bin/ld: disp_sdl.o: unde o ports/176096 [NEW PORT] www/xibo-server: Xibo - Digital Signage (se f ports/176047 ports: graphics/ImageMagick: -delay option spurious me f ports/176044 ports: print/ghostview (1.5_3) segfault/coredump f ports/176012 irc/inspircd fails to detect OpenSSL in base running r o ports/175947 [NEW PORT] www/sogo: Groupware server with a focus on o ports/175946 [NEW PORT] devel/sope: An extensive set of GNUstep web f ports/175868 security/nessus-libnasl: nasl_crypto.c:25:10: fatal er f ports/175813 [patch] mail/dovecot2 doesn't detect libstemmer or ext f ports/175798 FreeBSD 10 unable to build sysutils/fusefs-kmod f ports/175772 Update to finance/php-tclink o ports/175748 New port: www/your-freedom A SOCKS proxy application f ports/175733 devel/libatomic_ops: Segmentation fault : install - o ports/175620 New port: devel/bashdb, Bash debugger f ports/175611 sysutils/zfs-periodic package do not enable cron to ho o ports/175585 deskutils/cdcat: Update to version 2.2 o ports/175385 dns/fastresolve does not compile o ports/175266 port audio/libmtp is miscategorized: it should be sysu o ports/175233 devel/boehm-gc: GC does not scan static roots in share o ports/175229 x11-toolkit/swt-devel fails o ports/175145 security/bro, fix port so it installs broctl (required f ports/175121 devel/buildapp does not produce executable file o ports/175113 devel/freeocl: Port revision PORTREVISION=1 o ports/174988 New port: net/tclsoap o ports/174960 sysutils/fusefs-ntfs mkntfs fails because of "no block o ports/174947 [new port] ftp/php5-dav, php5 webdav module, allowing o ports/174940 [new port]: misc/valspeak, a filter that converts Engl f ports/174898 graphics/openimageio: pkg: (openimageio-1.1.2) /usr/lo o ports/174883 databases/grass: cut: ../dist.amd64-portbld-freebsd10. o ports/174841 graphics/sane-frontends fails to build f ports/174798 audio/soundtracker: request to add system menu item/en o ports/174795 x11-toolkits/open-motif: Installing open-motif-2.3.4.. f ports/174764 [patch] upgrade databases/postgis to 1.5.8 (fixes comp o ports/174746 Segmentation fault in security/prelude-lml o ports/174647 [NEW PORT] net/infinispan: Open source highly scalable f ports/174583 devel/libreadline-java: patch for UTF8 support o ports/174561 [patch] upgrade devel/avr-binutils from 2.20.1 to 2.22 o ports/174560 [patch] upgrade devel/avr-gcc from 4.5.1 to 4.6.2 o ports/174559 [patch] add vendor patchset to devel/avr-libc f ports/174487 mail/notmuch fails to build during portupgrade o ports/174368 New port: lang/nimrod The Nimrod programming language. o ports/174308 [bsd.database.mk] cyrus-sasl-2.1.25_2 will not compile f ports/174303 [PATCH] Update devel/libgta to version 1.0.4 o ports/174289 net/ssvnc build fails - configure: error: /usr/bin/cpp f ports/174237 databases/php5-redis - zAdd does not set the correct s o ports/174176 audio/timidity++: Update to version 2.14.0 o ports/174131 net/citrix_ica: Update port to 12.0.0.189834 f ports/174118 graphics/pecl-gmagick o ports/174055 Default Linux ALSA configuration update request f ports/174018 Can't disable security/sshguard -b option o ports/173998 textproc/xalan-c from version 1.10 to 1.11 o ports/173996 net-mgmt/p5-Cflow: add support for net-mgmt/flow-tools f ports/173858 sysutils/bsdadminscripts installs pkg_libchk that does o ports/173581 new port submission, security/sagan f ports/173489 [PATCH] databases/mysqltuner: [SUMMARIZE CHANGES] f ports/173369 math/gnuplot+: avoid conflicts with math/gnuplot o ports/173282 New port: security/keepassx2 Cross Platform Password M o ports/173194 [new port] java/eclipse-birt: BIRT plugin for Eclipse o ports/172967 [restore port] www/asterisk-gui for asterisk 1.6 to as o ports/172917 textproc/syck: LuaYAML-Testcases test-suite for lua ex f ports/172750 graphics/luminance does not compile if graphics/libraw f ports/172595 New port: net-p2p/pushpoold bitcoin push-mining pool s o ports/172496 biology/blat: Update to version 35 f ports/172441 chinese/fcitx should be in 'textproc' instead of 'chin o ports/172439 [New Port] chinese/fcitx-table-yonh: Pinyin-like input o ports/172361 lang/gnustep-base fail to configure with clang f ports/172353 multimedia/mencoder does not build with clang on amd64 f ports/172272 www/speedtest-mini - port not working f ports/171950 devel/tnt: include/tnt/tnt_sparse_matrix_csr.h:97:3: e o ports/171945 sysutils/fusefs-smbnetfs crash since fusefs-libs updat o ports/171921 New port: devel/ocltools: o ports/171903 net-mgmt/observium port should only provide dependenci f ports/171886 [PATCH] multimedia/gpac-mp4box: [SUMMARIZE CHANGES] f ports/171868 [new port] net/remotebox: Open Source VirtualBox Clien o ports/171855 [NEW PORT] net-mgmt/node-statsd - Simple daemon for ea f ports/171850 Misleading pkg install option in sysutils/fusefs-kmod f ports/171849 databases/postgis: port switches compiler! GCC -> CLAN o ports/171801 [patch] www/sams: Problem with creating MySQL database f ports/171539 [patch] net-mgmt/nrpe2 small fixes f ports/171338 both databases/mariadb-scripts and databases/mariadb-s o ports/171176 new port: net/winexe f ports/171160 sysutils/loganalyzer depends on php5 o ports/171149 new port: textproc/imsettings - a framework manages in o ports/171106 New Port: net/jdownloader - Download manager (java) o ports/171019 [new port] science/isis3: USGS ISIS3 planetary mapping o ports/171017 [new port] astro/cspice: New scientific port: NASA/NAI o ports/170819 New port: net-mgmt/UniFi UniFi Wireless Controller o ports/170695 sysutils/fusefs-ntfs - instant reboot when mv from UFS o ports/170448 [NEW PORT] devel/allegro5: Allegro 5 is a game program f ports/170366 lang/libobjc2: update to 1.6.1 f ports/170339 www/node: segmentation violation in v8::internal::Hand f ports/170100 astro/orsa: version 0.7.0 in ports hopelessly outdated o ports/169741 [new port] devel/visualparadigm o ports/169628 sysutils/devcpu-data f ports/169322 New port: net/armsd: SMFv2/ARMS Service Adapter daemon o ports/169165 sysutils/fusefs-kmod: calling fchown(2) on sshfs files o ports/168647 Remove trailing spaces from all ports-related files o ports/168404 [NEW PORT] databases/dev-sqlite3: This is a developmen o ports/168328 [REPOCOPY] devel/codeblocks --> devel/codeblocks-devel o ports/167759 [New Ports] x11-wm/e17-modules-ecomorph and x11-wm/eco f ports/167691 security/heimdal: problem compiling kerberos/heimdal o ports/167042 New port: net-p2p/tahoe-lafs f ports/167031 security/heimdal ignore environment after process call o ports/166987 net/nss_ldap: ports/152982 causes nss_ldap to not func o ports/166826 New port: misc/libphidget The driver for Phidgets devi o ports/166812 New port: mail/bounceHammer o ports/165720 [PATCH] www/suphp: [Add support for lighttpd] o ports/165586 New port german/lx-office-erp, sql-ledger fork with ex o ports/165565 New port: www/mod_auth_token Token-based authenticatio o ports/164197 smsd(comms/smstools3) doesn't read some configurations o ports/163850 New port: cad/linux-bricscad o ports/158983 [NEW PORT] devel/pecl-dtrace: PHP DTrace provider o ports/158791 Update security/openvas-* o ports/156834 New port: games/fairymax-devel latest version of games o i386/138737 [endian] [patch] Patch for bswap64(9) operation on IA o ports/107354 net/icmpinfo: icmpinfo -vvv does not recocnize any ICM o ports/93279 devel/cvsmonitor: not useable (/dev/mem: Permission de 359 problems total. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 12:51:04 2013 Return-Path: Delivered-To: ports@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 437021C8; Mon, 9 Sep 2013 12:51:04 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A3482219; Mon, 9 Sep 2013 12:51:02 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 5624F40029; Mon, 9 Sep 2013 14:50:59 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 379424002A; Mon, 9 Sep 2013 14:50:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL,T_FRT_LOLITA1 autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (unknown [94.254.45.105]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 05AD540029; Mon, 9 Sep 2013 14:50:47 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYTkb3cgyz8hVm; Mon, 9 Sep 2013 14:50:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([IPv6:2001:470:dca9:0:1::3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) (amavisd-new, port 10025) with ESMTPS id R2Ia2dIrXI5o; Mon, 9 Sep 2013 14:50:13 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [10.1.0.4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYTjx2rdpz8hVt; Mon, 9 Sep 2013 14:50:13 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cYTjx1vC2z9Ctq; Mon, 9 Sep 2013 14:50:13 +0200 (CEST) Message-ID: <522DC3EB.4060607@freebsd.org> Date: Mon, 09 Sep 2013 14:49:47 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: x11@FreeBSD.org, ports@FreeBSD.org Subject: [CFT] Update of xorg libraries and MESA X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="----enig2BRQOLGEICLWVXUDNLJOL" X-Virus-Scanned: ClamAV using ClamSMTP X-Mailman-Approved-At: Mon, 09 Sep 2013 13:11:09 +0000 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: x11@FreeBSD.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 12:51:04 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2BRQOLGEICLWVXUDNLJOL Content-Type: multipart/mixed; boundary="------------010302050208010508050208" This is a multi-part message in MIME format. --------------010302050208010508050208 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable [Cross-posted between x11@ and ports@, please respect reply-to] Hi! It is time once again to update parts of the FreeBSD xorg stack, and the x11@ team needs YOUR help in testing! The attached patch, also available in the latest updated version at http://people.freebsd.org/~zeising/xorg-mesaupdate.diff updates various xorg related libraries and drivers, most of this is visible for all users of xorg. xorg-server now has the possibility to use devd instead of hal for autoconfiguration. It also updates the MESA stack (libGL, dri) and libdrm for users of the new xorg stack (WITH_NEW_XORG=3D). Last, but definitely not least, it enables KMS for ati graphics cards, if you have the latest current, and compile with WITH_NEW_XORG=3D. It also contains a shlib version bumb of pixman, and ports depending on pixman. Be aware of this when updating pixman. Please test this on as many platforms and versions of FreeBSD as possible, both the old and new stack, so that we can try to avoid any regressions or other issues. The plan is to have this in the ports tree in a few weeks, at the most. To use the patch, check out the ports tree, preferably using svn and apply the patch using svn patch /path/to/patch. It should be possible to apply the patch using patch as well, but this is not tested. After the patch is applied, recompile the updated ports. See UPDATING for further instructions regarding libGL, dri and pixman. This is important! Please let us know of any issues, or if everything is working without a hitch. For more information, see https://wiki.freebsd.org/Graphics and https://wiki.freebsd.org/Xorg , or come talk to us in #freebsd-xorg@EFNet on IRC. Regards! --=20 Niclas Zeising FreeBSD x11@ team --------------010302050208010508050208 Content-Type: text/x-patch; name="xorg-mesaupdate.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xorg-mesaupdate.diff" Index: Mk/bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Mk/bsd.port.mk (revision 326808) +++ Mk/bsd.port.mk (working copy) @@ -350,7 +350,7 @@ # MAKE_ENV are extended with a DISPLAY variable. # # USE_GL - A list of Mesa or GL related dependencies needed by the port= =2E -# Supported components are: glut, glu, glw, and gl. +# Supported components are: egl, glesv2, glut, glu, glw, and gl. # If set to "yes", this is equivalent to "glu". Note that # glew and glut depend on glu, glw and glu depend on gl. ## @@ -1882,13 +1882,15 @@ =20 PKG_IGNORE_DEPENDS?=3D 'this_port_does_not_exist' =20 -_GL_gl_LIB_DEPENDS=3D GL.1:${PORTSDIR}/graphics/libGL +_GL_glesv2_LIB_DEPENDS=3D libGLESv2.so:${PORTSDIR}/grahpics/libglesv2 +_GL_egl_LIB_DEPENDS=3D libEGL.so:${PORTSDIR}/graphics/libEGL +_GL_gl_LIB_DEPENDS=3D libGL.so:${PORTSDIR}/graphics/libGL _GL_gl_USE_XORG=3D glproto dri2proto -_GL_glew_LIB_DEPENDS=3D GLEW.1:${PORTSDIR}/graphics/glew -_GL_glu_LIB_DEPENDS=3D GLU.1:${PORTSDIR}/graphics/libGLU +_GL_glew_LIB_DEPENDS=3D libGLEW.so:${PORTSDIR}/graphics/glew +_GL_glu_LIB_DEPENDS=3D libGLU.so:${PORTSDIR}/graphics/libGLU _GL_glu_USE_XORG=3D glproto dri2proto -_GL_glw_LIB_DEPENDS=3D GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS=3D glut.12:${PORTSDIR}/graphics/freeglut +_GL_glw_LIB_DEPENDS=3D libGLw.so:${PORTSDIR}/graphics/libGLw +_GL_glut_LIB_DEPENDS=3D libglut.so:${PORTSDIR}/graphics/freeglut =20 .if defined(USE_GL) . if ${USE_GL:L} =3D=3D "yes" Index: UPDATING =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- UPDATING (revision 326808) +++ UPDATING (working copy) @@ -5,6 +5,33 @@ You should get into the habit of checking this file for changes each tim= e you update your ports collection, before attempting any port upgrades. =20 +201309xx: + AFFECTS: users of x11/pixman + AUTHOR: zeising@FreeBSD.org + + The library version of x11/pixman has changed, and portrevision has + been bumped in all dependent ports. If you have external software tha= t + depends on pixman, this software needs to be recompiled. + To recompile all software dependent on pixman, run: + =20 + # portmaster -r pixman + or + # portupgrade -rf pixman + +201309xx: + AFFECTS: users of graphics/libGL, graphics/dri and other MESA ports + AUTHOR: zeising@FreeBSD.org + + The graphics/libGL, graphics/dri and related MESA ports have been + updated to 9.1 when compiled with WITH_NEW_XORG=3D set. It is necessa= ry + to remove the old versions of both ports before updating. + + # pkg_delete -f libGl-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + 20130904: AFFECTS: 10-CURRENT users with any port depending on converters/libico= nv AUTHOR: madpilot@FreeBSD.org @@ -553,7 +580,7 @@ settings in rc.conf prior to restarting postgrey. =20 20130525: - AFFECTS: users of x11/xorg and all X.Org ports + AFFECTS: users of x11/xorg and all xorg ports AUTHOR: zeising@FreeBSD.org =20 X.Org, including libraries and some drivers, was updated. If you are Index: astro/viking/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- astro/viking/Makefile (revision 326808) +++ astro/viking/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D viking PORTVERSION=3D 1.4.2 +PORTREVISION=3D 1 CATEGORIES=3D astro MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ =20 Index: cad/pdnmesh/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/pdnmesh/Makefile (revision 326808) +++ cad/pdnmesh/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pdnmesh PORTVERSION=3D 0.2.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D cad MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} =20 Index: cad/repsnapper/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/repsnapper/Makefile (revision 326808) +++ cad/repsnapper/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D repsnapper PORTVERSION=3D 2.2.0b3 +PORTREVISION=3D 1 CATEGORIES=3D cad MASTER_SITES=3D https://codeload.github.com/timschmidt/repsnapper/tar.gz= / DISTNAME=3D ${PORTVERSION} Index: deskutils/pinot/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/pinot/Makefile (revision 326808) +++ deskutils/pinot/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pinot PORTVERSION=3D 1.06 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D deskutils MASTER_SITES=3D ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES=3D http://colinf.chez.com/pinot/ Index: devel/xorg-macros/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/Makefile (revision 326808) +++ devel/xorg-macros/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-macros -PORTVERSION=3D 1.17 +PORTVERSION=3D 1.17.1 CATEGORIES=3D devel x11 DISTNAME=3D util-macros-$(PORTVERSION) =20 Index: devel/xorg-macros/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/distinfo (revision 326808) +++ devel/xorg-macros/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.17.tar.bz2) =3D 7d79edde72fc17dcdc56cfbe= 2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed -SIZE (xorg/util/util-macros-1.17.tar.bz2) =3D 77029 +SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) =3D 5e52654f2a0b04223cf28a= 9d7fd62cf288852e639ac13a75172fd47d0d6ac625 +SIZE (xorg/util/util-macros-1.17.1.tar.bz2) =3D 79105 Index: emulators/catapult/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/catapult/Makefile (revision 326808) +++ emulators/catapult/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D catapult PORTVERSION=3D 0.9.1 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D SF/openmsx/openmsx/${PORTVERSION} DISTNAME=3D openmsx-${PORTNAME}-${PORTVERSION} @@ -32,8 +32,7 @@ USE_GNOME=3D gdkpixbuf2 glib20 gtk20 libxml2 USE_WX=3D 2.6+ USE_PYTHON_BUILD=3Dyes -USE_GMAKE=3D yes -USES=3D gettext iconv +USES=3D gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE=3D GNUmakefile Index: emulators/qemu-devel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/qemu-devel/Makefile (revision 326808) +++ emulators/qemu-devel/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D qemu PORTVERSION=3D 1.6.0 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -14,13 +14,12 @@ MAINTAINER=3D nox@FreeBSD.org COMMENT=3D QEMU CPU Emulator - development version =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - HAS_CONFIGURE=3D yes USE_BZIP2=3D yes USES=3D gmake pkgconfig bison USE_PERL5_BUILD=3D yes USE_PYTHON_BUILD=3D -2.7 +USE_XORG=3D pixman USE_GNOME+=3D glib20 PATCH_STRIP=3D -p1 MAKE_ENV+=3D BSD_MAKE=3D"${MAKE}" Index: emulators/tme/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/tme/Makefile (revision 326808) +++ emulators/tme/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tme PORTVERSION=3D 0.8 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://people.csail.mit.edu/fredette/tme/ =20 @@ -21,9 +21,8 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D pkgconfig gettext iconv perl5 +USES=3D pkgconfig gettext gmake iconv perl5 USE_GNOME=3D gdkpixbuf2 gtk20 -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool libltdl CONFIGURE_ENV=3D ac_cv_have_isinff=3Dno CONFIGURE_ARGS=3D --datadir=3D${WRKDIR}/tmproot --disable-warnings Index: games/klavaro/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- games/klavaro/Makefile (revision 326808) +++ games/klavaro/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D klavaro PORTVERSION=3D 1.9.6 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D games MASTER_SITES=3D SF/${PORTNAME}/ =20 @@ -22,9 +22,8 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox =20 -USES=3D pkgconfig gettext iconv +USES=3D pkgconfig gettext gmake iconv USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME=3D gtk20 Index: graphics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/Makefile (revision 326808) +++ graphics/Makefile (working copy) @@ -484,6 +484,7 @@ SUBDIR +=3D leptonica SUBDIR +=3D lfview SUBDIR +=3D lib3ds + SUBDIR +=3D libEGL SUBDIR +=3D libGL SUBDIR +=3D libGLU SUBDIR +=3D libGLw @@ -505,6 +506,7 @@ SUBDIR +=3D libgeotiff SUBDIR +=3D libgfx SUBDIR +=3D libggi + SUBDIR +=3D libglesv2 SUBDIR +=3D libgltext SUBDIR +=3D libgnomecanvas SUBDIR +=3D libgnomecanvas-reference Index: graphics/cairo/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/cairo/Makefile (revision 326808) +++ graphics/cairo/Makefile (working copy) @@ -4,7 +4,7 @@ =20 PORTNAME=3D cairo PORTVERSION=3D 1.10.2 -PORTREVISION=3D 5 +PORTREVISION=3D 6 PORTEPOCH?=3D 2 CATEGORIES=3D graphics MASTER_SITES=3D http://cairographics.org/releases/ Index: graphics/dri/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/Makefile (revision 326808) +++ graphics/dri/Makefile (working copy) @@ -9,55 +9,76 @@ =20 COMMENT=3D OpenGL hardware acceleration drivers for the DRI =20 -LIB_DEPENDS=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto =20 +.include + +# gcc from base can't handle some code in mesa 9.1+ +# We only care for 9.x and 8.x, not for old pre-clang default current. +# This is for 0b0000 binary which gcc 4.3+ understands and is in the i96= 5 driver. +.if defined(WITH_NEW_XORG) +. if ${OSVERSION} >=3D 901000 && ${OSVERSION} < 902502 \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +CC=3Dclang +CXX=3Dclang++ +CPP=3Dclang-cpp +. elif ${OSVERSION} < 901500 +USE_GCC=3Dyes +. endif +.endif + +.if ${ARCH} =3D=3D ia64 +#BROKEN=3D does not install on ia64 +.endif + ALL_DRI_DRIVERS=3DI915 I965 R200 RADEON SWRAST =20 -.if ! defined(WITH_NEW_XORG) +.if !defined(WITH_NEW_XORG) ALL_DRI_DRIVERS+=3DI810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHR= OME .endif =20 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" =20 -OPTIONS_DEFINE_i386=3D ${ALL_DRI_DRIVERS} -OPTIONS_DEFINE_amd64=3D ${OPTIONS_DEFINE_i386} +PLIST_SUB+=3D VERSION=3D${MESADISTVERSION} =20 -.if defined(WITH_NEW_XORG) -OPTIONS_DEFINE_powerpc=3D RADEON SWRAST -OPTIONS_DEFINE_sparc64=3D RADEON SWRAST -.else -OPTIONS_DEFINE_powerpc=3D MACH64 RADEON SWRAST TDFX -OPTIONS_DEFINE_sparc64=3D MACH64 RADEON SWRAST +.if ${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386 +DRI_DRIVERS=3D ${ALL_DRI_DRIVERS} .endif =20 -OPTIONS_DEFAULT=3D${OPTIONS_DEFINE} +.if defined(WITH_NEW_XORG) +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) +BUILD_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +RUN_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +CONFIGURE_ENV+=3D LLVM_CONFIG=3D${LOCALBASE}/bin/llvm-config33 =20 -I810_DESC=3D Include DRI support for Intel i810 -I915_DESC=3D Include DRI support for Intel i915 -I965_DESC=3D Include DRI support for Intel i965 -MACH64_DESC=3D Include DRI support for AMD/ATI Mach64 -MGA_DESC=3D Include DRI support for Matrox -R128_DESC=3D Include DRI support for AMD/ATI R128 -R200_DESC=3D Include DRI support for AMD/ATI R200 -R300_DESC=3D Include DRI support for AMD/ATI R300 -R600_DESC=3D Include DRI support for AMD/ATI R600 -RADEON_DESC=3D Include DRI support for AMD/ATI RADEON -SAVAGE_DESC=3D Include DRI support for S3/Via Savage -SIS_DESC=3D Include DRI support for SiS 300 and 6326 -SWRAST_DESC=3D Include generic software DRI support -TDFX_DESC=3D Include DRI support for 3dfx Voodoo -UNICHROME_DESC=3D Include DRI support for S3/Via Unichrome +CONFIGURE_ARGS+=3D--enable-gallium-llvm --disable-gallium-egl =20 -.include +CONFIGURE_ARGS+=3D--with-gallium-drivers=3Dr300,r600,radeonsi,svga,swras= t +PLIST_SUB+=3D GALLIUM=3D"" +. else +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers +PLIST_SUB+=3D GALLIUM=3D"@comment " +. endif +. if ${ARCH} =3D=3D powerpc || ${ARCH} =3D=3D ia64 +DRI_DRIVERS=3D RADEON SWRAST +. endif +. if ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D SWRAST +. endif +.else # !defined(WITH_NEW_XORG) +. if ${ARCH} =3D=3D powerpc +DRI_DRIVERS=3D MACH64 RADEON SWRAST TDFX +. elif ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D MACH64 RADEON SWRAST +. endif +.endif # defined(WITH_NEW_XORG) =20 -DRI_DRIVERS=3D .for _d in ${ALL_DRI_DRIVERS} -.if ${PORT_OPTIONS:M${_d}} -DRI_DRIVERS+=3D ${_d} +.if ${DRI_DRIVERS:M${_d}} PLIST_SUB+=3D ${_d}_DRIVER=3D"" .else PLIST_SUB+=3D ${_d}_DRIVER=3D"@comment " @@ -64,16 +85,31 @@ .endif .endfor =20 -.if ${ARCH} =3D=3D "ia64" -BROKEN=3D does not install on ia64 -.endif - -.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") +.if !(${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386) CONFIGURE_ARGS+=3D--disable-gallium-intel .endif CONFIGURE_ARGS+=3D--with-dri-drivers=3D"${DRI_DRIVERS:L}" =20 +.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers= =2E" + @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" + @${ECHO_MSG} "Note that gallium support is highly experimental." + @${ECHO_MSG} "" +.endif + do-install: +.if !defined(WITH_NEW_XORG) cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri +.else + cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install + cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) + cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install + cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install +. endif +.endif =20 .include Index: graphics/dri/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/pkg-plist (revision 326808) +++ graphics/dri/pkg-plist (working copy) @@ -1,19 +1,38 @@ +%%NEW%%%%I965_DRIVER%%etc/drirc include/GL/internal/dri_interface.h %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so +%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so +%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la %%I965_DRIVER%%lib/dri/i965_dri.so %%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so %%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so %%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so +%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so %%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so %%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so +%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la %%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so %%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so %%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so +%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la %%SWRAST_DRIVER%%lib/dri/swrast_dri.so %%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%NEW%%lib/libdricore%%VERSION%%.la +%%NEW%%lib/libdricore%%VERSION%%.so +%%NEW%%lib/libdricore%%VERSION%%.so.1 +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal Index: graphics/libEGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/Makefile (revision 0) +++ graphics/libEGL/Makefile (working copy) @@ -0,0 +1,30 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libEGL +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenEGL library + +LIB_DEPENDS+=3D libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libEGL needs libdrm higher then = 2.4.24 +.endif + +USE_XORG=3D x11 xau xcb xdmcp + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes +LIB_DEPENDS+=3D libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdrm.so:${PORTSDIR}/graphics/libdrm + +BUILD_WKRSRC=3D ${WRKSRC}/src/egl +INSTALL_WRKSRC=3D ${WRKSRC}/src/egl + +WITH_NEW_XORG=3D yes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libEGL/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Index: graphics/libEGL/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-descr (revision 0) +++ graphics/libEGL/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the EGL utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libEGL/pkg-descr ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libEGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-plist (revision 0) +++ graphics/libEGL/pkg-plist (working copy) @@ -0,0 +1,11 @@ +include/EGL/egl.h +include/EGL/eglext.h +include/EGL/eglmesaext.h +include/EGL/eglplatform.h +include/KHR/khrplatform.h +lib/libEGL.la +lib/libEGL.so +lib/libEGL.so.1 +libdata/pkgconfig/egl.pc +@dirrmtry include/KHR +@dirrmtry include/EGL Property changes on: graphics/libEGL/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/Makefile (revision 326808) +++ graphics/libGL/Makefile (working copy) @@ -3,14 +3,13 @@ =20 PORTNAME=3D libGL PORTVERSION=3D ${MESAVERSION} -PORTREVISION=3D 4 +PORTREVISION=3D ${LIBGLREVISION} CATEGORIES=3D graphics =20 -MAINTAINER=3D x11@FreeBSD.org COMMENT=3D OpenGL library that renders using GLX or DRI =20 -LIB_DEPENDS+=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto:both @@ -17,9 +16,28 @@ =20 SUB_FILES=3D pkg-install pkg-deinstall =20 +.include + +.if defined(WITH_NEW_XORG) +LIBGLREVISION=3D 0 +.else +LIBGLREVISION=3D 4 +.endif + do-install: +.if ! defined(WITH_NEW_XORG) ${RM} -f ${WRKSRC}/include/GL/glu*.h + @${MKDIR} ${PREFIX}/lib/.libGL cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +.else + cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA + cd ${WRKSRC}/src/glx; ${GMAKE} install + ${MKDIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/= + @${MKDIR} ${PREFIX}/lib/.libGL + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/ + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/= +.endif =20 post-install: @PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @@ -26,10 +44,8 @@ =20 .include "${.CURDIR}/bsd.mesalib.mk" =20 -.include - .if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") CONFIGURE_ARGS+=3D--disable-gallium-intel .endif =20 -.include +.include Index: graphics/libGL/bsd.mesalib.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/bsd.mesalib.mk (revision 326808) +++ graphics/libGL/bsd.mesalib.mk (working copy) @@ -1,16 +1,12 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=3D4 +# bsd.mesalib.mk - shared code between MesaLib ports. # -# bsd.mesa.mk - an attempt to refactor MesaLib ports. -# -# Created by: Florent Thoumie -# # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION= : # +# - graphics/libEGL # - graphics/libGL -# - graphics/libGLU +# - grahpics/libglesv2 # - graphics/dri # # $FreeBSD$ @@ -21,7 +17,7 @@ MESADISTVERSION=3D${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} =20 .if defined(WITH_NEW_XORG) -MESABASEVERSION=3D 8.0.5 +MESABASEVERSION=3D 9.1.6 # if there is a subversion, include the '-' between 7.11-rc2 for example= =2E MESASUBVERSION=3D =09 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" @@ -35,64 +31,80 @@ DISTFILES=3D MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?=3D x11@FreeBSD.org =20 -# HACK: added lang/python as build dependency - we need to check, which = -# python versions are cleanly supported by Mesa BUILD_DEPENDS+=3D makedepend:${PORTSDIR}/devel/makedepend \ - python:${PORTSDIR}/lang/python \ + python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 =20 -USES+=3D bison -USE_PYTHON_BUILD=3Dyes +USES=3D bison gmake pathfix pkgconfig shebangfix +USE_PYTHON_BUILD=3D-2.7 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes =20 CPPFLAGS+=3D -I${LOCALBASE}/include LDFLAGS+=3D -L${LOCALBASE}/lib -CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers \= - --disable-egl =20 +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+=3D ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+=3Dac_cv_prog_LEX=3D${LOCALBASE}/bin/flex +.endif + .if defined(WITH_NEW_XORG) -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ - ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c= \ - ${PATCHDIR}/extra-src_glx_XF86dri.c +USE_AUTOTOOLS=3D autoconf:env automake:env libtool:env +# probably be shared lib, and in it own port. +CONFIGURE_ARGS+=3D --enable-shared-glapi=3Dno +# we need to reapply these patches because we doing wierd stuff with aut= ogen +REAPPLY_PATCHES=3D \ + ${PATCHDIR}/patch-configure \ + ${PATCHDIR}/patch-src_egl_main_Makefile.in \ + ${PATCHDIR}/patch-src_glx_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in + +python_OLD_CMD=3D "/usr/bin/env[[:space:]]python" +python_CMD=3D ${LOCALBASE}/bin/python2 +SHEBANG_FILES=3D src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ + src/gallium/drivers/svga/svgadump/svga_dump.py \ + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ + src/mapi/mapi/mapi_abi.py .else -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure-old \ - ${PATCHDIR}/extra-mach64_context.h-old \ - ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \ - ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ - ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ - ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S \ - ${PATCHDIR}/extra-src_glx_x11_XF86dri.c -CONFIGURE_ARGS+=3D--disable-glut --disable-glw -.endif +CONFIGURE_ARGS+=3D--disable-glut --disable-glw --disable-glu =20 ALL_TARGET=3D default +.endif =20 MASTERDIR=3D ${.CURDIR}/../../graphics/libGL +.if defined(WITH_NEW_XORG) PATCHDIR=3D ${MASTERDIR}/files +.else +PATCHDIR=3D ${MASTERDIR}/files-old +.endif DESCR=3D ${.CURDIR}/pkg-descr PLIST=3D ${.CURDIR}/pkg-plist WRKSRC=3D ${WRKDIR}/Mesa-${MESADISTVERSION} =20 -.if !defined(ARCH) -ARCH!=3D uname -p -.endif - COMPONENT=3D ${PORTNAME:L:C/^lib//:C/mesa-//} =20 -.if ${COMPONENT:Mglu} =3D=3D "" -CONFIGURE_ARGS+=3D --disable-glu +.if ${COMPONENT:Mglesv2} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-gles2 +.else +CONFIGURE_ARGS+=3D --enable-gles2 .endif =20 +.if ${COMPONENT:Megl} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-egl +.else +CONFIGURE_ARGS+=3D --enable-egl +.endif + .if ${COMPONENT:Mdri} =3D=3D "" -CONFIGURE_ARGS+=3D --with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers .else -CONFIGURE_ARGS+=3D --with-dri-drivers=3D"i915,i965,r200,radeon,swrast" +# done in the dri port .endif =20 .if !defined(WITH_NEW_XORG) @@ -106,8 +118,35 @@ post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|'= \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c +.if !defined(WITH_NEW_XORG) @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libda= ta/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile +.else + @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g'= \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ + ${WRKSRC}/src/glsl/builtins/tools/*.py + @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' = \ + ${WRKSRC}/src/mesa/main/get_hash_generator.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \ =20 +.endif + +pre-configure: +# workaround for stupid rerunning configure in do-build step +# xxx +.if defined(WITH_NEW_XORG) + cd ${WRKSRC} && env NOCONFIGURE=3D1 sh autogen.sh +. for file in ${REAPPLY_PATCHES} + @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} +. endfor +# make sure the pkg-config files are installed in the correct place. +# this was reverted by running autogen.sh + @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD= } -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; +.endif + Index: graphics/libGL/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/distinfo (revision 326808) +++ graphics/libGL/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad= d02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995 -SHA256 (MesaLib-8.0.5.tar.bz2) =3D 511b8da34f8e69ed24caf422964fb7ae747f3= b1d8093f6b8aa2602164a475a5e -SIZE (MesaLib-8.0.5.tar.bz2) =3D 5734571 +SHA256 (MesaLib-9.1.6.tar.bz2) =3D e632dff0acafad0a59dc208d16dedb37f7bd5= 8f94c5d58c4b51912e41d005e3d +SIZE (MesaLib-9.1.6.tar.bz2) =3D 6134267 Index: graphics/libGL/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure (revision 326808) +++ graphics/libGL/files/extra-configure (working copy) @@ -1,40 +0,0 @@ ---- configure.orig 2012-07-10 17:30:46.000000000 +0200 -+++ configure 2012-09-01 13:27:22.000000000 +0200 -@@ -9017,9 +9017,34 @@ - DEFINES=3D"$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=3D1" - DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" -=20 -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -- fi -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ esac -+ - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-configure-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure-old (revision 326808) +++ graphics/libGL/files/extra-configure-old (working copy) @@ -1,43 +0,0 @@ ---- configure.orig 2009-12-22 03:31:30.000000000 +0100 -+++ configure 2012-06-27 19:49:26.000000000 +0200 -@@ -6946,12 +6946,35 @@ - CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" - fi -=20 -- # ffb and gamma are missing because they have not been converte= d -- # to use the new interface. -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ - unichrome savage sis swrast" -- fi -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ -+ unichrome savage sis swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" -+ fi -+ ;; -+ esac - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-mach64_context.h-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-mach64_context.h-old (revision 326808) +++ graphics/libGL/files/extra-mach64_context.h-old (working copy) @@ -1,20 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 -@@ -294,11 +294,14 @@ - #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) - #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) - #else --#ifndef __OpenBSD__ --#include --#else -+#if defined(__OpenBSD__) - #include - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include -+#define bswap_32 bswap32 -+#else -+#include - #endif -=20 - #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Index: graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (revis= ion 326808) +++ graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -1,14 +0,0 @@ ---- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 -+++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 -@@ -39,6 +39,11 @@ - #include "ir_visitor.h" - #include "glsl_types.h" -=20 -+#include -+#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - static float - dot(ir_constant *op0, ir_constant *op1) - { Index: graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (r= evision 326808) +++ graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -1,25 +0,0 @@ ---- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 -+++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 -@@ -106,6 +106,13 @@ - #endif - #endif -=20 -+#if defined(__sparc__) || defined(__sparc64__) -+#define PIPE_ARCH_SPARC -+#if defined(__sparc64__) -+#define PIPE_ARCH_SPARC_64 -+#endif -+#endif -+ -=20 - /* - * Endian detection. -@@ -133,7 +140,7 @@ -=20 - #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) - #define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) -+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) - #define PIPE_ARCH_BIG_ENDIAN - #endif -=20 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_array.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (working copy) @@ -1,99 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_array.c.orig 2011-01-06 01:19:1= 5.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_array.c 2012-04-28 18:27:06.000= 000000 +0200 -@@ -29,54 +29,71 @@ - #include "nouveau_array.h" - #include "nouveau_bufferobj.h" -=20 -+#define EXTRACT(in_t, out_t) extract_func_##in_t##_to_##out_t -+ -+#define EXTRACT_FUNC(in_t, out_t, k) \ -+static out_t EXTRACT(in_t, out_t) \ -+(struct nouveau_array *a, int i, int j) { \ -+ in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -+ \ -+ return (out_t)x / (k); \ -+} -+ -+EXTRACT_FUNC(GLchar, unsigned, 1); -+EXTRACT_FUNC(GLchar, float, SCHAR_MAX); -+EXTRACT_FUNC(GLubyte, unsigned, 1); -+EXTRACT_FUNC(GLubyte, float, UCHAR_MAX); -+EXTRACT_FUNC(GLshort, unsigned, 1); -+EXTRACT_FUNC(GLshort, float, SHRT_MAX); -+EXTRACT_FUNC(GLushort, unsigned, 1); -+EXTRACT_FUNC(GLushort, float, USHRT_MAX); -+EXTRACT_FUNC(GLint, unsigned, 1); -+EXTRACT_FUNC(GLint, float, INT_MAX); -+EXTRACT_FUNC(GLuint, unsigned, 1); -+EXTRACT_FUNC(GLuint, float, UINT_MAX); -+EXTRACT_FUNC(GLfloat, unsigned, 1.0 / UINT_MAX); -+EXTRACT_FUNC(GLfloat, float, 1); -+ -+#undef EXTRACT_FUNC -+ - static void - get_array_extract(struct nouveau_array *a, extract_u_t *extract_u, - extract_f_t *extract_f) - { --#define EXTRACT(in_t, out_t, k) \ -- ({ \ -- auto out_t f(struct nouveau_array *, int, int); \ -- out_t f(struct nouveau_array *a, int i, int j) { \ -- in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -- \ -- return (out_t)x / (k); \ -- }; \ -- f; \ -- }); -- - switch (a->type) { - case GL_BYTE: -- *extract_u =3D EXTRACT(char, unsigned, 1); -- *extract_f =3D EXTRACT(char, float, SCHAR_MAX); -+ *extract_u =3D EXTRACT(GLchar, unsigned); -+ *extract_f =3D EXTRACT(GLchar, float); - break; - case GL_UNSIGNED_BYTE: -- *extract_u =3D EXTRACT(unsigned char, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned char, float, UCHAR_MAX); -+ *extract_u =3D EXTRACT(GLubyte, unsigned); -+ *extract_f =3D EXTRACT(GLubyte, float); - break; - case GL_SHORT: -- *extract_u =3D EXTRACT(short, unsigned, 1); -- *extract_f =3D EXTRACT(short, float, SHRT_MAX); -+ *extract_u =3D EXTRACT(GLshort, unsigned); -+ *extract_f =3D EXTRACT(GLshort, float); - break; - case GL_UNSIGNED_SHORT: -- *extract_u =3D EXTRACT(unsigned short, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned short, float, USHRT_MAX); -+ *extract_u =3D EXTRACT(GLushort, unsigned); -+ *extract_f =3D EXTRACT(GLushort, float); - break; - case GL_INT: -- *extract_u =3D EXTRACT(int, unsigned, 1); -- *extract_f =3D EXTRACT(int, float, INT_MAX); -+ *extract_u =3D EXTRACT(GLint, unsigned); -+ *extract_f =3D EXTRACT(GLint, float); - break; - case GL_UNSIGNED_INT: -- *extract_u =3D EXTRACT(unsigned int, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned int, float, UINT_MAX); -+ *extract_u =3D EXTRACT(GLuint, unsigned); -+ *extract_f =3D EXTRACT(GLuint, float); - break; - case GL_FLOAT: -- *extract_u =3D EXTRACT(float, unsigned, 1.0 / UINT_MAX); -- *extract_f =3D EXTRACT(float, float, 1); -+ *extract_u =3D EXTRACT(GLfloat, unsigned); -+ *extract_f =3D EXTRACT(GLfloat, float); - break; - default: - assert(0); - } - } -+#undef EXTRACT -=20 - void - nouveau_init_array(struct nouveau_array *a, int attr, int stride, Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_render_t.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (working copy) @@ -1,91 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_render_t.c.orig 2011-01-06 01:1= 9:34.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_render_t.c 2012-04-28 18:27:06.= 000000000 +0200 -@@ -97,52 +97,49 @@ - } \ - } while (0) -=20 --/* -- * Select an appropriate dispatch function for the given index buffer. -- */ --static dispatch_t --get_array_dispatch(struct nouveau_array *a) -+static void -+dispatch_l(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) - { -- if (!a->fields) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- EMIT_VBO(L, ctx, start, delta, n); -- }; -- -- return f; -- -- } else if (a->type =3D=3D GL_UNSIGNED_INT) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ EMIT_VBO(L, ctx, start, delta, n); -+} -=20 -- EMIT_VBO(I32, ctx, start, delta, n); -- }; -+static void -+dispatch_i32(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- return f; -+ EMIT_VBO(I32, ctx, start, delta, n); -+} -=20 -- } else { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -+static void -+dispatch_i16(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -- -- EMIT_VBO(I32, ctx, start, delta, n & 1); -- EMIT_VBO(I16, ctx, start, delta, n & ~1); -- }; -+ EMIT_VBO(I32, ctx, start, delta, n & 1); -+ EMIT_VBO(I16, ctx, start, delta, n & ~1); -+} -=20 -- return f; -- } -+/* -+ * Select an appropriate dispatch function for the given index buffer. -+ */ -+static dispatch_t -+get_array_dispatch(struct nouveau_array *a) -+{ -+ if (!a->fields) -+ return dispatch_l; -+ else if (a->type =3D=3D GL_UNSIGNED_INT) -+ return dispatch_i32; -+ else -+ return dispatch_i16; - } -=20 - /* Index: graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (revisio= n 326808) +++ graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (working= copy) @@ -1,12 +0,0 @@ ---- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 -+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= -@@ -73,7 +73,8 @@ _x86_64_get_dispatch: -=20 - .p2align 4,,15 - _x86_64_get_dispatch: -- movq _gl_DispatchTSD(%rip), %rdi -+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax -+ movl (%rax), %edi - jmp pthread_getspecific@PLT -=20 - #elif defined(THREADS) Index: graphics/libGL/files/extra-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (working copy)= @@ -1,74 +0,0 @@ ---- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 -+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 -@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: - * rdx =3D source - */ - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -116,7 +116,7 @@ p4_constants: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 --.float 0f+1.0 -+.float 1.0 -=20 - .text - .align 16 -@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: - movaps 16(%rax), %xmm10 -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -195,7 +195,7 @@ p4_3d_done: - _mesa_x86_64_transform_points4_identity: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -223,7 +223,7 @@ p4_identity_done: - _mesa_3dnow_transform_points4_3d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -287,7 +287,7 @@ p4_3d_no_rot_done: - _mesa_3dnow_transform_points4_perspective: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -353,7 +353,7 @@ p4_perspective_done: - _mesa_3dnow_transform_points4_2d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -408,7 +408,7 @@ p4_2d_no_rot_done: - _mesa_3dnow_transform_points4_2d: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ Index: graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (working copy)= @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 -+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 -@@ -47,7 +47,7 @@ - #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) -=20 - #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) --#define GLOBL_FN(x) GLOBL x ; .type x, function -+#define GLOBL_FN(x) GLOBL x ; .type x, @function - #else - #define GLOBL_FN(x) GLOBL x - #endif Index: graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (revi= sion 326808) +++ graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (work= ing copy) @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 -+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 -@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: - testl $0x01, %ecx - je .L01 -=20 -- movzxw (%eax), %ecx -+ movzwl (%eax), %ecx - movd %ecx, %mm4 -=20 - pshufw $0x00, %mm4, %mm0 Index: graphics/libGL/files/extra-src_glx_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/XF86dri.c.orig 2012-10-24 19:03:59.000000000 +0000 -+++ src/glx/XF86dri.c 2013-05-29 10:07:33.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 - static XExtensionInfo _xf86dri_info_data; - static XExtensionInfo *xf86dri_info =3D &_xf86dri_info_data; -@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/extra-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_x11_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_x11_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 -+++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 -=20 - #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 -@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-configure (revision 0) +++ graphics/libGL/files/patch-configure (working copy) @@ -0,0 +1,49 @@ +--- configure.orig 2013-08-01 23:22:15.000000000 +0200 ++++ configure 2013-08-19 20:05:02.000000000 +0200 +@@ -21046,9 +21046,34 @@ + DEFINES=3D"$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=3D1"= + DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" +=20 +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" +- fi ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ esac ++ + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " +@@ -23396,7 +23421,7 @@ + radeon_llvm_check() { + LLVM_REQUIRED_VERSION_MAJOR=3D"3" + LLVM_REQUIRED_VERSION_MINOR=3D"2" +- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then ++ if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then + as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRE= D_VERSION_MINOR with R600 target enabled is required. + To use the r600/radeonsi LLVM backend, you need to= fetch the LLVM source from: + git://people.freedesktop.org/~tstellar/llvm master= Property changes on: graphics/libGL/files/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (revis= ion 0) +++ graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -0,0 +1,14 @@ +--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 ++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 +@@ -39,6 +39,11 @@ + #include "ir_visitor.h" + #include "glsl_types.h" +=20 ++#include ++#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) ++#define log2(x) (log(x) / log(2)) ++#endif ++ + static float + dot(ir_constant *op0, ir_constant *op1) + { Property changes on: graphics/libGL/files/patch-src-glsl_ir_constant_expr= ession.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (r= evision 0) +++ graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -0,0 +1,25 @@ +--- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 ++++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 +@@ -106,6 +106,13 @@ + #endif + #endif +=20 ++#if defined(__sparc__) || defined(__sparc64__) ++#define PIPE_ARCH_SPARC ++#if defined(__sparc64__) ++#define PIPE_ARCH_SPARC_64 ++#endif ++#endif ++ +=20 + /* + * Endian detection. +@@ -133,7 +140,7 @@ +=20 + #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) + #define PIPE_ARCH_LITTLE_ENDIAN +-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) ++#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) + #define PIPE_ARCH_BIG_ENDIAN + #endif +=20 Property changes on: graphics/libGL/files/patch-src__gallium__include__pi= pe__p_config.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_egl_main_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_egl_main_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_egl_main_Makefile.in (working copy) @@ -0,0 +1,19 @@ +--- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200 ++++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200 +@@ -990,8 +990,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libEGL.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1 +- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_egl_main_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (r= evision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (w= orking copy) @@ -0,0 +1,26 @@ +diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drive= rs/r300/r300_chipset.c +index 11061ed..daf990e 100644 +--- src/gallium/drivers/r300/r300_chipset.c ++++ src/gallium/drivers/r300/r300_chipset.c +@@ -48,6 +48,21 @@ static void r300_apply_hyperz_blacklist(struct r300_c= apabilities* caps) + }; + int i; +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++ const char *progname, *program_invocation_short_name; ++ ++ progname =3D getprogname(); ++ program_invocation_short_name =3D strrchr(progname, '/'); ++ if (program_invocation_short_name) { ++ program_invocation_short_name++; ++ } else { ++ program_invocation_short_name =3D progname; ++ } ++#endif ++ + for (i =3D 0; i < Elements(list); i++) { + if (strcmp(list[i], program_invocation_short_name) =3D=3D 0) { + caps->zmask_ram =3D 0; Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r300_= r300-chipset.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (revis= ion 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (worki= ng copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_asm.c.orig 2013-03-20 00:28:25.0000000= 00 +0100 ++++ src/gallium/drivers/r600/r600_asm.c 2013-06-26 23:29:14.000000000 +0= 200 +@@ -27,7 +27,12 @@ + #include "r600d.h" +=20 + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif + #include "util/u_memory.h" + #include "pipe/p_shader_tokens.h" +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-asm.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (re= vision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (wo= rking copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_shader.c.orig 2013-05-16 19:38:54.0000= 00000 +0200 ++++ src/gallium/drivers/r600/r600_shader.c 2013-06-26 23:26:02.000000000= +0200 +@@ -35,7 +35,12 @@ + #include "util/u_memory.h" + #include + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + /* CAYMAN notes=20 + Why CAYMAN got loops for lots of instructions is explained here. Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-shader.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_com= mon.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (working copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_state_common.c.orig 2013-03-06 00:25:3= 9.000000000 +0100 ++++ src/gallium/drivers/r600/r600_state_common.c 2013-06-26 23:26:02.000= 000000 +0200 +@@ -33,7 +33,12 @@ + #include "util/u_memory.h" + #include "util/u_upload_mgr.h" + #include "tgsi/tgsi_parse.h" ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600_state_common.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-= emit.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (working copy) @@ -0,0 +1,28 @@ +--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig 2013-08-19 21:2= 3:06.000000000 +0200 ++++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-08-19 21:30:58.= 000000000 +0200 +@@ -25,13 +25,13 @@ + */ + #include "radeon_llvm_emit.h" +=20 +-#include +-#include ++#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include +=20 + #include + #include Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= n_radeon-llvm-emit.cpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffe= r.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (working copy) @@ -0,0 +1,16 @@ +--- src/gallium/drivers/radeonsi/r600_buffer.c.orig 2013-08-01 00:56:45.= 000000000 +0200 ++++ src/gallium/drivers/radeonsi/r600_buffer.c 2013-08-19 21:36:02.00000= 0000 +0200 +@@ -24,7 +24,13 @@ + * Jerome Glisse + * Corbin Simpson + */ ++ ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #include "pipe/p_screen.h" + #include "util/u_format.h" Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= nsi_r600-buffer.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-= ioctl.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (revision 0) +++ graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (working copy) @@ -0,0 +1,18 @@ +diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/galliu= m/winsys/svga/drm/vmw_screen_ioctl.c +index 36888dc..62a6e6a 100644 +--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c ++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +@@ -66,6 +66,13 @@ struct vmw_region + */ + #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9) +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++#define ERESTART EINTR ++#endif ++ + uint32 + vmw_ioctl_context_create(struct vmw_winsys_screen *vws) + { Property changes on: graphics/libGL/files/patch-src_gallium_winsys_svga_d= rm_vmw-screen-ioctl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_glx_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_glx_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_glx_Makefile.in (working copy) @@ -0,0 +1,59 @@ +--- src/glx/Makefile.in.orig 2013-07-03 15:13:37.000000000 +0200 ++++ src/glx/Makefile.in 2013-07-03 15:19:44.000000000 +0200 +@@ -162,12 +162,12 @@ + depcomp =3D $(SHELL) $(top_srcdir)/bin/depcomp + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f +-COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE =3D $(CC) $(DEFS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) = \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; +@@ -632,17 +632,17 @@ + $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=3D; \ ++ @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)/.libGL" || list=3D; \= + list2=3D; for p in $$list; do \ + if test -f $$p; then \ + list2=3D"$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ +- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)/.libGL'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(libdir)/.libGL" || exit 1; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)/.libGL'";= \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)/.libGL"; \ + } +=20 + uninstall-libLTLIBRARIES: +@@ -1068,8 +1068,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: lib@GL_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB= @.so.1 +- ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_glx_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_es2api_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (working copy)= @@ -0,0 +1,20 @@ +--- src/mapi/es2api/Makefile.in.orig 2013-08-01 23:22:21.000000000 +0200= ++++ src/mapi/es2api/Makefile.in 2013-09-01 11:38:01.000000000 +0200 +@@ -958,9 +958,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libGLESv2.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so +- ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2 +- ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so= =2E2.0.0 ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_es2api_Makefile.= in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (working= copy) @@ -0,0 +1,11 @@ +--- src/mapi/glapi/gen/gl_gentable.py.orig 2013-07-17 15:41:13.000000000= +0200 ++++ src/mapi/glapi/gen/gl_gentable.py 2013-07-17 15:41:55.000000000 +020= 0 +@@ -42,7 +42,7 @@ + #endif +=20 + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) + #define USE_BACKTRACE + #endif +=20 Property changes on: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gen= table.py ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (working= copy) @@ -0,0 +1,20 @@ +--- src/mapi/shared-glapi/Makefile.in.orig 2013-06-27 00:42:45.000000000= +0200 ++++ src/mapi/shared-glapi/Makefile.in 2013-06-27 00:43:25.000000000 +020= 0 +@@ -889,9 +889,14 @@ +=20 + all-local: libglapi.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR) +- ln -f .libs/libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0= =2E0.0 +- ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0 +- ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_shared-glapi_Mak= efile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_Makefile (revision 326808) +++ graphics/libGL/files/patch-src_mesa_Makefile (working copy) @@ -1,15 +0,0 @@ ---- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 -+++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 -@@ -183,10 +183,10 @@ - $(DESTDIR)$(INSTALL_INC_DIR)/GL -=20 - install-libgl: default gl.pc install-headers -- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ -- $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -=20 - install-osmesa: default osmesa.pc Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (r= evision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (w= orking copy) @@ -0,0 +1,17 @@ +--- src/mesa/drivers/dri/common/Makefile.in.orig 2013-04-20 14:50:15.000= 000000 +0000 ++++ src/mesa/drivers/dri/common/Makefile.in 2013-04-20 15:02:05.00000000= 0 +0000 +@@ -123,11 +123,11 @@ + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f + COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(CPPFLAGS= ) \ ++ $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Mak= efile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (revision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (working copy) @@ -0,0 +1,11 @@ +--- src/mesa/drivers/dri/common/xmlpool/Makefile.in.orig 2013-07-02 22:4= 2:09.000000000 +0200 ++++ src/mesa/drivers/dri/common/xmlpool/Makefile.in 2013-07-02 22:53:30.= 000000000 +0200 +@@ -639,7 +639,7 @@ + # Update .mo files from the corresponding .po files. + %/LC_MESSAGES/options.mo: %.po + @mo=3D"$@"; \ +- lang=3D$${mo%%/*}; \ ++ lang=3D$*; \ + echo "Updating ($$lang) $@ from $?."; \ + mkdir -p $$lang/LC_MESSAGES; \ + msgfmt -o $@ $? Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_xmlpool_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (revision = 0) +++ graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (working c= opy) @@ -0,0 +1,19 @@ +--- src/mesa/libdricore/Makefile.in.orig 2013-06-27 00:21:26.000000000 += 0200 ++++ src/mesa/libdricore/Makefile.in 2013-06-27 00:28:29.000000000 +0200 +@@ -3950,8 +4000,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + @HAVE_DRI_TRUE@all-local: libdricore@VERSION@.la + @HAVE_DRI_TRUE@ $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +-@HAVE_DRI_TRUE@ ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir= )/$(LIB_DIR)/libdricore@VERSION@.so.1; +-@HAVE_DRI_TRUE@ ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_D= IR)/libdricore@VERSION@.so ++@HAVE_DRI_TRUE@ base=3D$(basename $<); \ ++@HAVE_DRI_TRUE@ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2);= \ ++@HAVE_DRI_TRUE@ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2);= \ ++@HAVE_DRI_TRUE@ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlnam= e; \ ++@HAVE_DRI_TRUE@ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ];= then \ ++@HAVE_DRI_TRUE@ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.= $$ver; \ ++@HAVE_DRI_TRUE@ fi; \ ++@HAVE_DRI_TRUE@ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$bas= e.so +=20 + -include $(DEPENDS) +=20 Property changes on: graphics/libGL/files/patch-src_mesa_libdricore_Makef= ile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_main_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_main_compiler.h (revision 0) +++ graphics/libGL/files/patch-src_mesa_main_compiler.h (working copy) @@ -0,0 +1,12 @@ +--- src/mesa/main/compiler.h.orig 2013-04-06 04:01:09.000000000 +0200 ++++ src/mesa/main/compiler.h 2013-06-26 23:26:02.000000000 +0200 +@@ -171,6 +171,9 @@ + #if defined(__linux__) + #include + #define CPU_TO_LE32( x ) bswap_32( x ) ++#elif defined(__FreeBSD__) ++#include ++#define CPU_TO_LE32( x ) bswap32( x ) + #elif defined(__APPLE__) + #include + #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) Property changes on: graphics/libGL/files/patch-src_mesa_main_compiler.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-configure (revision 0) +++ graphics/libGL/files-old/patch-configure (working copy) @@ -0,0 +1,43 @@ +--- configure.orig 2009-12-22 03:31:30.000000000 +0100 ++++ configure 2012-06-27 19:49:26.000000000 +0200 +@@ -6946,12 +6946,35 @@ + CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" + fi +=20 +- # ffb and gamma are missing because they have not been converte= d +- # to use the new interface. +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ + unichrome savage sis swrast" +- fi ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ ++ unichrome savage sis swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" ++ fi ++ ;; ++ esac + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Property changes on: graphics/libGL/files-old/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-mach64_context.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-mach64_context.h (revision 0) +++ graphics/libGL/files-old/patch-mach64_context.h (working copy) @@ -0,0 +1,20 @@ +--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 ++++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 +@@ -294,11 +294,14 @@ + #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) + #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) + #else +-#ifndef __OpenBSD__ +-#include +-#else ++#if defined(__OpenBSD__) + #include + #define bswap_32 bswap32 ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32 bswap32 ++#else ++#include + #endif +=20 + #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Property changes on: graphics/libGL/files-old/patch-mach64_context.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (rev= ision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (wor= king copy) @@ -0,0 +1,12 @@ +--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 ++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= +@@ -73,7 +73,8 @@ _x86_64_get_dispatch: +=20 + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax ++ movl (%rax), %edi + jmp pthread_getspecific@PLT +=20 + #elif defined(THREADS) Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__gl= api_x86-64.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (working c= opy) @@ -0,0 +1,74 @@ +--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 ++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 +@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: + * rdx =3D source + */ + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -116,7 +116,7 @@ p4_constants: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 +-.float 0f+1.0 ++.float 1.0 +=20 + .text + .align 16 +@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: + movaps 16(%rax), %xmm10 +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -195,7 +195,7 @@ p4_3d_done: + _mesa_x86_64_transform_points4_identity: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -223,7 +223,7 @@ p4_identity_done: + _mesa_3dnow_transform_points4_3d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -287,7 +287,7 @@ p4_3d_no_rot_done: + _mesa_3dnow_transform_points4_perspective: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -353,7 +353,7 @@ p4_perspective_done: + _mesa_3dnow_transform_points4_2d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -408,7 +408,7 @@ p4_2d_no_rot_done: + _mesa_3dnow_transform_points4_2d: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__xf= orm4.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (working c= opy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 +@@ -47,7 +47,7 @@ + #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) +=20 + #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) +-#define GLOBL_FN(x) GLOBL x ; .type x, function ++#define GLOBL_FN(x) GLOBL x ; .type x, @function + #else + #define GLOBL_FN(x) GLOBL x + #endif Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__glapi= _x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.= S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= revision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= working copy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 ++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 +@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: + testl $0x01, %ecx + je .L01 +=20 +- movzxw (%eax), %ecx ++ movzwl (%eax), %ecx + movd %ecx, %mm4 +=20 + pshufw $0x00, %mm4, %mm0 Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__read_= rgba_span_x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (revision 0) +++ graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (working copy) @@ -0,0 +1,38 @@ +--- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 ++++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 +@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + #include + #include + #include "xf86dristr.h" ++#include +=20 +=20 + #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 +@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int + } +=20 + if (rep.length) { +- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { ++ if (rep.busIdStringLength < INT_MAX) ++ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); ++ else ++ *busIdString =3D NULL; ++ if (*busIdString =3D=3D NULL) { + _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); +@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy + *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; +=20 + if (rep.length) { +- if (! +- (*clientDriverName =3D +- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { ++ if (rep.clientDriverNameLength < INT_MAX) ++ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); ++ else ++ *clientDriverName =3D NULL; ++ if (*clientDriverName =3D=3D NULL) { + _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); Property changes on: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c= ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_mesa_Makefile (revision 0) +++ graphics/libGL/files-old/patch-src_mesa_Makefile (working copy) @@ -0,0 +1,15 @@ +--- src/mesa/Makefile.orig 2009-12-22 03:31:19.000000000 +0100 ++++ src/mesa/Makefile 2013-08-19 23:19:42.000000000 +0200 +@@ -127,10 +127,10 @@ + $(DESTDIR)$(INSTALL_INC_DIR)/GL +=20 + install-libgl: default gl.pc install-headers +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ +- $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig +=20 + install-osmesa: default osmesa.pc Property changes on: graphics/libGL/files-old/patch-src_mesa_Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/pkg-plist (revision 326808) +++ graphics/libGL/pkg-plist (working copy) @@ -11,9 +11,10 @@ %%OLD%%include/GL/mglmesa.h include/GL/osmesa.h %%OLD%%include/GL/svgamesa.h -include/GL/vms_x_fix.h +%%OLD%%include/GL/vms_x_fix.h include/GL/wglext.h include/GL/wmesa.h +%%NEW%%lib/.libGL/libGL.la lib/.libGL/libGL.so lib/.libGL/libGL.so.1 libdata/pkgconfig/gl.pc Index: graphics/libGLw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGLw/Makefile (revision 326808) +++ graphics/libGLw/Makefile (working copy) @@ -12,9 +12,10 @@ COMMENT=3D OpenGL widgets library =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig motif +USES=3D pathfix pkgconfig USE_LDCONFIG=3D yes USE_GL=3D gl +USE_MOTIF=3D yes USE_XORG=3D x11 xt xext GNU_CONFIGURE=3D yes CONFIGURE_ARGS=3D --disable-static --enable-motif Index: graphics/libdrm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/Makefile (revision 326808) +++ graphics/libdrm/Makefile (working copy) @@ -10,8 +10,8 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Userspace interface to kernel Direct Rendering Module service= s =20 -LIB_DEPENDS=3D pciaccess:${PORTSDIR}/devel/libpciaccess \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs +LIB_DEPENDS=3D libpciaccess.so:${PORTSDIR}/devel/libpciaccess \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs =20 USES=3D pkgconfig USE_BZIP2=3D yes @@ -18,15 +18,8 @@ GNU_CONFIGURE=3D yes USE_LDCONFIG=3D yes =20 +OPTIONS_DEFINE=3D MANPAGES =20 -.if defined(WITH_NEW_XORG) - -USES+=3D gmake - -OPTIONS_DEFINE=3D KMS MANPAGES -OPTIONS_DEFAULT=3DKMS -KMS_DESC=3D Enable KMS support - .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+=3D MANPAGES .endif @@ -33,12 +26,18 @@ =20 .include =20 -.if ${PORT_OPTIONS:MKMS} +.if defined(WITH_NEW_XORG) + +USES+=3D gmake + +# KMS support in the kernel is only build on these archs, disable others= +.if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" CONFIGURE_ARGS+=3D--enable-libkms EXTRA_PATCHES+=3D ${FILESDIR}/extra-xf86drmMode.c -PLIST_SUB+=3D KMS=3D"" +PLIST_SUB+=3D KMS=3D"" NOUVEAU=3D"" .else -PLIST_SUB+=3D KMS=3D"@comment " +CONFIGURE_ARGS+=3D--disable-libkms +PLIST_SUB+=3D KMS=3D"@comment " NOUVEAU=3D"@comment " .endif =20 .if ${PORT_OPTIONS:MMANPAGES} @@ -69,11 +68,9 @@ CONFIGURE_ARGS=3D --enable-nouveau-experimental-api LIBDRM_VERSION=3D 2.4.17 LIBDRM_REVISION=3D1 -PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " +PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " NOUVEAU=3D"" .endif =20 -.include - .if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" || ${ARCH} =3D=3D "i= a64" || ${ARCH} =3D=3D "powerpc" PLIST_SUB+=3D INTEL_DRIVER=3D"" PLIST_SUB+=3D RADEON_DRIVERS=3D"" @@ -87,4 +84,4 @@ s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure =20 -.include +.include Index: graphics/libdrm/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/pkg-plist (revision 326808) +++ graphics/libdrm/pkg-plist (working copy) @@ -22,8 +22,9 @@ %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h -%%NEW%%include/libdrm/nouveau.h +%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h +%%NEW%%include/libdrm/qxl_drm.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -54,10 +55,10 @@ %%INTEL_DRIVER%%lib/libdrm_intel.la %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 -lib/libdrm_nouveau.la -lib/libdrm_nouveau.so -%%OLD%%lib/libdrm_nouveau.so.1 -%%NEW%%lib/libdrm_nouveau.so.2 +%%NOUVEAU%%lib/libdrm_nouveau.la +%%NOUVEAU%%lib/libdrm_nouveau.so +%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1 +%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 @@ -66,7 +67,7 @@ %%NEW%%%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc -libdata/pkgconfig/libdrm_nouveau.pc +%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc %%OLD%%@dirrm include/nouveau Index: graphics/libglesv2/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/Makefile (revision 0) +++ graphics/libglesv2/Makefile (working copy) @@ -0,0 +1,29 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libglesv2 +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenGL ES v2 library + +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libglesv2 needs libdrm higher th= en 2.4.24 +.endif + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes + + +BUILD_WKRSRC=3D ${WRKSRC}/src/mapi/es2api +INSTALL_WRKSRC=3D ${WRKSRC}/src/mapi/es2api + +# this library doesn't exist in Mesa 7.6 so use newer +WITH_NEW_XORG=3Dyes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libglesv2/Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libglesv2/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-descr (revision 0) +++ graphics/libglesv2/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the GL ES v2 utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libglesv2/pkg-descr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libglesv2/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-plist (revision 0) +++ graphics/libglesv2/pkg-plist (working copy) @@ -0,0 +1,12 @@ +include/GLES2/gl2.h +include/GLES2/gl2ext.h +include/GLES2/gl2platform.h +include/GLES3/gl3.h +include/GLES3/gl3ext.h +include/GLES3/gl3platform.h +lib/libGLESv2.la +lib/libGLESv2.so +lib/libGLESv2.so.2 +libdata/pkgconfig/glesv2.pc +@dirrmtry include/GLES3 +@dirrmtry include/GLES2 Property changes on: graphics/libglesv2/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libreatlas/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libreatlas/Makefile (revision 326808) +++ graphics/libreatlas/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D libreatlas PORTVERSION=3D 1.0.0a -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D graphics geography MASTER_SITES=3D http://www.gaia-gis.it/gaia-sins/ =20 @@ -30,8 +30,7 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 GNU_CONFIGURE=3D yes -USES=3D pkgconfig gettext iconv -USE_GMAKE=3D yes +USES=3D pkgconfig gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp x= ext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME=3D atk gdkpixbuf2 glib20 gtk20 pango Index: multimedia/freetuxtv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- multimedia/freetuxtv/Makefile (revision 326808) +++ multimedia/freetuxtv/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D freetuxtv PORTVERSION=3D 0.6.5 -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D multimedia MASTER_SITES=3D GOOGLE_CODE =20 @@ -26,13 +26,12 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D iconv pathfix pkgconfig +USES=3D gmake iconv pathfix pkgconfig USE_GNOME=3D glib20 gtk20 USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfi= xes \ xi xinerama xrandr xrender GNU_CONFIGURE=3D yes CONFIGURE_ARGS+=3D--with-gtk=3D2.0 -USE_GMAKE=3D yes CFLAGS=3D -Wno-return-type INSTALLS_ICONS=3D yes =20 Index: net/cvsup/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/cvsup/Makefile (revision 326808) +++ net/cvsup/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D cvsup PORTVERSION=3D 16.1h -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D net devel MASTER_SITES=3D ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=3Ddevelopment/CVSup/snapshots Index: net/tigervnc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/tigervnc/Makefile (revision 326808) +++ net/tigervnc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tigervnc PORTVERSION=3D 1.2.0 -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D net x11-servers MASTER_SITES=3D SF:tigervnc MASTER_SITE_SUBDIR=3D ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc @@ -28,8 +28,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes =20 -USES=3D cmake pkgconfig -USE_GMAKE=3D yes +USES=3D cmake gmake pkgconfig USE_GL=3D gl USE_AUTOTOOLS+=3D autoconf:env automake:env libtool:env USE_PYTHON=3D yes Index: print/photoprint/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- print/photoprint/Makefile (revision 326808) +++ print/photoprint/Makefile (working copy) @@ -2,6 +2,7 @@ =20 PORTNAME=3D photoprint DISTVERSION=3D 0.4.2-pre2 +PORTREVISION=3D 1 CATEGORIES=3D print graphics MASTER_SITES=3D http://www.blackfiveimaging.co.uk/photoprint/ =20 @@ -17,7 +18,6 @@ lcms:${PORTSDIR}/graphics/lcms \ netpbm:${PORTSDIR}/graphics/netpbm \ pcre:${PORTSDIR}/devel/pcre \ - pixman:${PORTSDIR}/x11/pixman \ png15:${PORTSDIR}/graphics/png \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ tiff:${PORTSDIR}/graphics/tiff @@ -25,7 +25,7 @@ GNU_CONFIGURE=3D yes USES=3D desktop-file-utils gettext pkgconfig USE_GNOME=3D pango -USE_XORG=3D x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ +USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender INSTALLS_ICONS=3D yes =20 Index: sysutils/gtk-imonc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/gtk-imonc/Makefile (revision 326808) +++ sysutils/gtk-imonc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtk-imonc PORTVERSION=3D 0.6.4.1 -PORTREVISION=3D 12 +PORTREVISION=3D 13 CATEGORIES=3D sysutils MASTER_SITES=3D http://stefan-strigler.de/download/ =20 Index: sysutils/nitrogen/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/nitrogen/Makefile (revision 326808) +++ sysutils/nitrogen/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D nitrogen PORTVERSION=3D 1.5.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D sysutils MASTER_SITES=3D http://projects.l3ib.org/nitrogen/files/ =20 Index: x11/libSM/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/Makefile (revision 326808) +++ x11/libSM/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libSM -PORTVERSION=3D 1.2.1 +PORTVERSION=3D 1.2.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libSM/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/distinfo (revision 326808) +++ x11/libSM/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) =3D 93c11d569c64f40723b93b44af1efb= 474a0cfe92573b0c8c330343cabb897f1d -SIZE (xorg/lib/libSM-1.2.1.tar.bz2) =3D 334696 +SHA256 (xorg/lib/libSM-1.2.2.tar.bz2) =3D 0baca8c9f5d934450a70896c4ad38d= 06475521255ca63b717a6510fdb6e287bd +SIZE (xorg/lib/libSM-1.2.2.tar.bz2) =3D 348908 Index: x11/libX11/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/Makefile (revision 326808) +++ x11/libX11/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libX11 -PORTVERSION=3D 1.6.1 +PORTVERSION=3D 1.6.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libX11/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/distinfo (revision 326808) +++ x11/libX11/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libX11-1.6.1.tar.bz2) =3D 10a54fc16b58b4f5a5eed4d080c35= 7a82fd2f42d09af625c1f5df50650701892 -SIZE (xorg/lib/libX11-1.6.1.tar.bz2) =3D 2356196 +SHA256 (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2aa027e837231d2eeea90f3a4afe1= 9948a6eb4c8b2bec0241eba7dbc8106bd16 +SIZE (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2339981 Index: x11/libX11/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/pkg-plist (revision 326808) +++ x11/libX11/pkg-plist (working copy) @@ -103,6 +103,9 @@ lib/X11/locale/ja_JP.UTF-8/Compose lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE +lib/X11/locale/km_KH.UTF-8/Compose +lib/X11/locale/km_KH.UTF-8/XI18N_OBJS +lib/X11/locale/km_KH.UTF-8/XLC_LOCALE lib/X11/locale/ko/Compose lib/X11/locale/ko/XI18N_OBJS lib/X11/locale/ko/XLC_LOCALE @@ -141,6 +144,9 @@ lib/X11/locale/ru_RU.UTF-8/Compose lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE +lib/X11/locale/sr_CS.UTF-8/Compose +lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS +lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE lib/X11/locale/tatar-cyr/Compose lib/X11/locale/tatar-cyr/XI18N_OBJS lib/X11/locale/tatar-cyr/XLC_LOCALE @@ -215,6 +221,7 @@ @dirrm lib/X11/locale/th_TH.UTF-8 @dirrm lib/X11/locale/th_TH @dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/sr_CS.UTF-8 @dirrm lib/X11/locale/ru_RU.UTF-8 @dirrm lib/X11/locale/pt_BR.UTF-8 @dirrm lib/X11/locale/nokhchi-1 @@ -227,6 +234,7 @@ @dirrm lib/X11/locale/koi8-c @dirrm lib/X11/locale/ko_KR.UTF-8 @dirrm lib/X11/locale/ko +@dirrm lib/X11/locale/km_KH.UTF-8 @dirrm lib/X11/locale/ja_JP.UTF-8 @dirrm lib/X11/locale/ja.SJIS @dirrm lib/X11/locale/ja.JIS Index: x11/libXpm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/Makefile (revision 326808) +++ x11/libXpm/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXpm -PORTVERSION=3D 3.5.10 +PORTVERSION=3D 3.5.11 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXpm/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/distinfo (revision 326808) +++ x11/libXpm/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) =3D a6db7e234750e7d60330017972e3= 1d8e1f29f0a8c1391e4ac82f6102d919a735 -SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) =3D 431310 +SHA256 (xorg/lib/libXpm-3.5.11.tar.bz2) =3D c5bdafa51d1ae30086fac01ab83b= e8d47fe117b238d3437f8e965434090e041c +SIZE (xorg/lib/libXpm-3.5.11.tar.bz2) =3D 443496 Index: x11/libXrandr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/Makefile (revision 326808) +++ x11/libXrandr/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXrandr -PORTVERSION=3D 1.4.1 +PORTVERSION=3D 1.4.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXrandr/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/distinfo (revision 326808) +++ x11/libXrandr/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D d914a0490fd0a2ea6c3194505b= 5b28c56e2a277d8f4648b0275ee0ee370fb905 -SIZE (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D 312857 +SHA256 (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D caa7b31ac769be51a532343c65= 376f1d4df3f307afaed58e34fb5e82e8b825ad +SIZE (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D 315165 Index: x11/libXv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/Makefile (revision 326808) +++ x11/libXv/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXv -PORTVERSION=3D 1.0.9 +PORTVERSION=3D 1.0.10 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libXv/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/distinfo (revision 326808) +++ x11/libXv/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXv-1.0.9.tar.bz2) =3D a874dbf864d0271bbe795af67ef5b3= f20096c92fc11eacbf0d2af00e32bc5b4b -SIZE (xorg/lib/libXv-1.0.9.tar.bz2) =3D 309744 +SHA256 (xorg/lib/libXv-1.0.10.tar.bz2) =3D 55fe92f8686ce8612e2c1bfaf58c0= 57715534419da700bda8d517b1d97914525 +SIZE (xorg/lib/libXv-1.0.10.tar.bz2) =3D 300633 Index: x11/libxcb/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libxcb/Makefile (revision 326808) +++ x11/libxcb/Makefile (working copy) @@ -20,9 +20,8 @@ CONFIGURE_ARGS+=3D --disable-build-docs --without-doxygen --enable-xinpu= t =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig +USES=3D gmake pathfix pkgconfig USE_GNOME=3D libxslt:build -USE_GMAKE=3D yes USE_LDCONFIG=3D yes USE_XORG=3D xau xdmcp USE_PYTHON_BUILD=3D 2.5+ Index: x11/pixman/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/Makefile (revision 326808) +++ x11/pixman/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D pixman -PORTVERSION=3D 0.30.0 +PORTVERSION=3D 0.30.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org @@ -8,10 +8,9 @@ COMMENT=3D Low-level pixel manipulation library =20 USES=3D perl5 +USE_PERL5=3D build XORG_CAT=3D lib USE_AUTOTOOLS=3D libtool -USE_PERL5=3D build -USE_GNOME=3D ltverhack:9 CONFIGURE_ARGS=3D --disable-gtk =20 OPTIONS_DEFINE=3D SIMD Index: x11/pixman/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/distinfo (revision 326808) +++ x11/pixman/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.30.0.tar.bz2) =3D 77e756dc7fafdf17f39a4f23bdc8= be59f9f6a65c08704f5cac1d8aa87cfaf517 -SIZE (xorg/lib/pixman-0.30.0.tar.bz2) =3D 681343 +SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) =3D 4fbb51788fe7cbd8abb5f80aed95= ec878704e57a06328f7bebe0306e3822c96c +SIZE (xorg/lib/pixman-0.30.2.tar.bz2) =3D 666281 Index: x11/xkeyboard-config/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xkeyboard-config/Makefile (revision 326808) +++ x11/xkeyboard-config/Makefile (working copy) @@ -14,9 +14,8 @@ XORG_CAT=3D data =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_GNOME=3D intlhack libxslt:build -USES=3D pathfix perl5 +USES=3D gmake pathfix perl5 USE_PERL5=3D build GNU_CONFIGURE=3D yes MAKE_JOBS_UNSAFE=3Dyes Index: x11/xorg-cf-files/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xorg-cf-files/Makefile (revision 326808) +++ x11/xorg-cf-files/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D xorg-cf-files PORTVERSION=3D 1.0.5 +PORTREVISION=3D 1 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/xtrans/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xtrans/Makefile (revision 326808) +++ x11/xtrans/Makefile (working copy) @@ -8,8 +8,6 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Abstract network code for X =20 -CONFLICTS=3D libXtrans - LICENSE=3D MIT =20 XORG_CAT=3D lib Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (revision 32= 6808) +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (working cop= y) @@ -1,13 +1,65 @@ ---- src/bsd_mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/bsd_mouse.c 2012-07-30 00:49:09.000000000 +0200 -@@ -71,15 +71,20 @@ - static const char *FindDevice(InputInfoPtr, const char *, int); +--- src/bsd_mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/bsd_mouse.c 2013-07-03 01:00:50.897361950 +0200 +@@ -26,6 +26,24 @@ + * authorization from the copyright holder(s) and author(s). + */ =20 - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++/* ++ * XXX - Should this be autoconf'd instead? ++ */ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++#if !defined(USBMOUSE_SUPPORT) ++#define USBMOUSE_SUPPORT ++#endif ++#if !defined(HAS_LIB_USB_HID) ++#define HAS_LIB_USB_HID ++#endif +#if !defined(XPS2_SUPPORT) +#define XPS2_SUPPORT +#endif - /* These are for FreeBSD and DragonFly */ ++ ++#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || define= d(__DragonFly__) */ ++ + #include +=20 + #include +@@ -33,9 +51,23 @@ + #include "xf86Priv.h" + #include "xf86_OSlib.h" + #include "xf86Xinput.h" ++#include + #include "mouse.h" + #include "xisb.h" + #include "mipointer.h" ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 3 ++#define HAVE_PROPERTIES 1 ++#endif ++#ifdef HAVE_PROPERTIES ++#include ++#include ++/* 1.6 has properties, but no labels */ ++#ifdef AXIS_LABEL_PROP ++#define HAVE_LABELS ++#else ++#undef HAVE_LABELS ++#endif ++#endif + #ifdef WSCONS_SUPPORT + #include + #endif +@@ -47,9 +79,6 @@ + #endif +=20 + #include +-#ifdef USB_GET_REPORT_ID +-#define USB_NEW_HID +-#endif +=20 + #define HUP_GENERIC_DESKTOP 0x0001 + #define HUP_BUTTON 0x0009 +@@ -75,11 +104,13 @@ #define DEFAULT_MOUSE_DEV "/dev/mouse" #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" #define DEFAULT_PS2_DEV "/dev/psm0" @@ -21,7 +73,7 @@ NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_S= UPPORT) -@@ -100,7 +105,11 @@ +@@ -100,7 +131,11 @@ #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__= DragonFly__) @@ -34,7 +86,7 @@ #else return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_M= ISC; #endif -@@ -180,9 +189,30 @@ +@@ -180,9 +215,30 @@ { MOUSE_PROTO_SYSMOUSE, "SysMouse" } }; =20 @@ -41,7 +93,7 @@ +#ifdef XPS2_SUPPORT +static struct { + int dmodel; -+ char *name; ++ const char *name; +} ps2proto[] =3D { + { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, + { MOUSE_MODEL_NET, "NetMousePS/2" }, @@ -59,13 +111,13 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) { +#ifdef XPS2_SUPPORT -+ char *dev; ++ const char *dev; +#endif + const char *proto; int i; mousehw_t hw; mousemode_t mode; -@@ -190,7 +220,13 @@ +@@ -190,7 +246,13 @@ if (pInfo->fd =3D=3D -1) return NULL; =20 @@ -79,7 +131,7 @@ i =3D 1; ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); =20 -@@ -209,9 +245,18 @@ +@@ -209,9 +271,18 @@ protoPara[0] =3D mode.syncmask[0]; protoPara[1] =3D mode.syncmask[1]; } @@ -100,7 +152,7 @@ } } } -@@ -234,41 +279,41 @@ +@@ -234,41 +305,41 @@ (protocol && xf86NameCmp(protocol, "SysMouse") =3D=3D 0)) { /* * As the FreeBSD sysmouse driver defaults to protocol level 0 @@ -159,7 +211,7 @@ } return FALSE; } -@@ -276,17 +321,17 @@ +@@ -276,17 +347,17 @@ static const char * FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) { @@ -181,7 +233,7 @@ #endif } else { /* -@@ -295,28 +340,32 @@ +@@ -295,28 +366,32 @@ * the test for whether /dev/sysmouse is usable can be made= =2E */ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { @@ -227,7 +279,749 @@ break; } } -@@ -764,7 +813,9 @@ +@@ -468,30 +543,78 @@ +=20 + #if defined(USBMOUSE_SUPPORT) +=20 ++#define MAXRIDS 64 ++#define MAXACOLS 8 ++#define MAXLCOLS 16 + typedef struct _UsbMseRec { + int packetSize; +- int iid; +- hid_item_t loc_x; /* x locator item */ +- hid_item_t loc_y; /* y locator item */ +- hid_item_t loc_z; /* z (wheel) locator item */ +- hid_item_t loc_w; /* z (wheel) locator item */ +- hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ +- unsigned char *buffer; ++ int iid, nrids, nacols, opened; ++ struct { ++ int32_t rid; ++ int size; ++ } rids[MAXRIDS]; ++ struct UsbMseAcol { ++ InputInfoPtr pInfo; ++ int nlcols, nbuttons, hasZ, hasW; ++ int xmin, xmax, ymin, ymax, pmin, pmax, px, py; ++ int cxmin, cxmax, cymin, cymax, cpmin, cpmax; ++ struct UsbMseLcol { ++ hid_item_t loc_x; /* x locator item */ ++ hid_item_t loc_y; /* y locator item */ ++ hid_item_t loc_z; /* z (wheel) locator item */ ++ hid_item_t loc_w; /* w (hwheel) locator item */ ++ hid_item_t loc_p; /* Tip Pressure */ ++ hid_item_t loc_valid; /* Touch Valid */ ++ hid_item_t loc_in_range; /* In Range */ ++ hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ ++ } lcols[MAXLCOLS]; ++ hid_item_t loc_cc; /* contact count */ ++ } acols[MAXACOLS]; ++ unsigned char *buffer; + } UsbMseRec, *UsbMsePtr; +=20 ++static int * ++usbGetReportSizePtr(UsbMsePtr pUsbMse, int32_t rid) ++{ ++ int i; ++ ++ for (i =3D 0; i < pUsbMse->nrids; i++) { ++ if (pUsbMse->rids[i].rid =3D=3D rid) ++ return (&pUsbMse->rids[i].size); ++ } ++ for (i =3D 0; i < MAXRIDS; i++) { ++ if (pUsbMse->rids[i].size =3D=3D 0) { ++ pUsbMse->rids[i].rid =3D rid; ++ pUsbMse->nrids =3D max(pUsbMse->nrids, i + 1); ++ return (&pUsbMse->rids[i].size); ++ } ++ } ++ return (NULL); ++} ++ + static int + usbMouseProc(DeviceIntPtr pPointer, int what) + { + InputInfoPtr pInfo; + MouseDevPtr pMse; + UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; + unsigned char map[MSE_MAXBUTTONS + 1]; +- int nbuttons; ++ int nacol, nbuttons; ++#ifdef HAVE_LABELS ++ Atom btn_labels[MSE_MAXBUTTONS] =3D {0}; ++ Atom axes_labels[3] =3D { 0, 0, 0 }; ++#endif +=20 + pInfo =3D pPointer->public.devicePrivate; + pMse =3D pInfo->private; + pMse->device =3D pPointer; + pUsbMse =3D pMse->mousePriv; ++ for (nacol =3D 0; nacol < (pUsbMse->nacols - 1); nacol++) { ++ if (pUsbMse->acols[nacol].pInfo =3D=3D pInfo) ++ break; ++ } ++ acol =3D &pUsbMse->acols[nacol]; +=20 + switch (what) { + case DEVICE_INIT: +@@ -500,38 +623,96 @@ + for (nbuttons =3D 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons) + map[nbuttons + 1] =3D nbuttons + 1; +=20 +- InitPointerDeviceStruct((DevicePtr)pPointer, +- map, +- min(pMse->buttons, MSE_MAXBUTTONS), +- miPointerGetMotionEvents, +- pMse->Ctrl, +- miPointerGetMotionBufferSize()); ++#ifdef HAVE_LABELS ++ btn_labels[0] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ btn_labels[1] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ btn_labels[2] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++ axes_labels[0] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_X : AXIS_LABEL_PROP_REL_X); ++ axes_labels[1] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y); ++ axes_labels[2] =3D XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE); ++#endif ++ ++ InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTON= S), ++#ifdef HAVE_LABELS ++ btn_labels, ++#endif ++ map); ++ InitValuatorClassDeviceStruct(pPointer, (acol->pmin !=3D acol->pmax) ?= 3 : 2, ++#ifdef HAVE_LABELS ++ axes_labels, ++#endif ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) =3D=3D 0 ++ miPointerGetMotionEvents, ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ GetMotionHistory, ++#endif ++ GetMotionHistorySize(), ++ (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ? ++ Absolute : Relative); ++ InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl); +=20 + /* X valuator */ +- xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 0, ++#ifdef HAVE_LABELS ++ axes_labels[0], ++#endif ++ (acol->xmin !=3D acol->xmax) ? acol->xmin : -1, ++ (acol->xmin !=3D acol->xmax) ? acol->xmax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->xmin !=3D acol->xmax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 0); + /* Y valuator */ +- xf86InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 1, ++#ifdef HAVE_LABELS ++ axes_labels[1], ++#endif ++ (acol->ymin !=3D acol->ymax) ? acol->ymin : -1, ++ (acol->ymin !=3D acol->ymax) ? acol->ymax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->ymin !=3D acol->ymax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 1); ++ /* Pressure valuator */ ++ if (acol->pmin !=3D acol->pmax) { ++ xf86InitValuatorAxisStruct(pPointer, 2, ++#ifdef HAVE_LABELS ++ axes_labels[2], ++#endif ++ acol->pmin, acol->pmax, 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , Absolute ++#endif ++ ); ++ xf86InitValuatorDefaults(pPointer, 2); ++ } + xf86MotionHistoryAllocate(pInfo); + break; +=20 + case DEVICE_ON: +- pInfo->fd =3D xf86OpenSerial(pInfo->options); +- if (pInfo->fd =3D=3D -1) +- xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo-= >name); +- else { +- pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); +- if (!pMse->buffer) { +- free(pMse); +- xf86CloseSerial(pInfo->fd); +- pInfo->fd =3D -1; +- } else { +- xf86FlushInput(pInfo->fd); +- if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadIn= put, +- pInfo)) +- AddEnabledDevice(pInfo->fd); +- } ++ if (pUsbMse->opened++ =3D=3D 0) { ++ pInfo->fd =3D xf86OpenSerial(pInfo->options); ++ if (pInfo->fd =3D=3D -1) ++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name)= ; ++ else { ++ pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); ++ if (!pMse->buffer) { ++ free(pMse); ++ xf86CloseSerial(pInfo->fd); ++ pInfo->fd =3D -1; ++ } else { ++ xf86FlushInput(pInfo->fd); ++ if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,=20 ++ pInfo)) ++ AddEnabledDevice(pInfo->fd); ++ } ++ } + } + pMse->lastButtons =3D 0; + pMse->lastMappedButtons =3D 0; +@@ -553,6 +734,7 @@ + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; + } ++ pUsbMse->opened--; + pPointer->public.on =3D FALSE; + usleep(300000); + break; +@@ -568,45 +750,154 @@ + { + MouseDevPtr pMse; + UsbMsePtr pUsbMse; +- int buttons =3D pMse->lastButtons; +- int dx =3D 0, dy =3D 0, dz =3D 0, dw =3D 0; +- int n, c; ++ int buttons, cc; ++ int dx, dy, dz, dw, dp, upd, v, nx, ny, np, in_range; ++ int n, c, rid, *sizep, nacol, nlcol; + unsigned char *pBuf; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; +=20 + pMse =3D pInfo->private; + pUsbMse =3D pMse->mousePriv; +=20 + XisbBlockDuration(pMse->buffer, -1); ++next: + pBuf =3D pUsbMse->buffer; + n =3D 0; +- while ((c =3D XisbRead(pMse->buffer)) >=3D 0 && n < pUsbMse->packet= Size) { ++ if (pUsbMse->iid) { ++ rid =3D XisbRead(pMse->buffer); ++ if (rid < 0) ++ return; ++ pBuf[n++] =3D (unsigned char)rid; ++ } else ++ rid =3D 0; ++ sizep =3D usbGetReportSizePtr(pUsbMse, rid); ++ if (sizep =3D=3D NULL || *sizep =3D=3D 0) { ++ xf86Msg(X_WARNING, "%s: unknown report ID %d\n", pInfo->name, rid); ++ goto next; ++ } ++ while (n < *sizep && (c =3D XisbRead(pMse->buffer)) >=3D 0) { + pBuf[n++] =3D (unsigned char)c; + } + if (n =3D=3D 0) + return; +- if (n !=3D pUsbMse->packetSize) { ++// xf86MsgVerb(X_INFO, 3, "pkt: %d %02x %02x %02x %02x %02x %02x %02= x %02x %02x %02x\n", ++// n, pBuf[0], pBuf[1], pBuf[2], pBuf[3], pBuf[4], pBuf[5], pBuf[6], pB= uf[7], pBuf[8], pBuf[9]); ++ if (n !=3D *sizep) { + LogMessageVerbSigSafe(X_WARNING, -1, + "%s: incomplete packet, size %d\n", + pInfo->name, n); + } +- /* discard packets with an id that don't match the mouse */ +- /* XXX this is probably not the right thing */ +- if (pUsbMse->iid !=3D 0) { +- if (*pBuf++ !=3D pUsbMse->iid) +- return; +- } +- dx =3D hid_get_data(pBuf, &pUsbMse->loc_x); +- dy =3D hid_get_data(pBuf, &pUsbMse->loc_y); +- dz =3D hid_get_data(pBuf, &pUsbMse->loc_z); +- dw =3D hid_get_data(pBuf, &pUsbMse->loc_w); +- +- buttons =3D 0; +- for (n =3D 0; n < pMse->buttons; n++) { +- if (hid_get_data(pBuf, &pUsbMse->loc_btn[n])) +- buttons |=3D (1 << UMS_BUT(n)); ++ for (nacol =3D 0; nacol < pUsbMse->nacols; nacol++) { ++ acol =3D &pUsbMse->acols[nacol]; ++ if (acol->pInfo =3D=3D NULL) ++ continue; ++ nx =3D ny =3D np =3D upd =3D 0; ++ buttons =3D cc =3D 0; ++ dx =3D dy =3D dz =3D dw =3D dp =3D 0; ++ for (nlcol =3D 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) { ++ lcol =3D &acol->lcols[nlcol]; ++ ++ if (lcol->loc_valid.usage !=3D 0 && rid =3D=3D lcol->loc_valid.rep= ort_ID && ++ hid_get_data(pBuf, &lcol->loc_valid) =3D=3D 0) ++ continue; ++ if (lcol->loc_in_range.usage !=3D 0 && rid =3D=3D lcol->loc_in_ran= ge.report_ID) ++ in_range =3D hid_get_data(pBuf, &lcol->loc_in_range); ++ else ++ in_range =3D 1; ++ if (in_range && lcol->loc_x.usage !=3D 0 && rid =3D=3D lcol->loc_x= =2Ereport_ID && nx =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_x); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ lcol->loc_x.logical_maximum, lcol->loc_x.logical_minimum); ++ if (acol->cxmin !=3D acol->cxmax) ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ acol->cxmax, acol->cxmin); ++ } ++ dx +=3D v; ++ nx++; ++ } ++ if (in_range && lcol->loc_y.usage !=3D 0 && rid =3D=3D lcol->loc_y= =2Ereport_ID && ny =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_y); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ lcol->loc_y.logical_maximum, lcol->loc_y.logical_minimum); ++ if (acol->cymin !=3D acol->cymax) ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ acol->cymax, acol->cymin); ++ } ++ dy +=3D v; ++ ny++; ++ } ++ if (lcol->loc_z.usage !=3D 0 && rid =3D=3D lcol->loc_z.report_ID) = { ++ dz -=3D hid_get_data(pBuf, &lcol->loc_z); ++ upd =3D 1; ++ } ++ if (lcol->loc_w.usage !=3D 0 && rid =3D=3D lcol->loc_w.report_ID) = { ++ dw +=3D hid_get_data(pBuf, &lcol->loc_w); ++ upd =3D 1; ++ } ++ if (lcol->loc_p.usage !=3D 0 && rid =3D=3D lcol->loc_p.report_ID &= & np =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_p); ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ lcol->loc_p.logical_maximum, lcol->loc_p.logical_minimum); ++ if (acol->cpmin !=3D acol->cpmax) ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ acol->cpmax, acol->cpmin); ++ dp +=3D v; ++ np++; ++ } ++ ++ for (n =3D 0; n < acol->nbuttons; n++) { ++ if (lcol->loc_btn[n].usage !=3D 0 && rid =3D=3D lcol->loc_btn[n].repo= rt_ID) { ++ if (hid_get_data(pBuf, &lcol->loc_btn[n])) ++ buttons |=3D (1 << UMS_BUT(n)); ++ upd =3D 1; ++ } ++ } ++ } ++ if (acol->loc_cc.usage !=3D 0 && rid =3D=3D acol->loc_cc.report_ID) ++ cc =3D hid_get_data(pBuf, &acol->loc_cc); ++ else ++ cc =3D (nx || ny) ? 1 : 0; ++ if (cc > 1) ++ buttons =3D (1 << UMS_BUT(1)); ++ if (nx !=3D 0 && acol->xmin !=3D acol->xmax) ++ dx /=3D nx; ++ if (ny !=3D 0 && acol->ymin !=3D acol->ymax) ++ dy /=3D ny; ++ if (np !=3D 0 && acol->pmin !=3D acol->pmax) ++ dp /=3D np; ++// if (upd || nx || ny || np) ++// xf86MsgVerb(X_INFO, 3, "%d cc %d dx %d dy %d dz %d dw %d press %= d buttons %02x\n", ++// nacol, cc, dx, dy, dz, dw, dp, buttons); ++ if (nx !=3D 0 || ny !=3D 0) { ++ if (acol->pmin !=3D acol->pmax) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 3, ++ dx, dy, dp); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->yma= x) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 2, ++ dx, dy); ++ } ++ } ++ if (upd || (nx !=3D 0) || (ny !=3D 0)) { ++ ((MouseDevPtr)acol->pInfo->private)->PostEvent(acol->pInfo, button= s, ++ ((acol->xmin !=3D acol->xmax) ? dx - acol->px : dx), ++ ((acol->ymin !=3D acol->ymax) ? dy - acol->py : dy), ++ dz, dw); ++ } ++ if (nx > 0) ++ acol->px =3D dx; ++ if (ny > 0) ++ acol->py =3D dy; + } +- pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw); +- return; ++ goto next; + } +=20 + static void +@@ -615,14 +906,17 @@ + usbReadInput ((InputInfoPtr) closure); + } +=20 +-/* This function is called when the protocol is "usb". */ + static Bool +-usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++usbInitFirst(InputInfoPtr pInfo) + { + MouseDevPtr pMse =3D pInfo->private; + UsbMsePtr pUsbMse; + report_desc_t reportDesc; +- int i; ++ hid_data_t d; ++ hid_item_t h; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; ++ int mdepth, rsize, *rsizep, acolused, lcolused, used; +=20 + pUsbMse =3D malloc(sizeof(UsbMseRec)); + if (pUsbMse =3D=3D NULL) { +@@ -631,12 +925,7 @@ + return FALSE; + } +=20 +- pMse->protocol =3D protocol; +- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); +- +- /* Collect the options, and process the common options. */ +- COLLECT_INPUT_OPTIONS(pInfo, NULL); +- xf86ProcessCommonOptions(pInfo, pInfo->options); ++ bzero(pUsbMse, sizeof(UsbMseRec)); +=20 + /* Check if the device can be opened. */ + pInfo->fd =3D xf86OpenSerial(pInfo->options); +@@ -652,19 +941,134 @@ + } + /* Get USB informations */ + reportDesc =3D hid_get_report_desc(pInfo->fd); +- /* Get packet size & iid */ +-#ifdef USB_NEW_HID +- if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) =3D=3D -1) {= +- xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\= n", +- pInfo->name, strerror(errno)); +- return FALSE; +- } +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- pUsbMse->iid); +-#else +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- &pUsbMse->iid); +-#endif ++ mdepth =3D 0; ++ pUsbMse->nacols =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ acolused =3D 0; ++ lcolused =3D 0; ++ d =3D hid_start_parse(reportDesc, (1 << hid_input) | ++ (1 << hid_collection) | (1 << hid_endcollection), -1); ++ while (hid_get_item(d, &h)) { ++ switch (h.kind) { ++ case hid_collection: ++ if (mdepth !=3D 0) ++ mdepth++; ++ else if (h.collection =3D=3D 1 && ++ (h.usage =3D=3D 0x00010001 || h.usage =3D=3D 0x00010002 || ++ (h.usage >=3D 0x000d0001 && h.usage <=3D 0x000d000d))) { ++ mdepth++; ++ if (acolused) { ++ if (lcolused) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ } ++ pUsbMse->nacols++; ++ acolused =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ } ++ if (lcolused && (h.collection =3D=3D 0 || ++ h.collection =3D=3D 2 || h.collection =3D=3D 3)) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ break; ++ case hid_endcollection: ++ if (mdepth !=3D 0) ++ mdepth--; ++ break; ++ case hid_input: ++ if (h.report_ID !=3D 0) ++ pUsbMse->iid =3D 1; ++ rsize =3D pUsbMse->iid + ++ (h.pos + (h.report_size * h.report_count) + 7) / 8; ++ if ((rsizep =3D usbGetReportSizePtr(pUsbMse, h.report_ID)) !=3D NU= LL) ++ *rsizep =3D max(*rsizep, rsize); ++ pUsbMse->packetSize =3D max(pUsbMse->packetSize, rsize); ++ if (mdepth =3D=3D 0) ++ break; ++ used =3D 1; ++ if (h.usage =3D=3D 0x00010030) { /* X */ ++ lcol->loc_x =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->xmin =3D=3D acol->xmax) { ++ acol->xmin =3D h.logical_minimum; ++ acol->xmax =3D h.logical_maximum; ++ } else { ++ acol->xmin =3D min(acol->xmin, h.logical_minimum); ++ acol->xmax =3D max(acol->xmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010031) { /* Y */ ++ lcol->loc_y =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->ymin =3D=3D acol->ymax) { ++ acol->ymin =3D h.logical_minimum; ++ acol->ymax =3D h.logical_maximum; ++ } else { ++ acol->ymin =3D min(acol->ymin, h.logical_minimum); ++ acol->ymax =3D max(acol->ymax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010038) { /* Z */ ++ lcol->loc_z =3D h; ++ acol->hasZ =3D 1; ++ } else if (h.usage =3D=3D 0x000c0238) { /* W */ ++ lcol->loc_w =3D h; ++ acol->hasW =3D 1; ++ } else if (h.usage =3D=3D 0x000d0030) { /* Press */ ++ lcol->loc_p =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->pmin =3D=3D acol->pmax) { ++ acol->pmin =3D h.logical_minimum; ++ acol->pmax =3D h.logical_maximum; ++ } else { ++ acol->pmin =3D min(acol->pmin, h.logical_minimum); ++ acol->pmax =3D max(acol->pmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x000d0032) /* In Range */ ++ lcol->loc_in_range =3D h; ++ else if (h.usage =3D=3D 0x000d0047) /* Valid */ ++ lcol->loc_valid =3D h; ++ else if (h.usage > 0x00090000 && ++ h.usage <=3D 0x00090000 + MSE_MAXBUTTONS) { /* Buttons */ ++ lcol->loc_btn[(h.usage & 0xffff) - 1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, h.usage & 0xffff); ++ } else if (h.usage =3D=3D 0x000d0042) { /* Tip Switch */ ++ lcol->loc_btn[0] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 1); ++ } else if (h.usage =3D=3D 0x000d0044) { /* Barrel Switch */ ++ lcol->loc_btn[1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 2); ++ } else if (h.usage =3D=3D 0x000d0045) { /* Eraser */ ++ lcol->loc_btn[3] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 4); ++ } else if (h.usage =3D=3D 0x000d0046) { /* Tablet Pick */ ++ lcol->loc_btn[2] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 3); ++ } else if (h.usage =3D=3D 0x000d0054) /* Contact Count */ ++ acol->loc_cc =3D h; ++ else ++ used =3D 0; ++ lcolused +=3D used; ++ acolused +=3D used; ++ break; ++ default: ++ break; ++ } ++ } ++ if (lcolused) ++ acol->nlcols++; ++ if (acolused) ++ pUsbMse->nacols++; ++ hid_end_parse(d); ++ xf86Msg(X_DEFAULT, "%s: Found %d usable logical collections\n", ++ pInfo->name, pUsbMse->nacols); ++ + /* Allocate buffer */ + if (pUsbMse->packetSize <=3D 8) { + pUsbMse->buffer =3D pMse->protoBuf; +@@ -674,56 +1078,129 @@ + if (pUsbMse->buffer =3D=3D NULL) { + xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name); + free(pUsbMse); +- free(pMse); + xf86CloseSerial(pInfo->fd); + return FALSE; + } +-#ifdef USB_NEW_HID +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) { +- } +-#else +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z) < 0) { +- } +-#endif +- /* Probe for number of buttons */ +- for (i =3D 1; i <=3D MSE_MAXBUTTONS; i++) { +- if (!hid_locate(reportDesc, HID_USAGE2(HUP_BUTTON, i), +- hid_input, &pUsbMse->loc_btn[i-1] +-#ifdef USB_NEW_HID +- , pUsbMse->iid +-#endif +- )) +- break; +- } +- pMse->buttons =3D i-1; +=20 + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; +=20 + /* Private structure */ + pMse->mousePriv =3D pUsbMse; ++ return TRUE; ++} ++ ++/* This function is called when the protocol is "usb". */ ++static Bool ++usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++{ ++ InputInfoPtr pMatch; ++ MouseDevPtr pMse =3D pInfo->private; ++ UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; ++ char *str; ++ int i, colopt; ++ ++ pMse->protocol =3D protocol; ++ xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); ++ ++ /* Collect the options, and process the common options. */ ++ COLLECT_INPUT_OPTIONS(pInfo, NULL); ++ xf86ProcessCommonOptions(pInfo, pInfo->options); ++ ++ /* Check if this HID device is already opened. */ ++ for (pMatch =3D xf86FirstLocalDevice(); pMatch !=3D NULL; pMatch =3D= pMatch->next) { ++ if ((pInfo !=3D pMatch) && strstr(pMatch->drv->driverName, "mouse")) {= ++ char *dev1, *dev2; ++ ++ dev1 =3D xf86SetStrOption(pInfo->options, "Device", NULL); ++ dev2 =3D xf86SetStrOption(pMatch->options, "Device", NULL); ++ if (strcmp(dev1, dev2) =3D=3D 0) { ++ free(dev1); ++ free(dev2); ++ break; ++ } ++ free(dev1); ++ free(dev2); ++ } ++ } ++ if (pMatch =3D=3D NULL) { ++ xf86Msg(X_DEFAULT, "%s: Opening new HID device\n", pInfo->name); ++ if (!usbInitFirst(pInfo)) { ++ free(pMse); ++ return FALSE; ++ } ++ } else { ++ pMse->mousePriv =3D ((MouseDevPtr)pMatch->private)->mousePriv; ++ xf86Msg(X_DEFAULT, "%s: Attaching to already opened HID device\n", ++ pInfo->name); ++ } ++ pUsbMse =3D pMse->mousePriv; ++ ++ /* Attach to collection, respecting "Collection" option. */ ++ colopt =3D xf86SetIntOption(pInfo->options, "Collection", 0); ++ for (i =3D 0; i < pUsbMse->nacols; i++) { ++ if (pUsbMse->acols[i].pInfo =3D=3D NULL && ++ (colopt =3D=3D 0 || i =3D=3D colopt - 1)) { ++ pUsbMse->acols[i].pInfo =3D pInfo; ++ break; ++ } ++ } ++ xf86Msg(colopt =3D=3D 0 ? X_DEFAULT : X_CONFIG, ++ "%s: Collection: %d\n", pInfo->name, ++ i =3D=3D pUsbMse->nacols ? colopt : i + 1); ++ if (i =3D=3D pUsbMse->nacols) { ++ xf86Msg(X_ERROR, ++ "%s: Application collection not found or already handled\n", ++ pInfo->name); ++ free(pMse); ++ return FALSE; ++ } ++ ++ acol =3D &pUsbMse->acols[i]; ++ pMse->buttons =3D acol->nbuttons; ++ if (pMse->buttons =3D=3D 2) ++ pMse->buttons =3D 3; ++ if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ++ pMse->disableXY =3D TRUE; ++ pMse->hasZ =3D acol->hasZ; ++ pMse->hasW =3D acol->hasW; +=20 + /* Process common mouse options (like Emulate3Buttons, etc). */ + pMse->CommonOptions(pInfo); +=20 ++ /* Process "Calibration" option. */ ++ str =3D xf86CheckStrOption(pInfo->options, "Calibration", NULL); ++ if (str !=3D NULL && (acol->xmin !=3D acol->xmax || acol->ymin !=3D= acol->ymax)) { ++ int j, xmin, xmax, ymin, ymax, pmin, pmax; ++ ++ j =3D sscanf(str, "%d %d %d %d %d %d", &xmin, &xmax, &ymin, &ymax, &pm= in, &pmax); ++ if (j =3D=3D 4) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ } else if (j =3D=3D 6) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax, pmin, pmax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ acol->cpmin =3D pmin; ++ acol->cpmax =3D pmax; ++ } else ++ xf86Msg(X_WARNING, "%s: Calibration: Invalid arguments\n", ++ pInfo->name); ++ free(str); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax= ) { ++ xf86Msg(X_DEFAULT, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, acol->xmin, acol->xmax, acol->ymin, acol->ymax, ++ acol->pmin, acol->pmax); ++ } ++ + /* Setup the local procs. */ + pInfo->device_control =3D usbMouseProc; + pInfo->read_input =3D usbReadInput; +@@ -766,7 +1243,9 @@ p->CheckProtocol =3D CheckProtocol; #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__D= ragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto =3D SetupAuto; Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (revision 326808= ) +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (working copy) @@ -1,5 +1,5 @@ ---- src/mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/mouse.c 2012-07-30 00:31:48.000000000 +0200 +--- src/mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/mouse.c 2013-07-03 01:04:45.398343993 +0200 @@ -280,13 +280,39 @@ =20 pMse =3D pInfo->private; @@ -135,7 +135,7 @@ =20 protocol =3D MousePickProtocol(pInfo, device, protocol, &protocolID= ); =20 -@@ -2137,7 +2148,7 @@ +@@ -2136,7 +2147,7 @@ =20 if (pMse->emulateWheel) { /* Emulate wheel button handling */ @@ -144,7 +144,7 @@ wheelButtonMask =3D 0; else wheelButtonMask =3D 1 << (pMse->wheelButton - 1); -@@ -2221,6 +2232,9 @@ +@@ -2220,6 +2231,9 @@ } } } @@ -154,7 +154,7 @@ } =20 /* Absorb the mouse movement while the wheel button is pres= sed. */ -@@ -2238,7 +2252,7 @@ +@@ -2237,7 +2251,7 @@ if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy= )) buttonTimer(pInfo); =20 @@ -163,8 +163,21 @@ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); =20 if (change) { -@@ -2448,11 +2462,11 @@ +@@ -2349,12 +2363,10 @@ + int dx, int dy, int dz, int dw) + { + MouseDevPtr pMse; +- mousePrivPtr mousepriv; + int zbutton =3D 0, wbutton =3D 0, zbuttoncount =3D 0, wbuttoncount = =3D 0; + int i, b, buttons =3D 0; =20 + pMse =3D pInfo->private; +- mousepriv =3D (mousePrivPtr)pMse->mousePriv; +=20 + if (pMse->protocolID =3D=3D PROT_MMHIT) + b =3D reverseBits(hitachMap, truebuttons); +@@ -2447,11 +2459,11 @@ +=20 /* Accumulate the scaled dx, dy in the private variables fracdx,fracdy and return the integer number part */ - if (mousepriv) { Index: x11-drivers/xf86-input-synaptics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/Makefile (revision 326808) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -10,22 +10,10 @@ =20 CONFLICTS=3D synaptics-[0-9]* =20 -OPTIONS_DEFINE=3D HAL -OPTIONS_DEFAULT=3DHAL - -.include - USES=3D pathfix -USE_XORG=3D x11 +USE_XORG=3D x11 xtst XORG_CAT=3D driver =20 -.if ${PORT_OPTIONS:MHAL} -PLIST_SUB+=3D HAL=3D"" -LIB_DEPENDS+=3D hal.1:${PORTSDIR}/sysutils/hal -.else -PLIST_SUB+=3D HAL=3D"@comment " -.endif - MAN1=3D syndaemon.1 \ synclient.1 MAN4=3D synaptics.4x @@ -41,16 +29,4 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-Makefile.in .endif =20 -post-install: -.if ${PORT_OPTIONS:MHAL} - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/10osvendor/ -.if !defined(WITH_NEW_XORG) - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/20thirdparty/ -.endif -.endif - .include Index: x11-drivers/xf86-input-synaptics/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/pkg-plist (revision 326808) +++ x11-drivers/xf86-input-synaptics/pkg-plist (working copy) @@ -6,13 +6,7 @@ lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg @dirrmtry include/xorg -%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor -%%HAL%%@dirrmtry share/hal/fdi/policy -%%HAL%%@dirrmtry share/hal/fdi -%%HAL%%@dirrmtry share/hal Index: x11-drivers/xf86-video-ati/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/Makefile (revision 326808) +++ x11-drivers/xf86-video-ati/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D xf86-video-ati -PORTVERSION=3D 6.14.6 +PORTVERSION=3D ${ATI_VERSION} CATEGORIES=3D x11-drivers =20 MAINTAINER=3D x11@FreeBSD.org @@ -12,6 +12,17 @@ USE_XORG=3D xf86driproto xineramaproto xf86miscproto glproto MAN4=3D ati.4x radeon.4x =20 +.include + +.if ${OSVERSION} < 1000051 +ATI_VERSION=3D 6.14.6 CONFIGURE_ARGS+=3D--disable-kms +PLIST_SUB+=3D OLD=3D"" +.else +ATI_VERSION=3D 7.2.0 +CONFIGURE_ARGS+=3D--disable-udev +EXTRA_PATCHES+=3D ${FILESDIR}/extra-src__radeon_kms.c +PLIST_SUB+=3D OLD=3D"@comment " +.endif =20 -.include +.include Index: x11-drivers/xf86-video-ati/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/distinfo (revision 326808) +++ x11-drivers/xf86-video-ati/distinfo (working copy) @@ -1,2 +1,4 @@ SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D aa5286b3e4f0187d7= df14785c06dd800255d9405205dbf061da5d77df86bec36 SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D 1139495 +SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D f30f5efdc8d7d18d06= eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 +SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D 824613 Index: x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (revision 0)= +++ x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (working cop= y) @@ -0,0 +1,20 @@ +--- src/radeon_kms.c.orig 2013-08-07 10:44:09.000000000 +0200 ++++ src/radeon_kms.c 2013-08-31 01:20:44.370468797 +0200 +@@ -270,7 +270,7 @@ + radeon_dirty_update(ScreenPtr screen) + { + RegionPtr region; +- PixmapDirtyUpdatePtr ent; ++ PixmapDirtyUpdatePtr ent =3D NULL; +=20 + if (xorg_list_is_empty(&screen->pixmap_dirty_list)) + return; +@@ -606,7 +606,7 @@ + dev->domain, dev->bus, dev->dev, dev->func); + #endif +=20 +- info->dri2.drm_fd =3D drmOpen("radeon", busid); ++ info->dri2.drm_fd =3D drmOpen("radeonkms", busid); + if (info->dri2.drm_fd =3D=3D -1) { +=20 + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, Property changes on: x11-drivers/xf86-video-ati/files/extra-src__radeon_k= ms.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (revision 0= ) +++ x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (working co= py) @@ -0,0 +1,11 @@ +--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 ++++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 +@@ -578,7 +578,7 @@ + radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, = pointer data, pointer calldata) + { + DRI2ClientEventsPtr pClientEventsPriv; +- DRI2FrameEventPtr ref; ++ DRI2FrameEventPtr ref =3D NULL; + NewClientInfoRec *clientinfo =3D calldata; + ClientPtr pClient =3D clientinfo->client; + pClientEventsPriv =3D GetDRI2ClientEvents(pClient); Property changes on: x11-drivers/xf86-video-ati/files/patch-src__radeon_d= ri2.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-drivers/xf86-video-ati/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/pkg-plist (revision 326808) +++ x11-drivers/xf86-video-ati/pkg-plist (working copy) @@ -2,13 +2,13 @@ lib/xorg/modules/drivers/ati_drv.so lib/xorg/modules/drivers/radeon_drv.la lib/xorg/modules/drivers/radeon_drv.so -lib/xorg/modules/multimedia/theatre200_drv.la -lib/xorg/modules/multimedia/theatre200_drv.so -lib/xorg/modules/multimedia/theatre_detect_drv.la -lib/xorg/modules/multimedia/theatre_detect_drv.so -lib/xorg/modules/multimedia/theatre_drv.la -lib/xorg/modules/multimedia/theatre_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so @dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules/multimedia +%%OLD%%@dirrmtry lib/xorg/modules/multimedia @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Index: x11-drivers/xf86-video-intel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/Makefile (revision 326808) +++ x11-drivers/xf86-video-intel/Makefile (working copy) @@ -28,20 +28,20 @@ .include =20 .if defined(WITH_NEW_XORG) -INTEL_VERSION=3D 2.21.9 +INTEL_VERSION=3D 2.21.15 INTEL_REVISION=3D 0 +CONFIGURE_ENV+=3D xorg_cv_cc_flag__Wno_maybe_uninitialized=3Dno CONFIGURE_ARGS+=3D --enable-sna MAKE_JOBS_UNSAFE=3Dyes PLIST_SUB+=3D OLD=3D"@comment " -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-clang \ - ${PATCHDIR}/extra-src_sna_compiler.h \ +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${PATCHDIR}/extra-src_sna_kgem.c \ - ${PATCHDIR}/extra-src__sna__sna_threads.c \ + ${PATCHDIR}/extra-clang \ ${PATCHDIR}/extra-i915kms LIB_DEPENDS+=3D xcb-util:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION=3D 2.7.1 -INTEL_REVISION=3D 4 +INTEL_REVISION=3D 5 PLIST_SUB+=3D OLD=3D"" =20 EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src_ch7017_ch7017.c \ Index: x11-drivers/xf86-video-intel/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/distinfo (revision 326808) +++ x11-drivers/xf86-video-intel/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 255c0d54249cc013= 2f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 780625 -SHA256 (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1359cbc9e494a28= 4faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189 -SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1735037 +SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 7d5a140f82a72f= d1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc +SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 1977431 Index: x11-drivers/xf86-video-intel/files/extra-clang =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-clang (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-clang (working copy) @@ -1,27 +1,15 @@ ---- src/intel_display.c.orig 2012-12-11 20:33:06.000000000 +0100 -+++ src/intel_display.c 2012-12-11 20:33:45.000000000 +0100 -@@ -1691,7 +1691,7 @@ - static drmModeEncoderPtr - intel_get_kencoder(struct intel_mode *mode, int num) +--- src/sna/sna_cpu.c.orig 2013-08-14 12:04:40.231041285 +0200 ++++ src/sna/sna_cpu.c 2013-08-14 12:05:51.237030719 +0200 +@@ -41,6 +41,7 @@ { -- struct intel_output *iterator; -+ struct intel_output *iterator =3D NULL; - int id =3D mode->mode_res->encoders[num]; + unsigned max =3D __get_cpuid_max(BASIC_CPUID, NULL); + unsigned int eax, ebx, ecx, edx; ++ eax =3D ebx =3D ecx =3D edx =3D 0; + unsigned features =3D 0; + unsigned extra =3D 0; =20 - list_for_each_entry(iterator, &mode->outputs, link) ---- src/intel_batchbuffer.c.orig 2012-12-11 20:34:55.000000000 +0100 -+++ src/intel_batchbuffer.c 2012-12-11 20:35:19.000000000 +0100 -@@ -119,7 +119,7 @@ - static void intel_batch_do_flush(ScrnInfoPtr scrn) - { - intel_screen_private *intel =3D intel_get_screen_private(scrn); -- struct intel_pixmap *priv; -+ struct intel_pixmap *priv =3D NULL; -=20 - list_for_each_entry(priv, &intel->batch_pixmaps, batch) - priv->dirty =3D 0; ---- src/sna/sna_damage.c.orig 2012-12-11 20:41:38.000000000 +0100 -+++ src/sna/sna_damage.c 2012-12-11 20:42:23.000000000 +0100 +--- src/sna/sna_damage.c.orig 2013-08-14 12:06:26.381036854 +0200 ++++ src/sna/sna_damage.c 2013-08-14 12:07:23.684023065 +0200 @@ -410,7 +410,7 @@ int n, nboxes; BoxPtr boxes, free_boxes =3D NULL; @@ -31,7 +19,7 @@ =20 assert(damage->mode !=3D DAMAGE_ALL); assert(damage->dirty); -@@ -1671,7 +1671,7 @@ +@@ -1709,7 +1709,7 @@ { int n, nboxes; BoxPtr boxes; @@ -40,8 +28,30 @@ =20 RegionCopy(r, &damage->region); if (!damage->dirty) ---- uxa/uxa-accel.c.orig 2012-12-11 20:50:56.000000000 +0100 -+++ uxa/uxa-accel.c 2012-12-11 20:51:14.000000000 +0100 +--- src/uxa/intel_batchbuffer.c.orig 2013-08-14 12:08:14.323028320 +0200= ++++ src/uxa/intel_batchbuffer.c 2013-08-14 12:08:37.202016923 +0200 +@@ -141,7 +141,7 @@ + static void intel_batch_do_flush(ScrnInfoPtr scrn) + { + intel_screen_private *intel =3D intel_get_screen_private(scrn); +- struct intel_pixmap *priv; ++ struct intel_pixmap *priv =3D NULL; +=20 + list_for_each_entry(priv, &intel->batch_pixmaps, batch) + priv->dirty =3D 0; +--- src/uxa/intel_display.c.orig 2013-08-14 12:09:25.802015629 +0200 ++++ src/uxa/intel_display.c 2013-08-14 12:09:51.034009844 +0200 +@@ -1753,7 +1753,7 @@ + static drmModeEncoderPtr + intel_get_kencoder(struct intel_mode *mode, int num) + { +- struct intel_output *iterator; ++ struct intel_output *iterator =3D NULL; + int id =3D mode->mode_res->encoders[num]; +=20 + list_for_each_entry(iterator, &mode->outputs, link) +--- src/uxa/uxa-accel.c.orig 2013-08-14 12:02:11.898048975 +0200 ++++ src/uxa/uxa-accel.c 2013-08-14 12:03:39.336042139 +0200 @@ -944,7 +944,7 @@ =20 if (uxa_screen->info->flags & UXA_USE_GLAMOR) { Index: x11-drivers/xf86-video-intel/files/extra-i915kms =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-i915kms (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-i915kms (working copy) @@ -1,13 +1,13 @@ ---- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300 -+++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200 -@@ -393,8 +393,8 @@ - dev->domain, dev->bus, dev->dev, dev->func); +--- src/intel_device.c.orig 2013-06-30 16:03:51.000000000 +0200 ++++ src/intel_device.c 2013-07-02 14:08:34.903060688 +0200 +@@ -94,8 +94,8 @@ + pci->domain, pci->bus, pci->dev, pci->func); =20 - ret =3D drmCheckModesettingSupported(id); -- if (ret) { -- if (xf86LoadKernelModule("i915")) -+ if (ret || 1) { -+ if (xf86LoadKernelModule("i915kms")) - ret =3D drmCheckModesettingSupported(id); - if (ret) - return FALSE; + ret =3D drmCheckModesettingSupported(id); +- if (ret) { +- if (xf86LoadKernelModule("i915")) ++ if (ret || 1) { ++ if (xf86LoadKernelModule("i915kms")) + ret =3D drmCheckModesettingSupported(id); + if (ret) + return -1; Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (revision= 326808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (working = copy) @@ -1,18 +0,0 @@ ---- src/sna/compiler.h.orig 2013-03-12 12:48:29.745101779 +0100 -+++ src/sna/compiler.h 2013-03-12 12:48:52.857102997 +0100 -@@ -37,7 +37,6 @@ - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) - #define pure __attribute__((pure)) --#define __packed__ __attribute__((__packed__)) - #define flatten __attribute__((flatten)) - #else - #define likely(expr) (expr) -@@ -48,7 +47,6 @@ - #define must_check - #define constant - #define pure --#define __packed__ - #define flatten - #endif -=20 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (revision 326= 808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (working copy= ) @@ -1,18 +1,14 @@ ---- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100 -+++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100 -@@ -658,7 +658,11 @@ - if (file) { - size_t len =3D 0; - char *line =3D NULL; -+#ifdef __GLIBC__ - while (getline(&line, &len, file) !=3D -1) { -+#else -+ while ((line =3D fgetln(file, &len)) !=3D (char *) NULL) { -+#endif - int mb; - if (sscanf(line, "cache size : %d KB", &mb) =3D=3D 1) { - /* Paranoid check against gargantuan caches */ -@@ -1666,7 +1670,8 @@ +--- src/sna/kgem.c.orig 2013-08-04 11:10:59.000000000 +0200 ++++ src/sna/kgem.c 2013-08-14 11:59:14.787060294 +0200 +@@ -25,6 +25,7 @@ + * + */ +=20 ++#define _WITH_GETLINE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -1890,7 +1891,8 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned = flags) { @@ -22,7 +18,7 @@ =20 DBG(("%s: num_pages=3D%d, flags=3D%x\n", __FUNCTION__, num_pages, flag= s)); =20 -@@ -1868,7 +1873,8 @@ +@@ -2104,7 +2106,8 @@ =20 static bool kgem_retire__flushing(struct kgem *kgem) { @@ -32,7 +28,7 @@ bool retired =3D false; =20 list_for_each_entry_safe(bo, next, &kgem->flushing, request) { -@@ -2073,7 +2079,8 @@ +@@ -2309,7 +2312,8 @@ static void kgem_commit(struct kgem *kgem) { struct kgem_request *rq =3D kgem->next_request; @@ -42,7 +38,7 @@ =20 list_for_each_entry_safe(bo, next, &rq->buffers, request) { assert(next->request.prev =3D=3D &bo->request); -@@ -2154,7 +2161,8 @@ +@@ -2390,7 +2394,8 @@ =20 static void kgem_finish_buffers(struct kgem *kgem) { @@ -51,8 +47,8 @@ + struct kgem_buffer *next; =20 list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) { - DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%d\n", -@@ -2963,7 +2971,8 @@ + DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%s\n", +@@ -3252,7 +3257,8 @@ static struct kgem_bo * search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned= flags) { @@ -62,7 +58,7 @@ bool use_active =3D (flags & CREATE_INACTIVE) =3D=3D 0; struct list *cache; =20 -@@ -3521,7 +3530,7 @@ +@@ -3855,7 +3861,7 @@ uint32_t flags) { struct list *cache; @@ -71,7 +67,7 @@ uint32_t pitch, tiled_height, size; uint32_t handle; int i, bucket, retry; -@@ -4834,7 +4843,7 @@ +@@ -5302,7 +5308,7 @@ void kgem_clear_dirty(struct kgem *kgem) { struct list * const buffers =3D &kgem->next_request->buffers; @@ -79,8 +75,8 @@ + struct kgem_bo *bo =3D NULL; =20 list_for_each_entry(bo, buffers, request) { - if (!bo->dirty) -@@ -5072,7 +5081,7 @@ + if (!bo->gpu_dirty) +@@ -5578,7 +5584,7 @@ uint32_t size, uint32_t flags, void **ret) { Index: x11-drivers/xorg-drivers/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xorg-drivers/Makefile (revision 326808) +++ x11-drivers/xorg-drivers/Makefile (working copy) @@ -10,7 +10,7 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D X.org drivers meta-port =20 -.MAKE.FreeBSD_UL=3D yes +.MAKE.FreeBSD_UL=3D yes =20 VIDEODIR=3D ${PREFIX}/lib/xorg/modules/drivers INPUTDIR=3D ${PREFIX}/lib/xorg/modules/input Index: x11-fonts/xfs/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-fonts/xfs/Makefile (revision 326808) +++ x11-fonts/xfs/Makefile (working copy) @@ -9,7 +9,7 @@ COMMENT=3D X.Org font server =20 XORG_CAT=3D app -USE_GMAKE=3D yes +USES=3D gmake USE_XORG=3D libfs xfont xtrans USE_RC_SUBR=3D xfs CONFIGURE_ARGS=3D --without-xmlto --without-fop Index: x11-servers/xephyr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xephyr/Makefile (revision 326808) +++ x11-servers/xephyr/Makefile (working copy) @@ -1,7 +1,6 @@ # $FreeBSD$ =20 PORTNAME=3D xephyr -PORTREVISION=3D 0 =20 COMMENT=3D X server from X.Org based on kdrive =20 Index: x11-servers/xorg-dmx/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-dmx/Makefile (revision 326808) +++ x11-servers/xorg-dmx/Makefile (working copy) @@ -2,7 +2,6 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-dmx -PORTREVISION=3D 0 =20 COMMENT=3D Distributed Multihead X from X.Org =20 Index: x11-servers/xorg-nestserver/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-nestserver/Makefile (revision 326808) +++ x11-servers/xorg-nestserver/Makefile (working copy) @@ -23,6 +23,8 @@ PLIST_FILES=3D bin/Xnest MAN1=3D Xnest.1 =20 +.include + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/ .if defined(WITH_NEW_XORG) Index: x11-servers/xorg-server/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/Makefile (revision 326808) +++ x11-servers/xorg-server/Makefile (working copy) @@ -20,14 +20,28 @@ XORG_CAT=3D xserver SLAVE_PORT?=3D no =20 +OPTIONS_DEFINE=3D AIGLX SUID +OPTIONS_RADIO=3D CONF +OPTIONS_RADIO_CONF=3D HAL DEVD +AIGLX_DESC=3D Compile with Accelerated Indirect GLX support +SUID_DESC=3D Install the Xorg server with setuid bit set +HAL_DESC=3D Compile with HAL config support +DEVD_DESC=3D Use devd for autoconfiguration of input devices +OPTIONS_DEFAULT=3DAIGLX SUID DEVD + +OPTIONS_EXCLUDE_sparc64=3D HAL + +.include + .if defined(WITH_NEW_XORG) XORG_VERSION=3D 1.12.4 -XORG_REVISION=3D 1 +XORG_REVISION=3D 2 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" -EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang +EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang \ + ${FILESDIR}/extra-configure .else XORG_VERSION=3D 1.7.7 -XORG_REVISION=3D 8 +XORG_REVISION=3D 9 PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " EXTRA_PATCHES+=3D ${FILESDIR}/extra-Xext-xace.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ @@ -39,10 +53,8 @@ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c .endif =20 -USES=3D perl5 -USE_PERL5=3D build USE_BZIP2=3D yes -USE_GMAKE=3D yes +USES=3D gmake USE_GL=3D gl USE_XORG?=3D xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xa= w7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ @@ -54,6 +66,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes USE_OPENSSL=3D yes +USE_PERL5_BUILD=3Dyes CONFIGURE_ARGS?=3D--disable-dmx --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=3D/var --without-dtrace --disable-xephyr \ @@ -78,14 +91,6 @@ PLIST=3D ${.CURDIR}/pkg-plist .endif =20 -OPTIONS_DEFINE=3D AIGLX SUID HAL -AIGLX_DESC=3D Compile with Accelerated Indirect GLX support -SUID_DESC=3D Install the Xorg server with setuid bit set -HAL_DESC=3D Compile with HAL config support -OPTIONS_DEFAULT=3D AIGLX SUID HAL - -OPTIONS_EXCLUDE_sparc64=3D HAL - .include =20 .if defined(WITH_OPENSSL_BASE) @@ -102,6 +107,10 @@ CONFIGURE_ARGS+=3D --enable-config-hal=3Dno .endif =20 +.if ${PORT_OPTIONS:MDEVD} +EXTRA_PATCHES+=3D extra-config_devd.c +.endif + .if ${PORT_OPTIONS:MAIGLX} CONFIGURE_ARGS+=3D --enable-aiglx=3Dyes .else @@ -171,6 +180,17 @@ @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =3D|@GLX_BOGUS@GLXMODS =3D|g'= \ -e 's|^LTLIBRARIES =3D |LTLIBRARIES =3D libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in +.if ${PORT_OPTIONS:MDEVD} + @${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(v= oid);" \ + >> ${WRKSRC}/config/config-backends.h +.endif +=20 +post-configure: +.if ${PORT_OPTIONS:MDEVD} + @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ + -e 's|config\.lo|config.lo devd.lo|g' \ + ${WRKSRC}/config/Makefile +.endif =20 .if ${SLAVE_PORT} =3D=3D "no" pre-su-install: Index: x11-servers/xorg-server/files/extra-config_devd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-config_devd.c (revision 0) +++ x11-servers/xorg-server/files/extra-config_devd.c (working copy) @@ -0,0 +1,481 @@ +--- /dev/null 2013-08-03 00:44:23.000000000 +0200 ++++ config/devd.c 2013-08-03 00:45:15.162836806 +0200 +@@ -0,0 +1,478 @@ ++/* ++ * Copyright =C2=A9 2012 Baptiste Daroussin ++ * ++ * Permission is hereby granted, free of charge, to any person obtainin= g a ++ * copy of this software and associated documentation files (the "Softw= are"), ++ * to deal in the Software without restriction, including without limit= ation ++ * the rights to use, copy, modify, merge, publish, distribute, sublice= nse, ++ * and/or sell copies of the Software, and to permit persons to whom th= e ++ * Software is furnished to do so, subject to the following conditions:= ++ * ++ * The above copyright notice and this permission notice (including the= next ++ * paragraph) shall be included in all copies or substantial portions o= f the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPR= ESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL= ITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT S= HALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR= OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARIS= ING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Baptiste Daroussin ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define DEVD_SOCK_PATH "/var/run/devd.pipe" ++ ++#define DEVD_EVENT_ADD '+' ++#define DEVD_EVENT_REMOVE '-' ++ ++static int sock_devd =3D -1; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++enum { ++ ATTR_KEYBOARD, ++ ATTR_POINTER, ++ ATTR_JOYSTICK, ++ ATTR_TOUCHPAD, ++ ATTR_TOUCHSCREEN, ++}; ++#endif ++ ++struct hw_type { ++ const char *driver; ++ int flag; ++ const char *xdriver; ++}; ++ ++static struct hw_type hw_types[] =3D { ++ { "ukbd", ATTR_KEYBOARD, "kdb" }, ++ { "atkbd", ATTR_KEYBOARD, "kdb" }, ++ { "ums", ATTR_POINTER, "mouse" }, ++ { "psm", ATTR_POINTER, "mouse" }, ++ { "uhid", ATTR_POINTER, "mouse" }, ++ { "joy", ATTR_JOYSTICK, NULL }, ++ { "atp", ATTR_TOUCHPAD, NULL }, ++ { "uep", ATTR_TOUCHSCREEN, NULL }, ++ { NULL, -1, NULL }, ++}; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++static void ++add_option(InputOption **options, const char *key, const char *value) ++{ ++ if (!value || *value =3D=3D '\0') ++ return; ++ ++ for (; *options; options =3D &(*options)->next) ++ ; ++ *options =3D calloc(sizeof(**options), 1); ++ if (!*options) /* Yeesh. */ ++ return; ++ (*options)->key =3D xstrdup(key); ++ (*options)->value =3D xstrdup(value); ++ (*options)->next =3D NULL; ++} ++ ++static void ++remove_device(DeviceIntPtr dev) ++{ ++ /* this only gets called for devices that have already been added *= / ++ LogMessage(X_INFO, "config/devd: removing device %s\n", dev->name);= ++ ++ /* Call PIE here so we don't try to dereference a device that's ++ * already been removed. */ ++ OsBlockSignals(); ++ ProcessInputEvents(); ++ DeleteInputDeviceRequest(dev); ++ OsReleaseSignals(); ++} ++ ++static bool ++device_is_duplicate(char *config_info) ++{ ++ DeviceIntPtr dev; ++ ++ for (dev =3D inputInfo.devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ for (dev =3D inputInfo.off_devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ return false; ++} ++ ++#endif ++ ++static bool ++sysctl_exists(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ size_t len; ++ int ret; ++ ++ if (format =3D=3D NULL) ++ return false; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ ret =3D sysctlbyname(name, NULL, &len, NULL, 0); ++ ++ if (ret =3D=3D -1) ++ len =3D 0; ++ ++ free(name); ++ return (len > 0); ++} ++ ++static char * ++sysctl_get_str(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ char *dest =3D NULL; ++ size_t len; ++ ++ if (format =3D=3D NULL) ++ return NULL; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ if (sysctlbyname(name, NULL, &len, NULL, 0) =3D=3D 0) { ++ dest =3D malloc(len + 1); ++ if (sysctlbyname(name, dest, &len, NULL, 0) =3D=3D 0) ++ dest[len] =3D '\0'; ++ else { ++ free(dest); ++ dest =3D NULL; ++ } ++ } ++ ++ free(name); ++ return dest; ++} ++ ++static void ++device_added(char *line) ++{ ++ char *walk; ++ char *path; ++ char *vendor; ++ char *product =3D NULL; ++ char *config_info =3D NULL; ++ InputOption *options =3D NULL; ++#if XORG_VERSION_CURRENT > 10800000 ++ InputAttributes attrs =3D {}; ++#else ++ InputOption *tmpo; ++#endif ++ DeviceIntPtr dev =3D NULL; ++ int i, rc; ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ if (strncmp(line, hw_types[i].driver, ++ strlen(hw_types[i].driver)) =3D=3D 0 && ++ isnumber(*(line + strlen(hw_types[i].driver)))) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.flags |=3D hw_types[i].flag; ++#endif ++ break; ++ } ++ } ++ if (hw_types[i].driver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ if (hw_types[i].xdriver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++#endif ++ if (asprintf(&path, "/dev/%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ options =3D calloc(sizeof(*options), 1); ++ if (!options) ++ return; ++ ++ add_option(&options, "_source", "server/devd"); ++#else ++ options =3D input_option_new(NULL, "_source", "server/devd"); ++ if (!options) ++ return; ++#endif ++ ++ vendor =3D sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, l= ine + strlen(hw_types[i].driver)); ++ if (vendor =3D=3D NULL) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup("(unnamed)"); ++#endif ++ } else { ++ if ((product =3D strchr(vendor, ' ')) !=3D NULL) { ++ product[0] =3D '\0'; ++ product++; ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup(vendor); ++#endif ++ if (product !=3D NULL && (walk =3D strchr(product, ',')) !=3D N= ULL) ++ walk[0] =3D '\0'; ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.product =3D strdup(product !=3D NULL ? product : "(unname= d)"); ++ options =3D input_option_new(options, "name", product !=3D NULL ? prod= uct : "(unnamed)"); ++#else ++ add_option(&options, "name", product !=3D NULL ? product : "(un= named)"); ++#endif ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.usb_id =3D NULL; ++ options =3D input_option_new(options, "path", path); ++ options =3D input_option_new(options, "device", path); ++#else ++ add_option(&options, "path", path); ++ add_option(&options, "device", path); ++#endif ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "driver", hw_types[i].xdriver); ++#endif ++ ++ if (asprintf(&config_info, "devd:%s", line) =3D=3D -1) { ++ config_info =3D NULL; ++ goto unwind; ++ } ++ ++ if (device_is_duplicate(config_info)) { ++ LogMessage(X_WARNING, "config/devd: device %s already added. " ++ "Ignoring.\n", product !=3D NULL ? produc= t : "(unnamed)"); ++ goto unwind; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "config_info", config_info); ++#else ++ options =3D input_option_new(options, "config_info", config_info); ++#endif ++ LogMessage(X_INFO, "config/devd: Adding input device %s (%s)\n", ++ product !=3D NULL ? product : "(unnamed)", path); ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ rc =3D NewInputDeviceRequest(options, &attrs, &dev); ++#else ++ rc =3D NewInputDeviceRequest(options, &dev); ++#endif ++ ++ if (rc !=3D Success) ++ goto unwind; ++ ++ unwind: ++ free(config_info); ++#if XORG_VERSION_CURRENT < 10800000 ++ while ((tmpo =3D options)) { ++ options =3D tmpo->next; ++ free(tmpo->key); /* NULL if dev !=3D NULL */ ++ free(tmpo->value); /* NULL if dev !=3D NULL */ ++ free(tmpo); ++ } ++#else ++ input_option_free_list(&options); ++#endif ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ free(attrs.usb_id); ++ free(attrs.product); ++ free(attrs.device); ++ free(attrs.vendor); ++#endif ++ ++ return; ++} ++ ++static void ++device_removed(char *line) ++{ ++ char *walk; ++ char *value; ++#if XORG_VERSION_CURRENT < 10800000 ++ DeviceIntPtr dev, next; ++#endif ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ if (asprintf(&value, "devd:%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ remove_devices("dev", value); ++#else ++ for (dev =3D inputInfo.devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++ for (dev =3D inputInfo.off_devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++#endif ++ ++ free(value); ++} ++ ++static ssize_t ++socket_getline(int fd, char **out) ++{ ++ char *buf; ++ ssize_t ret, cap, sz =3D 0; ++ char c; ++ ++ cap =3D 1024; ++ buf =3D malloc(cap * sizeof(char)); ++ if (!buf) ++ return -1; ++ ++ for (;;) { ++ ret =3D read(sock_devd, &c, 1); ++ if (ret < 1) { ++ free(buf); ++ return -1; ++ } ++ ++ if (c =3D=3D '\n') ++ break; ++ ++ if (sz + 1 >=3D cap) { ++ cap *=3D 2; ++ buf =3D realloc(buf, cap *sizeof(char)); ++ } ++ buf[sz] =3D c; ++ sz++; ++ } ++ ++ buf[sz] =3D '\0'; ++ if (sz > 0) ++ *out =3D buf; ++ else ++ free(buf); ++ ++ return sz; /* number of bytes in the line, not counting the line break= */ ++} ++ ++static void ++wakeup_handler(pointer data, int err, pointer read_mask) ++{ ++ char *line =3D NULL; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(sock_devd, (fd_set *)read_mask)) { ++ if (socket_getline(sock_devd, &line) < 0) ++ return; ++ ++ switch(*line) { ++ case DEVD_EVENT_ADD: ++ device_added(line++); ++ break; ++ case DEVD_EVENT_REMOVE: ++ device_removed(line++); ++ break; ++ default: ++ break; ++ } ++ free(line); ++ } ++} ++ ++static void ++block_handler(pointer data, struct timeval **tv, pointer read_mask) ++{ ++} ++ ++int ++config_devd_init(void) ++{ ++ struct sockaddr_un devd; ++ char devicename[1024]; ++ int i, j; ++ ++ /* first scan the sysctl to determine the hardware if needed */ ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ for (j =3D 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].dri= ver, j); j++) { ++ snprintf(devicename, 1024, "%s%i", hw_types[i].driver, j); ++ device_added(devicename); ++ } ++ ++ } ++ sock_devd =3D socket(AF_UNIX, SOCK_STREAM, 0); ++ if (sock_devd < 0) { ++ ErrorF("config/devd: Fail opening stream socket"); ++ return 0; ++ } ++ ++ devd.sun_family =3D AF_UNIX; ++ strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path)); ++ ++ if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(struct soc= kaddr_un)) < 0) { ++ close(sock_devd); ++ ErrorF("config/devd: Fail to connect to devd"); ++ return 0; ++ } ++ ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL)= ; ++ AddGeneralSocket(sock_devd); ++ ++ return 1; ++} ++ ++void ++config_devd_fini(void) ++{ ++ if (sock_devd < 0) ++ return; ++ ++ RemoveGeneralSocket(sock_devd); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ close(sock_devd); ++} Property changes on: x11-servers/xorg-server/files/extra-config_devd.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-servers/xorg-server/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-configure (revision 0) +++ x11-servers/xorg-server/files/extra-configure (working copy) @@ -0,0 +1,11 @@ +--- configure.orig 2013-09-07 22:11:27.210621324 +0200 ++++ configure 2013-09-07 22:11:52.912624338 +0200 +@@ -22839,7 +22839,7 @@ + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_tls=3D$kw ++ ac_cv_tls=3D$kw; break ; + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done Property changes on: x11-servers/xorg-server/files/extra-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-themes/gtk-murrine-engine/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-themes/gtk-murrine-engine/Makefile (revision 326808) +++ x11-themes/gtk-murrine-engine/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D murrine PORTVERSION=3D 0.98.2 +PORTREVISION=3D 1 CATEGORIES=3D x11-themes MASTER_SITES=3D GNOME PKGNAMEPREFIX=3D gtk- @@ -11,14 +12,12 @@ MAINTAINER=3D pneumann@gmail.com COMMENT=3D Murrine GTK+ 2.x cairo based engine =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - USE_XZ=3D yes -USE_GMAKE=3D yes +USE_XORG=3D pixman USE_GNOME=3D gtk20 intltool intlhack USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes -USES=3D pkgconfig +USES=3D gmake pkgconfig =20 OPTIONS_DEFINE=3D ANIMATION ANIMATION_DESC=3D Animation support Index: x11-toolkits/gtkglext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/gtkglext/Makefile (revision 326808) +++ x11-toolkits/gtkglext/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtkglext PORTVERSION=3D 1.2.0 -PORTREVISION=3D 11 +PORTREVISION=3D 12 CATEGORIES=3D x11-toolkits MASTER_SITES=3D SF DIST_SUBDIR=3D gnome2 @@ -25,12 +25,11 @@ OPTIONS_DEFINE=3D DOCS =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL=3D glu -USES=3D gettext iconv pathfix pkgconfig +USES=3D gettext gmake iconv pathfix pkgconfig USE_GNOME=3D gdkpixbuf2 gtk20 pangox-compat USE_LDCONFIG=3D yes =20 Index: x11-toolkits/libXaw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/Makefile (revision 326808) +++ x11-toolkits/libXaw/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXaw -PORTVERSION=3D 1.0.11 +PORTVERSION=3D 1.0.12 PORTEPOCH=3D 2 CATEGORIES=3D x11-toolkits =20 @@ -11,7 +11,7 @@ =20 XORG_CAT=3D lib USE_XORG=3D printproto:both x11 xau xext xextproto xmu xp xpm xproto:bot= h xt -USE_GMAKE=3D yes +USES=3D gmake CONFIGURE_ARGS+=3D--without-xmlto =20 MAN3=3D Xaw.3 Index: x11-toolkits/libXaw/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/distinfo (revision 326808) +++ x11-toolkits/libXaw/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 87a874acbb71d1ee59b8047312fc= 91d89dcb373e2970f121184cdae29a3d9492 -SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 649633 +SHA256 (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 96fc314874fce9979556321d1d6e= e00b5baf32fb333b7278853b4983bc3cdbf6 +SIZE (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 677147 Index: x11-toolkits/libXmu/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/Makefile (revision 326808) +++ x11-toolkits/libXmu/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXmu -PORTVERSION=3D 1.1.1 +PORTVERSION=3D 1.1.2 PORTEPOCH=3D 1 CATEGORIES=3D x11-toolkits =20 Index: x11-toolkits/libXmu/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/distinfo (revision 326808) +++ x11-toolkits/libXmu/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 709081c550cc3a866d7c760a3f973= 84a1fe16e27fc38fe8169b8db9f33aa7edd -SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 383473 +SHA256 (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 756edc7c383254eef8b4e1b733c3b= f1dc061b523c9f9833ac7058378b8349d0b +SIZE (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 396230 Index: x11-wm/awesome/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-wm/awesome/Makefile (revision 326808) +++ x11-wm/awesome/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D awesome PORTVERSION=3D 3.5.1 -PORTREVISION=3D 2 +PORTREVISION=3D 3 PORTEPOCH=3D 1 CATEGORIES=3D x11-wm MASTER_SITES=3D http://awesome.naquadah.org/download/ --------------010302050208010508050208-- ------enig2BRQOLGEICLWVXUDNLJOL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBCgAGBQJSLcQEAAoJELuNS1e7i1VRbQAP/0DuPhjf0MQlcZGe7yGV2VZF MAOkQE+ASxevjWh8/rVPrGpmAt5TJOttzIgjsRUcOQzo/noqbDt/LYmSNXvvtZnt oisGQqbp9EXle0NsWphRBSeqKg1uQ4C2NX4SC2K38uaeJr3DG9jlVp+tFvJ5X8b2 /KlDtkHDc6v+ODNmDSczFQyRNpVatSkxf8YyvI2ICTnuR+MNHExhTapdY906PwkT ZeYjTZ6BTj43HBT5THh/L4ArsbkIqlhpAcUORjYPis1gZTeRCEMc6pzZ4j/rU76v ra6BmKMF7C8FF014yp1okig8v2pifwb0KwdKdNyb5uvRykwqkBRMKdHoAOqcW3WI eyqfXSYvNgzckMGL83eSCw9+1D1gPrsY+QYnkwNvhS9UVJUxvoOMOsoEvSnYZ0lC elYutSmPjxfatu8ZbCZwmYDj2ixyE640IYeFuSyyAZmfj8eHEA9mjozYj1/Nx17U CtTb72L7f1mCNR2eE1Gv9ZCS6DJu1AZAW1E3KJZCm/0DtHZV2Vf/F/Yw6wdFO5mI QyCaN6XmWB2DYQ8CskndJJkZF2V1M/pfUGX/i2EJrgnCpf+VSCIGC4gsJpr1vKHi l5DeMsFTXB8r+lcFNd9BgT6HxbA+JspeK5Zl+RJApDhP37tRZ7z8FCkGb5sd99F7 tOis8fNnPpmzdsivP6DY =rIiy -----END PGP SIGNATURE----- ------enig2BRQOLGEICLWVXUDNLJOL-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 13:51:54 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 22364880; Mon, 9 Sep 2013 13:51:54 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mho-02-ewr.mailhop.org (mho-02-ewr.mailhop.org [204.13.248.72]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E891B2769; Mon, 9 Sep 2013 13:51:53 +0000 (UTC) Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52] helo=damnhippie.dyndns.org) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1VJ1sZ-000IfQ-IJ; Mon, 09 Sep 2013 13:51:47 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id r89Dpikk001798; Mon, 9 Sep 2013 07:51:44 -0600 (MDT) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 24.8.230.52 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18pKb028NyEYjWkLZKYb7pI Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous From: Ian Lepore To: Stefan Esser In-Reply-To: <522D7162.5090806@freebsd.org> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> <522D7162.5090806@freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Mon, 09 Sep 2013 07:51:44 -0600 Message-ID: <1378734704.1111.558.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: kde@FreeBSD.org, freebsd-current@FreeBSD.org, "O. Hartmann" , freebsd-ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 13:51:54 -0000 On Mon, 2013-09-09 at 08:57 +0200, Stefan Esser wrote: > Am 08.09.2013 08:14, schrieb O. Hartmann: > > On Sat, 7 Sep 2013 22:49:54 GMT rakuco@FreeBSD.org wrote: > > > >> Synopsis: devel/qt4-script: > >> /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is > >> ambiguous > >> > >> State-Changed-From-To: open->patched State-Changed-By: rakuco > >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 > >> State-Changed-Why: I don't think the previous version worked. > >> > >> From your description, it looks like you've switched to building > >> with libc++ whereas libstdc++ was being used before. > >> > >> The upcoming Qt 4.8.5 plus a few patches which only made it to > >> 4.8.6 (but we've backported) will finally make Qt build with > >> libc++. > >> > >> We've just sent an exp-run request for Qt 4.8.5, and will > >> hopefully fix all these errors once it is committed. > >> > >> http://www.freebsd.org/cgi/query-pr.cgi?pr=181913 > > > > > > I build the world/kernel since early this year with > > > > CXXFLAGS+= -stdlib=libc++ CXXFLAGS+= > > -std=c++11 > > > > > > in /etc/src.conf. I do not use those flags in /etc/make.conf! > > /etc/src.conf is supposed to target ONLY the /usr/src world, not > > the ports - this is as I interpret the man page for /etc/src.conf > > and it would be logical. But this rule/thinking seems to be broken > > by some includes from /usr/ports/Mk ingredients. > > There are ports that use bsd.prog.mk instead of the Makefile supplied > with the source files. Just grep for bsd.port.mk in the port's "files" > sub directory, if you find that /etc/src.conf settings affect a port. > > I think these ports are in violation of POLA and had a longer mail > exchange with a port maintainer, who told me that use of bsd.prog.mk > was the preferred method to build binaries on FreeBSD, for base and > for ports. > > So no file under /usr/ports/Mk is to blame, but some ports do > implicitly reference /etc/src.conf via their use of bsd.prog.mk. > > Regards, STefan > > NB: I just performed the grep suggested above and found that the > following ports mention bsd.prog.mk in files/*: > > If those ports .include before bsd.prog.mk, I think everything should work properly. It looks like src.conf is an "opt-out" system, and bsd.port.mk sets the variable to opt out. I don't especially like this (opt-in would be better), but I don't see an easy fix either. We use bsd.prog.mk at $work (I'd better go add the opt-out now), it seems like others probably do the same. It would be much better if the base build opted in, but the only way I can see to do that would be to install a "makefile.up" system where a makefile.up in every directory under the base src allows "walking up" to the top of the src hierarchy no matter where the build is started from, so that you can always get some top-level file to do the opt-in. -- Ian From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 13:59:50 2013 Return-Path: Delivered-To: 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 BB675DC7; Mon, 9 Sep 2013 13:59:50 +0000 (UTC) (envelope-from c.kworr@gmail.com) Received: from mail-lb0-x22b.google.com (mail-lb0-x22b.google.com [IPv6:2a00:1450:4010:c04::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E13772845; Mon, 9 Sep 2013 13:59:49 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id u14so5024314lbd.16 for ; Mon, 09 Sep 2013 06:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=wq/+zoXyE9pBll164Lb2Fiw5UHxYFoz1Gj9I1DIVC/U=; b=v1hWKL8qLl2X6r5GDgqTmRneYUjbzb8RTJz+G1NyXZ1r8buZAWtH034380BrEhl7h6 XyGmUBIk/+P/eR7eaIUSU0fFNv2M/w1u3HXp+M/uePqsFYcdrJgPDLpSCqeLH1tTxtN1 Paugk07xF0g2rVvM5YAIrW8qcNj7K4YE8sbiti2VjBqaUnMZTZe0O0oPDGd+1SWS1kgQ hn2QLfmZ20+7ZH8/pcLvqjsF3JS6Nulh0LGxSQB+owCT4Fa2KT0IPwjyVH/qhyDbTo3U neAWRtuoYrcTwnpPvih5lDgAg9s1UW+X2NokpJ9TBMxVoMovtCv+X2BNHybVALiPMb0X RRsA== X-Received: by 10.112.156.103 with SMTP id wd7mr514844lbb.48.1378735187933; Mon, 09 Sep 2013 06:59:47 -0700 (PDT) Received: from [192.168.1.128] (mau.donbass.com. [92.242.127.250]) by mx.google.com with ESMTPSA id w10sm6029537lbv.6.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 06:59:47 -0700 (PDT) Message-ID: <522DD451.9000100@gmail.com> Date: Mon, 09 Sep 2013 16:59:45 +0300 From: Volodymyr Kostyrko User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130809 Thunderbird/17.0.8 MIME-Version: 1.0 To: x11@FreeBSD.org Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> In-Reply-To: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@FreeBSD.org, Niclas Zeising X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 13:59:50 -0000 09.09.2013 15:49, Niclas Zeising wrote: > [Cross-posted between x11@ and ports@, please respect reply-to] ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG CC intel_fbo.lo cc: warning: argument unused during compilation: '-fno-builtin-memcmp' cc: warning: argument unused during compilation: '-fno-builtin-memcmp' intel_screen.c:199:6: error: use of undeclared identifier '__DRI_IMAGE_FOURCC_ARGB8888' { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, ^ intel_screen.c:199:35: error: use of undeclared identifier '__DRI_IMAGE_COMPONENTS_RGBA' { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, ^ intel_screen.c:202:6: error: use of undeclared identifier '__DRI_IMAGE_FOURCC_XRGB8888' { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, ^ intel_screen.c:202:35: error: use of undeclared identifier '__DRI_IMAGE_COMPONENTS_RGB' { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, ^ Is this intended to work on 9? -- Sphinx of black quartz, judge my vow. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 14:02:30 2013 Return-Path: Delivered-To: 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 B59B0F85; Mon, 9 Sep 2013 14:02:30 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from fep20.mx.upcmail.net (fep20.mx.upcmail.net [62.179.121.40]) by mx1.freebsd.org (Postfix) with ESMTP id 9BC7128A2; Mon, 9 Sep 2013 14:02:29 +0000 (UTC) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep20-int.chello.at (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP id <20130909140228.RHXC22126.viefep20-int.chello.at@edge03.upcmail.net>; Mon, 9 Sep 2013 16:02:28 +0200 Received: from [127.0.0.1] ([178.84.132.32]) by edge03.upcmail.net with edge id P22T1m02o0i5fp60322Uvl; Mon, 09 Sep 2013 16:02:28 +0200 X-SourceIP: 178.84.132.32 Message-ID: <522DD4E5.5030206@rainbow-runner.nl> Date: Mon, 09 Sep 2013 16:02:13 +0200 From: Koop Mast User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Volodymyr Kostyrko Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> <522DD451.9000100@gmail.com> In-Reply-To: <522DD451.9000100@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 130909-0, 09-09-2013), Outbound message X-Antivirus-Status: Clean Cc: ports@FreeBSD.org, x11@FreeBSD.org, Niclas Zeising X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:02:30 -0000 On 9-9-2013 15:59, Volodymyr Kostyrko wrote: > 09.09.2013 15:49, Niclas Zeising wrote: >> [Cross-posted between x11@ and ports@, please respect reply-to] > > ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG > > CC intel_fbo.lo > cc: warning: argument unused during compilation: '-fno-builtin-memcmp' > cc: warning: argument unused during compilation: '-fno-builtin-memcmp' > intel_screen.c:199:6: error: use of undeclared identifier > '__DRI_IMAGE_FOURCC_ARGB8888' > { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, > ^ > intel_screen.c:199:35: error: use of undeclared identifier > '__DRI_IMAGE_COMPONENTS_RGBA' > { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_COMPONENTS_RGBA, 1, > ^ > intel_screen.c:202:6: error: use of undeclared identifier > '__DRI_IMAGE_FOURCC_XRGB8888' > { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, > ^ > intel_screen.c:202:35: error: use of undeclared identifier > '__DRI_IMAGE_COMPONENTS_RGB' > { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_COMPONENTS_RGB, 1, > ^ > Is this intended to work on 9? > You need to manual remove your old libGL and dri before updating to the new version, as mentioned in the UPDATING file. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 14:20:16 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 9C2B54DB for ; Mon, 9 Sep 2013 14:20:16 +0000 (UTC) (envelope-from brfr@metrico.lu) Received: from design20.letzebuerg.net (design20.letzebuerg.net [176.9.210.200]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5693B297D for ; Mon, 9 Sep 2013 14:20:16 +0000 (UTC) Received: from ip-88-207-241-24.dyn.luxdsl.pt.lu ([88.207.241.24]:58213 helo=[192.168.0.32]) by design20.letzebuerg.net with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1VJ2Jn-00024f-JI for freebsd-ports@freebsd.org; Mon, 09 Sep 2013 16:19:55 +0200 Message-ID: <522DD8D9.3090300@metrico.lu> Date: Mon, 09 Sep 2013 16:19:05 +0200 From: Frank Broniewski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: Mapserver shp2img References: <5226E1ED.9050405@metrico.lu> <52286E4E.4070605@metrico.lu> <52287923.8010908@metrico.lu> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - design20.letzebuerg.net X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - metrico.lu X-Get-Message-Sender-Via: design20.letzebuerg.net: authenticated_id: brfr@metrico.lu X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:20:16 -0000 Cool! It works! Thanks for helping, Frank Am 2013-09-06 18:05, schrieb wen heping: > Would you test with this simple patch? > Thanks ! > > wen > > Index: Makefile > =================================================================== > --- Makefile (revision 326520) > +++ Makefile (working copy) > @@ -187,7 +187,7 @@ > > do-install: > .for f in ${PROG_FILES} > - ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin > + ${INSTALL_SCRIPT} ${WRKSRC}/.libs/${f} ${PREFIX}/bin > .endfor > ${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmapserver-${PORTVERSION}.so > ${PREFIX}/lib > > > > 2013/9/6 wen heping > >> I shall look into that later. >> >> wen >> >> >> 2013/9/5 Frank Broniewski >> >>> Another thing I noticed: While doing >>> >>> # pkg_delete -d mapserver-6.2.1_2 >>> >>> I receive errors concerning the Python mapscript module: >>> >>> >>> pkg_delete: file '/usr/local/lib/python2.7/**site-packages/mapscript.py' >>> doesn't exist >>> pkg_delete: file '/usr/local/lib/python2.7/**site-packages/mapscript.pyc' >>> doesn't exist >>> pkg_delete: file '/usr/local/lib/python2.7/**site-packages/_mapscript.so' >>> doesn't exist >>> pkg_delete: file '/usr/local/lib/python2.7/** >>> site-packages/MapScript-6.2.1-**py2.7.egg-info' doesn't exist >>> pkg_delete: couldn't entirely delete package `mapserver-6.2.1_2' >>> (perhaps the packing list is incorrectly specified?) >>> >>> This is probably not intended, isn't it? >>> >>> I've got the following (leftover) eggs from previous installations left >>> in /usr/local/lib/python2.7/site-**packages >>> >>> drwxr-xr-x 3 root wheel 512 Sep 12 2012 >>> MapScript-6.0.1-py2.7-freebsd-**9.0-RELEASE-amd64.egg >>> drwxr-xr-x 3 root wheel 512 Jul 1 09:32 >>> MapScript-6.2.0-py2.7-freebsd-**9.1-RELEASE-p3-amd64.egg >>> drwxr-xr-x 3 root wheel 512 Sep 4 08:50 >>> MapScript-6.2.0-py2.7-freebsd-**9.1-RELEASE-p4-amd64.egg >>> drwxr-xr-x 3 root wheel 512 Sep 5 13:33 >>> MapScript-6.2.1-py2.7-freebsd-**9.1-RELEASE-p6-amd64.egg >>> >>> >>> >>> Frank >>> >>> Am 2013-09-05 13:43, schrieb Frank Broniewski: >>> >>> Any ideas? Is it just me or everyone else? >>>> >>>> Frank >>>> >>>> Am 2013-09-04 09:31, schrieb Frank Broniewski: >>>> >>>>> Hi all, >>>>> >>>>> I've a problem with my mapserver installation, the utility shp2img isn't >>>>> working, which is kind of odd. I get the following error when invoking >>>>> it: >>>>> >>>>> /usr/local/bin/shp2img: error: `/usr/local/bin/.libs/shp2img' does not >>>>> exist >>>>> This script is just a wrapper for shp2img. >>>>> See the libtool documentation for more information. >>>>> >>>>> I don't know what I shall do about that error now. On my Ubuntu machine, >>>>> shp2img is a binary and not a shell script like on FreeBSD. While >>>>> looking at the script, the error is invoked at the end of it (lines 205 >>>>> - 207): >>>>> >>>>> 189 if test -f "$progdir/$program"; then >>>>> 190 # Add our own library path to LD_LIBRARY_PATH >>>>> 191 >>>>> LD_LIBRARY_PATH="/usr/ports/**graphics/mapserver/work/** >>>>> mapserver-6.2.1/.libs:/usr/**local/lib:$LD_LI >>>>> >>>>> >>>>> 192 >>>>> 193 # Some systems cannot cope with colon-terminated >>>>> LD_LIBRARY_PATH >>>>> 194 # The second colon is a workaround for a bug in BeOS R4 sed >>>>> 195 LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed >>>>> 's/::*$//'` >>>>> 196 >>>>> 197 export LD_LIBRARY_PATH >>>>> 198 >>>>> 199 if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; >>>>> then >>>>> 200 # Run the actual program with our arguments. >>>>> 201 func_exec_program ${1+"$@"} >>>>> 202 fi >>>>> 203 else >>>>> 204 # The program doesn't exist. >>>>> 205 $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2 >>>>> 206 $ECHO "This script is just a wrapper for $program." 1>&2 >>>>> 207 $ECHO "See the libtool documentation for more information." >>>>> 1>&2 >>>>> 208 exit 1 >>>>> 209 fi >>>>> >>>>> This is rather confusing as I don't know what role the libtool plays and >>>>> what I can gain from reading the rather exhaustive documentation ... >>>>> >>>>> >>>>> Any hints? >>>>> >>>>> Many thanks, >>>>> >>>>> Frank >>>>> >>>>> >>>> >>>> >>> >>> -- >>> Frank BRONIEWSKI >>> >>> METRICO s.à r.l. >>> géomètres >>> technologies d'information géographique >>> rue des Romains 36 >>> L-5433 NIEDERDONVEN >>> >>> tél.: +352 26 74 94 - 28 >>> fax.: +352 26 74 94 99 >>> http://www.metrico.lu >>> >> >> > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" > -- Frank BRONIEWSKI METRICO s.à r.l. géomètres technologies d'information géographique rue des Romains 36 L-5433 NIEDERDONVEN tél.: +352 26 74 94 - 28 fax.: +352 26 74 94 99 http://www.metrico.lu From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 14:21:40 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 096D658A; Mon, 9 Sep 2013 14:21:40 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mho-02-ewr.mailhop.org (mho-02-ewr.mailhop.org [204.13.248.72]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CECD329B5; Mon, 9 Sep 2013 14:21:39 +0000 (UTC) Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52] helo=damnhippie.dyndns.org) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1VJ2LS-000DRD-JO; Mon, 09 Sep 2013 14:21:38 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id r89ELaNL001826; Mon, 9 Sep 2013 08:21:36 -0600 (MDT) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 24.8.230.52 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18hEOsvWEOWeLvfkFR7TDyu Subject: Re: ports/181913: devel/qt4-script: /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is ambiguous From: Ian Lepore To: Stefan Esser In-Reply-To: <1378734704.1111.558.camel@revolution.hippie.lan> References: <201309072249.r87MnsLP052803@freefall.freebsd.org> <20130908081445.242f77c7@thor.walstatt.dyndns.org> <522D7162.5090806@freebsd.org> <1378734704.1111.558.camel@revolution.hippie.lan> Content-Type: text/plain; charset="us-ascii" Date: Mon, 09 Sep 2013 08:21:35 -0600 Message-ID: <1378736495.1111.560.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: "O. Hartmann" , freebsd-current@FreeBSD.org, kde@FreeBSD.org, freebsd-ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:21:40 -0000 On Mon, 2013-09-09 at 07:51 -0600, Ian Lepore wrote: > On Mon, 2013-09-09 at 08:57 +0200, Stefan Esser wrote: > > Am 08.09.2013 08:14, schrieb O. Hartmann: > > > On Sat, 7 Sep 2013 22:49:54 GMT rakuco@FreeBSD.org wrote: > > > > > >> Synopsis: devel/qt4-script: > > >> /usr/include/c++/v1/type_traits:3175:22: error: call to 'swap' is > > >> ambiguous > > >> > > >> State-Changed-From-To: open->patched State-Changed-By: rakuco > > >> State-Changed-When: Sat Sep 7 22:47:43 UTC 2013 > > >> State-Changed-Why: I don't think the previous version worked. > > >> > > >> From your description, it looks like you've switched to building > > >> with libc++ whereas libstdc++ was being used before. > > >> > > >> The upcoming Qt 4.8.5 plus a few patches which only made it to > > >> 4.8.6 (but we've backported) will finally make Qt build with > > >> libc++. > > >> > > >> We've just sent an exp-run request for Qt 4.8.5, and will > > >> hopefully fix all these errors once it is committed. > > >> > > >> http://www.freebsd.org/cgi/query-pr.cgi?pr=181913 > > > > > > > > > I build the world/kernel since early this year with > > > > > > CXXFLAGS+= -stdlib=libc++ CXXFLAGS+= > > > -std=c++11 > > > > > > > > > in /etc/src.conf. I do not use those flags in /etc/make.conf! > > > /etc/src.conf is supposed to target ONLY the /usr/src world, not > > > the ports - this is as I interpret the man page for /etc/src.conf > > > and it would be logical. But this rule/thinking seems to be broken > > > by some includes from /usr/ports/Mk ingredients. > > > > There are ports that use bsd.prog.mk instead of the Makefile supplied > > with the source files. Just grep for bsd.port.mk in the port's "files" > > sub directory, if you find that /etc/src.conf settings affect a port. > > > > I think these ports are in violation of POLA and had a longer mail > > exchange with a port maintainer, who told me that use of bsd.prog.mk > > was the preferred method to build binaries on FreeBSD, for base and > > for ports. > > > > So no file under /usr/ports/Mk is to blame, but some ports do > > implicitly reference /etc/src.conf via their use of bsd.prog.mk. > > > > Regards, STefan > > > > NB: I just performed the grep suggested above and found that the > > following ports mention bsd.prog.mk in files/*: > > > > > > If those ports .include before bsd.prog.mk, I think > everything should work properly. It looks like src.conf is an "opt-out" > system, and bsd.port.mk sets the variable to opt out. > > I don't especially like this (opt-in would be better), but I don't see > an easy fix either. We use bsd.prog.mk at $work (I'd better go add the > opt-out now), it seems like others probably do the same. > > It would be much better if the base build opted in, but the only way I > can see to do that would be to install a "makefile.up" system where a > makefile.up in every directory under the base src allows "walking up" to > the top of the src hierarchy no matter where the build is started from, > so that you can always get some top-level file to do the opt-in. Hrm. I take that back. You can't set _WITHOUT_SRCCONF and then .include and expect anything to work. For some reason all the setting of the MK_whatever knobs is disabled by setting _WITHOUT_SRCCONF, and without all those things defined, the rest of the bsd.*.mk files don't work. ::sigh:: What a mess. -- Ian From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 14:43:27 2013 Return-Path: Delivered-To: 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 ACE4CAB8; Mon, 9 Sep 2013 14:43:27 +0000 (UTC) (envelope-from c.kworr@gmail.com) Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com [IPv6:2a00:1450:4010:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D3A352B00; Mon, 9 Sep 2013 14:43:26 +0000 (UTC) Received: by mail-la0-f43.google.com with SMTP id ep20so5026391lab.16 for ; Mon, 09 Sep 2013 07:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=DhD8Mom1zH/8oLtOJYIGVcAgC51/4q6yRPkzMtqL8aA=; b=zH8SDM/j/cRns4a5H8aGRFgCAacMUhzvdDlTxVpPrDT8F2/gMQAXqIc4f0EYMsRuOm p/YW8o9AwM9OiFOO7qgJ2nHeER+lvQWm3u10ky78LOzHCQrk6s32tKeDF0LoW/jFA0Lz c1B6sVrIn+DrR/cGz1NGHuDmdjFfSOFocncjIhnAUMqykAcBCZ7cU2XEW37VbhorvVQU 2hxMCbMIkyaV9tqCzs5GpRUDzmd5+vut3mJWvAciEhA5By6w/6cvQ/uPvcdfYMZ7MVL8 x7HsKKSoaNjVmLArRRDvZ+rSzJYS/LP5NDOYRVPrdCmFqWee+g0OIkzfBRKeVpZ5zY7c PC/g== X-Received: by 10.112.167.66 with SMTP id zm2mr1138496lbb.46.1378737804742; Mon, 09 Sep 2013 07:43:24 -0700 (PDT) Received: from [192.168.1.128] (mau.donbass.com. [92.242.127.250]) by mx.google.com with ESMTPSA id w10sm6127137lbv.6.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 07:43:24 -0700 (PDT) Message-ID: <522DDE8A.4030301@gmail.com> Date: Mon, 09 Sep 2013 17:43:22 +0300 From: Volodymyr Kostyrko User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130809 Thunderbird/17.0.8 MIME-Version: 1.0 To: Koop Mast Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607__24877.3824460388$1378732295$gmane$org@freebsd.org> <522DD451.9000100@gmail.com> <522DD4E5.5030206@rainbow-runner.nl> In-Reply-To: <522DD4E5.5030206@rainbow-runner.nl> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@FreeBSD.org, x11@FreeBSD.org, Niclas Zeising X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:43:27 -0000 09.09.2013 17:02, Koop Mast wrote: >> ^/releng/9, WITH_CLANG_IS_CC, CCACHE, WITH_NEW_XORG > > You need to manual remove your old libGL and dri before updating to the > new version, as mentioned in the UPDATING file. Oh, sorry.. I always mess the order of things. Thanks for a quick reply! And how about this one: ===> Applying extra patch extra-config_devd.c cat: extra-config_devd.c: No such file or directory I can't seem to find a patch in there anywhere. gmake[1]: Entering directory `/tmp/ports/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.4/config' gmake[1]: *** No rule to make target `devd.c', needed by `devd.lo'. Stop. gmake[1]: Leaving directory `/tmp/ports/usr/ports/x11-servers/xorg-server/work/xorg-server-1.12.4/config' gmake: *** [all-recursive] Error 1 *** [do-build] Error code 1 --- x11-ervers/xorg-server/Makefile 2013-09-09 17:42:06.005017508 +0300 +++ x11-ervers/xorg-server/Makefile 2013-09-09 17:40:08.468020532 +0300 @@ -108,7 +108,7 @@ .endif .if ${PORT_OPTIONS:MDEVD} -EXTRA_PATCHES+= extra-config_devd.c +EXTRA_PATCHES+= ${FILESDIR}/extra-config_devd.c .endif .if ${PORT_OPTIONS:MAIGLX} -- Sphinx of black quartz, judge my vow. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 14:53:01 2013 Return-Path: Delivered-To: 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 213B8EC1; Mon, 9 Sep 2013 14:53:01 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F18D2B9B; Mon, 9 Sep 2013 14:52:59 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id B5DF940029; Mon, 9 Sep 2013 16:52:57 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id A767440030; Mon, 9 Sep 2013 16:52:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL,T_FRT_LOLITA1 autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 9DF7940029; Mon, 9 Sep 2013 16:52:46 +0200 (CEST) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYXRL1hpNz8hVn; Mon, 9 Sep 2013 16:52:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6]) (amavisd-new, port 10025) with ESMTPS id b8jE5m7X2Xt8; Mon, 9 Sep 2013 16:52:21 +0200 (CEST) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4]) by mx.daemonic.se (Postfix) with ESMTPS id 3cYXQr75Jzz8hVm; Mon, 9 Sep 2013 16:52:20 +0200 (CEST) Received: from vivi.daemonic.se (vivi.daemonic.se [10.32.0.4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3cYXQr6H0Nz9Ctj; Mon, 9 Sep 2013 16:52:20 +0200 (CEST) Message-ID: <522DE093.9080504@freebsd.org> Date: Mon, 09 Sep 2013 16:52:03 +0200 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: x11@FreeBSD.org Subject: Re: [CFT] Update of xorg libraries and MESA References: <522DC3EB.4060607@freebsd.org> In-Reply-To: <522DC3EB.4060607@freebsd.org> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="----enig2QIVQNBKKMGPHGEVFEPQF" X-Virus-Scanned: ClamAV using ClamSMTP X-Mailman-Approved-At: Mon, 09 Sep 2013 15:36:27 +0000 Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 14:53:01 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2QIVQNBKKMGPHGEVFEPQF Content-Type: multipart/mixed; boundary="------------000902030408090803050609" This is a multi-part message in MIME format. --------------000902030408090803050609 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 09/09/13 14:49, Niclas Zeising wrote: > [Cross-posted between x11@ and ports@, please respect reply-to] >=20 > Hi! > It is time once again to update parts of the FreeBSD xorg stack, and th= e > x11@ team needs YOUR help in testing! >=20 > The attached patch, also available in the latest updated version at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff > updates various xorg related libraries and drivers, most of this is > visible for all users of xorg. > xorg-server now has the possibility to use devd instead of hal for > autoconfiguration. > It also updates the MESA stack (libGL, dri) and libdrm for users of the= > new xorg stack (WITH_NEW_XORG=3D). > Last, but definitely not least, it enables KMS for ati graphics cards, > if you have the latest current, and compile with WITH_NEW_XORG=3D. >=20 > It also contains a shlib version bumb of pixman, and ports depending on= > pixman. Be aware of this when updating pixman. >=20 > Please test this on as many platforms and versions of FreeBSD as > possible, both the old and new stack, so that we can try to avoid any > regressions or other issues. The plan is to have this in the ports tre= e > in a few weeks, at the most. >=20 > To use the patch, check out the ports tree, preferably using svn and > apply the patch using svn patch /path/to/patch. It should be possible > to apply the patch using patch as well, but this is not tested. > After the patch is applied, recompile the updated ports. See UPDATING > for further instructions regarding libGL, dri and pixman. This is > important! >=20 > Please let us know of any issues, or if everything is working without a= > hitch. >=20 > For more information, see https://wiki.freebsd.org/Graphics and > https://wiki.freebsd.org/Xorg , or come talk to us in > #freebsd-xorg@EFNet on IRC. >=20 > Regards! >=20 Hi! There was a mistake in the previous patch, which made the build of xorg-server fail. The patch has been updated, and the updated version is attached. As always, it is possible to find the latest version of the patch at http://people.freebsd.org/~zeising/xorg-mesaupdate.diff Sorry for the inconvenience! Regards! --=20 Niclas Zeising FreeBSD x11@ team --------------000902030408090803050609 Content-Type: text/x-patch; name="xorg-mesaupdate.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xorg-mesaupdate.diff" Index: Mk/bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Mk/bsd.port.mk (revision 326808) +++ Mk/bsd.port.mk (working copy) @@ -350,7 +350,7 @@ # MAKE_ENV are extended with a DISPLAY variable. # # USE_GL - A list of Mesa or GL related dependencies needed by the port= =2E -# Supported components are: glut, glu, glw, and gl. +# Supported components are: egl, glesv2, glut, glu, glw, and gl. # If set to "yes", this is equivalent to "glu". Note that # glew and glut depend on glu, glw and glu depend on gl. ## @@ -1882,13 +1882,15 @@ =20 PKG_IGNORE_DEPENDS?=3D 'this_port_does_not_exist' =20 -_GL_gl_LIB_DEPENDS=3D GL.1:${PORTSDIR}/graphics/libGL +_GL_glesv2_LIB_DEPENDS=3D libGLESv2.so:${PORTSDIR}/grahpics/libglesv2 +_GL_egl_LIB_DEPENDS=3D libEGL.so:${PORTSDIR}/graphics/libEGL +_GL_gl_LIB_DEPENDS=3D libGL.so:${PORTSDIR}/graphics/libGL _GL_gl_USE_XORG=3D glproto dri2proto -_GL_glew_LIB_DEPENDS=3D GLEW.1:${PORTSDIR}/graphics/glew -_GL_glu_LIB_DEPENDS=3D GLU.1:${PORTSDIR}/graphics/libGLU +_GL_glew_LIB_DEPENDS=3D libGLEW.so:${PORTSDIR}/graphics/glew +_GL_glu_LIB_DEPENDS=3D libGLU.so:${PORTSDIR}/graphics/libGLU _GL_glu_USE_XORG=3D glproto dri2proto -_GL_glw_LIB_DEPENDS=3D GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS=3D glut.12:${PORTSDIR}/graphics/freeglut +_GL_glw_LIB_DEPENDS=3D libGLw.so:${PORTSDIR}/graphics/libGLw +_GL_glut_LIB_DEPENDS=3D libglut.so:${PORTSDIR}/graphics/freeglut =20 .if defined(USE_GL) . if ${USE_GL:L} =3D=3D "yes" Index: UPDATING =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- UPDATING (revision 326808) +++ UPDATING (working copy) @@ -5,6 +5,33 @@ You should get into the habit of checking this file for changes each tim= e you update your ports collection, before attempting any port upgrades. =20 +201309xx: + AFFECTS: users of x11/pixman + AUTHOR: zeising@FreeBSD.org + + The library version of x11/pixman has changed, and portrevision has + been bumped in all dependent ports. If you have external software tha= t + depends on pixman, this software needs to be recompiled. + To recompile all software dependent on pixman, run: + =20 + # portmaster -r pixman + or + # portupgrade -rf pixman + +201309xx: + AFFECTS: users of graphics/libGL, graphics/dri and other MESA ports + AUTHOR: zeising@FreeBSD.org + + The graphics/libGL, graphics/dri and related MESA ports have been + updated to 9.1 when compiled with WITH_NEW_XORG=3D set. It is necessa= ry + to remove the old versions of both ports before updating. + + # pkg_delete -f libGl-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + 20130904: AFFECTS: 10-CURRENT users with any port depending on converters/libico= nv AUTHOR: madpilot@FreeBSD.org @@ -553,7 +580,7 @@ settings in rc.conf prior to restarting postgrey. =20 20130525: - AFFECTS: users of x11/xorg and all X.Org ports + AFFECTS: users of x11/xorg and all xorg ports AUTHOR: zeising@FreeBSD.org =20 X.Org, including libraries and some drivers, was updated. If you are Index: astro/viking/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- astro/viking/Makefile (revision 326808) +++ astro/viking/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D viking PORTVERSION=3D 1.4.2 +PORTREVISION=3D 1 CATEGORIES=3D astro MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ =20 Index: cad/pdnmesh/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/pdnmesh/Makefile (revision 326808) +++ cad/pdnmesh/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pdnmesh PORTVERSION=3D 0.2.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D cad MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} =20 Index: cad/repsnapper/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- cad/repsnapper/Makefile (revision 326808) +++ cad/repsnapper/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D repsnapper PORTVERSION=3D 2.2.0b3 +PORTREVISION=3D 1 CATEGORIES=3D cad MASTER_SITES=3D https://codeload.github.com/timschmidt/repsnapper/tar.gz= / DISTNAME=3D ${PORTVERSION} Index: deskutils/pinot/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/pinot/Makefile (revision 326808) +++ deskutils/pinot/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D pinot PORTVERSION=3D 1.06 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D deskutils MASTER_SITES=3D ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES=3D http://colinf.chez.com/pinot/ Index: devel/xorg-macros/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/Makefile (revision 326808) +++ devel/xorg-macros/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-macros -PORTVERSION=3D 1.17 +PORTVERSION=3D 1.17.1 CATEGORIES=3D devel x11 DISTNAME=3D util-macros-$(PORTVERSION) =20 Index: devel/xorg-macros/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- devel/xorg-macros/distinfo (revision 326808) +++ devel/xorg-macros/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.17.tar.bz2) =3D 7d79edde72fc17dcdc56cfbe= 2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed -SIZE (xorg/util/util-macros-1.17.tar.bz2) =3D 77029 +SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) =3D 5e52654f2a0b04223cf28a= 9d7fd62cf288852e639ac13a75172fd47d0d6ac625 +SIZE (xorg/util/util-macros-1.17.1.tar.bz2) =3D 79105 Index: emulators/catapult/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/catapult/Makefile (revision 326808) +++ emulators/catapult/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D catapult PORTVERSION=3D 0.9.1 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D SF/openmsx/openmsx/${PORTVERSION} DISTNAME=3D openmsx-${PORTNAME}-${PORTVERSION} @@ -32,8 +32,7 @@ USE_GNOME=3D gdkpixbuf2 glib20 gtk20 libxml2 USE_WX=3D 2.6+ USE_PYTHON_BUILD=3Dyes -USE_GMAKE=3D yes -USES=3D gettext iconv +USES=3D gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE=3D GNUmakefile Index: emulators/qemu-devel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/qemu-devel/Makefile (revision 326808) +++ emulators/qemu-devel/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D qemu PORTVERSION=3D 1.6.0 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot @@ -14,13 +14,12 @@ MAINTAINER=3D nox@FreeBSD.org COMMENT=3D QEMU CPU Emulator - development version =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - HAS_CONFIGURE=3D yes USE_BZIP2=3D yes USES=3D gmake pkgconfig bison USE_PERL5_BUILD=3D yes USE_PYTHON_BUILD=3D -2.7 +USE_XORG=3D pixman USE_GNOME+=3D glib20 PATCH_STRIP=3D -p1 MAKE_ENV+=3D BSD_MAKE=3D"${MAKE}" Index: emulators/tme/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- emulators/tme/Makefile (revision 326808) +++ emulators/tme/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tme PORTVERSION=3D 0.8 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D emulators MASTER_SITES=3D http://people.csail.mit.edu/fredette/tme/ =20 @@ -21,9 +21,8 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D pkgconfig gettext iconv perl5 +USES=3D pkgconfig gettext gmake iconv perl5 USE_GNOME=3D gdkpixbuf2 gtk20 -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool libltdl CONFIGURE_ENV=3D ac_cv_have_isinff=3Dno CONFIGURE_ARGS=3D --datadir=3D${WRKDIR}/tmproot --disable-warnings Index: games/klavaro/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- games/klavaro/Makefile (revision 326808) +++ games/klavaro/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D klavaro PORTVERSION=3D 1.9.6 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D games MASTER_SITES=3D SF/${PORTNAME}/ =20 @@ -22,9 +22,8 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox =20 -USES=3D pkgconfig gettext iconv +USES=3D pkgconfig gettext gmake iconv USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME=3D gtk20 Index: graphics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/Makefile (revision 326808) +++ graphics/Makefile (working copy) @@ -484,6 +484,7 @@ SUBDIR +=3D leptonica SUBDIR +=3D lfview SUBDIR +=3D lib3ds + SUBDIR +=3D libEGL SUBDIR +=3D libGL SUBDIR +=3D libGLU SUBDIR +=3D libGLw @@ -505,6 +506,7 @@ SUBDIR +=3D libgeotiff SUBDIR +=3D libgfx SUBDIR +=3D libggi + SUBDIR +=3D libglesv2 SUBDIR +=3D libgltext SUBDIR +=3D libgnomecanvas SUBDIR +=3D libgnomecanvas-reference Index: graphics/cairo/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/cairo/Makefile (revision 326808) +++ graphics/cairo/Makefile (working copy) @@ -4,7 +4,7 @@ =20 PORTNAME=3D cairo PORTVERSION=3D 1.10.2 -PORTREVISION=3D 5 +PORTREVISION=3D 6 PORTEPOCH?=3D 2 CATEGORIES=3D graphics MASTER_SITES=3D http://cairographics.org/releases/ Index: graphics/dri/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/Makefile (revision 326808) +++ graphics/dri/Makefile (working copy) @@ -9,55 +9,76 @@ =20 COMMENT=3D OpenGL hardware acceleration drivers for the DRI =20 -LIB_DEPENDS=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto =20 +.include + +# gcc from base can't handle some code in mesa 9.1+ +# We only care for 9.x and 8.x, not for old pre-clang default current. +# This is for 0b0000 binary which gcc 4.3+ understands and is in the i96= 5 driver. +.if defined(WITH_NEW_XORG) +. if ${OSVERSION} >=3D 901000 && ${OSVERSION} < 902502 \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +CC=3Dclang +CXX=3Dclang++ +CPP=3Dclang-cpp +. elif ${OSVERSION} < 901500 +USE_GCC=3Dyes +. endif +.endif + +.if ${ARCH} =3D=3D ia64 +#BROKEN=3D does not install on ia64 +.endif + ALL_DRI_DRIVERS=3DI915 I965 R200 RADEON SWRAST =20 -.if ! defined(WITH_NEW_XORG) +.if !defined(WITH_NEW_XORG) ALL_DRI_DRIVERS+=3DI810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHR= OME .endif =20 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" =20 -OPTIONS_DEFINE_i386=3D ${ALL_DRI_DRIVERS} -OPTIONS_DEFINE_amd64=3D ${OPTIONS_DEFINE_i386} +PLIST_SUB+=3D VERSION=3D${MESADISTVERSION} =20 -.if defined(WITH_NEW_XORG) -OPTIONS_DEFINE_powerpc=3D RADEON SWRAST -OPTIONS_DEFINE_sparc64=3D RADEON SWRAST -.else -OPTIONS_DEFINE_powerpc=3D MACH64 RADEON SWRAST TDFX -OPTIONS_DEFINE_sparc64=3D MACH64 RADEON SWRAST +.if ${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386 +DRI_DRIVERS=3D ${ALL_DRI_DRIVERS} .endif =20 -OPTIONS_DEFAULT=3D${OPTIONS_DEFINE} +.if defined(WITH_NEW_XORG) +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) +BUILD_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +RUN_DEPENDS+=3D llvm-config33:${PORTSDIR}/devel/llvm33 +CONFIGURE_ENV+=3D LLVM_CONFIG=3D${LOCALBASE}/bin/llvm-config33 =20 -I810_DESC=3D Include DRI support for Intel i810 -I915_DESC=3D Include DRI support for Intel i915 -I965_DESC=3D Include DRI support for Intel i965 -MACH64_DESC=3D Include DRI support for AMD/ATI Mach64 -MGA_DESC=3D Include DRI support for Matrox -R128_DESC=3D Include DRI support for AMD/ATI R128 -R200_DESC=3D Include DRI support for AMD/ATI R200 -R300_DESC=3D Include DRI support for AMD/ATI R300 -R600_DESC=3D Include DRI support for AMD/ATI R600 -RADEON_DESC=3D Include DRI support for AMD/ATI RADEON -SAVAGE_DESC=3D Include DRI support for S3/Via Savage -SIS_DESC=3D Include DRI support for SiS 300 and 6326 -SWRAST_DESC=3D Include generic software DRI support -TDFX_DESC=3D Include DRI support for 3dfx Voodoo -UNICHROME_DESC=3D Include DRI support for S3/Via Unichrome +CONFIGURE_ARGS+=3D--enable-gallium-llvm --disable-gallium-egl =20 -.include +CONFIGURE_ARGS+=3D--with-gallium-drivers=3Dr300,r600,radeonsi,svga,swras= t +PLIST_SUB+=3D GALLIUM=3D"" +. else +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers +PLIST_SUB+=3D GALLIUM=3D"@comment " +. endif +. if ${ARCH} =3D=3D powerpc || ${ARCH} =3D=3D ia64 +DRI_DRIVERS=3D RADEON SWRAST +. endif +. if ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D SWRAST +. endif +.else # !defined(WITH_NEW_XORG) +. if ${ARCH} =3D=3D powerpc +DRI_DRIVERS=3D MACH64 RADEON SWRAST TDFX +. elif ${ARCH} =3D=3D sparc64 +DRI_DRIVERS=3D MACH64 RADEON SWRAST +. endif +.endif # defined(WITH_NEW_XORG) =20 -DRI_DRIVERS=3D .for _d in ${ALL_DRI_DRIVERS} -.if ${PORT_OPTIONS:M${_d}} -DRI_DRIVERS+=3D ${_d} +.if ${DRI_DRIVERS:M${_d}} PLIST_SUB+=3D ${_d}_DRIVER=3D"" .else PLIST_SUB+=3D ${_d}_DRIVER=3D"@comment " @@ -64,16 +85,31 @@ .endif .endfor =20 -.if ${ARCH} =3D=3D "ia64" -BROKEN=3D does not install on ia64 -.endif - -.if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") +.if !(${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386) CONFIGURE_ARGS+=3D--disable-gallium-intel .endif CONFIGURE_ARGS+=3D--with-dri-drivers=3D"${DRI_DRIVERS:L}" =20 +.if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \ + && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd64) +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "For r300, r600, radeonsi and swrast gallium based drivers= =2E" + @${ECHO_MSG} "Please define WITH_GALLIUM in /etc/make.conf" + @${ECHO_MSG} "Note that gallium support is highly experimental." + @${ECHO_MSG} "" +.endif + do-install: +.if !defined(WITH_NEW_XORG) cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri +.else + cd ${WRKSRC}/src/mesa/libdricore; ${GMAKE} install + cd ${WRKSRC}/src/mesa/drivers/dri; ${GMAKE} install +. if defined(WITH_GALLIUM) && (${ARCH} =3D=3D i386 || ${ARCH} =3D=3D amd= 64) + cd ${WRKSRC}/src/gallium/drivers/radeon; ${GMAKE} install + cd ${WRKSRC}/src/gallium/targets; ${GMAKE} install +. endif +.endif =20 .include Index: graphics/dri/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/dri/pkg-plist (revision 326808) +++ graphics/dri/pkg-plist (working copy) @@ -1,19 +1,38 @@ +%%NEW%%%%I965_DRIVER%%etc/drirc include/GL/internal/dri_interface.h %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so +%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la %%I915_DRIVER%%lib/dri/i915_dri.so +%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la %%I965_DRIVER%%lib/dri/i965_dri.so %%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so %%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so %%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so +%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la %%R200_DRIVER%%lib/dri/r200_dri.so %%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r300_dri.so %%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.la +%%NEW%%%%GALLIUM%%lib/dri/r600_dri.so +%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la %%RADEON_DRIVER%%lib/dri/radeon_dri.so +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la +%%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so %%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so %%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so +%%NEW%%%%SWRAST_DRIVER%%lib/dri/swrast_dri.la %%SWRAST_DRIVER%%lib/dri/swrast_dri.so %%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la +%%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so +%%NEW%%lib/libdricore%%VERSION%%.la +%%NEW%%lib/libdricore%%VERSION%%.so +%%NEW%%lib/libdricore%%VERSION%%.so.1 +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la +%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal Index: graphics/libEGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/Makefile (revision 0) +++ graphics/libEGL/Makefile (working copy) @@ -0,0 +1,30 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libEGL +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenEGL library + +LIB_DEPENDS+=3D libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libEGL needs libdrm higher then = 2.4.24 +.endif + +USE_XORG=3D x11 xau xcb xdmcp + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes +LIB_DEPENDS+=3D libexpat.so:${PORTSDIR}/textproc/expat2 \ + libdrm.so:${PORTSDIR}/graphics/libdrm + +BUILD_WKRSRC=3D ${WRKSRC}/src/egl +INSTALL_WRKSRC=3D ${WRKSRC}/src/egl + +WITH_NEW_XORG=3D yes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libEGL/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libEGL/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-descr (revision 0) +++ graphics/libEGL/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the EGL utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libEGL/pkg-descr ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libEGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libEGL/pkg-plist (revision 0) +++ graphics/libEGL/pkg-plist (working copy) @@ -0,0 +1,11 @@ +include/EGL/egl.h +include/EGL/eglext.h +include/EGL/eglmesaext.h +include/EGL/eglplatform.h +include/KHR/khrplatform.h +lib/libEGL.la +lib/libEGL.so +lib/libEGL.so.1 +libdata/pkgconfig/egl.pc +@dirrmtry include/KHR +@dirrmtry include/EGL Property changes on: graphics/libEGL/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/Makefile (revision 326808) +++ graphics/libGL/Makefile (working copy) @@ -3,14 +3,13 @@ =20 PORTNAME=3D libGL PORTVERSION=3D ${MESAVERSION} -PORTREVISION=3D 4 +PORTREVISION=3D ${LIBGLREVISION} CATEGORIES=3D graphics =20 -MAINTAINER=3D x11@FreeBSD.org COMMENT=3D OpenGL library that renders using GLX or DRI =20 -LIB_DEPENDS+=3D drm:${PORTSDIR}/graphics/libdrm \ - expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 =20 USES=3D pkgconfig USE_XORG=3D glproto x11 xext xxf86vm xdamage xfixes dri2proto:both @@ -17,9 +16,28 @@ =20 SUB_FILES=3D pkg-install pkg-deinstall =20 +.include + +.if defined(WITH_NEW_XORG) +LIBGLREVISION=3D 0 +.else +LIBGLREVISION=3D 4 +.endif + do-install: +.if ! defined(WITH_NEW_XORG) ${RM} -f ${WRKSRC}/include/GL/glu*.h + @${MKDIR} ${PREFIX}/lib/.libGL cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +.else + cd ${WRKSRC}/src/mesa; ${GMAKE} install-pkgconfigDATA + cd ${WRKSRC}/src/glx; ${GMAKE} install + ${MKDIR} ${PREFIX}/include/GL + cd ${WRKSRC}/include/GL && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/GL/= + @${MKDIR} ${PREFIX}/lib/.libGL + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so ${PREFIX}/lib/.libGL/ + ${INSTALL_LIB} ${WRKSRC}/src/glx/.libs/libGL.so.1 ${PREFIX}/lib/.libGL/= +.endif =20 post-install: @PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @@ -26,10 +44,8 @@ =20 .include "${.CURDIR}/bsd.mesalib.mk" =20 -.include - .if !(${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386") CONFIGURE_ARGS+=3D--disable-gallium-intel .endif =20 -.include +.include Index: graphics/libGL/bsd.mesalib.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/bsd.mesalib.mk (revision 326808) +++ graphics/libGL/bsd.mesalib.mk (working copy) @@ -1,16 +1,12 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=3D4 +# bsd.mesalib.mk - shared code between MesaLib ports. # -# bsd.mesa.mk - an attempt to refactor MesaLib ports. -# -# Created by: Florent Thoumie -# # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION= : # +# - graphics/libEGL # - graphics/libGL -# - graphics/libGLU +# - grahpics/libglesv2 # - graphics/dri # # $FreeBSD$ @@ -21,7 +17,7 @@ MESADISTVERSION=3D${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} =20 .if defined(WITH_NEW_XORG) -MESABASEVERSION=3D 8.0.5 +MESABASEVERSION=3D 9.1.6 # if there is a subversion, include the '-' between 7.11-rc2 for example= =2E MESASUBVERSION=3D =09 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" @@ -35,64 +31,80 @@ DISTFILES=3D MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?=3D x11@FreeBSD.org =20 -# HACK: added lang/python as build dependency - we need to check, which = -# python versions are cleanly supported by Mesa BUILD_DEPENDS+=3D makedepend:${PORTSDIR}/devel/makedepend \ - python:${PORTSDIR}/lang/python \ + python2:${PORTSDIR}/lang/python2 \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 =20 -USES+=3D bison -USE_PYTHON_BUILD=3Dyes +USES=3D bison gmake pathfix pkgconfig shebangfix +USE_PYTHON_BUILD=3D-2.7 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes =20 CPPFLAGS+=3D -I${LOCALBASE}/include LDFLAGS+=3D -L${LOCALBASE}/lib -CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers \= - --disable-egl =20 +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+=3D ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+=3Dac_cv_prog_LEX=3D${LOCALBASE}/bin/flex +.endif + .if defined(WITH_NEW_XORG) -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ - ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c= \ - ${PATCHDIR}/extra-src_glx_XF86dri.c +USE_AUTOTOOLS=3D autoconf:env automake:env libtool:env +# probably be shared lib, and in it own port. +CONFIGURE_ARGS+=3D --enable-shared-glapi=3Dno +# we need to reapply these patches because we doing wierd stuff with aut= ogen +REAPPLY_PATCHES=3D \ + ${PATCHDIR}/patch-configure \ + ${PATCHDIR}/patch-src_egl_main_Makefile.in \ + ${PATCHDIR}/patch-src_glx_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \ + ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \ + ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in + +python_OLD_CMD=3D "/usr/bin/env[[:space:]]python" +python_CMD=3D ${LOCALBASE}/bin/python2 +SHEBANG_FILES=3D src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ + src/gallium/drivers/svga/svgadump/svga_dump.py \ + src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \ + src/mapi/mapi/mapi_abi.py .else -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-configure-old \ - ${PATCHDIR}/extra-mach64_context.h-old \ - ${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \ - ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ - ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ - ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S \ - ${PATCHDIR}/extra-src_glx_x11_XF86dri.c -CONFIGURE_ARGS+=3D--disable-glut --disable-glw -.endif +CONFIGURE_ARGS+=3D--disable-glut --disable-glw --disable-glu =20 ALL_TARGET=3D default +.endif =20 MASTERDIR=3D ${.CURDIR}/../../graphics/libGL +.if defined(WITH_NEW_XORG) PATCHDIR=3D ${MASTERDIR}/files +.else +PATCHDIR=3D ${MASTERDIR}/files-old +.endif DESCR=3D ${.CURDIR}/pkg-descr PLIST=3D ${.CURDIR}/pkg-plist WRKSRC=3D ${WRKDIR}/Mesa-${MESADISTVERSION} =20 -.if !defined(ARCH) -ARCH!=3D uname -p -.endif - COMPONENT=3D ${PORTNAME:L:C/^lib//:C/mesa-//} =20 -.if ${COMPONENT:Mglu} =3D=3D "" -CONFIGURE_ARGS+=3D --disable-glu +.if ${COMPONENT:Mglesv2} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-gles2 +.else +CONFIGURE_ARGS+=3D --enable-gles2 .endif =20 +.if ${COMPONENT:Megl} =3D=3D "" +CONFIGURE_ARGS+=3D --disable-egl +.else +CONFIGURE_ARGS+=3D --enable-egl +.endif + .if ${COMPONENT:Mdri} =3D=3D "" -CONFIGURE_ARGS+=3D --with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--with-dri-drivers=3Dno +CONFIGURE_ARGS+=3D--enable-gallium-llvm=3Dno --without-gallium-drivers .else -CONFIGURE_ARGS+=3D --with-dri-drivers=3D"i915,i965,r200,radeon,swrast" +# done in the dri port .endif =20 .if !defined(WITH_NEW_XORG) @@ -106,8 +118,35 @@ post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|'= \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c +.if !defined(WITH_NEW_XORG) @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libda= ta/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile +.else + @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g'= \ + ${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \ + ${WRKSRC}/src/glsl/builtins/tools/*.py + @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' = \ + ${WRKSRC}/src/mesa/main/get_hash_generator.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \ + ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \ =20 +.endif + +pre-configure: +# workaround for stupid rerunning configure in do-build step +# xxx +.if defined(WITH_NEW_XORG) + cd ${WRKSRC} && env NOCONFIGURE=3D1 sh autogen.sh +. for file in ${REAPPLY_PATCHES} + @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file} +. endfor +# make sure the pkg-config files are installed in the correct place. +# this was reverted by running autogen.sh + @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD= } -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ; +.endif + Index: graphics/libGL/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/distinfo (revision 326808) +++ graphics/libGL/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) =3D 701f0e4cb85d6298181651b780d1c0a439fad= d02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) =3D 4886995 -SHA256 (MesaLib-8.0.5.tar.bz2) =3D 511b8da34f8e69ed24caf422964fb7ae747f3= b1d8093f6b8aa2602164a475a5e -SIZE (MesaLib-8.0.5.tar.bz2) =3D 5734571 +SHA256 (MesaLib-9.1.6.tar.bz2) =3D e632dff0acafad0a59dc208d16dedb37f7bd5= 8f94c5d58c4b51912e41d005e3d +SIZE (MesaLib-9.1.6.tar.bz2) =3D 6134267 Index: graphics/libGL/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure (revision 326808) +++ graphics/libGL/files/extra-configure (working copy) @@ -1,40 +0,0 @@ ---- configure.orig 2012-07-10 17:30:46.000000000 +0200 -+++ configure 2012-09-01 13:27:22.000000000 +0200 -@@ -9017,9 +9017,34 @@ - DEFINES=3D"$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=3D1" - DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" -=20 -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -- fi -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"r200 radeon swrast" -+ fi -+ ;; -+ esac -+ - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-configure-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-configure-old (revision 326808) +++ graphics/libGL/files/extra-configure-old (working copy) @@ -1,43 +0,0 @@ ---- configure.orig 2009-12-22 03:31:30.000000000 +0100 -+++ configure 2012-06-27 19:49:26.000000000 +0200 -@@ -6946,12 +6946,35 @@ - CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" - fi -=20 -- # ffb and gamma are missing because they have not been converte= d -- # to use the new interface. -- if test "x$DRI_DIRS" =3D "xyes"; then -- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ -+ case "$host_cpu" in -+ x86_64) -+ # i810 is missing because there is no x86-64 system where i= t -+ # could *ever* be used. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ - unichrome savage sis swrast" -- fi -+ fi -+ ;; -+ i*86) -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ -+ unichrome savage sis swrast" -+ fi -+ ;; -+ powerpc*) -+ # Build only the drivers for cards that exist on PowerPC. -+ # At some point MGA will be added, but not yet. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" -+ fi -+ ;; -+ sparc*) -+ # Build only the drivers for cards that exist on SPARC. -+ if test "x$DRI_DIRS" =3D "xyes"; then -+ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" -+ fi -+ ;; -+ esac - ;; - gnu*) - DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Index: graphics/libGL/files/extra-mach64_context.h-old =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-mach64_context.h-old (revision 326808) +++ graphics/libGL/files/extra-mach64_context.h-old (working copy) @@ -1,20 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 -@@ -294,11 +294,14 @@ - #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) - #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) - #else --#ifndef __OpenBSD__ --#include --#else -+#if defined(__OpenBSD__) - #include - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include -+#define bswap_32 bswap32 -+#else -+#include - #endif -=20 - #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Index: graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (revis= ion 326808) +++ graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -1,14 +0,0 @@ ---- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 -+++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 -@@ -39,6 +39,11 @@ - #include "ir_visitor.h" - #include "glsl_types.h" -=20 -+#include -+#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - static float - dot(ir_constant *op0, ir_constant *op1) - { Index: graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (r= evision 326808) +++ graphics/libGL/files/extra-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -1,25 +0,0 @@ ---- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 -+++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 -@@ -106,6 +106,13 @@ - #endif - #endif -=20 -+#if defined(__sparc__) || defined(__sparc64__) -+#define PIPE_ARCH_SPARC -+#if defined(__sparc64__) -+#define PIPE_ARCH_SPARC_64 -+#endif -+#endif -+ -=20 - /* - * Endian detection. -@@ -133,7 +140,7 @@ -=20 - #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) - #define PIPE_ARCH_LITTLE_ENDIAN --#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) -+#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) - #define PIPE_ARCH_BIG_ENDIAN - #endif -=20 Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_array.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= array.c (working copy) @@ -1,99 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_array.c.orig 2011-01-06 01:19:1= 5.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_array.c 2012-04-28 18:27:06.000= 000000 +0200 -@@ -29,54 +29,71 @@ - #include "nouveau_array.h" - #include "nouveau_bufferobj.h" -=20 -+#define EXTRACT(in_t, out_t) extract_func_##in_t##_to_##out_t -+ -+#define EXTRACT_FUNC(in_t, out_t, k) \ -+static out_t EXTRACT(in_t, out_t) \ -+(struct nouveau_array *a, int i, int j) { \ -+ in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -+ \ -+ return (out_t)x / (k); \ -+} -+ -+EXTRACT_FUNC(GLchar, unsigned, 1); -+EXTRACT_FUNC(GLchar, float, SCHAR_MAX); -+EXTRACT_FUNC(GLubyte, unsigned, 1); -+EXTRACT_FUNC(GLubyte, float, UCHAR_MAX); -+EXTRACT_FUNC(GLshort, unsigned, 1); -+EXTRACT_FUNC(GLshort, float, SHRT_MAX); -+EXTRACT_FUNC(GLushort, unsigned, 1); -+EXTRACT_FUNC(GLushort, float, USHRT_MAX); -+EXTRACT_FUNC(GLint, unsigned, 1); -+EXTRACT_FUNC(GLint, float, INT_MAX); -+EXTRACT_FUNC(GLuint, unsigned, 1); -+EXTRACT_FUNC(GLuint, float, UINT_MAX); -+EXTRACT_FUNC(GLfloat, unsigned, 1.0 / UINT_MAX); -+EXTRACT_FUNC(GLfloat, float, 1); -+ -+#undef EXTRACT_FUNC -+ - static void - get_array_extract(struct nouveau_array *a, extract_u_t *extract_u, - extract_f_t *extract_f) - { --#define EXTRACT(in_t, out_t, k) \ -- ({ \ -- auto out_t f(struct nouveau_array *, int, int); \ -- out_t f(struct nouveau_array *a, int i, int j) { \ -- in_t x =3D ((in_t *)(a->buf + i * a->stride))[j]; \ -- \ -- return (out_t)x / (k); \ -- }; \ -- f; \ -- }); -- - switch (a->type) { - case GL_BYTE: -- *extract_u =3D EXTRACT(char, unsigned, 1); -- *extract_f =3D EXTRACT(char, float, SCHAR_MAX); -+ *extract_u =3D EXTRACT(GLchar, unsigned); -+ *extract_f =3D EXTRACT(GLchar, float); - break; - case GL_UNSIGNED_BYTE: -- *extract_u =3D EXTRACT(unsigned char, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned char, float, UCHAR_MAX); -+ *extract_u =3D EXTRACT(GLubyte, unsigned); -+ *extract_f =3D EXTRACT(GLubyte, float); - break; - case GL_SHORT: -- *extract_u =3D EXTRACT(short, unsigned, 1); -- *extract_f =3D EXTRACT(short, float, SHRT_MAX); -+ *extract_u =3D EXTRACT(GLshort, unsigned); -+ *extract_f =3D EXTRACT(GLshort, float); - break; - case GL_UNSIGNED_SHORT: -- *extract_u =3D EXTRACT(unsigned short, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned short, float, USHRT_MAX); -+ *extract_u =3D EXTRACT(GLushort, unsigned); -+ *extract_f =3D EXTRACT(GLushort, float); - break; - case GL_INT: -- *extract_u =3D EXTRACT(int, unsigned, 1); -- *extract_f =3D EXTRACT(int, float, INT_MAX); -+ *extract_u =3D EXTRACT(GLint, unsigned); -+ *extract_f =3D EXTRACT(GLint, float); - break; - case GL_UNSIGNED_INT: -- *extract_u =3D EXTRACT(unsigned int, unsigned, 1); -- *extract_f =3D EXTRACT(unsigned int, float, UINT_MAX); -+ *extract_u =3D EXTRACT(GLuint, unsigned); -+ *extract_f =3D EXTRACT(GLuint, float); - break; - case GL_FLOAT: -- *extract_u =3D EXTRACT(float, unsigned, 1.0 / UINT_MAX); -- *extract_f =3D EXTRACT(float, float, 1); -+ *extract_u =3D EXTRACT(GLfloat, unsigned); -+ *extract_f =3D EXTRACT(GLfloat, float); - break; - default: - assert(0); - } - } -+#undef EXTRACT -=20 - void - nouveau_init_array(struct nouveau_array *a, int attr, int stride, Index: graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouve= au_render_t.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (revision 326808) +++ graphics/libGL/files/extra-src__mesa__drivers__dri__nouveau__nouveau_= render_t.c (working copy) @@ -1,91 +0,0 @@ ---- src/mesa/drivers/dri/nouveau/nouveau_render_t.c.orig 2011-01-06 01:1= 9:34.000000000 +0100 -+++ src/mesa/drivers/dri/nouveau/nouveau_render_t.c 2012-04-28 18:27:06.= 000000000 +0200 -@@ -97,52 +97,49 @@ - } \ - } while (0) -=20 --/* -- * Select an appropriate dispatch function for the given index buffer. -- */ --static dispatch_t --get_array_dispatch(struct nouveau_array *a) -+static void -+dispatch_l(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) - { -- if (!a->fields) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- EMIT_VBO(L, ctx, start, delta, n); -- }; -- -- return f; -- -- } else if (a->type =3D=3D GL_UNSIGNED_INT) { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -- -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -+ EMIT_VBO(L, ctx, start, delta, n); -+} -=20 -- EMIT_VBO(I32, ctx, start, delta, n); -- }; -+static void -+dispatch_i32(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- return f; -+ EMIT_VBO(I32, ctx, start, delta, n); -+} -=20 -- } else { -- auto void f(struct gl_context *, unsigned int, int, unsigned int); -+static void -+dispatch_i16(struct gl_context *ctx, unsigned int start, int delta, -+ unsigned int n) -+{ -+ struct nouveau_channel *chan =3D context_chan(ctx); -+ RENDER_LOCALS(ctx); -=20 -- void f(struct gl_context *ctx, unsigned int start, int delta, -- unsigned int n) { -- struct nouveau_channel *chan =3D context_chan(ctx); -- RENDER_LOCALS(ctx); -- -- EMIT_VBO(I32, ctx, start, delta, n & 1); -- EMIT_VBO(I16, ctx, start, delta, n & ~1); -- }; -+ EMIT_VBO(I32, ctx, start, delta, n & 1); -+ EMIT_VBO(I16, ctx, start, delta, n & ~1); -+} -=20 -- return f; -- } -+/* -+ * Select an appropriate dispatch function for the given index buffer. -+ */ -+static dispatch_t -+get_array_dispatch(struct nouveau_array *a) -+{ -+ if (!a->fields) -+ return dispatch_l; -+ else if (a->type =3D=3D GL_UNSIGNED_INT) -+ return dispatch_i32; -+ else -+ return dispatch_i16; - } -=20 - /* Index: graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (revisio= n 326808) +++ graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S (working= copy) @@ -1,12 +0,0 @@ ---- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 -+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= -@@ -73,7 +73,8 @@ _x86_64_get_dispatch: -=20 - .p2align 4,,15 - _x86_64_get_dispatch: -- movq _gl_DispatchTSD(%rip), %rdi -+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax -+ movl (%rax), %edi - jmp pthread_getspecific@PLT -=20 - #elif defined(THREADS) Index: graphics/libGL/files/extra-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86-64__xform4.S (working copy)= @@ -1,74 +0,0 @@ ---- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 -+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 -@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: - * rdx =3D source - */ - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -116,7 +116,7 @@ p4_constants: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 --.float 0f+1.0 -+.float 1.0 -=20 - .text - .align 16 -@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: - movaps 16(%rax), %xmm10 -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -195,7 +195,7 @@ p4_3d_done: - _mesa_x86_64_transform_points4_identity: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -223,7 +223,7 @@ p4_identity_done: - _mesa_3dnow_transform_points4_3d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -287,7 +287,7 @@ p4_3d_no_rot_done: - _mesa_3dnow_transform_points4_perspective: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -353,7 +353,7 @@ p4_perspective_done: - _mesa_3dnow_transform_points4_2d_no_rot: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -408,7 +408,7 @@ p4_2d_no_rot_done: - _mesa_3dnow_transform_points4_2d: -=20 - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ -=20 - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ Index: graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (revision 3268= 08) +++ graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S (working copy)= @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 -+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 -@@ -47,7 +47,7 @@ - #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) -=20 - #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) --#define GLOBL_FN(x) GLOBL x ; .type x, function -+#define GLOBL_FN(x) GLOBL x ; .type x, @function - #else - #define GLOBL_FN(x) GLOBL x - #endif Index: graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (revi= sion 326808) +++ graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S (work= ing copy) @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 -+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 -@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: - testl $0x01, %ecx - je .L01 -=20 -- movzxw (%eax), %ecx -+ movzwl (%eax), %ecx - movd %ecx, %mm4 -=20 - pshufw $0x00, %mm4, %mm0 Index: graphics/libGL/files/extra-src_glx_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/XF86dri.c.orig 2012-10-24 19:03:59.000000000 +0000 -+++ src/glx/XF86dri.c 2013-05-29 10:07:33.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 - static XExtensionInfo _xf86dri_info_data; - static XExtensionInfo *xf86dri_info =3D &_xf86dri_info_data; -@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -300,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/extra-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/extra-src_glx_x11_XF86dri.c (revision 326808) +++ graphics/libGL/files/extra-src_glx_x11_XF86dri.c (working copy) @@ -1,38 +0,0 @@ ---- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 -+++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include - #include - #include "xf86dristr.h" -+#include -=20 -=20 - #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 -@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int - } -=20 - if (rep.length) { -- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString =3D NULL; -+ if (*busIdString =3D=3D NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; -=20 - if (rep.length) { -- if (! -- (*clientDriverName =3D -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName =3D NULL; -+ if (*clientDriverName =3D=3D NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); Index: graphics/libGL/files/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-configure (revision 0) +++ graphics/libGL/files/patch-configure (working copy) @@ -0,0 +1,49 @@ +--- configure.orig 2013-08-01 23:22:15.000000000 +0200 ++++ configure 2013-08-19 20:05:02.000000000 +0200 +@@ -21046,9 +21046,34 @@ + DEFINES=3D"$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=3D1"= + DEFINES=3D"$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" +=20 +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" +- fi ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 nouveau r200 radeon swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"r200 radeon swrast" ++ fi ++ ;; ++ esac ++ + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " +@@ -23396,7 +23421,7 @@ + radeon_llvm_check() { + LLVM_REQUIRED_VERSION_MAJOR=3D"3" + LLVM_REQUIRED_VERSION_MINOR=3D"2" +- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then ++ if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${L= LVM_REQUIRED_VERSION_MINOR}"; then + as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRE= D_VERSION_MINOR with R600 target enabled is required. + To use the r600/radeonsi LLVM backend, you need to= fetch the LLVM source from: + git://people.freedesktop.org/~tstellar/llvm master= Property changes on: graphics/libGL/files/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (revis= ion 0) +++ graphics/libGL/files/patch-src-glsl_ir_constant_expression.cpp (worki= ng copy) @@ -0,0 +1,14 @@ +--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.0000000= 00 +0200 ++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0= 200 +@@ -39,6 +39,11 @@ + #include "ir_visitor.h" + #include "glsl_types.h" +=20 ++#include ++#if __FreeBSD_version <=3D 704100 || (__FreeBSD_version >=3D 800000 && = __FreeBSD_version < 802502) || (__FreeBSD_version >=3D 900000 && __FreeBS= D_version < 900027) ++#define log2(x) (log(x) / log(2)) ++#endif ++ + static float + dot(ir_constant *op0, ir_constant *op1) + { Property changes on: graphics/libGL/files/patch-src-glsl_ir_constant_expr= ession.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (r= evision 0) +++ graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (w= orking copy) @@ -0,0 +1,25 @@ +--- src/gallium/include/pipe/p_config.h.orig 2011-10-15 02:43:58.0000000= 00 +0200 ++++ src/gallium/include/pipe/p_config.h 2012-06-28 21:27:06.000000000 +0= 200 +@@ -106,6 +106,13 @@ + #endif + #endif +=20 ++#if defined(__sparc__) || defined(__sparc64__) ++#define PIPE_ARCH_SPARC ++#if defined(__sparc64__) ++#define PIPE_ARCH_SPARC_64 ++#endif ++#endif ++ +=20 + /* + * Endian detection. +@@ -133,7 +140,7 @@ +=20 + #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) + #define PIPE_ARCH_LITTLE_ENDIAN +-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) ++#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PI= PE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64) + #define PIPE_ARCH_BIG_ENDIAN + #endif +=20 Property changes on: graphics/libGL/files/patch-src__gallium__include__pi= pe__p_config.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_egl_main_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_egl_main_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_egl_main_Makefile.in (working copy) @@ -0,0 +1,19 @@ +--- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200 ++++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200 +@@ -990,8 +990,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libEGL.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1 +- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_egl_main_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (r= evision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r300_r300-chipset.c (w= orking copy) @@ -0,0 +1,26 @@ +diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drive= rs/r300/r300_chipset.c +index 11061ed..daf990e 100644 +--- src/gallium/drivers/r300/r300_chipset.c ++++ src/gallium/drivers/r300/r300_chipset.c +@@ -48,6 +48,21 @@ static void r300_apply_hyperz_blacklist(struct r300_c= apabilities* caps) + }; + int i; +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++ const char *progname, *program_invocation_short_name; ++ ++ progname =3D getprogname(); ++ program_invocation_short_name =3D strrchr(progname, '/'); ++ if (program_invocation_short_name) { ++ program_invocation_short_name++; ++ } else { ++ program_invocation_short_name =3D progname; ++ } ++#endif ++ + for (i =3D 0; i < Elements(list); i++) { + if (strcmp(list[i], program_invocation_short_name) =3D=3D 0) { + caps->zmask_ram =3D 0; Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r300_= r300-chipset.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (revis= ion 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c (worki= ng copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_asm.c.orig 2013-03-20 00:28:25.0000000= 00 +0100 ++++ src/gallium/drivers/r600/r600_asm.c 2013-06-26 23:29:14.000000000 +0= 200 +@@ -27,7 +27,12 @@ + #include "r600d.h" +=20 + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif + #include "util/u_memory.h" + #include "pipe/p_shader_tokens.h" +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-asm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (re= vision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c (wo= rking copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_shader.c.orig 2013-05-16 19:38:54.0000= 00000 +0200 ++++ src/gallium/drivers/r600/r600_shader.c 2013-06-26 23:26:02.000000000= +0200 +@@ -35,7 +35,12 @@ + #include "util/u_memory.h" + #include + #include ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + /* CAYMAN notes=20 + Why CAYMAN got loops for lots of instructions is explained here. Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600-shader.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_com= mon.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common= =2Ec (working copy) @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_state_common.c.orig 2013-03-06 00:25:3= 9.000000000 +0100 ++++ src/gallium/drivers/r600/r600_state_common.c 2013-06-26 23:26:02.000= 000000 +0200 +@@ -33,7 +33,12 @@ + #include "util/u_memory.h" + #include "util/u_upload_mgr.h" + #include "tgsi/tgsi_parse.h" ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX +=20 Property changes on: graphics/libGL/files/patch-src_gallium_drivers_r600_= r600_state_common.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-= emit.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeon_radeon-llvm-emi= t.cpp (working copy) @@ -0,0 +1,28 @@ +--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig 2013-08-19 21:2= 3:06.000000000 +0200 ++++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-08-19 21:30:58.= 000000000 +0200 +@@ -25,13 +25,13 @@ + */ + #include "radeon_llvm_emit.h" +=20 +-#include +-#include ++#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include +=20 + #include + #include Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= n_radeon-llvm-emit.cpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffe= r.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (revision 0) +++ graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c= (working copy) @@ -0,0 +1,16 @@ +--- src/gallium/drivers/radeonsi/r600_buffer.c.orig 2013-08-01 00:56:45.= 000000000 +0200 ++++ src/gallium/drivers/radeonsi/r600_buffer.c 2013-08-19 21:36:02.00000= 0000 +0200 +@@ -24,7 +24,13 @@ + * Jerome Glisse + * Corbin Simpson + */ ++ ++#if defined(__linux__) + #include ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32(x) bswap32((x)) ++#endif +=20 + #include "pipe/p_screen.h" + #include "util/u_format.h" Property changes on: graphics/libGL/files/patch-src_gallium_drivers_radeo= nsi_r600-buffer.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-= ioctl.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (revision 0) +++ graphics/libGL/files/patch-src_gallium_winsys_svga_drm_vmw-screen-ioc= tl.c (working copy) @@ -0,0 +1,18 @@ +diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/galliu= m/winsys/svga/drm/vmw_screen_ioctl.c +index 36888dc..62a6e6a 100644 +--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c ++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +@@ -66,6 +66,13 @@ struct vmw_region + */ + #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9) +=20 ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++#define ERESTART EINTR ++#endif ++ + uint32 + vmw_ioctl_context_create(struct vmw_winsys_screen *vws) + { Property changes on: graphics/libGL/files/patch-src_gallium_winsys_svga_d= rm_vmw-screen-ioctl.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_glx_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_glx_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_glx_Makefile.in (working copy) @@ -0,0 +1,59 @@ +--- src/glx/Makefile.in.orig 2013-07-03 15:13:37.000000000 +0200 ++++ src/glx/Makefile.in 2013-07-03 15:19:44.000000000 +0200 +@@ -162,12 +162,12 @@ + depcomp =3D $(SHELL) $(top_srcdir)/bin/depcomp + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f +-COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE =3D $(CC) $(DEFS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) = \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; +@@ -632,17 +632,17 @@ + $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=3D; \ ++ @list=3D'$(lib_LTLIBRARIES)'; test -n "$(libdir)/.libGL" || list=3D; \= + list2=3D; for p in $$list; do \ + if test -f $$p; then \ + list2=3D"$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ +- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)/.libGL'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(libdir)/.libGL" || exit 1; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstal= l $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)/.libGL'";= \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=3Dinstall $(INS= TALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)/.libGL"; \ + } +=20 + uninstall-libLTLIBRARIES: +@@ -1068,8 +1068,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: lib@GL_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB= @.so.1 +- ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_glx_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_es2api_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (revision 0) +++ graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (working copy)= @@ -0,0 +1,20 @@ +--- src/mapi/es2api/Makefile.in.orig 2013-08-01 23:22:21.000000000 +0200= ++++ src/mapi/es2api/Makefile.in 2013-09-01 11:38:01.000000000 +0200 +@@ -958,9 +958,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + all-local: libGLESv2.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +- ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so +- ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2 +- ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so= =2E2.0.0 ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_es2api_Makefile.= in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py (working= copy) @@ -0,0 +1,11 @@ +--- src/mapi/glapi/gen/gl_gentable.py.orig 2013-07-17 15:41:13.000000000= +0200 ++++ src/mapi/glapi/gen/gl_gentable.py 2013-07-17 15:41:55.000000000 +020= 0 +@@ -42,7 +42,7 @@ + #endif +=20 + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !def= ined(__CYGWIN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) + #define USE_BACKTRACE + #endif +=20 Property changes on: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gen= table.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (revisio= n 0) +++ graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (working= copy) @@ -0,0 +1,20 @@ +--- src/mapi/shared-glapi/Makefile.in.orig 2013-06-27 00:42:45.000000000= +0200 ++++ src/mapi/shared-glapi/Makefile.in 2013-06-27 00:43:25.000000000 +020= 0 +@@ -889,9 +889,14 @@ +=20 + all-local: libglapi.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR) +- ln -f .libs/libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0= =2E0.0 +- ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0 +- ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so ++ base=3D$(basename $<); \ ++ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2); \ ++ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2); \ ++ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \ ++ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \ ++ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \ ++ fi; \ ++ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so +=20 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: graphics/libGL/files/patch-src_mapi_shared-glapi_Mak= efile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_Makefile (revision 326808) +++ graphics/libGL/files/patch-src_mesa_Makefile (working copy) @@ -1,15 +0,0 @@ ---- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 -+++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 -@@ -183,10 +183,10 @@ - $(DESTDIR)$(INSTALL_INC_DIR)/GL -=20 - install-libgl: default gl.pc install-headers -- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ -- $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -=20 - install-osmesa: default osmesa.pc Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (r= evision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_Makefile.in (w= orking copy) @@ -0,0 +1,17 @@ +--- src/mesa/drivers/dri/common/Makefile.in.orig 2013-04-20 14:50:15.000= 000000 +0000 ++++ src/mesa/drivers/dri/common/Makefile.in 2013-04-20 15:02:05.00000000= 0 +0000 +@@ -123,11 +123,11 @@ + am__depfiles_maybe =3D depfiles + am__mv =3D mv -f + COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS= ) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=3Dcompile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(CPPFLAGS= ) \ ++ $(CFLAGS) + AM_V_CC =3D $(am__v_CC_@AM_V@) + am__v_CC_ =3D $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 =3D @echo " CC " $@; Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Mak= efile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (revision 0) +++ graphics/libGL/files/patch-src_mesa_drivers_dri_common_xmlpool_Makefi= le.in (working copy) @@ -0,0 +1,11 @@ +--- src/mesa/drivers/dri/common/xmlpool/Makefile.in.orig 2013-07-02 22:4= 2:09.000000000 +0200 ++++ src/mesa/drivers/dri/common/xmlpool/Makefile.in 2013-07-02 22:53:30.= 000000000 +0200 +@@ -639,7 +639,7 @@ + # Update .mo files from the corresponding .po files. + %/LC_MESSAGES/options.mo: %.po + @mo=3D"$@"; \ +- lang=3D$${mo%%/*}; \ ++ lang=3D$*; \ + echo "Updating ($$lang) $@ from $?."; \ + mkdir -p $$lang/LC_MESSAGES; \ + msgfmt -o $@ $? Property changes on: graphics/libGL/files/patch-src_mesa_drivers_dri_comm= on_xmlpool_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (revision = 0) +++ graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (working c= opy) @@ -0,0 +1,19 @@ +--- src/mesa/libdricore/Makefile.in.orig 2013-06-27 00:21:26.000000000 += 0200 ++++ src/mesa/libdricore/Makefile.in 2013-06-27 00:28:29.000000000 +0200 +@@ -3950,8 +4000,14 @@ + # a while by putting a link to the driver into /lib of the build tree. + @HAVE_DRI_TRUE@all-local: libdricore@VERSION@.la + @HAVE_DRI_TRUE@ $(MKDIR_P) $(top_builddir)/$(LIB_DIR); +-@HAVE_DRI_TRUE@ ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir= )/$(LIB_DIR)/libdricore@VERSION@.so.1; +-@HAVE_DRI_TRUE@ ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_D= IR)/libdricore@VERSION@.so ++@HAVE_DRI_TRUE@ base=3D$(basename $<); \ ++@HAVE_DRI_TRUE@ dlname=3D$$(grep dlname=3D .libs/$< | cut -d "'" -f 2);= \ ++@HAVE_DRI_TRUE@ ver=3D$$(grep current=3D .libs/$< | cut -d "=3D" -f 2);= \ ++@HAVE_DRI_TRUE@ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlnam= e; \ ++@HAVE_DRI_TRUE@ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ];= then \ ++@HAVE_DRI_TRUE@ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.= $$ver; \ ++@HAVE_DRI_TRUE@ fi; \ ++@HAVE_DRI_TRUE@ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$bas= e.so +=20 + -include $(DEPENDS) +=20 Property changes on: graphics/libGL/files/patch-src_mesa_libdricore_Makef= ile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files/patch-src_mesa_main_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files/patch-src_mesa_main_compiler.h (revision 0) +++ graphics/libGL/files/patch-src_mesa_main_compiler.h (working copy) @@ -0,0 +1,12 @@ +--- src/mesa/main/compiler.h.orig 2013-04-06 04:01:09.000000000 +0200 ++++ src/mesa/main/compiler.h 2013-06-26 23:26:02.000000000 +0200 +@@ -171,6 +171,9 @@ + #if defined(__linux__) + #include + #define CPU_TO_LE32( x ) bswap_32( x ) ++#elif defined(__FreeBSD__) ++#include ++#define CPU_TO_LE32( x ) bswap32( x ) + #elif defined(__APPLE__) + #include + #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) Property changes on: graphics/libGL/files/patch-src_mesa_main_compiler.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-configure (revision 0) +++ graphics/libGL/files-old/patch-configure (working copy) @@ -0,0 +1,43 @@ +--- configure.orig 2009-12-22 03:31:30.000000000 +0100 ++++ configure 2012-06-27 19:49:26.000000000 +0200 +@@ -6946,12 +6946,35 @@ + CXXFLAGS=3D"$CXXFLAGS -ansi -pedantic" + fi +=20 +- # ffb and gamma are missing because they have not been converte= d +- # to use the new interface. +- if test "x$DRI_DIRS" =3D "xyes"; then +- DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r600 r= adeon tdfx \ ++ case "$host_cpu" in ++ x86_64) ++ # i810 is missing because there is no x86-64 system where i= t ++ # could *ever* be used. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i915 i965 mach64 mga r128 r200 r300 r600 ra= deon tdfx \ + unichrome savage sis swrast" +- fi ++ fi ++ ;; ++ i*86) ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"i810 i915 i965 mach64 mga r128 r200 r300 r6= 00 radeon tdfx \ ++ unichrome savage sis swrast" ++ fi ++ ;; ++ powerpc*) ++ # Build only the drivers for cards that exist on PowerPC. ++ # At some point MGA will be added, but not yet. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon tdfx swra= st" ++ fi ++ ;; ++ sparc*) ++ # Build only the drivers for cards that exist on SPARC. ++ if test "x$DRI_DIRS" =3D "xyes"; then ++ DRI_DIRS=3D"mach64 r128 r200 r300 r600 radeon swrast" ++ fi ++ ;; ++ esac + ;; + gnu*) + DEFINES=3D"$DEFINES -DUSE_EXTERNAL_DXTN_LIB=3D1 -DIN_DRI_DRIVER= " Property changes on: graphics/libGL/files-old/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-mach64_context.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-mach64_context.h (revision 0) +++ graphics/libGL/files-old/patch-mach64_context.h (working copy) @@ -0,0 +1,20 @@ +--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:3= 2.000000000 +0200 ++++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000= 000000 +0200 +@@ -294,11 +294,14 @@ + #define LE32_OUT( x, y ) do { *(GLuint *)(x) =3D (y); } while (0) + #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) =3D (y); } while (0= ) + #else +-#ifndef __OpenBSD__ +-#include +-#else ++#if defined(__OpenBSD__) + #include + #define bswap_32 bswap32 ++#elif defined(__FreeBSD__) ++#include ++#define bswap_32 bswap32 ++#else ++#include + #endif +=20 + #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) Property changes on: graphics/libGL/files-old/patch-mach64_context.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (rev= ision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S (wor= king copy) @@ -0,0 +1,12 @@ +--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 = +0100 ++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100= +@@ -73,7 +73,8 @@ _x86_64_get_dispatch: +=20 + .p2align 4,,15 + _x86_64_get_dispatch: +- movq _gl_DispatchTSD(%rip), %rdi ++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax ++ movl (%rax), %edi + jmp pthread_getspecific@PLT +=20 + #elif defined(THREADS) Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__gl= api_x86-64.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S (working c= opy) @@ -0,0 +1,74 @@ +--- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 ++++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 +@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: + * rdx =3D source + */ + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -116,7 +116,7 @@ p4_constants: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 +-.float 0f+1.0 ++.float 1.0 +=20 + .text + .align 16 +@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: + movaps 16(%rax), %xmm10 +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -195,7 +195,7 @@ p4_3d_done: + _mesa_x86_64_transform_points4_identity: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -223,7 +223,7 @@ p4_identity_done: + _mesa_3dnow_transform_points4_3d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -287,7 +287,7 @@ p4_3d_no_rot_done: + _mesa_3dnow_transform_points4_perspective: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -353,7 +353,7 @@ p4_perspective_done: + _mesa_3dnow_transform_points4_2d_no_rot: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ +@@ -408,7 +408,7 @@ p4_2d_no_rot_done: + _mesa_3dnow_transform_points4_2d: +=20 + movl V4F_COUNT(%rdx), %ecx /* count */ +- movzx V4F_STRIDE(%rdx), %eax /* stride */ ++ movzbl V4F_STRIDE(%rdx), %eax /* stride */ +=20 + movl %ecx, V4F_COUNT(%rdi) /* set dest count */ + movl $4, V4F_SIZE(%rdi) /* set dest size */ Property changes on: graphics/libGL/files-old/patch-src__mesa__x86-64__xf= orm4.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (revision = 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S (working c= opy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 ++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 +@@ -47,7 +47,7 @@ + #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) +=20 + #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32= __) +-#define GLOBL_FN(x) GLOBL x ; .type x, function ++#define GLOBL_FN(x) GLOBL x ; .type x, @function + #else + #define GLOBL_FN(x) GLOBL x + #endif Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__glapi= _x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.= S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= revision 0) +++ graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S (= working copy) @@ -0,0 +1,11 @@ +--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.0000000= 00 +0200 ++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0= 100 +@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: + testl $0x01, %ecx + je .L01 +=20 +- movzxw (%eax), %ecx ++ movzwl (%eax), %ecx + movd %ecx, %mm4 +=20 + pshufw $0x00, %mm4, %mm0 Property changes on: graphics/libGL/files-old/patch-src__mesa__x86__read_= rgba_span_x86.S ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (revision 0) +++ graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c (working copy) @@ -0,0 +1,38 @@ +--- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 ++++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 +@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN + #include + #include + #include "xf86dristr.h" ++#include +=20 +=20 + #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >=3D 303 +@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int + } +=20 + if (rep.length) { +- if (!(*busIdString =3D (char *) Xcalloc(rep.busIdStringLength + 1= , 1))) { ++ if (rep.busIdStringLength < INT_MAX) ++ *busIdString =3D Xcalloc(rep.busIdStringLength + 1, 1); ++ else ++ *busIdString =3D NULL; ++ if (*busIdString =3D=3D NULL) { + _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); +@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy + *ddxDriverPatchVersion =3D rep.ddxDriverPatchVersion; +=20 + if (rep.length) { +- if (! +- (*clientDriverName =3D +- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { ++ if (rep.clientDriverNameLength < INT_MAX) ++ *clientDriverName =3D Xcalloc(rep.clientDriverNameLength + 1, 1); ++ else ++ *clientDriverName =3D NULL; ++ if (*clientDriverName =3D=3D NULL) { + _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); + UnlockDisplay(dpy); + SyncHandle(); Property changes on: graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c= ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/files-old/patch-src_mesa_Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/files-old/patch-src_mesa_Makefile (revision 0) +++ graphics/libGL/files-old/patch-src_mesa_Makefile (working copy) @@ -0,0 +1,15 @@ +--- src/mesa/Makefile.orig 2009-12-22 03:31:19.000000000 +0100 ++++ src/mesa/Makefile 2013-08-19 23:19:42.000000000 +0200 +@@ -127,10 +127,10 @@ + $(DESTDIR)$(INSTALL_INC_DIR)/GL +=20 + install-libgl: default gl.pc install-headers +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ +- $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig +=20 + install-osmesa: default osmesa.pc Property changes on: graphics/libGL/files-old/patch-src_mesa_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libGL/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGL/pkg-plist (revision 326808) +++ graphics/libGL/pkg-plist (working copy) @@ -11,9 +11,10 @@ %%OLD%%include/GL/mglmesa.h include/GL/osmesa.h %%OLD%%include/GL/svgamesa.h -include/GL/vms_x_fix.h +%%OLD%%include/GL/vms_x_fix.h include/GL/wglext.h include/GL/wmesa.h +%%NEW%%lib/.libGL/libGL.la lib/.libGL/libGL.so lib/.libGL/libGL.so.1 libdata/pkgconfig/gl.pc Index: graphics/libGLw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libGLw/Makefile (revision 326808) +++ graphics/libGLw/Makefile (working copy) @@ -12,9 +12,10 @@ COMMENT=3D OpenGL widgets library =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig motif +USES=3D pathfix pkgconfig USE_LDCONFIG=3D yes USE_GL=3D gl +USE_MOTIF=3D yes USE_XORG=3D x11 xt xext GNU_CONFIGURE=3D yes CONFIGURE_ARGS=3D --disable-static --enable-motif Index: graphics/libdrm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/Makefile (revision 326808) +++ graphics/libdrm/Makefile (working copy) @@ -10,8 +10,8 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Userspace interface to kernel Direct Rendering Module service= s =20 -LIB_DEPENDS=3D pciaccess:${PORTSDIR}/devel/libpciaccess \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs +LIB_DEPENDS=3D libpciaccess.so:${PORTSDIR}/devel/libpciaccess \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs =20 USES=3D pkgconfig USE_BZIP2=3D yes @@ -18,15 +18,8 @@ GNU_CONFIGURE=3D yes USE_LDCONFIG=3D yes =20 +OPTIONS_DEFINE=3D MANPAGES =20 -.if defined(WITH_NEW_XORG) - -USES+=3D gmake - -OPTIONS_DEFINE=3D KMS MANPAGES -OPTIONS_DEFAULT=3DKMS -KMS_DESC=3D Enable KMS support - .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+=3D MANPAGES .endif @@ -33,12 +26,18 @@ =20 .include =20 -.if ${PORT_OPTIONS:MKMS} +.if defined(WITH_NEW_XORG) + +USES+=3D gmake + +# KMS support in the kernel is only build on these archs, disable others= +.if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" CONFIGURE_ARGS+=3D--enable-libkms EXTRA_PATCHES+=3D ${FILESDIR}/extra-xf86drmMode.c -PLIST_SUB+=3D KMS=3D"" +PLIST_SUB+=3D KMS=3D"" NOUVEAU=3D"" .else -PLIST_SUB+=3D KMS=3D"@comment " +CONFIGURE_ARGS+=3D--disable-libkms +PLIST_SUB+=3D KMS=3D"@comment " NOUVEAU=3D"@comment " .endif =20 .if ${PORT_OPTIONS:MMANPAGES} @@ -69,11 +68,9 @@ CONFIGURE_ARGS=3D --enable-nouveau-experimental-api LIBDRM_VERSION=3D 2.4.17 LIBDRM_REVISION=3D1 -PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " +PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " NOUVEAU=3D"" .endif =20 -.include - .if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386" || ${ARCH} =3D=3D "i= a64" || ${ARCH} =3D=3D "powerpc" PLIST_SUB+=3D INTEL_DRIVER=3D"" PLIST_SUB+=3D RADEON_DRIVERS=3D"" @@ -87,4 +84,4 @@ s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure =20 -.include +.include Index: graphics/libdrm/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libdrm/pkg-plist (revision 326808) +++ graphics/libdrm/pkg-plist (working copy) @@ -22,8 +22,9 @@ %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h -%%NEW%%include/libdrm/nouveau.h +%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h +%%NEW%%include/libdrm/qxl_drm.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -54,10 +55,10 @@ %%INTEL_DRIVER%%lib/libdrm_intel.la %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 -lib/libdrm_nouveau.la -lib/libdrm_nouveau.so -%%OLD%%lib/libdrm_nouveau.so.1 -%%NEW%%lib/libdrm_nouveau.so.2 +%%NOUVEAU%%lib/libdrm_nouveau.la +%%NOUVEAU%%lib/libdrm_nouveau.so +%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1 +%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 @@ -66,7 +67,7 @@ %%NEW%%%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc -libdata/pkgconfig/libdrm_nouveau.pc +%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc %%OLD%%@dirrm include/nouveau Index: graphics/libglesv2/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/Makefile (revision 0) +++ graphics/libglesv2/Makefile (working copy) @@ -0,0 +1,29 @@ +# Created by: kwm@FreeBSD.org +# $FreeBSD$ + +PORTNAME=3D libglesv2 +PORTVERSION=3D ${MESAVERSION} +CATEGORIES=3D graphics + +COMMENT=3D OpenGL ES v2 library + +LIB_DEPENDS+=3D libdrm.so:${PORTSDIR}/graphics/libdrm \ + libexpat.so:${PORTSDIR}/textproc/expat2 + +.if ! defined(WITH_NEW_XORG) +IGNORE=3D Please enable WITH_NEW_XORG, libglesv2 needs libdrm higher th= en 2.4.24 +.endif + +# stuff not needed by libEGL but configure wants it +USE_XORG+=3D glproto dri2proto xext xdamage xfixes + + +BUILD_WKRSRC=3D ${WRKSRC}/src/mapi/es2api +INSTALL_WRKSRC=3D ${WRKSRC}/src/mapi/es2api + +# this library doesn't exist in Mesa 7.6 so use newer +WITH_NEW_XORG=3Dyes + +.include +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include Property changes on: graphics/libglesv2/Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: graphics/libglesv2/pkg-descr =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-descr (revision 0) +++ graphics/libglesv2/pkg-descr (working copy) @@ -0,0 +1,3 @@ +This package contains the GL ES v2 utility library. + +WWW: http://www.freedesktop.org/Software/xorg Property changes on: graphics/libglesv2/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libglesv2/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libglesv2/pkg-plist (revision 0) +++ graphics/libglesv2/pkg-plist (working copy) @@ -0,0 +1,12 @@ +include/GLES2/gl2.h +include/GLES2/gl2ext.h +include/GLES2/gl2platform.h +include/GLES3/gl3.h +include/GLES3/gl3ext.h +include/GLES3/gl3platform.h +lib/libGLESv2.la +lib/libGLESv2.so +lib/libGLESv2.so.2 +libdata/pkgconfig/glesv2.pc +@dirrmtry include/GLES3 +@dirrmtry include/GLES2 Property changes on: graphics/libglesv2/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/libreatlas/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/libreatlas/Makefile (revision 326808) +++ graphics/libreatlas/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D libreatlas PORTVERSION=3D 1.0.0a -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D graphics geography MASTER_SITES=3D http://www.gaia-gis.it/gaia-sins/ =20 @@ -30,8 +30,7 @@ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 GNU_CONFIGURE=3D yes -USES=3D pkgconfig gettext iconv -USE_GMAKE=3D yes +USES=3D pkgconfig gettext gmake iconv USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp x= ext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME=3D atk gdkpixbuf2 glib20 gtk20 pango Index: multimedia/freetuxtv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- multimedia/freetuxtv/Makefile (revision 326808) +++ multimedia/freetuxtv/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D freetuxtv PORTVERSION=3D 0.6.5 -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D multimedia MASTER_SITES=3D GOOGLE_CODE =20 @@ -26,13 +26,12 @@ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig =20 -USES=3D iconv pathfix pkgconfig +USES=3D gmake iconv pathfix pkgconfig USE_GNOME=3D glib20 gtk20 USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfi= xes \ xi xinerama xrandr xrender GNU_CONFIGURE=3D yes CONFIGURE_ARGS+=3D--with-gtk=3D2.0 -USE_GMAKE=3D yes CFLAGS=3D -Wno-return-type INSTALLS_ICONS=3D yes =20 Index: net/cvsup/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/cvsup/Makefile (revision 326808) +++ net/cvsup/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D cvsup PORTVERSION=3D 16.1h -PORTREVISION=3D 4 +PORTREVISION=3D 5 CATEGORIES=3D net devel MASTER_SITES=3D ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=3Ddevelopment/CVSup/snapshots Index: net/tigervnc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- net/tigervnc/Makefile (revision 326808) +++ net/tigervnc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D tigervnc PORTVERSION=3D 1.2.0 -PORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D net x11-servers MASTER_SITES=3D SF:tigervnc MASTER_SITE_SUBDIR=3D ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc @@ -28,8 +28,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes =20 -USES=3D cmake pkgconfig -USE_GMAKE=3D yes +USES=3D cmake gmake pkgconfig USE_GL=3D gl USE_AUTOTOOLS+=3D autoconf:env automake:env libtool:env USE_PYTHON=3D yes Index: print/photoprint/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- print/photoprint/Makefile (revision 326808) +++ print/photoprint/Makefile (working copy) @@ -2,6 +2,7 @@ =20 PORTNAME=3D photoprint DISTVERSION=3D 0.4.2-pre2 +PORTREVISION=3D 1 CATEGORIES=3D print graphics MASTER_SITES=3D http://www.blackfiveimaging.co.uk/photoprint/ =20 @@ -17,7 +18,6 @@ lcms:${PORTSDIR}/graphics/lcms \ netpbm:${PORTSDIR}/graphics/netpbm \ pcre:${PORTSDIR}/devel/pcre \ - pixman:${PORTSDIR}/x11/pixman \ png15:${PORTSDIR}/graphics/png \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ tiff:${PORTSDIR}/graphics/tiff @@ -25,7 +25,7 @@ GNU_CONFIGURE=3D yes USES=3D desktop-file-utils gettext pkgconfig USE_GNOME=3D pango -USE_XORG=3D x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ +USE_XORG=3D pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender INSTALLS_ICONS=3D yes =20 Index: sysutils/gtk-imonc/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/gtk-imonc/Makefile (revision 326808) +++ sysutils/gtk-imonc/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtk-imonc PORTVERSION=3D 0.6.4.1 -PORTREVISION=3D 12 +PORTREVISION=3D 13 CATEGORIES=3D sysutils MASTER_SITES=3D http://stefan-strigler.de/download/ =20 Index: sysutils/nitrogen/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sysutils/nitrogen/Makefile (revision 326808) +++ sysutils/nitrogen/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D nitrogen PORTVERSION=3D 1.5.2 -PORTREVISION=3D 2 +PORTREVISION=3D 3 CATEGORIES=3D sysutils MASTER_SITES=3D http://projects.l3ib.org/nitrogen/files/ =20 Index: x11/libSM/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/Makefile (revision 326808) +++ x11/libSM/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libSM -PORTVERSION=3D 1.2.1 +PORTVERSION=3D 1.2.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libSM/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libSM/distinfo (revision 326808) +++ x11/libSM/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) =3D 93c11d569c64f40723b93b44af1efb= 474a0cfe92573b0c8c330343cabb897f1d -SIZE (xorg/lib/libSM-1.2.1.tar.bz2) =3D 334696 +SHA256 (xorg/lib/libSM-1.2.2.tar.bz2) =3D 0baca8c9f5d934450a70896c4ad38d= 06475521255ca63b717a6510fdb6e287bd +SIZE (xorg/lib/libSM-1.2.2.tar.bz2) =3D 348908 Index: x11/libX11/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/Makefile (revision 326808) +++ x11/libX11/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libX11 -PORTVERSION=3D 1.6.1 +PORTVERSION=3D 1.6.2 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libX11/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/distinfo (revision 326808) +++ x11/libX11/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libX11-1.6.1.tar.bz2) =3D 10a54fc16b58b4f5a5eed4d080c35= 7a82fd2f42d09af625c1f5df50650701892 -SIZE (xorg/lib/libX11-1.6.1.tar.bz2) =3D 2356196 +SHA256 (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2aa027e837231d2eeea90f3a4afe1= 9948a6eb4c8b2bec0241eba7dbc8106bd16 +SIZE (xorg/lib/libX11-1.6.2.tar.bz2) =3D 2339981 Index: x11/libX11/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libX11/pkg-plist (revision 326808) +++ x11/libX11/pkg-plist (working copy) @@ -103,6 +103,9 @@ lib/X11/locale/ja_JP.UTF-8/Compose lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE +lib/X11/locale/km_KH.UTF-8/Compose +lib/X11/locale/km_KH.UTF-8/XI18N_OBJS +lib/X11/locale/km_KH.UTF-8/XLC_LOCALE lib/X11/locale/ko/Compose lib/X11/locale/ko/XI18N_OBJS lib/X11/locale/ko/XLC_LOCALE @@ -141,6 +144,9 @@ lib/X11/locale/ru_RU.UTF-8/Compose lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE +lib/X11/locale/sr_CS.UTF-8/Compose +lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS +lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE lib/X11/locale/tatar-cyr/Compose lib/X11/locale/tatar-cyr/XI18N_OBJS lib/X11/locale/tatar-cyr/XLC_LOCALE @@ -215,6 +221,7 @@ @dirrm lib/X11/locale/th_TH.UTF-8 @dirrm lib/X11/locale/th_TH @dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/sr_CS.UTF-8 @dirrm lib/X11/locale/ru_RU.UTF-8 @dirrm lib/X11/locale/pt_BR.UTF-8 @dirrm lib/X11/locale/nokhchi-1 @@ -227,6 +234,7 @@ @dirrm lib/X11/locale/koi8-c @dirrm lib/X11/locale/ko_KR.UTF-8 @dirrm lib/X11/locale/ko +@dirrm lib/X11/locale/km_KH.UTF-8 @dirrm lib/X11/locale/ja_JP.UTF-8 @dirrm lib/X11/locale/ja.SJIS @dirrm lib/X11/locale/ja.JIS Index: x11/libXpm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/Makefile (revision 326808) +++ x11/libXpm/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXpm -PORTVERSION=3D 3.5.10 +PORTVERSION=3D 3.5.11 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXpm/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXpm/distinfo (revision 326808) +++ x11/libXpm/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) =3D a6db7e234750e7d60330017972e3= 1d8e1f29f0a8c1391e4ac82f6102d919a735 -SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) =3D 431310 +SHA256 (xorg/lib/libXpm-3.5.11.tar.bz2) =3D c5bdafa51d1ae30086fac01ab83b= e8d47fe117b238d3437f8e965434090e041c +SIZE (xorg/lib/libXpm-3.5.11.tar.bz2) =3D 443496 Index: x11/libXrandr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/Makefile (revision 326808) +++ x11/libXrandr/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXrandr -PORTVERSION=3D 1.4.1 +PORTVERSION=3D 1.4.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/libXrandr/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXrandr/distinfo (revision 326808) +++ x11/libXrandr/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D d914a0490fd0a2ea6c3194505b= 5b28c56e2a277d8f4648b0275ee0ee370fb905 -SIZE (xorg/lib/libXrandr-1.4.1.tar.bz2) =3D 312857 +SHA256 (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D caa7b31ac769be51a532343c65= 376f1d4df3f307afaed58e34fb5e82e8b825ad +SIZE (xorg/lib/libXrandr-1.4.2.tar.bz2) =3D 315165 Index: x11/libXv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/Makefile (revision 326808) +++ x11/libXv/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXv -PORTVERSION=3D 1.0.9 +PORTVERSION=3D 1.0.10 PORTEPOCH=3D 1 CATEGORIES=3D x11 =20 Index: x11/libXv/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libXv/distinfo (revision 326808) +++ x11/libXv/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXv-1.0.9.tar.bz2) =3D a874dbf864d0271bbe795af67ef5b3= f20096c92fc11eacbf0d2af00e32bc5b4b -SIZE (xorg/lib/libXv-1.0.9.tar.bz2) =3D 309744 +SHA256 (xorg/lib/libXv-1.0.10.tar.bz2) =3D 55fe92f8686ce8612e2c1bfaf58c0= 57715534419da700bda8d517b1d97914525 +SIZE (xorg/lib/libXv-1.0.10.tar.bz2) =3D 300633 Index: x11/libxcb/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/libxcb/Makefile (revision 326808) +++ x11/libxcb/Makefile (working copy) @@ -20,9 +20,8 @@ CONFIGURE_ARGS+=3D --disable-build-docs --without-doxygen --enable-xinpu= t =20 USE_BZIP2=3D yes -USES=3D pathfix pkgconfig +USES=3D gmake pathfix pkgconfig USE_GNOME=3D libxslt:build -USE_GMAKE=3D yes USE_LDCONFIG=3D yes USE_XORG=3D xau xdmcp USE_PYTHON_BUILD=3D 2.5+ Index: x11/pixman/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/Makefile (revision 326808) +++ x11/pixman/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D pixman -PORTVERSION=3D 0.30.0 +PORTVERSION=3D 0.30.2 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org @@ -8,10 +8,9 @@ COMMENT=3D Low-level pixel manipulation library =20 USES=3D perl5 +USE_PERL5=3D build XORG_CAT=3D lib USE_AUTOTOOLS=3D libtool -USE_PERL5=3D build -USE_GNOME=3D ltverhack:9 CONFIGURE_ARGS=3D --disable-gtk =20 OPTIONS_DEFINE=3D SIMD Index: x11/pixman/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/pixman/distinfo (revision 326808) +++ x11/pixman/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.30.0.tar.bz2) =3D 77e756dc7fafdf17f39a4f23bdc8= be59f9f6a65c08704f5cac1d8aa87cfaf517 -SIZE (xorg/lib/pixman-0.30.0.tar.bz2) =3D 681343 +SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) =3D 4fbb51788fe7cbd8abb5f80aed95= ec878704e57a06328f7bebe0306e3822c96c +SIZE (xorg/lib/pixman-0.30.2.tar.bz2) =3D 666281 Index: x11/xkeyboard-config/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xkeyboard-config/Makefile (revision 326808) +++ x11/xkeyboard-config/Makefile (working copy) @@ -14,9 +14,8 @@ XORG_CAT=3D data =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_GNOME=3D intlhack libxslt:build -USES=3D pathfix perl5 +USES=3D gmake pathfix perl5 USE_PERL5=3D build GNU_CONFIGURE=3D yes MAKE_JOBS_UNSAFE=3Dyes Index: x11/xorg-cf-files/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xorg-cf-files/Makefile (revision 326808) +++ x11/xorg-cf-files/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D xorg-cf-files PORTVERSION=3D 1.0.5 +PORTREVISION=3D 1 CATEGORIES=3D x11 =20 MAINTAINER=3D x11@FreeBSD.org Index: x11/xtrans/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11/xtrans/Makefile (revision 326808) +++ x11/xtrans/Makefile (working copy) @@ -8,8 +8,6 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D Abstract network code for X =20 -CONFLICTS=3D libXtrans - LICENSE=3D MIT =20 XORG_CAT=3D lib Index: x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (revision 32= 6808) +++ x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c (working cop= y) @@ -1,13 +1,65 @@ ---- src/bsd_mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/bsd_mouse.c 2012-07-30 00:49:09.000000000 +0200 -@@ -71,15 +71,20 @@ - static const char *FindDevice(InputInfoPtr, const char *, int); +--- src/bsd_mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/bsd_mouse.c 2013-07-03 01:00:50.897361950 +0200 +@@ -26,6 +26,24 @@ + * authorization from the copyright holder(s) and author(s). + */ =20 - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++/* ++ * XXX - Should this be autoconf'd instead? ++ */ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Dr= agonFly__) ++ ++#if !defined(USBMOUSE_SUPPORT) ++#define USBMOUSE_SUPPORT ++#endif ++#if !defined(HAS_LIB_USB_HID) ++#define HAS_LIB_USB_HID ++#endif +#if !defined(XPS2_SUPPORT) +#define XPS2_SUPPORT +#endif - /* These are for FreeBSD and DragonFly */ ++ ++#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || define= d(__DragonFly__) */ ++ + #include +=20 + #include +@@ -33,9 +51,23 @@ + #include "xf86Priv.h" + #include "xf86_OSlib.h" + #include "xf86Xinput.h" ++#include + #include "mouse.h" + #include "xisb.h" + #include "mipointer.h" ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 3 ++#define HAVE_PROPERTIES 1 ++#endif ++#ifdef HAVE_PROPERTIES ++#include ++#include ++/* 1.6 has properties, but no labels */ ++#ifdef AXIS_LABEL_PROP ++#define HAVE_LABELS ++#else ++#undef HAVE_LABELS ++#endif ++#endif + #ifdef WSCONS_SUPPORT + #include + #endif +@@ -47,9 +79,6 @@ + #endif +=20 + #include +-#ifdef USB_GET_REPORT_ID +-#define USB_NEW_HID +-#endif +=20 + #define HUP_GENERIC_DESKTOP 0x0001 + #define HUP_BUTTON 0x0009 +@@ -75,11 +104,13 @@ #define DEFAULT_MOUSE_DEV "/dev/mouse" #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" #define DEFAULT_PS2_DEV "/dev/psm0" @@ -21,7 +73,7 @@ NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_S= UPPORT) -@@ -100,7 +105,11 @@ +@@ -100,7 +131,11 @@ #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__= DragonFly__) @@ -34,7 +86,7 @@ #else return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_M= ISC; #endif -@@ -180,9 +189,30 @@ +@@ -180,9 +215,30 @@ { MOUSE_PROTO_SYSMOUSE, "SysMouse" } }; =20 @@ -41,7 +93,7 @@ +#ifdef XPS2_SUPPORT +static struct { + int dmodel; -+ char *name; ++ const char *name; +} ps2proto[] =3D { + { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, + { MOUSE_MODEL_NET, "NetMousePS/2" }, @@ -59,13 +111,13 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) { +#ifdef XPS2_SUPPORT -+ char *dev; ++ const char *dev; +#endif + const char *proto; int i; mousehw_t hw; mousemode_t mode; -@@ -190,7 +220,13 @@ +@@ -190,7 +246,13 @@ if (pInfo->fd =3D=3D -1) return NULL; =20 @@ -79,7 +131,7 @@ i =3D 1; ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); =20 -@@ -209,9 +245,18 @@ +@@ -209,9 +271,18 @@ protoPara[0] =3D mode.syncmask[0]; protoPara[1] =3D mode.syncmask[1]; } @@ -100,7 +152,7 @@ } } } -@@ -234,41 +279,41 @@ +@@ -234,41 +305,41 @@ (protocol && xf86NameCmp(protocol, "SysMouse") =3D=3D 0)) { /* * As the FreeBSD sysmouse driver defaults to protocol level 0 @@ -159,7 +211,7 @@ } return FALSE; } -@@ -276,17 +321,17 @@ +@@ -276,17 +347,17 @@ static const char * FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) { @@ -181,7 +233,7 @@ #endif } else { /* -@@ -295,28 +340,32 @@ +@@ -295,28 +366,32 @@ * the test for whether /dev/sysmouse is usable can be made= =2E */ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { @@ -227,7 +279,749 @@ break; } } -@@ -764,7 +813,9 @@ +@@ -468,30 +543,78 @@ +=20 + #if defined(USBMOUSE_SUPPORT) +=20 ++#define MAXRIDS 64 ++#define MAXACOLS 8 ++#define MAXLCOLS 16 + typedef struct _UsbMseRec { + int packetSize; +- int iid; +- hid_item_t loc_x; /* x locator item */ +- hid_item_t loc_y; /* y locator item */ +- hid_item_t loc_z; /* z (wheel) locator item */ +- hid_item_t loc_w; /* z (wheel) locator item */ +- hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ +- unsigned char *buffer; ++ int iid, nrids, nacols, opened; ++ struct { ++ int32_t rid; ++ int size; ++ } rids[MAXRIDS]; ++ struct UsbMseAcol { ++ InputInfoPtr pInfo; ++ int nlcols, nbuttons, hasZ, hasW; ++ int xmin, xmax, ymin, ymax, pmin, pmax, px, py; ++ int cxmin, cxmax, cymin, cymax, cpmin, cpmax; ++ struct UsbMseLcol { ++ hid_item_t loc_x; /* x locator item */ ++ hid_item_t loc_y; /* y locator item */ ++ hid_item_t loc_z; /* z (wheel) locator item */ ++ hid_item_t loc_w; /* w (hwheel) locator item */ ++ hid_item_t loc_p; /* Tip Pressure */ ++ hid_item_t loc_valid; /* Touch Valid */ ++ hid_item_t loc_in_range; /* In Range */ ++ hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ ++ } lcols[MAXLCOLS]; ++ hid_item_t loc_cc; /* contact count */ ++ } acols[MAXACOLS]; ++ unsigned char *buffer; + } UsbMseRec, *UsbMsePtr; +=20 ++static int * ++usbGetReportSizePtr(UsbMsePtr pUsbMse, int32_t rid) ++{ ++ int i; ++ ++ for (i =3D 0; i < pUsbMse->nrids; i++) { ++ if (pUsbMse->rids[i].rid =3D=3D rid) ++ return (&pUsbMse->rids[i].size); ++ } ++ for (i =3D 0; i < MAXRIDS; i++) { ++ if (pUsbMse->rids[i].size =3D=3D 0) { ++ pUsbMse->rids[i].rid =3D rid; ++ pUsbMse->nrids =3D max(pUsbMse->nrids, i + 1); ++ return (&pUsbMse->rids[i].size); ++ } ++ } ++ return (NULL); ++} ++ + static int + usbMouseProc(DeviceIntPtr pPointer, int what) + { + InputInfoPtr pInfo; + MouseDevPtr pMse; + UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; + unsigned char map[MSE_MAXBUTTONS + 1]; +- int nbuttons; ++ int nacol, nbuttons; ++#ifdef HAVE_LABELS ++ Atom btn_labels[MSE_MAXBUTTONS] =3D {0}; ++ Atom axes_labels[3] =3D { 0, 0, 0 }; ++#endif +=20 + pInfo =3D pPointer->public.devicePrivate; + pMse =3D pInfo->private; + pMse->device =3D pPointer; + pUsbMse =3D pMse->mousePriv; ++ for (nacol =3D 0; nacol < (pUsbMse->nacols - 1); nacol++) { ++ if (pUsbMse->acols[nacol].pInfo =3D=3D pInfo) ++ break; ++ } ++ acol =3D &pUsbMse->acols[nacol]; +=20 + switch (what) { + case DEVICE_INIT: +@@ -500,38 +623,96 @@ + for (nbuttons =3D 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons) + map[nbuttons + 1] =3D nbuttons + 1; +=20 +- InitPointerDeviceStruct((DevicePtr)pPointer, +- map, +- min(pMse->buttons, MSE_MAXBUTTONS), +- miPointerGetMotionEvents, +- pMse->Ctrl, +- miPointerGetMotionBufferSize()); ++#ifdef HAVE_LABELS ++ btn_labels[0] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ btn_labels[1] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ btn_labels[2] =3D XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++ axes_labels[0] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_X : AXIS_LABEL_PROP_REL_X); ++ axes_labels[1] =3D XIGetKnownProperty((acol->xmin !=3D acol->xmax) ++ ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y); ++ axes_labels[2] =3D XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE); ++#endif ++ ++ InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTON= S), ++#ifdef HAVE_LABELS ++ btn_labels, ++#endif ++ map); ++ InitValuatorClassDeviceStruct(pPointer, (acol->pmin !=3D acol->pmax) ?= 3 : 2, ++#ifdef HAVE_LABELS ++ axes_labels, ++#endif ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) =3D=3D 0 ++ miPointerGetMotionEvents, ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ GetMotionHistory, ++#endif ++ GetMotionHistorySize(), ++ (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ? ++ Absolute : Relative); ++ InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl); +=20 + /* X valuator */ +- xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 0, ++#ifdef HAVE_LABELS ++ axes_labels[0], ++#endif ++ (acol->xmin !=3D acol->xmax) ? acol->xmin : -1, ++ (acol->xmin !=3D acol->xmax) ? acol->xmax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->xmin !=3D acol->xmax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 0); + /* Y valuator */ +- xf86InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1); ++ xf86InitValuatorAxisStruct(pPointer, 1, ++#ifdef HAVE_LABELS ++ axes_labels[1], ++#endif ++ (acol->ymin !=3D acol->ymax) ? acol->ymin : -1, ++ (acol->ymin !=3D acol->ymax) ? acol->ymax : -1, ++ 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , (acol->ymin !=3D acol->ymax) ? Absolute : Relative ++#endif ++ ); + xf86InitValuatorDefaults(pPointer, 1); ++ /* Pressure valuator */ ++ if (acol->pmin !=3D acol->pmax) { ++ xf86InitValuatorAxisStruct(pPointer, 2, ++#ifdef HAVE_LABELS ++ axes_labels[2], ++#endif ++ acol->pmin, acol->pmax, 1, 0, 1 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >=3D 12 ++ , Absolute ++#endif ++ ); ++ xf86InitValuatorDefaults(pPointer, 2); ++ } + xf86MotionHistoryAllocate(pInfo); + break; +=20 + case DEVICE_ON: +- pInfo->fd =3D xf86OpenSerial(pInfo->options); +- if (pInfo->fd =3D=3D -1) +- xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo-= >name); +- else { +- pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); +- if (!pMse->buffer) { +- free(pMse); +- xf86CloseSerial(pInfo->fd); +- pInfo->fd =3D -1; +- } else { +- xf86FlushInput(pInfo->fd); +- if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadIn= put, +- pInfo)) +- AddEnabledDevice(pInfo->fd); +- } ++ if (pUsbMse->opened++ =3D=3D 0) { ++ pInfo->fd =3D xf86OpenSerial(pInfo->options); ++ if (pInfo->fd =3D=3D -1) ++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name)= ; ++ else { ++ pMse->buffer =3D XisbNew(pInfo->fd, pUsbMse->packetSize); ++ if (!pMse->buffer) { ++ free(pMse); ++ xf86CloseSerial(pInfo->fd); ++ pInfo->fd =3D -1; ++ } else { ++ xf86FlushInput(pInfo->fd); ++ if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,=20 ++ pInfo)) ++ AddEnabledDevice(pInfo->fd); ++ } ++ } + } + pMse->lastButtons =3D 0; + pMse->lastMappedButtons =3D 0; +@@ -553,6 +734,7 @@ + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; + } ++ pUsbMse->opened--; + pPointer->public.on =3D FALSE; + usleep(300000); + break; +@@ -568,45 +750,154 @@ + { + MouseDevPtr pMse; + UsbMsePtr pUsbMse; +- int buttons =3D pMse->lastButtons; +- int dx =3D 0, dy =3D 0, dz =3D 0, dw =3D 0; +- int n, c; ++ int buttons, cc; ++ int dx, dy, dz, dw, dp, upd, v, nx, ny, np, in_range; ++ int n, c, rid, *sizep, nacol, nlcol; + unsigned char *pBuf; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; +=20 + pMse =3D pInfo->private; + pUsbMse =3D pMse->mousePriv; +=20 + XisbBlockDuration(pMse->buffer, -1); ++next: + pBuf =3D pUsbMse->buffer; + n =3D 0; +- while ((c =3D XisbRead(pMse->buffer)) >=3D 0 && n < pUsbMse->packet= Size) { ++ if (pUsbMse->iid) { ++ rid =3D XisbRead(pMse->buffer); ++ if (rid < 0) ++ return; ++ pBuf[n++] =3D (unsigned char)rid; ++ } else ++ rid =3D 0; ++ sizep =3D usbGetReportSizePtr(pUsbMse, rid); ++ if (sizep =3D=3D NULL || *sizep =3D=3D 0) { ++ xf86Msg(X_WARNING, "%s: unknown report ID %d\n", pInfo->name, rid); ++ goto next; ++ } ++ while (n < *sizep && (c =3D XisbRead(pMse->buffer)) >=3D 0) { + pBuf[n++] =3D (unsigned char)c; + } + if (n =3D=3D 0) + return; +- if (n !=3D pUsbMse->packetSize) { ++// xf86MsgVerb(X_INFO, 3, "pkt: %d %02x %02x %02x %02x %02x %02x %02= x %02x %02x %02x\n", ++// n, pBuf[0], pBuf[1], pBuf[2], pBuf[3], pBuf[4], pBuf[5], pBuf[6], pB= uf[7], pBuf[8], pBuf[9]); ++ if (n !=3D *sizep) { + LogMessageVerbSigSafe(X_WARNING, -1, + "%s: incomplete packet, size %d\n", + pInfo->name, n); + } +- /* discard packets with an id that don't match the mouse */ +- /* XXX this is probably not the right thing */ +- if (pUsbMse->iid !=3D 0) { +- if (*pBuf++ !=3D pUsbMse->iid) +- return; +- } +- dx =3D hid_get_data(pBuf, &pUsbMse->loc_x); +- dy =3D hid_get_data(pBuf, &pUsbMse->loc_y); +- dz =3D hid_get_data(pBuf, &pUsbMse->loc_z); +- dw =3D hid_get_data(pBuf, &pUsbMse->loc_w); +- +- buttons =3D 0; +- for (n =3D 0; n < pMse->buttons; n++) { +- if (hid_get_data(pBuf, &pUsbMse->loc_btn[n])) +- buttons |=3D (1 << UMS_BUT(n)); ++ for (nacol =3D 0; nacol < pUsbMse->nacols; nacol++) { ++ acol =3D &pUsbMse->acols[nacol]; ++ if (acol->pInfo =3D=3D NULL) ++ continue; ++ nx =3D ny =3D np =3D upd =3D 0; ++ buttons =3D cc =3D 0; ++ dx =3D dy =3D dz =3D dw =3D dp =3D 0; ++ for (nlcol =3D 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) { ++ lcol =3D &acol->lcols[nlcol]; ++ ++ if (lcol->loc_valid.usage !=3D 0 && rid =3D=3D lcol->loc_valid.rep= ort_ID && ++ hid_get_data(pBuf, &lcol->loc_valid) =3D=3D 0) ++ continue; ++ if (lcol->loc_in_range.usage !=3D 0 && rid =3D=3D lcol->loc_in_ran= ge.report_ID) ++ in_range =3D hid_get_data(pBuf, &lcol->loc_in_range); ++ else ++ in_range =3D 1; ++ if (in_range && lcol->loc_x.usage !=3D 0 && rid =3D=3D lcol->loc_x= =2Ereport_ID && nx =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_x); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ lcol->loc_x.logical_maximum, lcol->loc_x.logical_minimum); ++ if (acol->cxmin !=3D acol->cxmax) ++ v =3D xf86ScaleAxis(v, acol->xmax, acol->xmin, ++ acol->cxmax, acol->cxmin); ++ } ++ dx +=3D v; ++ nx++; ++ } ++ if (in_range && lcol->loc_y.usage !=3D 0 && rid =3D=3D lcol->loc_y= =2Ereport_ID && ny =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_y); ++ if (acol->xmin !=3D acol->xmax) { ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ lcol->loc_y.logical_maximum, lcol->loc_y.logical_minimum); ++ if (acol->cymin !=3D acol->cymax) ++ v =3D xf86ScaleAxis(v, acol->ymax, acol->ymin, ++ acol->cymax, acol->cymin); ++ } ++ dy +=3D v; ++ ny++; ++ } ++ if (lcol->loc_z.usage !=3D 0 && rid =3D=3D lcol->loc_z.report_ID) = { ++ dz -=3D hid_get_data(pBuf, &lcol->loc_z); ++ upd =3D 1; ++ } ++ if (lcol->loc_w.usage !=3D 0 && rid =3D=3D lcol->loc_w.report_ID) = { ++ dw +=3D hid_get_data(pBuf, &lcol->loc_w); ++ upd =3D 1; ++ } ++ if (lcol->loc_p.usage !=3D 0 && rid =3D=3D lcol->loc_p.report_ID &= & np =3D=3D 0) { ++ v =3D hid_get_data(pBuf, &lcol->loc_p); ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ lcol->loc_p.logical_maximum, lcol->loc_p.logical_minimum); ++ if (acol->cpmin !=3D acol->cpmax) ++ v =3D xf86ScaleAxis(v, acol->pmax, acol->pmin, ++ acol->cpmax, acol->cpmin); ++ dp +=3D v; ++ np++; ++ } ++ ++ for (n =3D 0; n < acol->nbuttons; n++) { ++ if (lcol->loc_btn[n].usage !=3D 0 && rid =3D=3D lcol->loc_btn[n].repo= rt_ID) { ++ if (hid_get_data(pBuf, &lcol->loc_btn[n])) ++ buttons |=3D (1 << UMS_BUT(n)); ++ upd =3D 1; ++ } ++ } ++ } ++ if (acol->loc_cc.usage !=3D 0 && rid =3D=3D acol->loc_cc.report_ID) ++ cc =3D hid_get_data(pBuf, &acol->loc_cc); ++ else ++ cc =3D (nx || ny) ? 1 : 0; ++ if (cc > 1) ++ buttons =3D (1 << UMS_BUT(1)); ++ if (nx !=3D 0 && acol->xmin !=3D acol->xmax) ++ dx /=3D nx; ++ if (ny !=3D 0 && acol->ymin !=3D acol->ymax) ++ dy /=3D ny; ++ if (np !=3D 0 && acol->pmin !=3D acol->pmax) ++ dp /=3D np; ++// if (upd || nx || ny || np) ++// xf86MsgVerb(X_INFO, 3, "%d cc %d dx %d dy %d dz %d dw %d press %= d buttons %02x\n", ++// nacol, cc, dx, dy, dz, dw, dp, buttons); ++ if (nx !=3D 0 || ny !=3D 0) { ++ if (acol->pmin !=3D acol->pmax) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 3, ++ dx, dy, dp); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->yma= x) { ++ xf86PostMotionEvent(acol->pInfo->dev, ++ /* is_absolute: */ TRUE, ++ /* first_valuator: */ 0, ++ /* num_valuators: */ 2, ++ dx, dy); ++ } ++ } ++ if (upd || (nx !=3D 0) || (ny !=3D 0)) { ++ ((MouseDevPtr)acol->pInfo->private)->PostEvent(acol->pInfo, button= s, ++ ((acol->xmin !=3D acol->xmax) ? dx - acol->px : dx), ++ ((acol->ymin !=3D acol->ymax) ? dy - acol->py : dy), ++ dz, dw); ++ } ++ if (nx > 0) ++ acol->px =3D dx; ++ if (ny > 0) ++ acol->py =3D dy; + } +- pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw); +- return; ++ goto next; + } +=20 + static void +@@ -615,14 +906,17 @@ + usbReadInput ((InputInfoPtr) closure); + } +=20 +-/* This function is called when the protocol is "usb". */ + static Bool +-usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++usbInitFirst(InputInfoPtr pInfo) + { + MouseDevPtr pMse =3D pInfo->private; + UsbMsePtr pUsbMse; + report_desc_t reportDesc; +- int i; ++ hid_data_t d; ++ hid_item_t h; ++ struct UsbMseAcol *acol; ++ struct UsbMseLcol *lcol; ++ int mdepth, rsize, *rsizep, acolused, lcolused, used; +=20 + pUsbMse =3D malloc(sizeof(UsbMseRec)); + if (pUsbMse =3D=3D NULL) { +@@ -631,12 +925,7 @@ + return FALSE; + } +=20 +- pMse->protocol =3D protocol; +- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); +- +- /* Collect the options, and process the common options. */ +- COLLECT_INPUT_OPTIONS(pInfo, NULL); +- xf86ProcessCommonOptions(pInfo, pInfo->options); ++ bzero(pUsbMse, sizeof(UsbMseRec)); +=20 + /* Check if the device can be opened. */ + pInfo->fd =3D xf86OpenSerial(pInfo->options); +@@ -652,19 +941,134 @@ + } + /* Get USB informations */ + reportDesc =3D hid_get_report_desc(pInfo->fd); +- /* Get packet size & iid */ +-#ifdef USB_NEW_HID +- if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) =3D=3D -1) {= +- xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\= n", +- pInfo->name, strerror(errno)); +- return FALSE; +- } +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- pUsbMse->iid); +-#else +- pUsbMse->packetSize =3D hid_report_size(reportDesc, hid_input, +- &pUsbMse->iid); +-#endif ++ mdepth =3D 0; ++ pUsbMse->nacols =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ acolused =3D 0; ++ lcolused =3D 0; ++ d =3D hid_start_parse(reportDesc, (1 << hid_input) | ++ (1 << hid_collection) | (1 << hid_endcollection), -1); ++ while (hid_get_item(d, &h)) { ++ switch (h.kind) { ++ case hid_collection: ++ if (mdepth !=3D 0) ++ mdepth++; ++ else if (h.collection =3D=3D 1 && ++ (h.usage =3D=3D 0x00010001 || h.usage =3D=3D 0x00010002 || ++ (h.usage >=3D 0x000d0001 && h.usage <=3D 0x000d000d))) { ++ mdepth++; ++ if (acolused) { ++ if (lcolused) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ } ++ pUsbMse->nacols++; ++ acolused =3D 0; ++ acol =3D &pUsbMse->acols[pUsbMse->nacols]; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ } ++ if (lcolused && (h.collection =3D=3D 0 || ++ h.collection =3D=3D 2 || h.collection =3D=3D 3)) { ++ acol->nlcols++; ++ lcolused =3D 0; ++ lcol =3D &acol->lcols[acol->nlcols]; ++ } ++ break; ++ case hid_endcollection: ++ if (mdepth !=3D 0) ++ mdepth--; ++ break; ++ case hid_input: ++ if (h.report_ID !=3D 0) ++ pUsbMse->iid =3D 1; ++ rsize =3D pUsbMse->iid + ++ (h.pos + (h.report_size * h.report_count) + 7) / 8; ++ if ((rsizep =3D usbGetReportSizePtr(pUsbMse, h.report_ID)) !=3D NU= LL) ++ *rsizep =3D max(*rsizep, rsize); ++ pUsbMse->packetSize =3D max(pUsbMse->packetSize, rsize); ++ if (mdepth =3D=3D 0) ++ break; ++ used =3D 1; ++ if (h.usage =3D=3D 0x00010030) { /* X */ ++ lcol->loc_x =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->xmin =3D=3D acol->xmax) { ++ acol->xmin =3D h.logical_minimum; ++ acol->xmax =3D h.logical_maximum; ++ } else { ++ acol->xmin =3D min(acol->xmin, h.logical_minimum); ++ acol->xmax =3D max(acol->xmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010031) { /* Y */ ++ lcol->loc_y =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->ymin =3D=3D acol->ymax) { ++ acol->ymin =3D h.logical_minimum; ++ acol->ymax =3D h.logical_maximum; ++ } else { ++ acol->ymin =3D min(acol->ymin, h.logical_minimum); ++ acol->ymax =3D max(acol->ymax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x00010038) { /* Z */ ++ lcol->loc_z =3D h; ++ acol->hasZ =3D 1; ++ } else if (h.usage =3D=3D 0x000c0238) { /* W */ ++ lcol->loc_w =3D h; ++ acol->hasW =3D 1; ++ } else if (h.usage =3D=3D 0x000d0030) { /* Press */ ++ lcol->loc_p =3D h; ++ if ((h.flags & 0x04) =3D=3D 0) { ++ if (acol->pmin =3D=3D acol->pmax) { ++ acol->pmin =3D h.logical_minimum; ++ acol->pmax =3D h.logical_maximum; ++ } else { ++ acol->pmin =3D min(acol->pmin, h.logical_minimum); ++ acol->pmax =3D max(acol->pmax, h.logical_maximum); ++ } ++ } ++ } else if (h.usage =3D=3D 0x000d0032) /* In Range */ ++ lcol->loc_in_range =3D h; ++ else if (h.usage =3D=3D 0x000d0047) /* Valid */ ++ lcol->loc_valid =3D h; ++ else if (h.usage > 0x00090000 && ++ h.usage <=3D 0x00090000 + MSE_MAXBUTTONS) { /* Buttons */ ++ lcol->loc_btn[(h.usage & 0xffff) - 1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, h.usage & 0xffff); ++ } else if (h.usage =3D=3D 0x000d0042) { /* Tip Switch */ ++ lcol->loc_btn[0] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 1); ++ } else if (h.usage =3D=3D 0x000d0044) { /* Barrel Switch */ ++ lcol->loc_btn[1] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 2); ++ } else if (h.usage =3D=3D 0x000d0045) { /* Eraser */ ++ lcol->loc_btn[3] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 4); ++ } else if (h.usage =3D=3D 0x000d0046) { /* Tablet Pick */ ++ lcol->loc_btn[2] =3D h; ++ acol->nbuttons =3D max(acol->nbuttons, 3); ++ } else if (h.usage =3D=3D 0x000d0054) /* Contact Count */ ++ acol->loc_cc =3D h; ++ else ++ used =3D 0; ++ lcolused +=3D used; ++ acolused +=3D used; ++ break; ++ default: ++ break; ++ } ++ } ++ if (lcolused) ++ acol->nlcols++; ++ if (acolused) ++ pUsbMse->nacols++; ++ hid_end_parse(d); ++ xf86Msg(X_DEFAULT, "%s: Found %d usable logical collections\n", ++ pInfo->name, pUsbMse->nacols); ++ + /* Allocate buffer */ + if (pUsbMse->packetSize <=3D 8) { + pUsbMse->buffer =3D pMse->protoBuf; +@@ -674,56 +1078,129 @@ + if (pUsbMse->buffer =3D=3D NULL) { + xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name); + free(pUsbMse); +- free(pMse); + xf86CloseSerial(pInfo->fd); + return FALSE; + } +-#ifdef USB_NEW_HID +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y, pUsbMse->iid) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) { +- } +-#else +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), +- hid_input, &pUsbMse->loc_x) < 0) { +- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), +- hid_input, &pUsbMse->loc_y) < 0) { +- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name); +- } +- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEE= L), +- hid_input, &pUsbMse->loc_z) < 0) { +- } +-#endif +- /* Probe for number of buttons */ +- for (i =3D 1; i <=3D MSE_MAXBUTTONS; i++) { +- if (!hid_locate(reportDesc, HID_USAGE2(HUP_BUTTON, i), +- hid_input, &pUsbMse->loc_btn[i-1] +-#ifdef USB_NEW_HID +- , pUsbMse->iid +-#endif +- )) +- break; +- } +- pMse->buttons =3D i-1; +=20 + xf86CloseSerial(pInfo->fd); + pInfo->fd =3D -1; +=20 + /* Private structure */ + pMse->mousePriv =3D pUsbMse; ++ return TRUE; ++} ++ ++/* This function is called when the protocol is "usb". */ ++static Bool ++usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags) ++{ ++ InputInfoPtr pMatch; ++ MouseDevPtr pMse =3D pInfo->private; ++ UsbMsePtr pUsbMse; ++ struct UsbMseAcol *acol; ++ char *str; ++ int i, colopt; ++ ++ pMse->protocol =3D protocol; ++ xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); ++ ++ /* Collect the options, and process the common options. */ ++ COLLECT_INPUT_OPTIONS(pInfo, NULL); ++ xf86ProcessCommonOptions(pInfo, pInfo->options); ++ ++ /* Check if this HID device is already opened. */ ++ for (pMatch =3D xf86FirstLocalDevice(); pMatch !=3D NULL; pMatch =3D= pMatch->next) { ++ if ((pInfo !=3D pMatch) && strstr(pMatch->drv->driverName, "mouse")) {= ++ char *dev1, *dev2; ++ ++ dev1 =3D xf86SetStrOption(pInfo->options, "Device", NULL); ++ dev2 =3D xf86SetStrOption(pMatch->options, "Device", NULL); ++ if (strcmp(dev1, dev2) =3D=3D 0) { ++ free(dev1); ++ free(dev2); ++ break; ++ } ++ free(dev1); ++ free(dev2); ++ } ++ } ++ if (pMatch =3D=3D NULL) { ++ xf86Msg(X_DEFAULT, "%s: Opening new HID device\n", pInfo->name); ++ if (!usbInitFirst(pInfo)) { ++ free(pMse); ++ return FALSE; ++ } ++ } else { ++ pMse->mousePriv =3D ((MouseDevPtr)pMatch->private)->mousePriv; ++ xf86Msg(X_DEFAULT, "%s: Attaching to already opened HID device\n", ++ pInfo->name); ++ } ++ pUsbMse =3D pMse->mousePriv; ++ ++ /* Attach to collection, respecting "Collection" option. */ ++ colopt =3D xf86SetIntOption(pInfo->options, "Collection", 0); ++ for (i =3D 0; i < pUsbMse->nacols; i++) { ++ if (pUsbMse->acols[i].pInfo =3D=3D NULL && ++ (colopt =3D=3D 0 || i =3D=3D colopt - 1)) { ++ pUsbMse->acols[i].pInfo =3D pInfo; ++ break; ++ } ++ } ++ xf86Msg(colopt =3D=3D 0 ? X_DEFAULT : X_CONFIG, ++ "%s: Collection: %d\n", pInfo->name, ++ i =3D=3D pUsbMse->nacols ? colopt : i + 1); ++ if (i =3D=3D pUsbMse->nacols) { ++ xf86Msg(X_ERROR, ++ "%s: Application collection not found or already handled\n", ++ pInfo->name); ++ free(pMse); ++ return FALSE; ++ } ++ ++ acol =3D &pUsbMse->acols[i]; ++ pMse->buttons =3D acol->nbuttons; ++ if (pMse->buttons =3D=3D 2) ++ pMse->buttons =3D 3; ++ if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax) ++ pMse->disableXY =3D TRUE; ++ pMse->hasZ =3D acol->hasZ; ++ pMse->hasW =3D acol->hasW; +=20 + /* Process common mouse options (like Emulate3Buttons, etc). */ + pMse->CommonOptions(pInfo); +=20 ++ /* Process "Calibration" option. */ ++ str =3D xf86CheckStrOption(pInfo->options, "Calibration", NULL); ++ if (str !=3D NULL && (acol->xmin !=3D acol->xmax || acol->ymin !=3D= acol->ymax)) { ++ int j, xmin, xmax, ymin, ymax, pmin, pmax; ++ ++ j =3D sscanf(str, "%d %d %d %d %d %d", &xmin, &xmax, &ymin, &ymax, &pm= in, &pmax); ++ if (j =3D=3D 4) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ } else if (j =3D=3D 6) { ++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, xmin, xmax, ymin, ymax, pmin, pmax); ++ acol->cxmin =3D xmin; ++ acol->cxmax =3D xmax; ++ acol->cymin =3D ymin; ++ acol->cymax =3D ymax; ++ acol->cpmin =3D pmin; ++ acol->cpmax =3D pmax; ++ } else ++ xf86Msg(X_WARNING, "%s: Calibration: Invalid arguments\n", ++ pInfo->name); ++ free(str); ++ } else if (acol->xmin !=3D acol->xmax || acol->ymin !=3D acol->ymax= ) { ++ xf86Msg(X_DEFAULT, "%s: Calibration: %d %d %d %d %d %d\n", ++ pInfo->name, acol->xmin, acol->xmax, acol->ymin, acol->ymax, ++ acol->pmin, acol->pmax); ++ } ++ + /* Setup the local procs. */ + pInfo->device_control =3D usbMouseProc; + pInfo->read_input =3D usbReadInput; +@@ -766,7 +1243,9 @@ p->CheckProtocol =3D CheckProtocol; #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__D= ragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto =3D SetupAuto; Index: x11-drivers/xf86-input-mouse/files/patch-src_mouse.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (revision 326808= ) +++ x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (working copy) @@ -1,5 +1,5 @@ ---- src/mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 -+++ src/mouse.c 2012-07-30 00:31:48.000000000 +0200 +--- src/mouse.c.orig 2012-10-08 03:40:07.000000000 +0200 ++++ src/mouse.c 2013-07-03 01:04:45.398343993 +0200 @@ -280,13 +280,39 @@ =20 pMse =3D pInfo->private; @@ -135,7 +135,7 @@ =20 protocol =3D MousePickProtocol(pInfo, device, protocol, &protocolID= ); =20 -@@ -2137,7 +2148,7 @@ +@@ -2136,7 +2147,7 @@ =20 if (pMse->emulateWheel) { /* Emulate wheel button handling */ @@ -144,7 +144,7 @@ wheelButtonMask =3D 0; else wheelButtonMask =3D 1 << (pMse->wheelButton - 1); -@@ -2221,6 +2232,9 @@ +@@ -2220,6 +2231,9 @@ } } } @@ -154,7 +154,7 @@ } =20 /* Absorb the mouse movement while the wheel button is pres= sed. */ -@@ -2238,7 +2252,7 @@ +@@ -2237,7 +2251,7 @@ if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy= )) buttonTimer(pInfo); =20 @@ -163,8 +163,21 @@ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); =20 if (change) { -@@ -2448,11 +2462,11 @@ +@@ -2349,12 +2363,10 @@ + int dx, int dy, int dz, int dw) + { + MouseDevPtr pMse; +- mousePrivPtr mousepriv; + int zbutton =3D 0, wbutton =3D 0, zbuttoncount =3D 0, wbuttoncount = =3D 0; + int i, b, buttons =3D 0; =20 + pMse =3D pInfo->private; +- mousepriv =3D (mousePrivPtr)pMse->mousePriv; +=20 + if (pMse->protocolID =3D=3D PROT_MMHIT) + b =3D reverseBits(hitachMap, truebuttons); +@@ -2447,11 +2459,11 @@ +=20 /* Accumulate the scaled dx, dy in the private variables fracdx,fracdy and return the integer number part */ - if (mousepriv) { Index: x11-drivers/xf86-input-synaptics/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/Makefile (revision 326808) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -10,22 +10,10 @@ =20 CONFLICTS=3D synaptics-[0-9]* =20 -OPTIONS_DEFINE=3D HAL -OPTIONS_DEFAULT=3DHAL - -.include - USES=3D pathfix -USE_XORG=3D x11 +USE_XORG=3D x11 xtst XORG_CAT=3D driver =20 -.if ${PORT_OPTIONS:MHAL} -PLIST_SUB+=3D HAL=3D"" -LIB_DEPENDS+=3D hal.1:${PORTSDIR}/sysutils/hal -.else -PLIST_SUB+=3D HAL=3D"@comment " -.endif - MAN1=3D syndaemon.1 \ synclient.1 MAN4=3D synaptics.4x @@ -41,16 +29,4 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-Makefile.in .endif =20 -post-install: -.if ${PORT_OPTIONS:MHAL} - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/10osvendor/ -.if !defined(WITH_NEW_XORG) - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/20thirdparty/ -.endif -.endif - .include Index: x11-drivers/xf86-input-synaptics/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-input-synaptics/pkg-plist (revision 326808) +++ x11-drivers/xf86-input-synaptics/pkg-plist (working copy) @@ -6,13 +6,7 @@ lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg @dirrmtry include/xorg -%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor -%%HAL%%@dirrmtry share/hal/fdi/policy -%%HAL%%@dirrmtry share/hal/fdi -%%HAL%%@dirrmtry share/hal Index: x11-drivers/xf86-video-ati/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/Makefile (revision 326808) +++ x11-drivers/xf86-video-ati/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ =20 PORTNAME=3D xf86-video-ati -PORTVERSION=3D 6.14.6 +PORTVERSION=3D ${ATI_VERSION} CATEGORIES=3D x11-drivers =20 MAINTAINER=3D x11@FreeBSD.org @@ -12,6 +12,17 @@ USE_XORG=3D xf86driproto xineramaproto xf86miscproto glproto MAN4=3D ati.4x radeon.4x =20 +.include + +.if ${OSVERSION} < 1000051 +ATI_VERSION=3D 6.14.6 CONFIGURE_ARGS+=3D--disable-kms +PLIST_SUB+=3D OLD=3D"" +.else +ATI_VERSION=3D 7.2.0 +CONFIGURE_ARGS+=3D--disable-udev +EXTRA_PATCHES+=3D ${FILESDIR}/extra-src__radeon_kms.c +PLIST_SUB+=3D OLD=3D"@comment " +.endif =20 -.include +.include Index: x11-drivers/xf86-video-ati/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/distinfo (revision 326808) +++ x11-drivers/xf86-video-ati/distinfo (working copy) @@ -1,2 +1,4 @@ SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D aa5286b3e4f0187d7= df14785c06dd800255d9405205dbf061da5d77df86bec36 SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) =3D 1139495 +SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D f30f5efdc8d7d18d06= eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 +SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) =3D 824613 Index: x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (revision 0)= +++ x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (working cop= y) @@ -0,0 +1,20 @@ +--- src/radeon_kms.c.orig 2013-08-07 10:44:09.000000000 +0200 ++++ src/radeon_kms.c 2013-08-31 01:20:44.370468797 +0200 +@@ -270,7 +270,7 @@ + radeon_dirty_update(ScreenPtr screen) + { + RegionPtr region; +- PixmapDirtyUpdatePtr ent; ++ PixmapDirtyUpdatePtr ent =3D NULL; +=20 + if (xorg_list_is_empty(&screen->pixmap_dirty_list)) + return; +@@ -606,7 +606,7 @@ + dev->domain, dev->bus, dev->dev, dev->func); + #endif +=20 +- info->dri2.drm_fd =3D drmOpen("radeon", busid); ++ info->dri2.drm_fd =3D drmOpen("radeonkms", busid); + if (info->dri2.drm_fd =3D=3D -1) { +=20 + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, Property changes on: x11-drivers/xf86-video-ati/files/extra-src__radeon_k= ms.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (revision 0= ) +++ x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (working co= py) @@ -0,0 +1,11 @@ +--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 ++++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 +@@ -578,7 +578,7 @@ + radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, = pointer data, pointer calldata) + { + DRI2ClientEventsPtr pClientEventsPriv; +- DRI2FrameEventPtr ref; ++ DRI2FrameEventPtr ref =3D NULL; + NewClientInfoRec *clientinfo =3D calldata; + ClientPtr pClient =3D clientinfo->client; + pClientEventsPriv =3D GetDRI2ClientEvents(pClient); Property changes on: x11-drivers/xf86-video-ati/files/patch-src__radeon_d= ri2.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-drivers/xf86-video-ati/pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-ati/pkg-plist (revision 326808) +++ x11-drivers/xf86-video-ati/pkg-plist (working copy) @@ -2,13 +2,13 @@ lib/xorg/modules/drivers/ati_drv.so lib/xorg/modules/drivers/radeon_drv.la lib/xorg/modules/drivers/radeon_drv.so -lib/xorg/modules/multimedia/theatre200_drv.la -lib/xorg/modules/multimedia/theatre200_drv.so -lib/xorg/modules/multimedia/theatre_detect_drv.la -lib/xorg/modules/multimedia/theatre_detect_drv.so -lib/xorg/modules/multimedia/theatre_drv.la -lib/xorg/modules/multimedia/theatre_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la +%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so @dirrmtry lib/xorg/modules/drivers -@dirrmtry lib/xorg/modules/multimedia +%%OLD%%@dirrmtry lib/xorg/modules/multimedia @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Index: x11-drivers/xf86-video-intel/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/Makefile (revision 326808) +++ x11-drivers/xf86-video-intel/Makefile (working copy) @@ -28,20 +28,20 @@ .include =20 .if defined(WITH_NEW_XORG) -INTEL_VERSION=3D 2.21.9 +INTEL_VERSION=3D 2.21.15 INTEL_REVISION=3D 0 +CONFIGURE_ENV+=3D xorg_cv_cc_flag__Wno_maybe_uninitialized=3Dno CONFIGURE_ARGS+=3D --enable-sna MAKE_JOBS_UNSAFE=3Dyes PLIST_SUB+=3D OLD=3D"@comment " -EXTRA_PATCHES+=3D ${PATCHDIR}/extra-clang \ - ${PATCHDIR}/extra-src_sna_compiler.h \ +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${PATCHDIR}/extra-src_sna_kgem.c \ - ${PATCHDIR}/extra-src__sna__sna_threads.c \ + ${PATCHDIR}/extra-clang \ ${PATCHDIR}/extra-i915kms LIB_DEPENDS+=3D xcb-util:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION=3D 2.7.1 -INTEL_REVISION=3D 4 +INTEL_REVISION=3D 5 PLIST_SUB+=3D OLD=3D"" =20 EXTRA_PATCHES+=3D ${PATCHDIR}/extra-src_ch7017_ch7017.c \ Index: x11-drivers/xf86-video-intel/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/distinfo (revision 326808) +++ x11-drivers/xf86-video-intel/distinfo (working copy) @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 255c0d54249cc013= 2f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) =3D 780625 -SHA256 (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1359cbc9e494a28= 4faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189 -SIZE (xorg/driver/xf86-video-intel-2.21.9.tar.bz2) =3D 1735037 +SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 7d5a140f82a72f= d1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc +SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) =3D 1977431 Index: x11-drivers/xf86-video-intel/files/extra-clang =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-clang (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-clang (working copy) @@ -1,27 +1,15 @@ ---- src/intel_display.c.orig 2012-12-11 20:33:06.000000000 +0100 -+++ src/intel_display.c 2012-12-11 20:33:45.000000000 +0100 -@@ -1691,7 +1691,7 @@ - static drmModeEncoderPtr - intel_get_kencoder(struct intel_mode *mode, int num) +--- src/sna/sna_cpu.c.orig 2013-08-14 12:04:40.231041285 +0200 ++++ src/sna/sna_cpu.c 2013-08-14 12:05:51.237030719 +0200 +@@ -41,6 +41,7 @@ { -- struct intel_output *iterator; -+ struct intel_output *iterator =3D NULL; - int id =3D mode->mode_res->encoders[num]; + unsigned max =3D __get_cpuid_max(BASIC_CPUID, NULL); + unsigned int eax, ebx, ecx, edx; ++ eax =3D ebx =3D ecx =3D edx =3D 0; + unsigned features =3D 0; + unsigned extra =3D 0; =20 - list_for_each_entry(iterator, &mode->outputs, link) ---- src/intel_batchbuffer.c.orig 2012-12-11 20:34:55.000000000 +0100 -+++ src/intel_batchbuffer.c 2012-12-11 20:35:19.000000000 +0100 -@@ -119,7 +119,7 @@ - static void intel_batch_do_flush(ScrnInfoPtr scrn) - { - intel_screen_private *intel =3D intel_get_screen_private(scrn); -- struct intel_pixmap *priv; -+ struct intel_pixmap *priv =3D NULL; -=20 - list_for_each_entry(priv, &intel->batch_pixmaps, batch) - priv->dirty =3D 0; ---- src/sna/sna_damage.c.orig 2012-12-11 20:41:38.000000000 +0100 -+++ src/sna/sna_damage.c 2012-12-11 20:42:23.000000000 +0100 +--- src/sna/sna_damage.c.orig 2013-08-14 12:06:26.381036854 +0200 ++++ src/sna/sna_damage.c 2013-08-14 12:07:23.684023065 +0200 @@ -410,7 +410,7 @@ int n, nboxes; BoxPtr boxes, free_boxes =3D NULL; @@ -31,7 +19,7 @@ =20 assert(damage->mode !=3D DAMAGE_ALL); assert(damage->dirty); -@@ -1671,7 +1671,7 @@ +@@ -1709,7 +1709,7 @@ { int n, nboxes; BoxPtr boxes; @@ -40,8 +28,30 @@ =20 RegionCopy(r, &damage->region); if (!damage->dirty) ---- uxa/uxa-accel.c.orig 2012-12-11 20:50:56.000000000 +0100 -+++ uxa/uxa-accel.c 2012-12-11 20:51:14.000000000 +0100 +--- src/uxa/intel_batchbuffer.c.orig 2013-08-14 12:08:14.323028320 +0200= ++++ src/uxa/intel_batchbuffer.c 2013-08-14 12:08:37.202016923 +0200 +@@ -141,7 +141,7 @@ + static void intel_batch_do_flush(ScrnInfoPtr scrn) + { + intel_screen_private *intel =3D intel_get_screen_private(scrn); +- struct intel_pixmap *priv; ++ struct intel_pixmap *priv =3D NULL; +=20 + list_for_each_entry(priv, &intel->batch_pixmaps, batch) + priv->dirty =3D 0; +--- src/uxa/intel_display.c.orig 2013-08-14 12:09:25.802015629 +0200 ++++ src/uxa/intel_display.c 2013-08-14 12:09:51.034009844 +0200 +@@ -1753,7 +1753,7 @@ + static drmModeEncoderPtr + intel_get_kencoder(struct intel_mode *mode, int num) + { +- struct intel_output *iterator; ++ struct intel_output *iterator =3D NULL; + int id =3D mode->mode_res->encoders[num]; +=20 + list_for_each_entry(iterator, &mode->outputs, link) +--- src/uxa/uxa-accel.c.orig 2013-08-14 12:02:11.898048975 +0200 ++++ src/uxa/uxa-accel.c 2013-08-14 12:03:39.336042139 +0200 @@ -944,7 +944,7 @@ =20 if (uxa_screen->info->flags & UXA_USE_GLAMOR) { Index: x11-drivers/xf86-video-intel/files/extra-i915kms =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-i915kms (revision 326808) +++ x11-drivers/xf86-video-intel/files/extra-i915kms (working copy) @@ -1,13 +1,13 @@ ---- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300 -+++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200 -@@ -393,8 +393,8 @@ - dev->domain, dev->bus, dev->dev, dev->func); +--- src/intel_device.c.orig 2013-06-30 16:03:51.000000000 +0200 ++++ src/intel_device.c 2013-07-02 14:08:34.903060688 +0200 +@@ -94,8 +94,8 @@ + pci->domain, pci->bus, pci->dev, pci->func); =20 - ret =3D drmCheckModesettingSupported(id); -- if (ret) { -- if (xf86LoadKernelModule("i915")) -+ if (ret || 1) { -+ if (xf86LoadKernelModule("i915kms")) - ret =3D drmCheckModesettingSupported(id); - if (ret) - return FALSE; + ret =3D drmCheckModesettingSupported(id); +- if (ret) { +- if (xf86LoadKernelModule("i915")) ++ if (ret || 1) { ++ if (xf86LoadKernelModule("i915kms")) + ret =3D drmCheckModesettingSupported(id); + if (ret) + return -1; Index: x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (revision= 326808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (working = copy) @@ -1,18 +0,0 @@ ---- src/sna/compiler.h.orig 2013-03-12 12:48:29.745101779 +0100 -+++ src/sna/compiler.h 2013-03-12 12:48:52.857102997 +0100 -@@ -37,7 +37,6 @@ - #define must_check __attribute__((warn_unused_result)) - #define constant __attribute__((const)) - #define pure __attribute__((pure)) --#define __packed__ __attribute__((__packed__)) - #define flatten __attribute__((flatten)) - #else - #define likely(expr) (expr) -@@ -48,7 +47,6 @@ - #define must_check - #define constant - #define pure --#define __packed__ - #define flatten - #endif -=20 Index: x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (revision 326= 808) +++ x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (working copy= ) @@ -1,18 +1,14 @@ ---- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100 -+++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100 -@@ -658,7 +658,11 @@ - if (file) { - size_t len =3D 0; - char *line =3D NULL; -+#ifdef __GLIBC__ - while (getline(&line, &len, file) !=3D -1) { -+#else -+ while ((line =3D fgetln(file, &len)) !=3D (char *) NULL) { -+#endif - int mb; - if (sscanf(line, "cache size : %d KB", &mb) =3D=3D 1) { - /* Paranoid check against gargantuan caches */ -@@ -1666,7 +1670,8 @@ +--- src/sna/kgem.c.orig 2013-08-04 11:10:59.000000000 +0200 ++++ src/sna/kgem.c 2013-08-14 11:59:14.787060294 +0200 +@@ -25,6 +25,7 @@ + * + */ +=20 ++#define _WITH_GETLINE + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -1890,7 +1891,8 @@ static struct kgem_bo * search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned = flags) { @@ -22,7 +18,7 @@ =20 DBG(("%s: num_pages=3D%d, flags=3D%x\n", __FUNCTION__, num_pages, flag= s)); =20 -@@ -1868,7 +1873,8 @@ +@@ -2104,7 +2106,8 @@ =20 static bool kgem_retire__flushing(struct kgem *kgem) { @@ -32,7 +28,7 @@ bool retired =3D false; =20 list_for_each_entry_safe(bo, next, &kgem->flushing, request) { -@@ -2073,7 +2079,8 @@ +@@ -2309,7 +2312,8 @@ static void kgem_commit(struct kgem *kgem) { struct kgem_request *rq =3D kgem->next_request; @@ -42,7 +38,7 @@ =20 list_for_each_entry_safe(bo, next, &rq->buffers, request) { assert(next->request.prev =3D=3D &bo->request); -@@ -2154,7 +2161,8 @@ +@@ -2390,7 +2394,8 @@ =20 static void kgem_finish_buffers(struct kgem *kgem) { @@ -51,8 +47,8 @@ + struct kgem_buffer *next; =20 list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) { - DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%d\n", -@@ -2963,7 +2971,8 @@ + DBG(("%s: buffer handle=3D%d, used=3D%d, exec?=3D%d, write=3D%d, mmap= ped=3D%s\n", +@@ -3252,7 +3257,8 @@ static struct kgem_bo * search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned= flags) { @@ -62,7 +58,7 @@ bool use_active =3D (flags & CREATE_INACTIVE) =3D=3D 0; struct list *cache; =20 -@@ -3521,7 +3530,7 @@ +@@ -3855,7 +3861,7 @@ uint32_t flags) { struct list *cache; @@ -71,7 +67,7 @@ uint32_t pitch, tiled_height, size; uint32_t handle; int i, bucket, retry; -@@ -4834,7 +4843,7 @@ +@@ -5302,7 +5308,7 @@ void kgem_clear_dirty(struct kgem *kgem) { struct list * const buffers =3D &kgem->next_request->buffers; @@ -79,8 +75,8 @@ + struct kgem_bo *bo =3D NULL; =20 list_for_each_entry(bo, buffers, request) { - if (!bo->dirty) -@@ -5072,7 +5081,7 @@ + if (!bo->gpu_dirty) +@@ -5578,7 +5584,7 @@ uint32_t size, uint32_t flags, void **ret) { Index: x11-drivers/xorg-drivers/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-drivers/xorg-drivers/Makefile (revision 326808) +++ x11-drivers/xorg-drivers/Makefile (working copy) @@ -10,7 +10,7 @@ MAINTAINER=3D x11@FreeBSD.org COMMENT=3D X.org drivers meta-port =20 -.MAKE.FreeBSD_UL=3D yes +.MAKE.FreeBSD_UL=3D yes =20 VIDEODIR=3D ${PREFIX}/lib/xorg/modules/drivers INPUTDIR=3D ${PREFIX}/lib/xorg/modules/input Index: x11-fonts/xfs/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-fonts/xfs/Makefile (revision 326808) +++ x11-fonts/xfs/Makefile (working copy) @@ -9,7 +9,7 @@ COMMENT=3D X.Org font server =20 XORG_CAT=3D app -USE_GMAKE=3D yes +USES=3D gmake USE_XORG=3D libfs xfont xtrans USE_RC_SUBR=3D xfs CONFIGURE_ARGS=3D --without-xmlto --without-fop Index: x11-servers/xephyr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xephyr/Makefile (revision 326808) +++ x11-servers/xephyr/Makefile (working copy) @@ -1,7 +1,6 @@ # $FreeBSD$ =20 PORTNAME=3D xephyr -PORTREVISION=3D 0 =20 COMMENT=3D X server from X.Org based on kdrive =20 Index: x11-servers/xorg-dmx/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-dmx/Makefile (revision 326808) +++ x11-servers/xorg-dmx/Makefile (working copy) @@ -2,7 +2,6 @@ # $FreeBSD$ =20 PORTNAME=3D xorg-dmx -PORTREVISION=3D 0 =20 COMMENT=3D Distributed Multihead X from X.Org =20 Index: x11-servers/xorg-nestserver/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-nestserver/Makefile (revision 326808) +++ x11-servers/xorg-nestserver/Makefile (working copy) @@ -23,6 +23,8 @@ PLIST_FILES=3D bin/Xnest MAN1=3D Xnest.1 =20 +.include + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/ .if defined(WITH_NEW_XORG) Index: x11-servers/xorg-server/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/Makefile (revision 326808) +++ x11-servers/xorg-server/Makefile (working copy) @@ -20,14 +20,28 @@ XORG_CAT=3D xserver SLAVE_PORT?=3D no =20 +OPTIONS_DEFINE=3D AIGLX SUID +OPTIONS_RADIO=3D CONF +OPTIONS_RADIO_CONF=3D HAL DEVD +AIGLX_DESC=3D Compile with Accelerated Indirect GLX support +SUID_DESC=3D Install the Xorg server with setuid bit set +HAL_DESC=3D Compile with HAL config support +DEVD_DESC=3D Use devd for autoconfiguration of input devices +OPTIONS_DEFAULT=3DAIGLX SUID DEVD + +OPTIONS_EXCLUDE_sparc64=3D HAL + +.include + .if defined(WITH_NEW_XORG) XORG_VERSION=3D 1.12.4 -XORG_REVISION=3D 1 +XORG_REVISION=3D 2 PLIST_SUB+=3D OLD=3D"@comment " NEW=3D"" -EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang +EXTRA_PATCHES+=3D ${FILESDIR}/extra-clang \ + ${FILESDIR}/extra-configure .else XORG_VERSION=3D 1.7.7 -XORG_REVISION=3D 8 +XORG_REVISION=3D 9 PLIST_SUB+=3D OLD=3D"" NEW=3D"@comment " EXTRA_PATCHES+=3D ${FILESDIR}/extra-Xext-xace.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ @@ -39,10 +53,8 @@ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c .endif =20 -USES=3D perl5 -USE_PERL5=3D build USE_BZIP2=3D yes -USE_GMAKE=3D yes +USES=3D gmake USE_GL=3D gl USE_XORG?=3D xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xa= w7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ @@ -54,6 +66,7 @@ =20 MAKE_JOBS_UNSAFE=3D yes USE_OPENSSL=3D yes +USE_PERL5_BUILD=3Dyes CONFIGURE_ARGS?=3D--disable-dmx --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=3D/var --without-dtrace --disable-xephyr \ @@ -78,14 +91,6 @@ PLIST=3D ${.CURDIR}/pkg-plist .endif =20 -OPTIONS_DEFINE=3D AIGLX SUID HAL -AIGLX_DESC=3D Compile with Accelerated Indirect GLX support -SUID_DESC=3D Install the Xorg server with setuid bit set -HAL_DESC=3D Compile with HAL config support -OPTIONS_DEFAULT=3D AIGLX SUID HAL - -OPTIONS_EXCLUDE_sparc64=3D HAL - .include =20 .if defined(WITH_OPENSSL_BASE) @@ -102,6 +107,10 @@ CONFIGURE_ARGS+=3D --enable-config-hal=3Dno .endif =20 +.if ${PORT_OPTIONS:MDEVD} +EXTRA_PATCHES+=3D ${FILESDIR}/extra-config_devd.c +.endif + .if ${PORT_OPTIONS:MAIGLX} CONFIGURE_ARGS+=3D --enable-aiglx=3Dyes .else @@ -171,6 +180,17 @@ @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =3D|@GLX_BOGUS@GLXMODS =3D|g'= \ -e 's|^LTLIBRARIES =3D |LTLIBRARIES =3D libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in +.if ${PORT_OPTIONS:MDEVD} + @${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(v= oid);" \ + >> ${WRKSRC}/config/config-backends.h +.endif +=20 +post-configure: +.if ${PORT_OPTIONS:MDEVD} + @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ + -e 's|config\.lo|config.lo devd.lo|g' \ + ${WRKSRC}/config/Makefile +.endif =20 .if ${SLAVE_PORT} =3D=3D "no" pre-su-install: Index: x11-servers/xorg-server/files/extra-config_devd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-config_devd.c (revision 0) +++ x11-servers/xorg-server/files/extra-config_devd.c (working copy) @@ -0,0 +1,481 @@ +--- /dev/null 2013-08-03 00:44:23.000000000 +0200 ++++ config/devd.c 2013-08-03 00:45:15.162836806 +0200 +@@ -0,0 +1,478 @@ ++/* ++ * Copyright =C2=A9 2012 Baptiste Daroussin ++ * ++ * Permission is hereby granted, free of charge, to any person obtainin= g a ++ * copy of this software and associated documentation files (the "Softw= are"), ++ * to deal in the Software without restriction, including without limit= ation ++ * the rights to use, copy, modify, merge, publish, distribute, sublice= nse, ++ * and/or sell copies of the Software, and to permit persons to whom th= e ++ * Software is furnished to do so, subject to the following conditions:= ++ * ++ * The above copyright notice and this permission notice (including the= next ++ * paragraph) shall be included in all copies or substantial portions o= f the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPR= ESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL= ITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT S= HALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR= OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARIS= ING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Baptiste Daroussin ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define DEVD_SOCK_PATH "/var/run/devd.pipe" ++ ++#define DEVD_EVENT_ADD '+' ++#define DEVD_EVENT_REMOVE '-' ++ ++static int sock_devd =3D -1; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++enum { ++ ATTR_KEYBOARD, ++ ATTR_POINTER, ++ ATTR_JOYSTICK, ++ ATTR_TOUCHPAD, ++ ATTR_TOUCHSCREEN, ++}; ++#endif ++ ++struct hw_type { ++ const char *driver; ++ int flag; ++ const char *xdriver; ++}; ++ ++static struct hw_type hw_types[] =3D { ++ { "ukbd", ATTR_KEYBOARD, "kdb" }, ++ { "atkbd", ATTR_KEYBOARD, "kdb" }, ++ { "ums", ATTR_POINTER, "mouse" }, ++ { "psm", ATTR_POINTER, "mouse" }, ++ { "uhid", ATTR_POINTER, "mouse" }, ++ { "joy", ATTR_JOYSTICK, NULL }, ++ { "atp", ATTR_TOUCHPAD, NULL }, ++ { "uep", ATTR_TOUCHSCREEN, NULL }, ++ { NULL, -1, NULL }, ++}; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++static void ++add_option(InputOption **options, const char *key, const char *value) ++{ ++ if (!value || *value =3D=3D '\0') ++ return; ++ ++ for (; *options; options =3D &(*options)->next) ++ ; ++ *options =3D calloc(sizeof(**options), 1); ++ if (!*options) /* Yeesh. */ ++ return; ++ (*options)->key =3D xstrdup(key); ++ (*options)->value =3D xstrdup(value); ++ (*options)->next =3D NULL; ++} ++ ++static void ++remove_device(DeviceIntPtr dev) ++{ ++ /* this only gets called for devices that have already been added *= / ++ LogMessage(X_INFO, "config/devd: removing device %s\n", dev->name);= ++ ++ /* Call PIE here so we don't try to dereference a device that's ++ * already been removed. */ ++ OsBlockSignals(); ++ ProcessInputEvents(); ++ DeleteInputDeviceRequest(dev); ++ OsReleaseSignals(); ++} ++ ++static bool ++device_is_duplicate(char *config_info) ++{ ++ DeviceIntPtr dev; ++ ++ for (dev =3D inputInfo.devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ for (dev =3D inputInfo.off_devices; dev; dev =3D dev->next) ++ if (dev->config_info && (strcmp(dev->config_info, config_info) = =3D=3D 0)) ++ return true; ++ ++ return false; ++} ++ ++#endif ++ ++static bool ++sysctl_exists(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ size_t len; ++ int ret; ++ ++ if (format =3D=3D NULL) ++ return false; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ ret =3D sysctlbyname(name, NULL, &len, NULL, 0); ++ ++ if (ret =3D=3D -1) ++ len =3D 0; ++ ++ free(name); ++ return (len > 0); ++} ++ ++static char * ++sysctl_get_str(const char *format, ...) ++{ ++ va_list args; ++ char *name =3D NULL; ++ char *dest =3D NULL; ++ size_t len; ++ ++ if (format =3D=3D NULL) ++ return NULL; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ if (sysctlbyname(name, NULL, &len, NULL, 0) =3D=3D 0) { ++ dest =3D malloc(len + 1); ++ if (sysctlbyname(name, dest, &len, NULL, 0) =3D=3D 0) ++ dest[len] =3D '\0'; ++ else { ++ free(dest); ++ dest =3D NULL; ++ } ++ } ++ ++ free(name); ++ return dest; ++} ++ ++static void ++device_added(char *line) ++{ ++ char *walk; ++ char *path; ++ char *vendor; ++ char *product =3D NULL; ++ char *config_info =3D NULL; ++ InputOption *options =3D NULL; ++#if XORG_VERSION_CURRENT > 10800000 ++ InputAttributes attrs =3D {}; ++#else ++ InputOption *tmpo; ++#endif ++ DeviceIntPtr dev =3D NULL; ++ int i, rc; ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ if (strncmp(line, hw_types[i].driver, ++ strlen(hw_types[i].driver)) =3D=3D 0 && ++ isnumber(*(line + strlen(hw_types[i].driver)))) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.flags |=3D hw_types[i].flag; ++#endif ++ break; ++ } ++ } ++ if (hw_types[i].driver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ if (hw_types[i].xdriver =3D=3D NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n",= line); ++ return; ++ } ++#endif ++ if (asprintf(&path, "/dev/%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ options =3D calloc(sizeof(*options), 1); ++ if (!options) ++ return; ++ ++ add_option(&options, "_source", "server/devd"); ++#else ++ options =3D input_option_new(NULL, "_source", "server/devd"); ++ if (!options) ++ return; ++#endif ++ ++ vendor =3D sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, l= ine + strlen(hw_types[i].driver)); ++ if (vendor =3D=3D NULL) { ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup("(unnamed)"); ++#endif ++ } else { ++ if ((product =3D strchr(vendor, ' ')) !=3D NULL) { ++ product[0] =3D '\0'; ++ product++; ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.vendor =3D strdup(vendor); ++#endif ++ if (product !=3D NULL && (walk =3D strchr(product, ',')) !=3D N= ULL) ++ walk[0] =3D '\0'; ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.product =3D strdup(product !=3D NULL ? product : "(unname= d)"); ++ options =3D input_option_new(options, "name", product !=3D NULL ? prod= uct : "(unnamed)"); ++#else ++ add_option(&options, "name", product !=3D NULL ? product : "(un= named)"); ++#endif ++ } ++#if XORG_VERSION_CURRENT > 10800000 ++ attrs.usb_id =3D NULL; ++ options =3D input_option_new(options, "path", path); ++ options =3D input_option_new(options, "device", path); ++#else ++ add_option(&options, "path", path); ++ add_option(&options, "device", path); ++#endif ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "driver", hw_types[i].xdriver); ++#endif ++ ++ if (asprintf(&config_info, "devd:%s", line) =3D=3D -1) { ++ config_info =3D NULL; ++ goto unwind; ++ } ++ ++ if (device_is_duplicate(config_info)) { ++ LogMessage(X_WARNING, "config/devd: device %s already added. " ++ "Ignoring.\n", product !=3D NULL ? produc= t : "(unnamed)"); ++ goto unwind; ++ } ++ ++#if XORG_VERSION_CURRENT < 10800000 ++ add_option(&options, "config_info", config_info); ++#else ++ options =3D input_option_new(options, "config_info", config_info); ++#endif ++ LogMessage(X_INFO, "config/devd: Adding input device %s (%s)\n", ++ product !=3D NULL ? product : "(unnamed)", path); ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ rc =3D NewInputDeviceRequest(options, &attrs, &dev); ++#else ++ rc =3D NewInputDeviceRequest(options, &dev); ++#endif ++ ++ if (rc !=3D Success) ++ goto unwind; ++ ++ unwind: ++ free(config_info); ++#if XORG_VERSION_CURRENT < 10800000 ++ while ((tmpo =3D options)) { ++ options =3D tmpo->next; ++ free(tmpo->key); /* NULL if dev !=3D NULL */ ++ free(tmpo->value); /* NULL if dev !=3D NULL */ ++ free(tmpo); ++ } ++#else ++ input_option_free_list(&options); ++#endif ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ free(attrs.usb_id); ++ free(attrs.product); ++ free(attrs.device); ++ free(attrs.vendor); ++#endif ++ ++ return; ++} ++ ++static void ++device_removed(char *line) ++{ ++ char *walk; ++ char *value; ++#if XORG_VERSION_CURRENT < 10800000 ++ DeviceIntPtr dev, next; ++#endif ++ ++ walk =3D strchr(line, ' '); ++ if (walk !=3D NULL) ++ walk[0] =3D '\0'; ++ ++ if (asprintf(&value, "devd:%s", line) =3D=3D -1) ++ return; ++ ++#if XORG_VERSION_CURRENT > 10800000 ++ remove_devices("dev", value); ++#else ++ for (dev =3D inputInfo.devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++ for (dev =3D inputInfo.off_devices; dev; dev =3D next) { ++ next =3D dev->next; ++ if (dev->config_info && strcmp(dev->config_info, value) =3D=3D = 0) ++ remove_device(dev); ++ } ++#endif ++ ++ free(value); ++} ++ ++static ssize_t ++socket_getline(int fd, char **out) ++{ ++ char *buf; ++ ssize_t ret, cap, sz =3D 0; ++ char c; ++ ++ cap =3D 1024; ++ buf =3D malloc(cap * sizeof(char)); ++ if (!buf) ++ return -1; ++ ++ for (;;) { ++ ret =3D read(sock_devd, &c, 1); ++ if (ret < 1) { ++ free(buf); ++ return -1; ++ } ++ ++ if (c =3D=3D '\n') ++ break; ++ ++ if (sz + 1 >=3D cap) { ++ cap *=3D 2; ++ buf =3D realloc(buf, cap *sizeof(char)); ++ } ++ buf[sz] =3D c; ++ sz++; ++ } ++ ++ buf[sz] =3D '\0'; ++ if (sz > 0) ++ *out =3D buf; ++ else ++ free(buf); ++ ++ return sz; /* number of bytes in the line, not counting the line break= */ ++} ++ ++static void ++wakeup_handler(pointer data, int err, pointer read_mask) ++{ ++ char *line =3D NULL; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(sock_devd, (fd_set *)read_mask)) { ++ if (socket_getline(sock_devd, &line) < 0) ++ return; ++ ++ switch(*line) { ++ case DEVD_EVENT_ADD: ++ device_added(line++); ++ break; ++ case DEVD_EVENT_REMOVE: ++ device_removed(line++); ++ break; ++ default: ++ break; ++ } ++ free(line); ++ } ++} ++ ++static void ++block_handler(pointer data, struct timeval **tv, pointer read_mask) ++{ ++} ++ ++int ++config_devd_init(void) ++{ ++ struct sockaddr_un devd; ++ char devicename[1024]; ++ int i, j; ++ ++ /* first scan the sysctl to determine the hardware if needed */ ++ ++ for (i =3D 0; hw_types[i].driver !=3D NULL; i++) { ++ for (j =3D 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].dri= ver, j); j++) { ++ snprintf(devicename, 1024, "%s%i", hw_types[i].driver, j); ++ device_added(devicename); ++ } ++ ++ } ++ sock_devd =3D socket(AF_UNIX, SOCK_STREAM, 0); ++ if (sock_devd < 0) { ++ ErrorF("config/devd: Fail opening stream socket"); ++ return 0; ++ } ++ ++ devd.sun_family =3D AF_UNIX; ++ strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path)); ++ ++ if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(struct soc= kaddr_un)) < 0) { ++ close(sock_devd); ++ ErrorF("config/devd: Fail to connect to devd"); ++ return 0; ++ } ++ ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL)= ; ++ AddGeneralSocket(sock_devd); ++ ++ return 1; ++} ++ ++void ++config_devd_fini(void) ++{ ++ if (sock_devd < 0) ++ return; ++ ++ RemoveGeneralSocket(sock_devd); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ close(sock_devd); ++} Property changes on: x11-servers/xorg-server/files/extra-config_devd.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=3D%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-servers/xorg-server/files/extra-configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-configure (revision 0) +++ x11-servers/xorg-server/files/extra-configure (working copy) @@ -0,0 +1,11 @@ +--- configure.orig 2013-09-07 22:11:27.210621324 +0200 ++++ configure 2013-09-07 22:11:52.912624338 +0200 +@@ -22839,7 +22839,7 @@ + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_tls=3D$kw ++ ac_cv_tls=3D$kw; break ; + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done Property changes on: x11-servers/xorg-server/files/extra-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: x11-themes/gtk-murrine-engine/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-themes/gtk-murrine-engine/Makefile (revision 326808) +++ x11-themes/gtk-murrine-engine/Makefile (working copy) @@ -3,6 +3,7 @@ =20 PORTNAME=3D murrine PORTVERSION=3D 0.98.2 +PORTREVISION=3D 1 CATEGORIES=3D x11-themes MASTER_SITES=3D GNOME PKGNAMEPREFIX=3D gtk- @@ -11,14 +12,12 @@ MAINTAINER=3D pneumann@gmail.com COMMENT=3D Murrine GTK+ 2.x cairo based engine =20 -LIB_DEPENDS=3D pixman-1:${PORTSDIR}/x11/pixman - USE_XZ=3D yes -USE_GMAKE=3D yes +USE_XORG=3D pixman USE_GNOME=3D gtk20 intltool intlhack USE_LDCONFIG=3D yes GNU_CONFIGURE=3D yes -USES=3D pkgconfig +USES=3D gmake pkgconfig =20 OPTIONS_DEFINE=3D ANIMATION ANIMATION_DESC=3D Animation support Index: x11-toolkits/gtkglext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/gtkglext/Makefile (revision 326808) +++ x11-toolkits/gtkglext/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D gtkglext PORTVERSION=3D 1.2.0 -PORTREVISION=3D 11 +PORTREVISION=3D 12 CATEGORIES=3D x11-toolkits MASTER_SITES=3D SF DIST_SUBDIR=3D gnome2 @@ -25,12 +25,11 @@ OPTIONS_DEFINE=3D DOCS =20 USE_BZIP2=3D yes -USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool USE_XORG=3D ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \= xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL=3D glu -USES=3D gettext iconv pathfix pkgconfig +USES=3D gettext gmake iconv pathfix pkgconfig USE_GNOME=3D gdkpixbuf2 gtk20 pangox-compat USE_LDCONFIG=3D yes =20 Index: x11-toolkits/libXaw/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/Makefile (revision 326808) +++ x11-toolkits/libXaw/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXaw -PORTVERSION=3D 1.0.11 +PORTVERSION=3D 1.0.12 PORTEPOCH=3D 2 CATEGORIES=3D x11-toolkits =20 @@ -11,7 +11,7 @@ =20 XORG_CAT=3D lib USE_XORG=3D printproto:both x11 xau xext xextproto xmu xp xpm xproto:bot= h xt -USE_GMAKE=3D yes +USES=3D gmake CONFIGURE_ARGS+=3D--without-xmlto =20 MAN3=3D Xaw.3 Index: x11-toolkits/libXaw/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXaw/distinfo (revision 326808) +++ x11-toolkits/libXaw/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 87a874acbb71d1ee59b8047312fc= 91d89dcb373e2970f121184cdae29a3d9492 -SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) =3D 649633 +SHA256 (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 96fc314874fce9979556321d1d6e= e00b5baf32fb333b7278853b4983bc3cdbf6 +SIZE (xorg/lib/libXaw-1.0.12.tar.bz2) =3D 677147 Index: x11-toolkits/libXmu/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/Makefile (revision 326808) +++ x11-toolkits/libXmu/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ =20 PORTNAME=3D libXmu -PORTVERSION=3D 1.1.1 +PORTVERSION=3D 1.1.2 PORTEPOCH=3D 1 CATEGORIES=3D x11-toolkits =20 Index: x11-toolkits/libXmu/distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-toolkits/libXmu/distinfo (revision 326808) +++ x11-toolkits/libXmu/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 709081c550cc3a866d7c760a3f973= 84a1fe16e27fc38fe8169b8db9f33aa7edd -SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) =3D 383473 +SHA256 (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 756edc7c383254eef8b4e1b733c3b= f1dc061b523c9f9833ac7058378b8349d0b +SIZE (xorg/lib/libXmu-1.1.2.tar.bz2) =3D 396230 Index: x11-wm/awesome/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-wm/awesome/Makefile (revision 326808) +++ x11-wm/awesome/Makefile (working copy) @@ -3,7 +3,7 @@ =20 PORTNAME=3D awesome PORTVERSION=3D 3.5.1 -PORTREVISION=3D 2 +PORTREVISION=3D 3 PORTEPOCH=3D 1 CATEGORIES=3D x11-wm MASTER_SITES=3D http://awesome.naquadah.org/download/ --------------000902030408090803050609-- ------enig2QIVQNBKKMGPHGEVFEPQF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBCgAGBQJSLeCkAAoJELuNS1e7i1VRYnYP/1T6iYejWHNRggGlaIjNSKhd NLX6/Hc/EzdC0VSjYodZENaZyVGksJwZKVfnHCjJorcX56MQZpBOk+JaXZOwgnQm 4ugTpQK/T/UyJSA1D/KDvuivnEzSvYt764CDedfmMqn9Okk3olfIEIlW75u15vnG NUL9L4huF5mAnza/3JkvxV8rIOngzjqrYxIFOzK0zXUg2BaJLZ7Fnnb6fGZzneVR KUpYVfOMDdCI5yLLWmNZtzK/ZR+64A4Z5QkKtu/7h4HnjdDmULKqiwWmFfifGUBl vHWUOrFX0hp1m1nXz7OG9W8C4Dyq5djtDc8B5NKEZeF4w5EfRXWgPiWlPp2Vu1+e 66bfS0UrFsB8WcL1dmZOHFSf7otS0DCjvUrWy4MaIDRYvuNM9q4L3kBYjkiiHHbx jPcfqPSPai2u+fVGqM2NfZ3wzIgSChRxo0AhwULy87Ac6jINlXnmm/Dgb9ojk3rR hqzvlyr11LzHVmb1To6fFS6G6Tc4rZwUSSMnJ+m3Jo/XGQuiudMRSBJiQRy3CH5U f+YcXJtff0GXzVW4WCjCMKM3RPrIM5u3VOF5YA9JAutfWz9SyG79qkJeKtDfrLpe 4WYewe6L1zWDIggvX1PBWFCApFn0k4HJCtuv1sL6zAszZC8075Cfu6fNJNOuBfyQ q5g+gvKBJQ+XX6+w7c68 =winD -----END PGP SIGNATURE----- ------enig2QIVQNBKKMGPHGEVFEPQF-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 18:46:11 2013 Return-Path: Delivered-To: ports@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 AA40393C; Mon, 9 Sep 2013 18:46:11 +0000 (UTC) (envelope-from david.wahlund@gmail.com) Received: from mail-oa0-x22f.google.com (mail-oa0-x22f.google.com [IPv6:2607:f8b0:4003:c02::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B8652C22; Mon, 9 Sep 2013 18:46:11 +0000 (UTC) Received: by mail-oa0-f47.google.com with SMTP id g12so6949728oah.34 for ; Mon, 09 Sep 2013 11:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=Ua2KhYYmBc0f/X8n5xqtr6THlOV7qU1GJZjjB9IIA7I=; b=P4zHY8JvtQTya4fStKd/oDS9196TiXrNQEwZ7W4oX/lhXKJ8jOu43A6b7wTkZ+xCcz rJLrk4vsj5UCVJqY9whDXKlCd1YXOMWi+lJ8sU9Rki/6UAU3X/QAom6ojugF//MjaSHF 7S4u/1hOlDhMP/2Cpe+dMZsvIVq487x7T5yrOMSJyuathpIh99V1CPbxIZk9N6Lp0nR7 pGfaMVc/P4uIilZ46yd7ckOLhsJzErB93Gle+eWbhe5hMOS7EOHORJnBapW+c9ASlaT+ 8Nn6pvHfKyHyIRonbJIlwRYn72HxgyH64vQvdoA/7FSMbkCZwfWwcYLF8iyOVaXyNuxG uDDw== MIME-Version: 1.0 X-Received: by 10.60.103.146 with SMTP id fw18mr12282580oeb.32.1378752370686; Mon, 09 Sep 2013 11:46:10 -0700 (PDT) Received: by 10.60.38.162 with HTTP; Mon, 9 Sep 2013 11:46:10 -0700 (PDT) Date: Mon, 9 Sep 2013 20:46:10 +0200 Message-ID: Subject: FreeBSD Port: mapserver-6.2.1_2 building with python support requires python 2.6. From: David Wahlund To: wen@FreeBSD.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 18:46:11 -0000 This throws a "this port is deprecated"-warning. EoL for python26 is 1 october 2013. Just a heads up. Regards David From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 19:11:33 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 7852EF75; Mon, 9 Sep 2013 19:11:33 +0000 (UTC) (envelope-from nox@jelal.kn-bremen.de) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id 354672DA9; Mon, 9 Sep 2013 19:11:32 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id E30DC1E007B6; Mon, 9 Sep 2013 21:11:30 +0200 (CEST) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.5/8.14.4) with ESMTP id r89JA3jp035814; Mon, 9 Sep 2013 21:10:03 +0200 (CEST) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.5/8.14.3/Submit) id r89JA3iC035813; Mon, 9 Sep 2013 21:10:03 +0200 (CEST) (envelope-from nox) From: Juergen Lock Date: Mon, 9 Sep 2013 21:10:03 +0200 To: Pawel Pekala Subject: Re: CFT: vlc 2.0.8 (with two PRs applied) Message-ID: <20130909191002.GA35774@triton8.kn-bremen.de> References: <20130828202616.GA34647@triton8.kn-bremen.de> <20130830202501.6c28a3ba@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20130830202501.6c28a3ba@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-multimedia@FreeBSD.org, Juergen Lock , freebsd-ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 19:11:33 -0000 On Fri, Aug 30, 2013 at 08:25:01PM +0200, Pawel Pekala wrote: > Dnia 2013-08-28, o godz. 22:26:16 > Juergen Lock napisaÅ‚(a): > > >Hi! > > > > It's this time again, there's a new vlc version out and I'd like to > >update the port: > > > > svn co https://svn.redports.org/nox/multimedia/vlc/ > > > > I have applied two PRs as well, ports/181596 and ports/181610, so > >livemedia and ncurses should work better now as well: > > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=181596 > > Add subtitle, video, and audio track scrolling to VLC's > > ncurses.c module > > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=181610 > > livemedia breakage > > > > Please give this update a good testing again, I've added the other > >changes from vlc's NEWS file below. > > Looking good. Just one small dependency missing: > > [corn:~]> pkg-lib-check vlc-2.0.8,3 > vlc-2.0.8,3: > missing dependency: audio/libgme > [corn:~]> pkg-lib-check -s libgme vlc-2.0.8,3 > vlc-2.0.8,3: > /usr/local/lib/vlc/plugins/demux/libgme_plugin.so > > Wanted to fill PR about this, but you were faster with new version ;) > And now I finally committed the update with this fix. Thanx to all testers, :) Juergen From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 20:22:02 2013 Return-Path: Delivered-To: freebsd-ports@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 0E00C9FF for ; Mon, 9 Sep 2013 20:22:02 +0000 (UTC) (envelope-from mueller6721@twc.com) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.122]) by mx1.freebsd.org (Postfix) with ESMTP id C9C2121E1 for ; Mon, 9 Sep 2013 20:22:01 +0000 (UTC) X-Authority-Analysis: v=2.0 cv=fJG7LOme c=1 sm=0 a=68NkTaeYMVLl2m++3813FQ==:17 a=i4YerQ4AwY4A:10 a=YIR2rTe5SWEA:10 a=DvSzqBOGy98A:10 a=pedpZTtsAAAA:8 a=ayC55rCoAAAA:8 a=KGjhK52YXX0A:10 a=oxR5pxIyE2UA:10 a=qEQFGRsvt5dMDONqHVcA:9 a=gLuVUtZYn3QA:10 a=68NkTaeYMVLl2m++3813FQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.130.200.176 Received: from [74.130.200.176] ([74.130.200.176:26387] helo=localhost) by hrndva-oedge04.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 11/E5-27973-8ED2E225; Mon, 09 Sep 2013 20:22:00 +0000 Date: Mon, 09 Sep 2013 20:22:00 +0000 Message-ID: <11.E5.27973.8ED2E225@hrndva-omtalb.mail.rr.com> From: "Thomas Mueller" To: freebsd-ports@freebsd.org Subject: What is MAKE_JOBS_UNSAFE? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 20:22:02 -0000 In some ports that failto build/upgrade, with portmaster in this case, I get a message like gmake[1]: Leaving directory `/BETA1/usr/ports/multimedia/vlc/work9amd64/vlc-2.0.7' gmake: *** [all] Error 2 ===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to the maintainer. *** [do-build] Error code 1 I also got this with mplayer and graphics/gstreamer-plugins-gl, resulting from the instructions in UPDATING 20130731. I looked in man pages (portmaster, ports, make.conf, make) and online Porters' Handbook without finding anything. So I want to know what MAKE_JOBS_UNSAFE=yes is supposed to do, and do I set it by env MAKE_JOBS_UNSAFE=yes portmaster multimedia/vlc (or whatever other port it applies to)? Tom From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 20:38:02 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 428EFD3C; Mon, 9 Sep 2013 20:38:02 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 00973228F; Mon, 9 Sep 2013 20:38:01 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VJ8Da-003CAd-LL>; Mon, 09 Sep 2013 22:37:54 +0200 Received: from e179065126.adsl.alicedsl.de ([85.179.65.126] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VJ8Da-000Wzg-Hq>; Mon, 09 Sep 2013 22:37:54 +0200 Date: Mon, 9 Sep 2013 22:37:48 +0200 From: "O. Hartmann" To: FreeBSD CURRENT Subject: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); Message-ID: <20130909223748.61dd8859@thor.walstatt.dyndns.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/AwrEDm1jQPZyyo23/SlD3eb"; protocol="application/pgp-signature" X-Originating-IP: 85.179.65.126 Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 20:38:02 -0000 --Sig_/AwrEDm1jQPZyyo23/SlD3eb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable x11/nvidia-driver (as well as emulators/virtualbox-ose-kmod) do not compile on FreeBSD 10.0-CURRENT #0 r255426: Mon Sep 9 21:35:43 CEST 2013 amd64. The error is: x11/nvidia-driver: --- nvidia_subr.o --- nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); ^ @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t, ^ 1 error generated. *** [nvidia_subr.o] Error code 1 emulators/virtualbox-ose-kmod: [...] /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.18/out/freebs= d.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-freebsd.c:83:76: error: too few arguments to function call, expected 10, have 9 cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t, --Sig_/AwrEDm1jQPZyyo23/SlD3eb Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLjGhAAoJEOgBcD7A/5N8HSoH/2uTjJWuOSQMeVt18bDc95xR LuxeP5b2+1mKBnUoma/bBNGSDWlgd6cphZqUkcnNz6zAWnEJ4QiEGfBre47MjPyt Y18EUHDI7Yurp98Jyw8KgoGKqH0LLIXyFHaA566cS3XRE2xKs9U3fhdki8IZn1TC E3Q2B++Y16OXpPvJZt5Vbii8K1pW6o8ZJ6SnwEjU7pHUGBtiKeyAjy6ClfmHtoFB avbGF43veN5fI4RhgRHJBWXcBG0unxZ/y1ZQDskK4XfTXxMdhMyH6Z1nYvpSK4cj EJ27Pn8dKR80mkHyitRKQxsa4UWV7S63HCpC/8zapcwXnebZ1DFi2FkqWBVgQic= =4lYb -----END PGP SIGNATURE----- --Sig_/AwrEDm1jQPZyyo23/SlD3eb-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 20:40:12 2013 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mandree.no-ip.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7AD61F2E; Mon, 9 Sep 2013 20:40:11 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [IPv6:::1] (localhost6.localdomain6 [IPv6:::1]) by apollo.emma.line.org (Postfix) with ESMTP id 14DE923CF4D; Mon, 9 Sep 2013 22:40:07 +0200 (CEST) Message-ID: <522E3223.9080805@FreeBSD.org> Date: Mon, 09 Sep 2013 22:40:03 +0200 From: Matthias Andree User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? References: <11.E5.27973.8ED2E225@hrndva-omtalb.mail.rr.com> In-Reply-To: <11.E5.27973.8ED2E225@hrndva-omtalb.mail.rr.com> X-Enigmail-Version: 1.4.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigA9650F31EA3CE9C6F6A7BFDF" Cc: freebsd-doc@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 20:40:12 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA9650F31EA3CE9C6F6A7BFDF Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Am 09.09.2013 22:22, schrieb Thomas Mueller: > So I want to know what MAKE_JOBS_UNSAFE=3Dyes is supposed to do, and do= I set it by >=20 > env MAKE_JOBS_UNSAFE=3Dyes portmaster multimedia/vlc=20 > (or whatever other port it applies to)? Thomas, It prevents parallel ("make -j 4") build of ports, and your assumption about how to set it is correct; alternatively, it can be given on the make command line: portmaster -mMAKE_JOBS_UNSAFE=3Dyes multimedia/vlc. URL: http://www.freebsd.org/doc/en/books/porters-handbook/building.html It's described in Section 6.3.1 Building Ports in Parallel of the porter's handbook, and apparently a bit out of date, because MAKE_JOBS_SAFE=3Dyes is now the default, and this feature must explicitly= be _disabled_. Can someone from among the doc committers team please reflect the new default in the Porter's Handbook? (I was looking at r42618.) HTH Matthias --------------enigA9650F31EA3CE9C6F6A7BFDF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iEYEARECAAYFAlIuMicACgkQvmGDOQUufZUNvgCfXEIMOVS9X91ae0g3lc2sDCfv guIAn0F/+c5imvsVdLRSuWXDWpxtr8zf =LzP7 -----END PGP SIGNATURE----- --------------enigA9650F31EA3CE9C6F6A7BFDF-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 21:02:54 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 0E9A639A; Mon, 9 Sep 2013 21:02:54 +0000 (UTC) (envelope-from fidaj@ukr.net) Received: from fsm2.ukr.net (fsm2.ukr.net [195.214.192.121]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B494B2410; Mon, 9 Sep 2013 21:02:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=lhqhy2nsI+ZoHHc76mt8CdoJMWCLVQEq6p98ksmvRmQ=; b=abMiiA56UyWzq1u3UJp/7ud8Vn+/6Ujmi3ZX4iBKL4z7KLjn02ozp8Dt8vYjWSZIq4W4VThgOaocjOb0ds2UOqG5cw0/p2cAZkfuaJXEqOxaVeMW1eXXGf62yHkC6TOBaYnJt7UyHZU1oR5gmy41m0xp8Udgdi4X2bqiJPJ+lwQ=; Received: from [178.137.138.140] (helo=nonamehost.local) by fsm2.ukr.net with esmtpsa ID 1VJ8bZ-000Nyl-4o ; Tue, 10 Sep 2013 00:02:41 +0300 Date: Tue, 10 Sep 2013 00:02:37 +0300 From: Ivan Klymenko To: "O. Hartmann" Subject: Re: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); Message-ID: <20130910000237.6b5604da@nonamehost.local> In-Reply-To: <20130909223748.61dd8859@thor.walstatt.dyndns.org> References: <20130909223748.61dd8859@thor.walstatt.dyndns.org> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=178.137.138.140; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: FreeBSD CURRENT , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 21:02:54 -0000 =D0=92 Mon, 9 Sep 2013 22:37:48 +0200 "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > x11/nvidia-driver (as well as emulators/virtualbox-ose-kmod) do not > compile on FreeBSD 10.0-CURRENT #0 r255426: Mon Sep 9 21:35:43 CEST > 2013 amd64. >=20 > The error is: >=20 > x11/nvidia-driver: >=20 > --- nvidia_subr.o --- > nvidia_subr.c:835:46: error: too few arguments to function call, > expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); > ^ > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here > int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > vm_size_t, ^ > 1 error generated. > *** [nvidia_subr.o] Error code 1 >=20 >=20 > emulators/virtualbox-ose-kmod: >=20 > [...] > /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.18/out/free= bsd.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-freebsd.c:83:76: > error: too few arguments to function call, expected 10, have 9 > cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int > vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > vm_size_t, Try the following changes: int rc =3D vm_map_find(kernel_map, pVmObject, 0, &Addr, --- cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0= ); +++ cbAllocated, 0, VMFS_OPTIMAL_SPACE, VM_PROT_AL= L, VM_PROT_ALL, 0); for Nvidia driver need to make similar changes... From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 21:09:42 2013 Return-Path: Delivered-To: ports@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 CE0C074D for ; Mon, 9 Sep 2013 21:09:42 +0000 (UTC) (envelope-from indexbuild@FreeBSD.org) Received: from portsindexbuild.ysv.freebsd.org (portsindexbuild.ysv.freebsd.org [IPv6:2001:1900:2254:206a::16:6601]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC76F246C for ; Mon, 9 Sep 2013 21:09:42 +0000 (UTC) Received: from portsindexbuild.ysv.freebsd.org ([127.0.1.2]) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.7) with ESMTP id r89L9gRX019932 for ; Mon, 9 Sep 2013 21:09:42 GMT (envelope-from indexbuild@portsindexbuild.ysv.freebsd.org) Received: (from indexbuild@localhost) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.5/Submit) id r89L9gHu019929 for ports@FreeBSD.org; Mon, 9 Sep 2013 21:09:42 GMT (envelope-from indexbuild) Date: Mon, 9 Sep 2013 21:09:42 GMT From: Ports Index build Message-Id: <201309092109.r89L9gHu019929@portsindexbuild.ysv.freebsd.org> To: ports@FreeBSD.org Subject: INDEX build failed for 8.x X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 21:09:43 -0000 INDEX build failed with errors: Generating INDEX-8 - please wait.. Done. Warning: Duplicate INDEX entry: p5-SOAP-Transport-HTTP-Plack-0.03 Committers on the hook: antoine az delphij dinoex nox sunpoet Most recent SVN update was: Updating '.': U emulators/fuse/Makefile U emulators/bfe/Makefile U sysutils/downtime/pkg-plist U sysutils/downtime/Makefile UU devel/p5-Data-SExpression/Makefile UU devel/p5-Data-TreeDumper-Renderer-GTK/Makefile UU devel/p5-AnyEvent-Connection/Makefile UU devel/p5-RRDTool-OO/Makefile UU devel/p5-Log-Accounting-SVN/Makefile UU devel/p5-Filesys-Notify-KQueue/Makefile UU devel/p5-accessors/Makefile UU devel/p5-File-ChangeNotify/Makefile UU devel/p5-ZConf-GUI/Makefile UU devel/p5-List-Group/Makefile U devel/p5-ParseLex/Makefile U devel/Makefile UU devel/cvsd/Makefile UU devel/p5-MouseX-AttributeHelpers/Makefile UU devel/p5-HOP-Lexer/Makefile UU devel/p5-App-Control/Makefile UU devel/p5-Config-Grammar/Makefile UU devel/p5-Log-Dispatch-Dir/distinfo U devel/p5-Log-Dispatch-Dir/Makefile UU devel/p5-Parallel-Scoreboard/Makefile UU devel/p5-Test-Filename/Makefile A devel/p5-IO-SessionData A devel/p5-IO-SessionData/pkg-plist A devel/p5-IO-SessionData/Makefile A devel/p5-IO-SessionData/distinfo A devel/p5-IO-SessionData/pkg-descr U devel/p5-MooseX-StrictConstructor/Makefile UU audio/libamrnb/pkg-plist UU audio/libamrnb/Makefile UU audio/libamrnb/distinfo UU audio/libamrwb/distinfo UU audio/libamrwb/pkg-plist UU audio/libamrwb/Makefile A textproc/checkbashisms A textproc/checkbashisms/Makefile A textproc/checkbashisms/distinfo A textproc/checkbashisms/pkg-descr U textproc/libvisio/Makefile UU textproc/libvisio/distinfo UU textproc/libvisio/pkg-descr U textproc/Makefile U textproc/fcitx-m17n/Makefile U graphics/darktable/Makefile U graphics/apvlv/Makefile A security/gpgdir A security/gpgdir/Makefile A security/gpgdir/distinfo A security/gpgdir/pkg-descr U security/p5-openxpki/Makefile U security/Makefile UU security/p5-Mcrypt/pkg-plist UU security/p5-Mcrypt/Makefile U security/openssl/Makefile U security/p5-IO-Async-SSL/Makefile U security/p5-IO-Async-SSL/distinfo U science/dcl/Makefile U science/gdis/Makefile U x11-fm/emelfm2/Makefile U x11-fm/catseye-fm/Makefile U irc/cwirc/Makefile U x11-clocks/alltraxclock/Makefile U games/frozenbubble/Makefile U games/freedoko/Makefile U games/battletanks/Makefile U games/csmash/Makefile UU net/p5-SOAP-Lite/pkg-plist U net/p5-SOAP-Lite/Makefile U net/Makefile A net/p5-SOAP-Transport-HTTP-Plack A net/p5-SOAP-Transport-HTTP-Plack/pkg-plist A net/p5-SOAP-Transport-HTTP-Plack/Makefile A net/p5-SOAP-Transport-HTTP-Plack/distinfo A net/p5-SOAP-Transport-HTTP-Plack/pkg-descr U databases/lmdb/Makefile U databases/lmdb/distinfo U net-mgmt/Makefile A net-mgmt/p5-GRNOC-Config A net-mgmt/p5-GRNOC-Config/Makefile A net-mgmt/p5-GRNOC-Config/distinfo A net-mgmt/p5-GRNOC-Config/pkg-descr U x11-wm/afterstep-stable/pkg-plist U x11-wm/afterstep-stable/Makefile U multimedia/ffmpeg2theora/Makefile U multimedia/vlc/Makefile U multimedia/vlc/distinfo D multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c D multimedia/vlc/files/patch-modules-codec-flac.c A multimedia/vlc/files/patch-modules-gui-ncurses.c A multimedia/vlc/files/patch-modules-stream_filter-dash-mpd-SegmentInfoCommon.h A multimedia/vlc/files/patch-modules-gui-qt4-Makefile.in A multimedia/vlc/files/patch-share-Makefile.in U x11/docker/Makefile U x11/eaglemode/Makefile U x11/bmpanel2/Makefile U x11/gdkxft/Makefile U x11/bbrun/Makefile U ports-mgmt/bxpkg/Makefile Updated to revision 326841. From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 21:17:16 2013 Return-Path: Delivered-To: freebsd-ports@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 85822952; Mon, 9 Sep 2013 21:17:16 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1ADAD24CF; Mon, 9 Sep 2013 21:17:15 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VJ8pe-003JsV-FU>; Mon, 09 Sep 2013 23:17:14 +0200 Received: from e179065126.adsl.alicedsl.de ([85.179.65.126] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VJ8pe-000ZJu-Aa>; Mon, 09 Sep 2013 23:17:14 +0200 Date: Mon, 9 Sep 2013 23:17:13 +0200 From: "O. Hartmann" To: Ivan Klymenko Subject: Re: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); Message-ID: <20130909231713.34ebfbdd@thor.walstatt.dyndns.org> In-Reply-To: <20130910000237.6b5604da@nonamehost.local> References: <20130909223748.61dd8859@thor.walstatt.dyndns.org> <20130910000237.6b5604da@nonamehost.local> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/UrICAPLQIU4o8yBNhfpaT_O"; protocol="application/pgp-signature" X-Originating-IP: 85.179.65.126 Cc: FreeBSD CURRENT , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 21:17:16 -0000 --Sig_/UrICAPLQIU4o8yBNhfpaT_O Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Tue, 10 Sep 2013 00:02:37 +0300 Ivan Klymenko wrote: > =D0=92 Mon, 9 Sep 2013 22:37:48 +0200 > "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5=D1= =82: >=20 > > x11/nvidia-driver (as well as emulators/virtualbox-ose-kmod) do not > > compile on FreeBSD 10.0-CURRENT #0 r255426: Mon Sep 9 21:35:43 > > CEST 2013 amd64. > >=20 > > The error is: > >=20 > > x11/nvidia-driver: > >=20 > > --- nvidia_subr.o --- > > nvidia_subr.c:835:46: error: too few arguments to function call, > > expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); > > ^ > > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here > > int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > > vm_size_t, ^ > > 1 error generated. > > *** [nvidia_subr.o] Error code 1 > >=20 > >=20 > > emulators/virtualbox-ose-kmod: > >=20 > > [...] > > /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.18/out/fr= eebsd.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-freebsd.c:83:= 76: > > error: too few arguments to function call, expected 10, have 9 > > cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ > > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int > > vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > > vm_size_t, >=20 > Try the following changes: > int rc =3D vm_map_find(kernel_map, pVmObject, 0, &Addr, > --- cbAllocated, TRUE, VM_PROT_ALL, > VM_PROT_ALL, 0); +++ cbAllocated, 0, > VMFS_OPTIMAL_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0); >=20 > for Nvidia driver need to make similar changes... > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to > "freebsd-current-unsubscribe@freebsd.org" The man page of vm_map_find() says the last parameter is of int, named int cow. On the hurry, I didn't find any explanation of that parameter. Setting it to "0" (zero) also in the nvidia_subr.c makes the driver compile again. But simply filling in a int zero is a bit strange without knowing what to do, isn't it? Thanks anyway, Oliver --Sig_/UrICAPLQIU4o8yBNhfpaT_O Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLjrZAAoJEOgBcD7A/5N8+oYIANdaYd2qOZHiMBOmiYVnNMY9 jYXPUHB+O2CpVAoSPHeAEuzAvl9QfzZ9BMS4NaMPmaVTH8qV3stHX63uI58qAM2f pKmHGzBoOLY+PF9NC3gniwaZQ/8FcseOD8wDtPvvaoxBa8PMHPeXArE/vFyKphEL f+ngRwpTlJw1REElyPPZzB3S86jrnecm9Uy+XhRuD0WziyBrCvpa0CZTxxIM2I68 w/U//34mSBScvibIBLpuA6O7ffQlgTjMHT1dMr+3AgKJNmEFKizbDOxoX22ua8iF EIBX4pRFGgiRUkTTlC4EEc5ODV10dmp0fELcifI5rQfP4osD/Z2deAY536mNH1g= =qouV -----END PGP SIGNATURE----- --Sig_/UrICAPLQIU4o8yBNhfpaT_O-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 21:24:21 2013 Return-Path: Delivered-To: freebsd-ports@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 2A39EDDE; Mon, 9 Sep 2013 21:24:21 +0000 (UTC) (envelope-from fidaj@ukr.net) Received: from fsm1.ukr.net (fsm1.ukr.net [195.214.192.120]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CF858254E; Mon, 9 Sep 2013 21:24:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=1c64/cEj9Aj4lyTAcGuGtRNf/gCS2uNdn0VTfl5pX8Q=; b=g0zYtO8hIodOOXsgVFeH81WuUg9nIHZ06O7HF2k7HyEUkzHeVz3m0x1K4/F6fACZKH3CfbhDjkmLmO6nbmqc1Yzy3uDgpmIKuK3TptfjpyfCe0+mLMFwmN1wpq4oMBcOfqjcoEKBg+pE6Pqt/5QF7pN2WD300mKCrNn5U58PddU=; Received: from [178.137.138.140] (helo=nonamehost.local) by fsm1.ukr.net with esmtpsa ID 1VJ8wK-000CVM-Er ; Tue, 10 Sep 2013 00:24:08 +0300 Date: Tue, 10 Sep 2013 00:24:05 +0300 From: Ivan Klymenko To: "O. Hartmann" Subject: Re: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); Message-ID: <20130910002405.4aa701d0@nonamehost.local> In-Reply-To: <20130909231713.34ebfbdd@thor.walstatt.dyndns.org> References: <20130909223748.61dd8859@thor.walstatt.dyndns.org> <20130910000237.6b5604da@nonamehost.local> <20130909231713.34ebfbdd@thor.walstatt.dyndns.org> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=178.137.138.140; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: FreeBSD CURRENT , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 21:24:21 -0000 =D0=92 Mon, 9 Sep 2013 23:17:13 +0200 "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On Tue, 10 Sep 2013 00:02:37 +0300 > Ivan Klymenko wrote: >=20 > > =D0=92 Mon, 9 Sep 2013 22:37:48 +0200 > > "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5=D1= =82: > > > /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.18/out/= freebsd.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-freebsd.c:8= 3:76: > > > error: too few arguments to function call, expected 10, have 9 > > > cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ > > > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int > > > vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > > > vm_size_t, > >=20 > > Try the following changes: > > int rc =3D vm_map_find(kernel_map, pVmObject, 0, &Addr, > > --- cbAllocated, TRUE, VM_PROT_ALL, > > VM_PROT_ALL, 0); +++ cbAllocated, 0, > > VMFS_OPTIMAL_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0); > >=20 > > for Nvidia driver need to make similar changes... > The man page of vm_map_find() says the last parameter is of int, named > int cow. On the hurry, I didn't find any explanation of that > parameter. Setting it to "0" (zero) also in the nvidia_subr.c makes > the driver compile again. >=20 > But simply filling in a int zero is a bit strange without knowing what > to do, isn't it? >=20 > Thanks anyway, >=20 > Oliver This commit you to find an appropriate example ... http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D291456+0+current/svn-src-head And in this case, the driver Nvidia really need to specify 0 in place of the sixth argument ... but I'm not sure at 100% :) From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 22:42:48 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 A143156C; Mon, 9 Sep 2013 22:42:48 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 33D68292C; Mon, 9 Sep 2013 22:42:47 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VJAAQ-003aWt-91>; Tue, 10 Sep 2013 00:42:46 +0200 Received: from e179065126.adsl.alicedsl.de ([85.179.65.126] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VJAAQ-000e6Z-4B>; Tue, 10 Sep 2013 00:42:46 +0200 Date: Tue, 10 Sep 2013 00:42:40 +0200 From: "O. Hartmann" To: Ivan Klymenko Subject: Re: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); Message-ID: <20130910004240.70bc281f@thor.walstatt.dyndns.org> In-Reply-To: <20130910002405.4aa701d0@nonamehost.local> References: <20130909223748.61dd8859@thor.walstatt.dyndns.org> <20130910000237.6b5604da@nonamehost.local> <20130909231713.34ebfbdd@thor.walstatt.dyndns.org> <20130910002405.4aa701d0@nonamehost.local> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/=Yo2NVK0V6hf5X=_BhBi_K+"; protocol="application/pgp-signature" X-Originating-IP: 85.179.65.126 Cc: FreeBSD CURRENT , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 22:42:48 -0000 --Sig_/=Yo2NVK0V6hf5X=_BhBi_K+ Content-Type: multipart/mixed; boundary="MP_/t9rnh6LEgzGFFLdd98QRq.=" --MP_/t9rnh6LEgzGFFLdd98QRq.= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Tue, 10 Sep 2013 00:24:05 +0300 Ivan Klymenko wrote: > =D0=92 Mon, 9 Sep 2013 23:17:13 +0200 > "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5=D1= =82: >=20 > > On Tue, 10 Sep 2013 00:02:37 +0300 > > Ivan Klymenko wrote: > >=20 > > > =D0=92 Mon, 9 Sep 2013 22:37:48 +0200 > > > "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5= =D1=82: > > > > /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.18/ou= t/freebsd.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-freebsd.c= :83:76: > > > > error: too few arguments to function call, expected 10, have 9 > > > > cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ > > > > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int > > > > vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > > > > vm_size_t, > > >=20 > > > Try the following changes: > > > int rc =3D vm_map_find(kernel_map, pVmObject, 0, &Addr, > > > --- cbAllocated, TRUE, VM_PROT_ALL, > > > VM_PROT_ALL, 0); +++ cbAllocated, 0, > > > VMFS_OPTIMAL_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0); > > >=20 > > > for Nvidia driver need to make similar changes... > > The man page of vm_map_find() says the last parameter is of int, > > named int cow. On the hurry, I didn't find any explanation of that > > parameter. Setting it to "0" (zero) also in the nvidia_subr.c makes > > the driver compile again. > >=20 > > But simply filling in a int zero is a bit strange without knowing > > what to do, isn't it? > >=20 > > Thanks anyway, > >=20 > > Oliver >=20 > This commit you to find an appropriate example ... > http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D291456+0+current/svn-src-h= ead > And in this case, the driver Nvidia really need to specify 0 in place > of the sixth argument ... > but I'm not sure at 100% :) I have a patch attached for the x11/nvidia-driver Makefile. It doesn't work and I loose hairs due to not knowing why. When issuing the following command sequence on the console: cd /usr/ports/x11/nvidia-driver make clean extract sed -i -e '/(VM_PROT_READ | VM_PROT_WRITE), 0);$/s/0);$/0, 0);/g' \ work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c and check then line 835 (the corrupt one) in file=20 work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c, I see this BEFORE: status =3D vm_map_find(kernel_map, at->object, (i * PAGE_SIZE), &virtual_address, size, VMFS_ANY_SPACE, (VM_PROT_READ | VM_PROT_WRITE), =3D=3D=3D(835)>> (VM_PROT_READ | VM_PROT_WRITE), 0); and I see this AFTER the sed'ed replacement: status =3D vm_map_find(kernel_map, at->object, (i * PAGE_SIZE), &virtual_address, size, VMFS_ANY_SPACE, (VM_PROT_READ | VM_PROT_WRITE), =3D=3D=3D(835)>> (VM_PROT_READ | VM_PROT_WRITE), 0, 0); BUT: Using the patch (see attached, please apply to x11/nvidia-driver/Makefile) gives me an error in x11/nvidia-driver: make clean patch =3D=3D=3D> Cleaning for nvidia-driver-325.15 =3D=3D=3D> License NVIDIA accepted by the user =3D=3D=3D> Found saved configuration for nvidia-driver-325.08_1 =3D=3D=3D> nvidia-driver-325.15 depends on file: /usr/local/sbin/pkg - fo= und =3D=3D=3D> Fetching all distfiles required by nvidia-driver-325.15 for building =3D=3D=3D> Extracting for nvidia-driver-325.15 =3D> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-325.15.tar.gz. =3D=3D=3D> Patching for nvidia-driver-325.15 sed: 1: "/(VM_PROT_READ | VM_PRO ...": invalid command code 0 *** Error code 1 The Shell/make should be able to substitute within a single-quotet command to sed, but the error message reports differently. Do not be confused about the driver revision I use. I tried the official one (319.XX) as well and it is not working the very same way and the patch won't either. Oliver --MP_/t9rnh6LEgzGFFLdd98QRq.= Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=nvidia-driver.patch --- Makefile.orig 2013-09-10 00:30:53.000000000 +0200 +++ Makefile 2013-09-10 00:40:08.000000000 +0200 @@ -160,6 +160,11 @@ s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \ ${WRKSRC}/src/nvidia_linux.c .endif +# Changes in vm_map_find() due to r255426 +.if ${OSVERSION} >=3D 1000054 + ${REINPLACE_CMD} -e '/(VM_PROT_READ | VM_PROT_WRITE), 0);$/s/0);$/0, 0);/= g' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Fix stack buffer overflow in nvidia_sysctl_bus_type() .if ${NVVERSION} < 3192300 ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \ --MP_/t9rnh6LEgzGFFLdd98QRq.=-- --Sig_/=Yo2NVK0V6hf5X=_BhBi_K+ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLk7lAAoJEOgBcD7A/5N8EDQIAJx9TjgQarW8JUYRGklqTQJ2 N5qAqOvMLQALSZMMYyT+EJAwCaavAgYXXIFrIcGEVnqwKgZujtECiLun5Sxx3ZVp 0Vec7gvhA/IBRQ3o5rvgN4ClSy8gX68+IBS5YaPDKRpi4n1c3/ifKG1sjEeIGrxT 0All458Srcq/25EUNaD2OUrBR58RDGS6ewNpUFM0cm59CCFoyHqUM9QTnC6Mgv0n ZTzrZikizjEStR8FppoqgKMTXfs5HDto0Rx8qd77IqxCII9RI41rb9nFA81MDo9o 2xlnNn10IMZpyYsMWHUlDqUgzym7xQZHSJk9fBE3jC4713DLJdTO+i9j7KLGbIA= =PCXK -----END PGP SIGNATURE----- --Sig_/=Yo2NVK0V6hf5X=_BhBi_K+-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 22:49:34 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 45C5791D; Mon, 9 Sep 2013 22:49:34 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mho-01-ewr.mailhop.org (mho-03-ewr.mailhop.org [204.13.248.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 061C02971; Mon, 9 Sep 2013 22:49:33 +0000 (UTC) Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52] helo=damnhippie.dyndns.org) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1VJAGs-000Nvv-Uj; Mon, 09 Sep 2013 22:49:27 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id r89MnNJL002218; Mon, 9 Sep 2013 16:49:23 -0600 (MDT) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 24.8.230.52 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19FLDb8X/Nv6wyRFcrUD3X/ Subject: Re: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); From: Ian Lepore To: "O. Hartmann" In-Reply-To: <20130910004240.70bc281f@thor.walstatt.dyndns.org> References: <20130909223748.61dd8859@thor.walstatt.dyndns.org> <20130910000237.6b5604da@nonamehost.local> <20130909231713.34ebfbdd@thor.walstatt.dyndns.org> <20130910002405.4aa701d0@nonamehost.local> <20130910004240.70bc281f@thor.walstatt.dyndns.org> Content-Type: text/plain; charset="koi8-r" Date: Mon, 09 Sep 2013 16:49:23 -0600 Message-ID: <1378766963.1111.579.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by damnhippie.dyndns.org id r89MnNJL002218 Cc: Ivan Klymenko , FreeBSD CURRENT , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 22:49:34 -0000 On Tue, 2013-09-10 at 00:42 +0200, O. Hartmann wrote: > On Tue, 10 Sep 2013 00:24:05 +0300 > Ivan Klymenko wrote: >=20 > > =F7 Mon, 9 Sep 2013 23:17:13 +0200 > > "O. Hartmann" =D0=C9=DB=C5=D4: > >=20 > > > On Tue, 10 Sep 2013 00:02:37 +0300 > > > Ivan Klymenko wrote: > > >=20 > > > > =F7 Mon, 9 Sep 2013 22:37:48 +0200 > > > > "O. Hartmann" =D0=C9=DB=C5=D4: > > > > > /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.1= 8/out/freebsd.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-fre= ebsd.c:83:76: > > > > > error: too few arguments to function call, expected 10, have 9 > > > > > cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ > > > > > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int > > > > > vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, > > > > > vm_size_t, > > > >=20 > > > > Try the following changes: > > > > int rc =3D vm_map_find(kernel_map, pVmObject, 0, &Addr, > > > > --- cbAllocated, TRUE, VM_PROT_ALL, > > > > VM_PROT_ALL, 0); +++ cbAllocated, 0, > > > > VMFS_OPTIMAL_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0); > > > >=20 > > > > for Nvidia driver need to make similar changes... > > > The man page of vm_map_find() says the last parameter is of int, > > > named int cow. On the hurry, I didn't find any explanation of that > > > parameter. Setting it to "0" (zero) also in the nvidia_subr.c makes > > > the driver compile again. > > >=20 > > > But simply filling in a int zero is a bit strange without knowing > > > what to do, isn't it? > > >=20 > > > Thanks anyway, > > >=20 > > > Oliver > >=20 > > This commit you to find an appropriate example ... > > http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D291456+0+current/svn-s= rc-head > > And in this case, the driver Nvidia really need to specify 0 in place > > of the sixth argument ... > > but I'm not sure at 100% :) >=20 > I have a patch attached for the x11/nvidia-driver Makefile. It doesn't > work and I loose hairs due to not knowing why. >=20 > When issuing the following command sequence on the console: >=20 > cd /usr/ports/x11/nvidia-driver > make clean extract > sed -i -e '/(VM_PROT_READ | VM_PROT_WRITE), 0);$/s/0);$/0, 0);/g' \ > work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c >=20 >=20 > and check then line 835 (the corrupt one) in file=20 > work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c, >=20 > I see this BEFORE: >=20 > status =3D vm_map_find(kernel_map, at->object, (i * PAGE_SIZE), > &virtual_address, size, VMFS_ANY_SPACE, > (VM_PROT_READ | VM_PROT_WRITE), > =3D=3D=3D(835)>> (VM_PROT_READ | VM_PROT_WRITE), 0); >=20 >=20 > and I see this AFTER the sed'ed replacement: >=20 > status =3D vm_map_find(kernel_map, at->object, (i * PAGE_SIZE), > &virtual_address, size, VMFS_ANY_SPACE, > (VM_PROT_READ | VM_PROT_WRITE), > =3D=3D=3D(835)>> (VM_PROT_READ | VM_PROT_WRITE), 0, 0); >=20 > BUT: Using the patch (see attached, please apply to > x11/nvidia-driver/Makefile) gives me an error in x11/nvidia-driver: >=20 > make clean patch >=20 > =3D=3D=3D> Cleaning for nvidia-driver-325.15 > =3D=3D=3D> License NVIDIA accepted by the user > =3D=3D=3D> Found saved configuration for nvidia-driver-325.08_1 > =3D=3D=3D> nvidia-driver-325.15 depends on file: /usr/local/sbin/pkg = - found > =3D=3D=3D> Fetching all distfiles required by nvidia-driver-325.15 for > building > =3D=3D=3D> Extracting for nvidia-driver-325.15 > =3D> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-325.15.tar.gz. > =3D=3D=3D> Patching for nvidia-driver-325.15 > sed: 1: "/(VM_PROT_READ | VM_PRO ...": invalid command code 0 > *** Error code 1 >=20 > The Shell/make should be able to substitute within a single-quotet > command to sed, but the error message reports differently. >=20 > Do not be confused about the driver revision I use. I tried the > official one (319.XX) as well and it is not working the very same way > and the patch won't either. >=20 > Oliver I don't know about the sed error, but I think the change you're trying to make is wrong. The new '0' parameter to vm_map_find() isn't added at the end, it goes after the size parameter. -- Ian From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 23:05:30 2013 Return-Path: Delivered-To: freebsd-ports@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 0266EEA4; Mon, 9 Sep 2013 23:05:30 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8617D2A3D; Mon, 9 Sep 2013 23:05:29 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VJAWN-003eRh-Qq>; Tue, 10 Sep 2013 01:05:27 +0200 Received: from e179065126.adsl.alicedsl.de ([85.179.65.126] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VJAWN-000fEd-KU>; Tue, 10 Sep 2013 01:05:27 +0200 Date: Tue, 10 Sep 2013 01:05:26 +0200 From: "O. Hartmann" To: Ian Lepore Subject: Re: CURRENT r255426: x11/nvidia-driver: nvidia_subr.c:835:46: error: too few arguments to function call, expected 10, have 9 (VM_PROT_READ | VM_PROT_WRITE), 0); Message-ID: <20130910010526.2a6aff37@thor.walstatt.dyndns.org> In-Reply-To: <1378766963.1111.579.camel@revolution.hippie.lan> References: <20130909223748.61dd8859@thor.walstatt.dyndns.org> <20130910000237.6b5604da@nonamehost.local> <20130909231713.34ebfbdd@thor.walstatt.dyndns.org> <20130910002405.4aa701d0@nonamehost.local> <20130910004240.70bc281f@thor.walstatt.dyndns.org> <1378766963.1111.579.camel@revolution.hippie.lan> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/Vmtyepju929/5CxjndkXwz4"; protocol="application/pgp-signature" X-Originating-IP: 85.179.65.126 Cc: Ivan Klymenko , FreeBSD CURRENT , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 23:05:30 -0000 --Sig_/Vmtyepju929/5CxjndkXwz4 Content-Type: multipart/mixed; boundary="MP_/SiMt+dXgloLdHvspPyGi3UV" --MP_/SiMt+dXgloLdHvspPyGi3UV Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Mon, 09 Sep 2013 16:49:23 -0600 Ian Lepore wrote: > On Tue, 2013-09-10 at 00:42 +0200, O. Hartmann wrote: > > On Tue, 10 Sep 2013 00:24:05 +0300 > > Ivan Klymenko wrote: > >=20 > > > =F7 Mon, 9 Sep 2013 23:17:13 +0200 > > > "O. Hartmann" =D0=C9=DB=C5=D4: > > >=20 > > > > On Tue, 10 Sep 2013 00:02:37 +0300 > > > > Ivan Klymenko wrote: > > > >=20 > > > > > =F7 Mon, 9 Sep 2013 22:37:48 +0200 > > > > > "O. Hartmann" =D0=C9=DB=C5=D4: > > > > > > /usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.1= 8/out/freebsd.amd64/release/bin/src/vboxdrv/r0drv/freebsd/alloc-r0drv-freeb= sd.c:83:76: > > > > > > error: too few arguments to function call, expected 10, > > > > > > have 9 cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); ^ > > > > > > @/vm/vm_map.h:368:1: note: 'vm_map_find' declared here int > > > > > > vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, > > > > > > vm_offset_t *, vm_size_t, > > > > >=20 > > > > > Try the following changes: > > > > > int rc =3D vm_map_find(kernel_map, pVmObject, 0, &Addr, > > > > > --- cbAllocated, TRUE, VM_PROT_ALL, > > > > > VM_PROT_ALL, 0); +++ cbAllocated, 0, > > > > > VMFS_OPTIMAL_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0); > > > > >=20 > > > > > for Nvidia driver need to make similar changes... > > > > The man page of vm_map_find() says the last parameter is of int, > > > > named int cow. On the hurry, I didn't find any explanation of > > > > that parameter. Setting it to "0" (zero) also in the > > > > nvidia_subr.c makes the driver compile again. > > > >=20 > > > > But simply filling in a int zero is a bit strange without > > > > knowing what to do, isn't it? > > > >=20 > > > > Thanks anyway, > > > >=20 > > > > Oliver > > >=20 > > > This commit you to find an appropriate example ... > > > http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D291456+0+current/svn-s= rc-head > > > And in this case, the driver Nvidia really need to specify 0 in > > > place of the sixth argument ... > > > but I'm not sure at 100% :) > >=20 > > I have a patch attached for the x11/nvidia-driver Makefile. It > > doesn't work and I loose hairs due to not knowing why. > >=20 > > When issuing the following command sequence on the console: > >=20 > > cd /usr/ports/x11/nvidia-driver > > make clean extract > > sed -i -e '/(VM_PROT_READ | VM_PROT_WRITE), 0);$/s/0);$/0, 0);/g' \ > > work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c > >=20 > >=20 > > and check then line 835 (the corrupt one) in file=20 > > work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c, > >=20 > > I see this BEFORE: > >=20 > > status =3D vm_map_find(kernel_map, at->object, (i * PAGE_SIZE), > > &virtual_address, size, VMFS_ANY_SPACE, > > (VM_PROT_READ | VM_PROT_WRITE), > > =3D=3D=3D(835)>> (VM_PROT_READ | VM_PROT_WRITE), 0); > >=20 > >=20 > > and I see this AFTER the sed'ed replacement: > >=20 > > status =3D vm_map_find(kernel_map, at->object, (i * PAGE_SIZE), > > &virtual_address, size, VMFS_ANY_SPACE, > > (VM_PROT_READ | VM_PROT_WRITE), > > =3D=3D=3D(835)>> (VM_PROT_READ | VM_PROT_WRITE), 0, 0); > >=20 > > BUT: Using the patch (see attached, please apply to > > x11/nvidia-driver/Makefile) gives me an error in x11/nvidia-driver: > >=20 > > make clean patch > >=20 > > =3D=3D=3D> Cleaning for nvidia-driver-325.15 > > =3D=3D=3D> License NVIDIA accepted by the user > > =3D=3D=3D> Found saved configuration for nvidia-driver-325.08_1 > > =3D=3D=3D> nvidia-driver-325.15 depends on file: /usr/local/sbin/pkg - > > found =3D=3D=3D> Fetching all distfiles required by nvidia-driver-325.15 > > for building > > =3D=3D=3D> Extracting for nvidia-driver-325.15 > > =3D> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-325.15.tar.gz. > > =3D=3D=3D> Patching for nvidia-driver-325.15 > > sed: 1: "/(VM_PROT_READ | VM_PRO ...": invalid command code 0 > > *** Error code 1 > >=20 > > The Shell/make should be able to substitute within a single-quotet > > command to sed, but the error message reports differently. > >=20 > > Do not be confused about the driver revision I use. I tried the > > official one (319.XX) as well and it is not working the very same > > way and the patch won't either. > >=20 > > Oliver >=20 > I don't know about the sed error, but I think the change you're trying > to make is wrong. The new '0' parameter to vm_map_find() isn't added > at the end, it goes after the size parameter. >=20 > -- Ian Yes, you're correct and my face is red like a tomatoe :-( I try this sed replacement expression: sed -i -e '/\&virtual_address\, size\, \ VMFS_ANY\_SPACE\,$/s//\&virtual_address\, size\, 0\, \ VMFS_ANY\_SPACE\,/g' work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c It works from the command line, but it doesn't work from the (attached) Makefile-patch. --MP_/SiMt+dXgloLdHvspPyGi3UV Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=nvidia-driver_2nd.patch --- Makefile.orig 2013-09-10 00:30:53.000000000 +0200 +++ Makefile 2013-09-10 01:04:05.000000000 +0200 @@ -160,6 +160,12 @@ s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \ ${WRKSRC}/src/nvidia_linux.c .endif +# Changes in vm_map_find() due to r255426 +.if ${OSVERSION} > 1000053 + ${REINPLACE_CMD} -e '/\&virtual_address\, size\, VMFS_ANY\_SPACE\,$/s/\ + /\&virtual_address\, size\, 0\, VMFS_ANY\_SPACE\,/g' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Fix stack buffer overflow in nvidia_sysctl_bus_type() .if ${NVVERSION} < 3192300 ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \ --MP_/SiMt+dXgloLdHvspPyGi3UV-- --Sig_/Vmtyepju929/5CxjndkXwz4 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLlQ3AAoJEOgBcD7A/5N8r7kH/jQ+EKxUICcnwJ1huoQCl2R0 Rtie4n33ylRFMmoqNm1EEdsGbb30vMTdI/x6/puNJ58uTKpOUpLdJ9gfhpB4+75a S9Xv3K/Jva4SV1jzuVeCAi0+Vo64zqHiysatVm00LGEId9BlB06iJmbak1gMqd2I u2wksFQ8dmcwks4DK/PuYbWgaXCHXnXXDmkzF5SUTfy9gwBGxfyxOZ38ydbDsc6d ThqrfeFmqm7qSAOREnaWG9BjZuEkQ1k385SA1n5VXFifzrebdevaAUyZO/iBMhG6 +U7ppozqnreH32pDZXlsEHay2KK/M0TQ/wdQPM/rHxomtptUMWbJkZVY2+tQ8yk= =a/7R -----END PGP SIGNATURE----- --Sig_/Vmtyepju929/5CxjndkXwz4-- From owner-freebsd-ports@FreeBSD.ORG Mon Sep 9 23:51:47 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 C4CC97F3 for ; Mon, 9 Sep 2013 23:51:47 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5BAC12C7B for ; Mon, 9 Sep 2013 23:51:47 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtp (envelope-from ) id <1VJBFB-003loh-FR>; Tue, 10 Sep 2013 01:51:45 +0200 Received: from e179065126.adsl.alicedsl.de ([85.179.65.126] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtpsa (envelope-from ) id <1VJBFB-000hQr-9w>; Tue, 10 Sep 2013 01:51:45 +0200 Date: Tue, 10 Sep 2013 01:51:44 +0200 From: "O. Hartmann" To: FreeBSD Ports Subject: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! Message-ID: <20130910015144.41c88d52@thor.walstatt.dyndns.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/2F1JNAPK0+iiXS0.UIENXi2"; protocol="application/pgp-signature" X-Originating-IP: 85.179.65.126 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 23:51:47 -0000 --Sig_/2F1JNAPK0+iiXS0.UIENXi2 Content-Type: multipart/mixed; boundary="MP_//DvhNUYKUjBvUkV__y+9dki" --MP_//DvhNUYKUjBvUkV__y+9dki Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline With CURRENT r255426 several changes has been introduced (see http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D291456+0+current/svn-src-hea= d). This results in a non-functionality of the x11/nvidia-driver port after updating world and kernel to CURRENT r255426. I try to patch this. The target file is src/nvidia_subr.c, line 833 (nVidia driver 325.15, 319.XX might differ). The solution is to insert a zero (0) after the size parameter, which can be targetted by the sed-expression sed -i -e 's/\(\&virtual_address, size,\) \(VMFS_ANY_SPACE,\)$/ \ \1 0, \2/' work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c (do "make clean patch" first in x11/nvidia-driver). Checking work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c at line 833 reveals: &virtual_address, size, 0, VMFS_ANY_SPACE, which is exactly what I wanted. But putting the very same sed-expression into the port's Makefile=20 # Changes in vm_map_find() due to r255426=20 .if ${OSVERSION} > 1000053=20 ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ \(VMFS_ANY_SPACE,\)$/\1 0, \2/' \ \ ${WRKSRC}/src/nvidia_subr.c .endif (patch attached) gives this weird error: =3D=3D=3D> Cleaning for nvidia-driver-325.15 =3D=3D=3D> License NVIDIA accepted by the user =3D=3D=3D> Found saved configuration for nvidia-driver-325.08_1 =3D=3D=3D> nvidia-driver-325.15 depends on file: /usr/local/sbin/pkg - fo= und =3D=3D=3D> Fetching all distfiles required by nvidia-driver-325.15 for building =3D=3D=3D> Extracting for nvidia-driver-325.15 =3D> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-325.15.tar.gz. =3D=3D=3D> Patching for nvidia-driver-325.15 sed: 1: "s/\(\&virtual_address, ...": unescaped newline inside substitute pattern *** Error code 1 Stop. make[1]: stopped in /usr/ports/x11/nvidia-driver *** Error code 1 Stop. make: stopped in /usr/ports/x11/nvidia-driver What the f*** is going on here? The expression in single-quotes is supposed not to substituted by the shell/make, isn't it? What I am doing wrong here? I filed a PR (ports/181972) for the nvidia problem, but I'm incapale of providing the patch due to this sticky obscure fault. Oliver=20 --MP_//DvhNUYKUjBvUkV__y+9dki Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=nvidia-driver_3rd.patch --- Makefile.orig 2013-09-10 00:30:53.000000000 +0200 +++ Makefile 2013-09-10 01:30:21.000000000 +0200 @@ -160,6 +160,11 @@ s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \ ${WRKSRC}/src/nvidia_linux.c .endif +# Changes in vm_map_find() due to r255426 +.if ${OSVERSION} > 1000053 + ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \(VMFS_ANY_SPACE,\)$/= \1 0, \2/' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Fix stack buffer overflow in nvidia_sysctl_bus_type() .if ${NVVERSION} < 3192300 ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \ --MP_//DvhNUYKUjBvUkV__y+9dki-- --Sig_/2F1JNAPK0+iiXS0.UIENXi2 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLl8QAAoJEOgBcD7A/5N8WLsH/108NFZXkr7RPAj8Dzav9cCc xLUhP0LUIXk+7M4PIyIzyTilc1r9LWLKZbiSYtEPelZPTACU6ScdnuKEZj6MRbmV 7RY9RgD76k6vPyCxY46heDktJmUFm9mQKHTLz/5gdbUH11tN1GpGlEyKBeDtlvcf pOIbp1iZhw7MwOztqd/vy6EOC3/HW75bQq77RY3VvH4ch4MjmvA6yWkungtG1wjn txWUnfs3Oj4A9Pk9bh5xuTDEULohm3kr9+6SPgEenC4xqJoBonfLTho7Mifjzh1A 22+1TwMUwO1ry9uFWEeKxc/1LJuto/ZQLNujrI6fiBebq0rotpwVSed3eEs7L2A= =HSJz -----END PGP SIGNATURE----- --Sig_/2F1JNAPK0+iiXS0.UIENXi2-- From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 00:09:49 2013 Return-Path: Delivered-To: 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 32F9DA3E for ; Tue, 10 Sep 2013 00:09:49 +0000 (UTC) (envelope-from indexbuild@FreeBSD.org) Received: from portsindexbuild.ysv.freebsd.org (portsindexbuild.ysv.freebsd.org [IPv6:2001:1900:2254:206a::16:6601]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 234862D2E for ; Tue, 10 Sep 2013 00:09:49 +0000 (UTC) Received: from portsindexbuild.ysv.freebsd.org ([127.0.1.2]) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.7) with ESMTP id r8A09mgH093353 for ; Tue, 10 Sep 2013 00:09:48 GMT (envelope-from indexbuild@portsindexbuild.ysv.freebsd.org) Received: (from indexbuild@localhost) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.5/Submit) id r8A09msi093349 for ports@FreeBSD.org; Tue, 10 Sep 2013 00:09:48 GMT (envelope-from indexbuild) Date: Tue, 10 Sep 2013 00:09:48 GMT From: Ports Index build Message-Id: <201309100009.r8A09msi093349@portsindexbuild.ysv.freebsd.org> To: ports@FreeBSD.org Subject: INDEX build failed for 8.x X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 00:09:49 -0000 INDEX build failed with errors: Generating INDEX-8 - please wait.. Done. Warning: Duplicate INDEX entry: p5-SOAP-Transport-HTTP-Plack-0.03 Committers on the hook: antoine az bar delphij dinoex mandree mm nox rakuco sunpoet wg Most recent SVN update was: Updating '.': U audio/audacity/Makefile U audio/audacity/distinfo U deskutils/docear/Makefile U deskutils/docear/distinfo U x11-toolkits/fox17/Makefile U games/vavoom-extras/Makefile U games/vavoom-extras/distinfo U games/vavoom-extras/pkg-plist U games/netradiant/Makefile U textproc/wiggle/Makefile U textproc/wiggle/distinfo U net/hupnp/Makefile U net/hupnp/pkg-descr D net/hupnp/files/patch-herqq.pro U net/hupnp/files/patch-hmulticast_socket.cpp U net/crtmpserver/files/crtmpserver.in U net/crtmpserver/pkg-plist U net/crtmpserver/Makefile U net/crtmpserver/distinfo U net/crtmpserver/pkg-descr U graphics/opencv/pkg-descr U graphics/sdl2_image/Makefile U graphics/leptonica/Makefile U graphics/sdl_image/Makefile U graphics/gdal/Makefile U graphics/ImageMagick/Makefile U graphics/openimageio/Makefile U graphics/webp/pkg-plist U graphics/webp/Makefile U graphics/webp/distinfo U graphics/ida/Makefile U www/xpi-firebug/pkg-plist U www/xpi-firebug/Makefile U www/xpi-firebug/distinfo U www/xpi-adblock_plus/pkg-plist U www/xpi-adblock_plus/Makefile U www/xpi-adblock_plus/distinfo U www/netsurf/Makefile Updated to revision 326853. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 00:17:03 2013 Return-Path: Delivered-To: freebsd-ports@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 530DCC54 for ; Tue, 10 Sep 2013 00:17:03 +0000 (UTC) (envelope-from mueller6721@twc.com) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.122]) by mx1.freebsd.org (Postfix) with ESMTP id 1C9AC2D97 for ; Tue, 10 Sep 2013 00:17:02 +0000 (UTC) X-Authority-Analysis: v=2.0 cv=fJG7LOme c=1 sm=0 a=68NkTaeYMVLl2m++3813FQ==:17 a=i4YerQ4AwY4A:10 a=uPZnjBv91u8A:10 a=DvSzqBOGy98A:10 a=pedpZTtsAAAA:8 a=ayC55rCoAAAA:8 a=KGjhK52YXX0A:10 a=jFtjEtZ8J7QA:10 a=6I5d2MoRAAAA:8 a=seEyJ1AafpvYrvt9RxAA:9 a=YkdnB3fMhV8A:10 a=68NkTaeYMVLl2m++3813FQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.130.200.176 Received: from [74.130.200.176] ([74.130.200.176:43290] helo=localhost) by hrndva-oedge04.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 62/B1-27973-7F46E225; Tue, 10 Sep 2013 00:16:56 +0000 Date: Tue, 10 Sep 2013 00:16:55 +0000 Message-ID: <62.B1.27973.7F46E225@hrndva-omtalb.mail.rr.com> From: "Thomas Mueller" To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 00:17:03 -0000 > Thomas, > It prevents parallel ("make -j 4") build of ports, and your assumption > about how to set it is correct; alternatively, it can be given on the > make command line: > portmaster -mMAKE_JOBS_UNSAFE=yes multimedia/vlc. > URL: http://www.freebsd.org/doc/en/books/porters-handbook/building.html > It's described in Section 6.3.1 Building Ports in Parallel of the > porter's handbook, and apparently a bit out of date, because > MAKE_JOBS_SAFE=yes is now the default, and this feature must explicitly > be _disabled_. > Can someone from among the doc committers team please reflect the new > default in the Porter's Handbook? (I was looking at r42618.) HTH > Matthias If MAKE_JOBS_UNSAFE=yes is already the default, then presumably trying to build or upgrade a port will fail just the same with this part specified? Now "pkg info -r gio-fam-backend" shows gio-fam-backend-2.34.3: mplayer-1.1.r20130308 gstreamer-plugins-gl-0.10.3_1 vlc-2.0.6_3,3 So to go to the last step ("portmaster -a") in this UPDATING 20130731, I have to somehow upgrade or get rid of those three reverse dependencies, or possibly pkg delete -f gio-fam-backend I see in other posts that vlc has had a further update/commit, and I could switch from mplayer to mplayer2, but what about gstreamer-plugins-gl, or is this not critical? Tom From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 03:23:36 2013 Return-Path: Delivered-To: ports@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 1C1A53C9 for ; Tue, 10 Sep 2013 03:23:36 +0000 (UTC) (envelope-from indexbuild@FreeBSD.org) Received: from portsindexbuild.ysv.freebsd.org (portsindexbuild.ysv.freebsd.org [IPv6:2001:1900:2254:206a::16:6601]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E4560259E for ; Tue, 10 Sep 2013 03:23:35 +0000 (UTC) Received: from portsindexbuild.ysv.freebsd.org ([127.0.1.2]) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.7) with ESMTP id r8A3NZBd048936 for ; Tue, 10 Sep 2013 03:23:35 GMT (envelope-from indexbuild@portsindexbuild.ysv.freebsd.org) Received: (from indexbuild@localhost) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.5/Submit) id r8A3NZwA048933 for ports@FreeBSD.org; Tue, 10 Sep 2013 03:23:35 GMT (envelope-from indexbuild) Date: Tue, 10 Sep 2013 03:23:35 GMT From: Ports Index build Message-Id: <201309100323.r8A3NZwA048933@portsindexbuild.ysv.freebsd.org> To: ports@FreeBSD.org Subject: INDEX build failed for 8.x X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 03:23:36 -0000 INDEX build failed with errors: Generating INDEX-8 - please wait.. Done. Warning: Duplicate INDEX entry: p5-SOAP-Transport-HTTP-Plack-0.03 Committers on the hook: antoine az bar delphij dinoex mandree mm nox rakuco sunpoet tabthorpe wg Most recent SVN update was: Updating '.': U www/py-flexget/Makefile U www/py-flexget/distinfo U misc/bibletime/Makefile U math/giacxcas/pkg-plist U math/giacxcas/Makefile U math/giacxcas/distinfo Updated to revision 326856. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 04:06:14 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 8DEB7DF1 for ; Tue, 10 Sep 2013 04:06:14 +0000 (UTC) (envelope-from mueller6721@twc.com) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.122]) by mx1.freebsd.org (Postfix) with ESMTP id 54A64279E for ; Tue, 10 Sep 2013 04:06:13 +0000 (UTC) X-Authority-Analysis: v=2.0 cv=R/aB6KtX c=1 sm=0 a=68NkTaeYMVLl2m++3813FQ==:17 a=i4YerQ4AwY4A:10 a=uPZnjBv91u8A:10 a=DvSzqBOGy98A:10 a=pedpZTtsAAAA:8 a=ayC55rCoAAAA:8 a=KGjhK52YXX0A:10 a=jFtjEtZ8J7QA:10 a=6I5d2MoRAAAA:8 a=seEyJ1AafpvYrvt9RxAA:9 a=YkdnB3fMhV8A:10 a=68NkTaeYMVLl2m++3813FQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.130.200.176 Received: from [74.130.200.176] ([74.130.200.176:52487] helo=localhost) by hrndva-oedge02.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 43/E3-01080-4BA9E225; Tue, 10 Sep 2013 04:06:13 +0000 Date: Tue, 10 Sep 2013 04:06:12 +0000 Message-ID: <43.E3.01080.4BA9E225@hrndva-omtalb.mail.rr.com> From: "Thomas Mueller" To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 04:06:14 -0000 > Thomas, > It prevents parallel ("make -j 4") build of ports, and your assumption > about how to set it is correct; alternatively, it can be given on the > make command line: > portmaster -mMAKE_JOBS_UNSAFE=yes multimedia/vlc. > URL: http://www.freebsd.org/doc/en/books/porters-handbook/building.html > It's described in Section 6.3.1 Building Ports in Parallel of the > porter's handbook, and apparently a bit out of date, because > MAKE_JOBS_SAFE=yes is now the default, and this feature must explicitly > be _disabled_. > Can someone from among the doc committers team please reflect the new > default in the Porter's Handbook? (I was looking at r42618.) HTH > Matthias If MAKE_JOBS_UNSAFE=yes is already the default, then presumably trying to build or upgrade a port will fail just the same with this part specified? Now "pkg info -r gio-fam-backend" shows gio-fam-backend-2.34.3: mplayer-1.1.r20130308 gstreamer-plugins-gl-0.10.3_1 vlc-2.0.6_3,3 So to go to the last step ("portmaster -a") in this UPDATING 20130731, I have to somehow upgrade or get rid of those three reverse dependencies, or possibly pkg delete -f gio-fam-backend I see in other posts that vlc has had a further update/commit, and I could switch from mplayer to mplayer2, but what about gstreamer-plugins-gl, or is this not critical? Update: I did portmaster -o multimedia/mplayer2 multimedia/mplayer successfully, but failed with vlc and gstreamer-plugins-gl. Can I safely pkg delete -f gio-fam-backend since its function is (?) presumably filled by glib 2.36 ? Tom From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 05:20:56 2013 Return-Path: Delivered-To: freebsd-ports@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 D00FF992; Tue, 10 Sep 2013 05:20:56 +0000 (UTC) (envelope-from hiren.panchasara@gmail.com) Received: from mail-vb0-x229.google.com (mail-vb0-x229.google.com [IPv6:2607:f8b0:400c:c02::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6641E2AA9; Tue, 10 Sep 2013 05:20:56 +0000 (UTC) Received: by mail-vb0-f41.google.com with SMTP id g17so4659896vbg.14 for ; Mon, 09 Sep 2013 22:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=3ImI3sHGj9WbpsshIptNa75JmE5LKqnKCeLTQFrt0XQ=; b=tm8Y3XGHgJpIits7+pvtBw/I3Fx0LEam2/MbYGprYSgLPJqFmugvJrisndhfOULwvO cBAM0vdX4KxjzcgU4qY2KwCaaiRzDDmKwpRKVj8g4yOkVF1/x0cp0e+u7Cxfwx9bZ7mA NZub2CoUoCmAp4wry3DvnDVfXz4Mu9aNj8bxw+9ebtohWhB5FTLDHVRLdIekfZOMnN4f zRARAK/LAkqLN/cE9Wj/LnTNbYKeAlPFd0aHIgHZmnU8961pD3MMUgRaAs1QyGTCii8v VlA84XUrZiGuTH2VNl53iUR+PUm9TUbGjSiTI9hSCPSHGqNUIyUZ98GCbBkEESNvukom aMxQ== MIME-Version: 1.0 X-Received: by 10.52.162.66 with SMTP id xy2mr16921480vdb.3.1378790455394; Mon, 09 Sep 2013 22:20:55 -0700 (PDT) Received: by 10.58.173.101 with HTTP; Mon, 9 Sep 2013 22:20:55 -0700 (PDT) In-Reply-To: <522B17AC.5060503@gmx.de> References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> Date: Mon, 9 Sep 2013 22:20:55 -0700 Message-ID: Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv From: hiren panchasara To: olli hauer Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: freebsd-current , Guido Falsi , FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 05:20:57 -0000 On Sat, Sep 7, 2013 at 5:10 AM, olli hauer wrote: > There are 13 ports using --with-iconv=${LOCALBASE} > devel/apr1 > devel/apr2 > devel/git > irc/epic5 > lang/gauche > net-mgmt/ettercap > net/ssltunnel-client > net/yaz > net/zebra-server > textproc/libxml2 > textproc/py-libxml2 > www/apache22 > www/apache24 > > > and devel/glib20, print/ghostscript8, print/ghostscript9 using > --with-libiconv=gnu > --with-libiconv=native > --with-libiconv=no > --with-libiconv=no > I am hitting following failure while building devel/glib20 gconvert.c:66:2: error: GNU libiconv not in use but included iconv.h is from libiconv #error GNU libiconv not in use but included iconv.h is from libiconv How do I get past this? % uname -a FreeBSD flymockour-l7.corp.yahoo.com 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r255423M: Mon Sep 9 12:29:22 PDT 2013 root@flymockour-l7.corp.yahoo.com:/usr/obj/usr/home/hirenp/head/sys/GENERIC amd64 % cat /etc/src.conf WITH_LIBICONV_COMPAT=y BOOT_COMCONSOLE_SPEED=115200 PORTS_MODULES=x11/nvidia-driver cheers, Hiren > > Unfortunately Uses/iconv.mk defines only --with-libiconv(-prefix). > > If Uses/iconv.mk can be extended with something like ICON_PATH, then > the 13 ports can be changed quickly to use the right iconv. > > -- > Regards, > olli > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 06:03:50 2013 Return-Path: Delivered-To: freebsd-ports@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 B41B9625 for ; Tue, 10 Sep 2013 06:03:50 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F4262C78 for ; Tue, 10 Sep 2013 06:03:49 +0000 (UTC) Received: from mandree.no-ip.org ([78.48.41.58]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0Lngv5-1Vt96h1fSx-00htRp for ; Tue, 10 Sep 2013 08:03:48 +0200 Received: from [IPv6:::1] (localhost6.localdomain6 [IPv6:::1]) by apollo.emma.line.org (Postfix) with ESMTP id AE45F23CF75 for ; Tue, 10 Sep 2013 08:03:47 +0200 (CEST) Message-ID: <522EB643.5040900@gmx.de> Date: Tue, 10 Sep 2013 08:03:47 +0200 From: Matthias Andree User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? References: <43.E3.01080.4BA9E225@hrndva-omtalb.mail.rr.com> In-Reply-To: <43.E3.01080.4BA9E225@hrndva-omtalb.mail.rr.com> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:POtWDdUe4GJAUyn342ASXsVFXvD/PPKJZP4WufNblyvH6h3YxLk SJ3+xrTscP/ZvkKWxHsUoDGVSyTW/aDhrbhoAFfeGi6IdvZqIUaiy5N1ZeZfYqXKs/3NjsT ks3fkgPnULdIKaRq8GN4wY0kpyVunVheW/Dws0bDOrxRvKcvaZKdVVKX7j+0/N+i21q4YGX dlQTSuBR+OnHNYZNAO5Uw== X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 06:03:50 -0000 Am 10.09.2013 06:06, schrieb Thomas Mueller: >> Thomas, > >> It prevents parallel ("make -j 4") build of ports, and your assumption >> about how to set it is correct; alternatively, it can be given on the >> make command line: > >> portmaster -mMAKE_JOBS_UNSAFE=yes multimedia/vlc. > >> URL: http://www.freebsd.org/doc/en/books/porters-handbook/building.html > >> It's described in Section 6.3.1 Building Ports in Parallel of the >> porter's handbook, and apparently a bit out of date, because >> MAKE_JOBS_SAFE=yes is now the default, and this feature must explicitly >> be _disabled_. > >> Can someone from among the doc committers team please reflect the new >> default in the Porter's Handbook? (I was looking at r42618.) > > HTH >> Matthias > > If MAKE_JOBS_UNSAFE=yes is already the default, then presumably trying to build or upgrade a port will fail just the same with this part specified? FORCE_MAKE_JOBS is the new default, meaning that: Unless MAKE_JOBS_UNSAFE is defined, MAKE_JOBS_SAFE is assumed. You should not see the ports framework message telling you to retry if MAKE_JOBS_UNSAFE is set. > I see in other posts that vlc has had a further update/commit, and I could switch from mplayer to mplayer2, but what about gstreamer-plugins-gl, or is this not critical? I have not followed what's needed there. > Can I safely > pkg delete -f gio-fam-backend > since its function is (?) presumably filled by glib 2.36 ? Yes, providing that you've rebuilt all ports that did previously require gio-fam-backend. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 06:09:54 2013 Return-Path: Delivered-To: ports@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 82213715 for ; Tue, 10 Sep 2013 06:09:54 +0000 (UTC) (envelope-from indexbuild@FreeBSD.org) Received: from portsindexbuild.ysv.freebsd.org (portsindexbuild.ysv.freebsd.org [IPv6:2001:1900:2254:206a::16:6601]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 571C62CAC for ; Tue, 10 Sep 2013 06:09:54 +0000 (UTC) Received: from portsindexbuild.ysv.freebsd.org ([127.0.1.2]) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.7) with ESMTP id r8A69s2w042942 for ; Tue, 10 Sep 2013 06:09:54 GMT (envelope-from indexbuild@portsindexbuild.ysv.freebsd.org) Received: (from indexbuild@localhost) by portsindexbuild.ysv.freebsd.org (8.14.7/8.14.5/Submit) id r8A69smB042919 for ports@FreeBSD.org; Tue, 10 Sep 2013 06:09:54 GMT (envelope-from indexbuild) Date: Tue, 10 Sep 2013 06:09:54 GMT From: Ports Index build Message-Id: <201309100609.r8A69smB042919@portsindexbuild.ysv.freebsd.org> To: ports@FreeBSD.org Subject: INDEX now builds successfully on 8.x X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 06:09:54 -0000 From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 06:11:16 2013 Return-Path: Delivered-To: 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 0BC767BB; Tue, 10 Sep 2013 06:11:16 +0000 (UTC) (envelope-from cvs-src@yandex.ru) Received: from forward9l.mail.yandex.net (forward9l.mail.yandex.net [IPv6:2a02:6b8:0:1819::9]) by mx1.freebsd.org (Postfix) with ESMTP id BE9DF2CDC; Tue, 10 Sep 2013 06:11:15 +0000 (UTC) Received: from smtp3h.mail.yandex.net (smtp3h.mail.yandex.net [84.201.186.20]) by forward9l.mail.yandex.net (Yandex) with ESMTP id 063EBE60E34; Tue, 10 Sep 2013 10:11:12 +0400 (MSK) Received: from smtp3h.mail.yandex.net (localhost [127.0.0.1]) by smtp3h.mail.yandex.net (Yandex) with ESMTP id 87B811B41777; Tue, 10 Sep 2013 10:11:12 +0400 (MSK) Received: from unknown (unknown [178.76.216.133]) by smtp3h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ZUZ8YmHquB-BCZa5TQI; Tue, 10 Sep 2013 10:11:12 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1378793472; bh=KF49+jqVWBUlig2igCPxblQoQ4G7eG3hFLhJ+GkVlnM=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=P57tVHSVhYirc811tSFqcmKUHCY/UkJVcvH+VEtVihfr8WX82l1EqglwKREPSHGgh raB7fCbDob9f0cTDV2EFUOYH17S7Wjrxjg4/sKkOWj+lCM95b4TD6cK92c4KtLe6dE p0zrQyPG5XJOmBJLDg6cHqW5+aptAL8WGZ65kt74= Authentication-Results: smtp3h.mail.yandex.net; dkim=pass header.i=@yandex.ru Message-ID: <522EB7FE.1010709@yandex.ru> Date: Tue, 10 Sep 2013 10:11:10 +0400 From: Ruslan Makhmatkhanov User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130810 Thunderbird/17.0.8 MIME-Version: 1.0 To: David Wahlund Subject: Re: FreeBSD Port: mapserver-6.2.1_2 building with python support requires python 2.6. References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: wen@FreeBSD.org, ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 06:11:16 -0000 David Wahlund wrote on 09.09.2013 22:46: > This throws a "this port is deprecated"-warning. EoL for python26 is 1 > october 2013. > > Just a heads up. > > Regards > David It builds fine python 2.7: https://redports.org/~rm/20130909204800-7664-143662/mapserver-6.2.1_3.log Would you try to change USE_PYTHON to -2.7 and check if it works for you? -- Regards, Ruslan Tinderboxing kills... the drives. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 06:23:04 2013 Return-Path: Delivered-To: ports@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 DF60CA80; Tue, 10 Sep 2013 06:23:04 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from lmtp.galacsys.net (webmail.galacsys.net [IPv6:2001:1b78:0:1:d918:51d7:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id AA8A42D69; Tue, 10 Sep 2013 06:23:04 +0000 (UTC) Received: from martymac.org (webmail.galacsys.net [217.24.81.215]) by lmtp.galacsys.net (Postfix) with ESMTP id 73BB11FA5D4E; Tue, 10 Sep 2013 08:23:02 +0200 (CEST) From: "Ganael LAPLANCHE" To: Niclas Zeising ,x11@FreeBSD.org Subject: Re: [CFT] Update of xorg libraries and MESA X-Openwebmail-Date: Tue, 10 Sep 2013 09:23:02 +0200 Message-Id: <20130910062045.M54984@martymac.org> In-Reply-To: <522DE093.9080504@freebsd.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> X-Mailer: Open WebMail 2.01 20030425 X-OriginatingIP: 157.99.64.43 (ganael.laplanche@martymac.org) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Date: Tue, 10 Sep 2013 06:23:04 +0000 (UTC) Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 06:23:05 -0000 On Mon, 09 Sep 2013 16:52:03 +0200, Niclas Zeising wrote Hi Nicolas, > The patch has been updated, and the updated version is attached. As > always, it is possible to find the latest version of the patch at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff Works like a charm on my Lenovo X220 (-CURRENT). Thanks ! -- Ganael LAPLANCHE http://www.martymac.org | http://contribs.martymac.org FreeBSD: martymac , http://www.FreeBSD.org From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 06:28:24 2013 Return-Path: Delivered-To: freebsd-ports@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 C6B0AC60 for ; Tue, 10 Sep 2013 06:28:24 +0000 (UTC) (envelope-from brfr@metrico.lu) Received: from design20.letzebuerg.net (design20.letzebuerg.net [176.9.210.200]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 828422D97 for ; Tue, 10 Sep 2013 06:28:24 +0000 (UTC) Received: from ip-88-207-240-117.dyn.luxdsl.pt.lu ([88.207.240.117]:53773 helo=[192.168.0.32]) by design20.letzebuerg.net with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1VJHQp-0002l2-3K for freebsd-ports@freebsd.org; Tue, 10 Sep 2013 08:28:11 +0200 Message-ID: <522EBBC6.6090709@metrico.lu> Date: Tue, 10 Sep 2013 08:27:18 +0200 From: Frank Broniewski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: FreeBSD Port: mapserver-6.2.1_2 building with python support requires python 2.6. References: <522EB7FE.1010709@yandex.ru> In-Reply-To: <522EB7FE.1010709@yandex.ru> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - design20.letzebuerg.net X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - metrico.lu X-Get-Message-Sender-Via: design20.letzebuerg.net: authenticated_id: brfr@metrico.lu X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 06:28:24 -0000 Am 2013-09-10 08:11, schrieb Ruslan Makhmatkhanov: > David Wahlund wrote on 09.09.2013 22:46: >> This throws a "this port is deprecated"-warning. EoL for python26 is 1 >> october 2013. >> >> Just a heads up. >> >> Regards >> David > > It builds fine python 2.7: > https://redports.org/~rm/20130909204800-7664-143662/mapserver-6.2.1_3.log > > Would you try to change USE_PYTHON to -2.7 and check if it works for you? > I'm doing this already. For me, in line 55 in the Makefile, I have the following line: USE_PYTHON= 2.7 and Mapscript works as usual ... Frank -- Frank BRONIEWSKI METRICO s.à r.l. géomètres technologies d'information géographique rue des Romains 36 L-5433 NIEDERDONVEN tél.: +352 26 74 94 - 28 fax.: +352 26 74 94 99 http://www.metrico.lu From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 06:56:45 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 2489F318; Tue, 10 Sep 2013 06:56:45 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id CF8FD2EEB; Tue, 10 Sep 2013 06:56:44 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3cYxqV3wpfzFVB9; Tue, 10 Sep 2013 08:56:38 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aMUI0Feq1QRE; Tue, 10 Sep 2013 08:56:36 +0200 (CEST) Received: from marvin.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Tue, 10 Sep 2013 08:56:36 +0200 (CEST) Message-ID: <522EC2A3.8000403@FreeBSD.org> Date: Tue, 10 Sep 2013 08:56:35 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130902 Thunderbird/17.0.8 MIME-Version: 1.0 To: hiren panchasara Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: olli hauer , freebsd-current , FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 06:56:45 -0000 On 09/10/13 07:20, hiren panchasara wrote: > > > > On Sat, Sep 7, 2013 at 5:10 AM, olli hauer > wrote: > > There are 13 ports using --with-iconv=${LOCALBASE} > devel/apr1 > devel/apr2 > devel/git > irc/epic5 > lang/gauche > net-mgmt/ettercap > net/ssltunnel-client > net/yaz > net/zebra-server > textproc/libxml2 > textproc/py-libxml2 > www/apache22 > www/apache24 > > > and devel/glib20, print/ghostscript8, print/ghostscript9 using > --with-libiconv=gnu > --with-libiconv=native > --with-libiconv=no > --with-libiconv=no > > > I am hitting following failure while building devel/glib20 > > gconvert.c:66:2: error: GNU libiconv not in use but included iconv.h > is from libiconv > #error GNU libiconv not in use but included iconv.h is from libiconv > > How do I get past this? Looks like you have some leftovers from the libiconv port. Have you removed it? can you give the output of ls /usr/local/include/iconv.h? What is the output if "head /usr/include/iconv.h"? > > % uname -a > FreeBSD flymockour-l7.corp.yahoo.com > 10.0-CURRENT FreeBSD 10.0-CURRENT > #2 r255423M: Mon Sep 9 12:29:22 PDT 2013 That M in the revision number indicates you're using a modified checkout, May I ask which modifications you have in your source tree? -- Guido Falsi From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 07:28:29 2013 Return-Path: Delivered-To: freebsd-ports@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 86A80761; Tue, 10 Sep 2013 07:28:29 +0000 (UTC) (envelope-from hiren.panchasara@gmail.com) Received: from mail-ee0-x22b.google.com (mail-ee0-x22b.google.com [IPv6:2a00:1450:4013:c00::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B8FD12070; Tue, 10 Sep 2013 07:28:28 +0000 (UTC) Received: by mail-ee0-f43.google.com with SMTP id e52so3612015eek.2 for ; Tue, 10 Sep 2013 00:28:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=6L54/KlFbVmPX3idvPaK7WKim0Qjhpm1HZtS1ForriQ=; b=otv0k7+RnZPGFiQBGjsfZ/gJKWdga8X77zyCNK/aphpt3aihi6YJFChT3w8ZNli2hi SuvJ/uP/HepckV1gIWxnmvGBOUg7dRdhlle7zFjJvsCjrwkKBZSFl1zOxWkuDxlaJvYq o6TDSezD34nde6zupQ4/VH0YHhchNoZ5DX2YEzWYxuZNxZ4G90PTEbEl/84iHTNtw32O WP5ucgwQJtFiLIEQRQEyJHBw33jKipNnTPKmHMYGO8RvUU/UQ8o8N6IsU+/MO8IKdref aCMtrfN/IGPKbWM+DUpyblfScdNlDSiujYpoZWT5BJXHP1JUVRwlYxjSOPP2UYXYVI0w r7sg== MIME-Version: 1.0 X-Received: by 10.14.98.137 with SMTP id v9mr1067482eef.62.1378798107108; Tue, 10 Sep 2013 00:28:27 -0700 (PDT) Received: by 10.14.105.137 with HTTP; Tue, 10 Sep 2013 00:28:26 -0700 (PDT) In-Reply-To: <522EC2A3.8000403@FreeBSD.org> References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> <522EC2A3.8000403@FreeBSD.org> Date: Tue, 10 Sep 2013 00:28:26 -0700 Message-ID: Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv From: hiren panchasara To: Guido Falsi Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: olli hauer , freebsd-current , FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 07:28:29 -0000 On Mon, Sep 9, 2013 at 11:56 PM, Guido Falsi wrote: > On 09/10/13 07:20, hiren panchasara wrote: > >> >> >> >> On Sat, Sep 7, 2013 at 5:10 AM, olli hauer > > wrote: >> >> There are 13 ports using --with-iconv=${LOCALBASE} >> devel/apr1 >> devel/apr2 >> devel/git >> irc/epic5 >> lang/gauche >> net-mgmt/ettercap >> net/ssltunnel-client >> net/yaz >> net/zebra-server >> textproc/libxml2 >> textproc/py-libxml2 >> www/apache22 >> www/apache24 >> >> >> and devel/glib20, print/ghostscript8, print/ghostscript9 using >> --with-libiconv=gnu >> --with-libiconv=native >> --with-libiconv=no >> --with-libiconv=no >> >> >> I am hitting following failure while building devel/glib20 >> >> gconvert.c:66:2: error: GNU libiconv not in use but included iconv.h >> is from libiconv >> #error GNU libiconv not in use but included iconv.h is from libiconv >> >> How do I get past this? >> > > Looks like you have some leftovers from the libiconv port. Have you > removed it? can you give the output of ls /usr/local/include/iconv.h? > I still have the port installed. % pkg info | grep iconv libiconv-1.14_1 A character set conversion library Should I remove the port? % ls /usr/local/include/iconv.h /usr/local/include/iconv.h > What is the output if "head /usr/include/iconv.h"? > % head /usr/include/iconv.h /* $FreeBSD: head/include/iconv.h 255297 2013-09-06 09:46:44Z theraven $ */ /* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */ /*- * Copyright (c) 2003 Citrus Project, * Copyright (c) 2009, 2010 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions > >> % uname -a >> FreeBSD flymockour-l7.corp.yahoo.com >> > >> 10.0-CURRENT FreeBSD 10.0-CURRENT >> >> #2 r255423M: Mon Sep 9 12:29:22 PDT 2013 >> > > That M in the revision number indicates you're using a modified checkout, > May I ask which modifications you have in your source tree? Nothing related to this. Thanks, Hiren From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 08:16:50 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 0766EFEF; Tue, 10 Sep 2013 08:16:50 +0000 (UTC) (envelope-from hiren.panchasara@gmail.com) Received: from mail-ea0-x22d.google.com (mail-ea0-x22d.google.com [IPv6:2a00:1450:4013:c01::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C75E22DA; Tue, 10 Sep 2013 08:16:49 +0000 (UTC) Received: by mail-ea0-f173.google.com with SMTP id g10so3686121eak.4 for ; Tue, 10 Sep 2013 01:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=FPaYzgM6zAznXc8LfR1ERWvB8GUTSPjk6dsw4vxcQ9k=; b=pl1OHtL3GBpTVvQLPdnjFsajAJRASnl4pJFvAWDcP8t+jiJO9n+FsH7MfgDa4TfMPJ jfKAqlpAkBTQqc12XRD3V/bwbckG/ZV/Bqxrs0KyFg5XBzUHiK+1RT8XWH4+Vdg6frc4 QbslzfYqAECpgyxvC5eUA3R6BJsc+XGS48p5EzFcWCkzadA0EhhDd5DfRdFwHrO+CZw+ 30javyB75/rlNKqNYP3IS62Th6nff8ZG5hvcFTXwB0SfzZzY8ZmNGIdAy8uszU7WwtJg QJBmwh0ZpRjMsckCnp0JSve5eLDPeltsMMM/6+aB8XnNzSPkClfbn7eHYVLkI00C5Cye 4dxQ== MIME-Version: 1.0 X-Received: by 10.14.100.138 with SMTP id z10mr914794eef.74.1378801007681; Tue, 10 Sep 2013 01:16:47 -0700 (PDT) Received: by 10.14.105.137 with HTTP; Tue, 10 Sep 2013 01:16:47 -0700 (PDT) In-Reply-To: References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> <522EC2A3.8000403@FreeBSD.org> Date: Tue, 10 Sep 2013 01:16:47 -0700 Message-ID: Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv From: hiren panchasara To: Guido Falsi Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: olli hauer , freebsd-current , FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 08:16:50 -0000 On Tue, Sep 10, 2013 at 12:28 AM, hiren panchasara < hiren.panchasara@gmail.com> wrote: > > > > On Mon, Sep 9, 2013 at 11:56 PM, Guido Falsi wrote: > >> On 09/10/13 07:20, hiren panchasara wrote: >> >>> >>> >>> >>> On Sat, Sep 7, 2013 at 5:10 AM, olli hauer >> > wrote: >>> >>> There are 13 ports using --with-iconv=${LOCALBASE} >>> devel/apr1 >>> devel/apr2 >>> devel/git >>> irc/epic5 >>> lang/gauche >>> net-mgmt/ettercap >>> net/ssltunnel-client >>> net/yaz >>> net/zebra-server >>> textproc/libxml2 >>> textproc/py-libxml2 >>> www/apache22 >>> www/apache24 >>> >>> >>> and devel/glib20, print/ghostscript8, print/ghostscript9 using >>> --with-libiconv=gnu >>> --with-libiconv=native >>> --with-libiconv=no >>> --with-libiconv=no >>> >>> >>> I am hitting following failure while building devel/glib20 >>> >>> gconvert.c:66:2: error: GNU libiconv not in use but included iconv.h >>> is from libiconv >>> #error GNU libiconv not in use but included iconv.h is from libiconv >>> >>> How do I get past this? >>> >> >> Looks like you have some leftovers from the libiconv port. Have you >> removed it? can you give the output of ls /usr/local/include/iconv.h? >> > > I still have the port installed. > > % pkg info | grep iconv > libiconv-1.14_1 A character set conversion library > > Should I remove the port? > Removed the port and now reinstalling almost everything :-) Will report back how it goes. cheers, Hiren > > % ls /usr/local/include/iconv.h > /usr/local/include/iconv.h > > >> What is the output if "head /usr/include/iconv.h"? >> > % head /usr/include/iconv.h > /* $FreeBSD: head/include/iconv.h 255297 2013-09-06 09:46:44Z theraven > $ */ > /* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */ > > /*- > * Copyright (c) 2003 Citrus Project, > * Copyright (c) 2009, 2010 Gabor Kovesdan > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > > >> >>> % uname -a >>> FreeBSD flymockour-l7.corp.yahoo.com >>> > >>> 10.0-CURRENT FreeBSD 10.0-CURRENT >>> >>> #2 r255423M: Mon Sep 9 12:29:22 PDT 2013 >>> >> >> That M in the revision number indicates you're using a modified checkout, >> May I ask which modifications you have in your source tree? > > Nothing related to this. > > Thanks, > Hiren > > From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 09:13:58 2013 Return-Path: Delivered-To: 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 74EF5334 for ; Tue, 10 Sep 2013 09:13:58 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 63A922633 for ; Tue, 10 Sep 2013 09:13:58 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id r8A9DwWH023899 for ; Tue, 10 Sep 2013 09:13:58 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id r8A9DwGA023896; Tue, 10 Sep 2013 09:13:58 GMT (envelope-from portscout) Message-Id: <201309100913.r8A9DwGA023896@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Tue, 10 Sep 2013 09:13:58 +0000 From: portscout@FreeBSD.org To: ports@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 09:13:58 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/ports@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ security/snortreport | 1.3.3 | 1.3.4 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 09:41:56 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 18624133; Tue, 10 Sep 2013 09:41:56 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id 909D82864; Tue, 10 Sep 2013 09:41:55 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3cZ1VB4nMDzFVBB; Tue, 10 Sep 2013 11:41:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z1aNO0qNDHQ6; Tue, 10 Sep 2013 11:41:52 +0200 (CEST) Received: from marvin.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Tue, 10 Sep 2013 11:41:52 +0200 (CEST) Message-ID: <522EE960.5040600@FreeBSD.org> Date: Tue, 10 Sep 2013 11:41:52 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130902 Thunderbird/17.0.8 MIME-Version: 1.0 To: hiren panchasara Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> <522EC2A3.8000403@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: olli hauer , freebsd-current , FreeBSD ports list X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 09:41:56 -0000 On 09/10/13 10:16, hiren panchasara wrote: > > > > On Tue, Sep 10, 2013 at 12:28 AM, hiren panchasara > > wrote: > > > > > On Mon, Sep 9, 2013 at 11:56 PM, Guido Falsi > wrote: > > On 09/10/13 07:20, hiren panchasara wrote: > > > > > On Sat, Sep 7, 2013 at 5:10 AM, olli hauer > >> wrote: > > There are 13 ports using --with-iconv=${LOCALBASE} > devel/apr1 > devel/apr2 > devel/git > irc/epic5 > lang/gauche > net-mgmt/ettercap > net/ssltunnel-client > net/yaz > net/zebra-server > textproc/libxml2 > textproc/py-libxml2 > www/apache22 > www/apache24 > > > and devel/glib20, print/ghostscript8, > print/ghostscript9 using > --with-libiconv=gnu > --with-libiconv=native > --with-libiconv=no > --with-libiconv=no > > > I am hitting following failure while building devel/glib20 > > gconvert.c:66:2: error: GNU libiconv not in use but > included iconv.h > is from libiconv > #error GNU libiconv not in use but included iconv.h is from > libiconv > > How do I get past this? > > > Looks like you have some leftovers from the libiconv port. Have > you removed it? can you give the output of ls > /usr/local/include/iconv.h? > > > I still have the port installed. > > % pkg info | grep iconv > libiconv-1.14_1 A character set conversion library > > Should I remove the port? > > Removed the port and now reinstalling almost everything :-) > Unluckily some configure scripts and build systems get confused by two implementations of iconv present on the system and fail in various manners, this one is just an example. This is the main reason why the ports tree was patched to only use the system provided iconv implementation now that it is the default. This requires a lot of work to "fix" installed pieces to adapt to this new world order. -- Guido Falsi From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 11:52:46 2013 Return-Path: Delivered-To: freebsd-ports@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 6471DEBF for ; Tue, 10 Sep 2013 11:52:46 +0000 (UTC) (envelope-from jerry@seibercom.net) Received: from mail-qc0-x22c.google.com (mail-qc0-x22c.google.com [IPv6:2607:f8b0:400d:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0D4552214 for ; Tue, 10 Sep 2013 11:52:45 +0000 (UTC) Received: by mail-qc0-f172.google.com with SMTP id l13so2083445qcy.17 for ; Tue, 10 Sep 2013 04:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seibercom.net; s=google; h=date:from:to:subject:message-id:in-reply-to:references:reply-to :organization:face:mime-version:content-type :content-transfer-encoding; bh=FDGjwbGWRhwjLVVbkfhvhcGHRJYsbu+82Qo0UUlz7fk=; b=WNV3dgmhCIuSaKAG7UL4+QAUTo8ZghJMyLITXcQfD3U863M5WyNp9C41UaIKw9TSHc XFO0Owyy2uxYM0BQUqWsh2RPOZ2Wz4xX2F5Xpio5l7BQV4Z4SVhDCiY47cBFwJbuK571 vCsso4tqk4cvrFof/WeLyx+2PD9OoZILZmQGM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:reply-to:organization:face:mime-version:content-type :content-transfer-encoding; bh=FDGjwbGWRhwjLVVbkfhvhcGHRJYsbu+82Qo0UUlz7fk=; b=hEorNdxSwLTBw8uq3iWnggmQt7PQm7qzJ4LWLWR8VvAl1gnk5nmw6bS/sx14/2sCC/ 3IgKg+vY9GVXhuyzsSpGCQXE/mNMhP23cCmLXrd6Nibiu3nusljPeszPImldbITt+3dv MBaGjjJ8sKvAmZOeMHOgyT9Qnk8vJvn0zQOt9W1SiaK0cnHbJjGjqbLgj2eSRAn8rLsB /lBbRRxyzaJTogOvAjD5RTTsIUsTz9BFHy1e2Z5HlnxxUz/HZYqxRS9l33uxwYnRwHZs EWTf1HNABduigWaORsqIN7AONqYfqIXBv3X9NPiEbt9REcb5XhRyTIgHdSZdXN5XAnqT X10w== X-Gm-Message-State: ALoCoQmB0knJKEJM+cixqYPj+rwn+KR8hoNGCfpwTnMYE+hCuVckdNxOcW4k2ee2mMQl2Ufd4c/O X-Received: by 10.229.192.6 with SMTP id do6mr31342104qcb.3.1378813964952; Tue, 10 Sep 2013 04:52:44 -0700 (PDT) Received: from scorpio.seibercom.net (cpe-076-182-104-150.nc.res.rr.com. [76.182.104.150]) by mx.google.com with ESMTPSA id h2sm34311274qev.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 04:52:44 -0700 (PDT) Received: from scorpio (localhost [127.0.0.1]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: jerry@seibercom.net) by scorpio.seibercom.net (Postfix) with ESMTPSA id 3cZ4P63k6Cz2CG48 for ; Tue, 10 Sep 2013 07:52:42 -0400 (EDT) Date: Tue, 10 Sep 2013 07:52:42 -0400 From: Jerry To: freebsd-ports@freebsd.org Subject: Re: AFFECTS: 10-CURRENT users with any port depending on converters/libiconv Message-ID: <20130910075242.5cd0498f@scorpio> In-Reply-To: <522EE960.5040600@FreeBSD.org> References: <522985C7.2010303@passap.ru> <20130906173203.6423556d@munin.geoinf.fu-berlin.de> <5229F5B5.1040303@FreeBSD.org> <20130906174448.1680d23c@munin.geoinf.fu-berlin.de> <5229FE1B.3050104@passap.ru> <20130906184444.46418838@munin.geoinf.fu-berlin.de> <522A0CBE.8010905@passap.ru> <20130906235132.0efd9fca@munin.geoinf.fu-berlin.de> <522A52EA.80900@passap.ru> <522A5430.8050001@FreeBSD.org> <20130907130350.0c13cfa1@thor.walstatt.dyndns.org> <522B0F41.1030306@FreeBSD.org> <522B17AC.5060503@gmx.de> <522EC2A3.8000403@FreeBSD.org> <522EE960.5040600@FreeBSD.org> Organization: seibercom.net X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd8.3) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEUAAABYRlwJCw4FAgAIBwKprDkBAQFQLR0BAgCir7VRttp8AAACAUlEQVQ4jZWUTYvbMBCGTVl8V2hX6Gg5G5FbWQdBj0lEfE7BhN4cyzi5Wt1E5L70roWy6N92xok/skkP+5IYrMcz78xIduDWpNM3vFzuA/jX5EY1AI6KHFwW/CzFuQAwqUBbV12p+CzIh6Awq7sg33pn5D64SQXAexffeuQlA/L35RrkaB551OjGfP/cAO8mCNaDcgvfky5ijoD0pAXlCQCnljiAjsJD9Ax05Ko5sZxbnLQcmM+dZg5IjREfZrWIHK0JuwU68pAGwHvfRxBundRzTxxz3r9dNUikPsEihjz2Dc4kjp1hKsJGuot4EDxaxzMoC7XqhxhOSfZrTS6gSX1JVdjp+o1PvWfekXgw3WL0g70nDEwA0H0HQsEZc8sTmFMTkWUfYWC/vdR1zQy3xLQgLwzu90QnlnFLjeiGWBjwhb4Sa42IqOg2qqS4O1/zhKokFUb1Q8Rj4Eb69WVflXEehJ35DgChVTE5n50eaGyMLOfH8AOodoSM4PVYAQgQdBulOa+knklYks3vAuQ+uX492lTl+A+e8qBV2AKoXalVKFfyuUp0pUp1ARaUHh82lv9MN+Ig7CZtgE6FNYvjlywT2VP2dMgOG46gTIWcqdfvuwyXNz0oMJNd/N5lh1YNiJt19ADTUo3VuFSNeQwVqRSrGjSCp53fk2g+Mvfk/gfoPxHeUS8MH9vRAAAAAElFTkSuQmCC Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-ports@freebsd.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 11:52:46 -0000 On Tue, 10 Sep 2013 11:41:52 +0200 Guido Falsi articulated: > This is the main reason why the ports tree was patched to only use > the system provided iconv implementation now that it is the default. I am not on "current" so this doesn't affect me yet. However, at some point, when current becomes stable, I will upgrade. Therefore my question is will it be possible to use "converters/libiconv" via the ports system should a user so desire to? -- Jerry â™” Disclaimer: off-list followups get on-list replies or get ignored. Please do not ignore the Reply-To header. __________________________________________________________________ From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 14:16:46 2013 Return-Path: Delivered-To: freebsd-ports@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 EBA6E9B3 for ; Tue, 10 Sep 2013 14:16:46 +0000 (UTC) (envelope-from jhein@symmetricom.com) Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214]) by mx1.freebsd.org (Postfix) with ESMTP id A038C2D8E for ; Tue, 10 Sep 2013 14:16:46 +0000 (UTC) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id r8AEGepq090593; Tue, 10 Sep 2013 08:16:40 -0600 (MDT) (envelope-from jhein@symmetricom.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.14.7/8.14.5) with ESMTP id r8AEGLH9056179; Tue, 10 Sep 2013 08:16:21 -0600 (MDT) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.14.7/8.14.6/Submit) id r8AEGKal056178; Tue, 10 Sep 2013 08:16:20 -0600 (MDT) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21039.10674.968260.7845@gromit.timing.com> Date: Tue, 10 Sep 2013 08:16:18 -0600 From: John Hein To: "O. Hartmann" Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! In-Reply-To: <20130910015144.41c88d52@thor.walstatt.dyndns.org> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> X-Mailer: VM 8.2.0b-trunk-1484 under 24.3.1 (i386-portbld-freebsd8.3) Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 14:16:47 -0000 O. Hartmann wrote at 01:51 +0200 on Sep 10, 2013: > sed -i -e 's/\(\&virtual_address, size,\) \(VMFS_ANY_SPACE,\)$/ \ > \1 0, \2/' work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c In a makefile shell command, you have to escape $ signs if you want them to be used as $ signs in the shell context. . . > But putting the very same > sed-expression into the port's Makefile > > # Changes in vm_map_find() due to r255426 > ..if ${OSVERSION} > 1000053 > ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ > \(VMFS_ANY_SPACE,\)$/\1 0, \2/' \ > \ ${WRKSRC}/src/nvidia_subr.c > ..endif > > (patch attached) gives this weird error: > > ===> Cleaning for nvidia-driver-325.15 > ===> License NVIDIA accepted by the user > ===> Found saved configuration for nvidia-driver-325.08_1 > ===> nvidia-driver-325.15 depends on file: /usr/local/sbin/pkg - found > ===> Fetching all distfiles required by nvidia-driver-325.15 for > building ===> Extracting for nvidia-driver-325.15 > => SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-325.15.tar.gz. > ===> Patching for nvidia-driver-325.15 > sed: 1: "s/\(\&virtual_address, ...": unescaped newline inside > substitute pattern *** Error code 1 make(1) evaluates $/ - which is likely empty which is why sed doesn't see the end of the expression before the newline. Hence the weird error (not so weird once it's understood). You want to use $$/ instead of $/ : .if ${OSVERSION} > 1000053 ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ \(VMFS_ANY_SPACE,\)$$/\1 0, \2/' \ \ ${WRKSRC}/src/nvidia_subr.c .endif From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 14:26:18 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 CA8C2E1C for ; Tue, 10 Sep 2013 14:26:18 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 883B92E92 for ; Tue, 10 Sep 2013 14:26:18 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VJOtV-003VNA-1P>; Tue, 10 Sep 2013 16:26:17 +0200 Received: from e178187024.adsl.alicedsl.de ([85.178.187.24] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VJOtU-001ic9-Sy>; Tue, 10 Sep 2013 16:26:17 +0200 Date: Tue, 10 Sep 2013 16:26:16 +0200 From: "O. Hartmann" To: John Hein Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! Message-ID: <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> In-Reply-To: <21039.10674.968260.7845@gromit.timing.com> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/.E0deP8LXMVxjrRH74WP=/j"; protocol="application/pgp-signature" X-Originating-IP: 85.178.187.24 Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 14:26:18 -0000 --Sig_/.E0deP8LXMVxjrRH74WP=/j Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 10 Sep 2013 08:16:18 -0600 John Hein wrote: > O. Hartmann wrote at 01:51 +0200 on Sep 10, 2013: > > sed -i -e 's/\(\&virtual_address, size,\) \(VMFS_ANY_SPACE,\)$/ \ > > \1 0, \2/' work/NVIDIA-FreeBSD-x86_64-325.15/src/nvidia_subr.c >=20 > In a makefile shell command, you have to escape $ signs > if you want them to be used as $ signs in the shell context. >=20 > . > . > > But putting the very same > > sed-expression into the port's Makefile=20 > >=20 > > # Changes in vm_map_find() due to r255426=20 > > ..if ${OSVERSION} > 1000053=20 > > ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ > > \(VMFS_ANY_SPACE,\)$/\1 0, \2/' \ > > \ ${WRKSRC}/src/nvidia_subr.c > > ..endif > >=20 > > (patch attached) gives this weird error: > >=20 > > =3D=3D=3D> Cleaning for nvidia-driver-325.15 > > =3D=3D=3D> License NVIDIA accepted by the user > > =3D=3D=3D> Found saved configuration for nvidia-driver-325.08_1 > > =3D=3D=3D> nvidia-driver-325.15 depends on file: /usr/local/sbin/pkg= - > > found =3D=3D=3D> Fetching all distfiles required by nvidia-driver-325.= 15 > > for building =3D=3D=3D> Extracting for nvidia-driver-325.15 > > =3D> SHA256 Checksum OK for NVIDIA-FreeBSD-x86_64-325.15.tar.gz. > > =3D=3D=3D> Patching for nvidia-driver-325.15 > > sed: 1: "s/\(\&virtual_address, ...": unescaped newline inside > > substitute pattern *** Error code 1 >=20 >=20 > make(1) evaluates $/ - which is likely empty which is why sed doesn't > see the end of the expression before the newline. Hence the > weird error (not so weird once it's understood). >=20 > You want to use $$/ instead of $/ : >=20 > .if ${OSVERSION} > 1000053=20 > ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ > \(VMFS_ANY_SPACE,\)$$/\1 0, \2/' \ > \ ${WRKSRC}/src/nvidia_subr.c > .endif if things are understood, there s nothing scaring. Thanks, I didn't realize that even the expression inside '' is eavluated by make. Thanks to you I could provide the patch to my PR. Hopefuilly, there is a committer soon. Oliver --Sig_/.E0deP8LXMVxjrRH74WP=/j Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSLywIAAoJEOgBcD7A/5N8yn4IANWUWw/OnyKzLO7JM+1dwzxw Zis2+Wluf5hbtPgFudp/7eD0mhco1B3ajzlzmbqMfd+dyrril0g0EqI2nnay5Qrt tbAno5pGP+Oy7lAxV4e0D4W22MWgMvEYC8JUyfamEkdC1Oby8w1vcU4evUY8ZEwG 1OikAxYf2NWX28zPP5w+CdgI5/tFRkaXO4R5zfds5wmASMy9A6oDhY8jqHNkAj8d yn1A+yhG3VndtRmIXNEUT5lNGKgKzX4VrnRmfQsaxPogZokIA1IL4rGh86n9QSfq WReV58oCthD0tYjTXy9kLXH7VeVYrgYZFH/pSmayeVmJSWAJf0bJM0p6P8aAgXg= =FAQN -----END PGP SIGNATURE----- --Sig_/.E0deP8LXMVxjrRH74WP=/j-- From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 15:50:36 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 63071CCB for ; Tue, 10 Sep 2013 15:50:36 +0000 (UTC) (envelope-from jhein@symmetricom.com) Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214]) by mx1.freebsd.org (Postfix) with ESMTP id 36B382546 for ; Tue, 10 Sep 2013 15:50:35 +0000 (UTC) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id r8AFoZQc093718; Tue, 10 Sep 2013 09:50:35 -0600 (MDT) (envelope-from jhein@symmetricom.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.14.7/8.14.5) with ESMTP id r8AFo6MK000707; Tue, 10 Sep 2013 09:50:06 -0600 (MDT) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.14.7/8.14.6/Submit) id r8AFo5LR000706; Tue, 10 Sep 2013 09:50:05 -0600 (MDT) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21039.16301.572328.142329@gromit.timing.com> Date: Tue, 10 Sep 2013 09:50:05 -0600 From: John Hein To: "O. Hartmann" Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! In-Reply-To: <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> X-Mailer: VM 8.2.0b-trunk-1484 under 24.3.1 (i386-portbld-freebsd8.3) Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 15:50:36 -0000 O. Hartmann wrote at 16:26 +0200 on Sep 10, 2013: > On Tue, 10 Sep 2013 08:16:18 -0600 > John Hein wrote: > > You want to use $$/ instead of $/ : > > > > .if ${OSVERSION} > 1000053 > > ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ > > \(VMFS_ANY_SPACE,\)$$/\1 0, \2/' \ > > \ ${WRKSRC}/src/nvidia_subr.c > > .endif > > if things are understood, there s nothing scaring. Thanks, I didn't > realize that even the expression inside '' is eavluated by make. > > Thanks to you I could provide the patch to my PR. Hopefuilly, there is > a committer soon. Actually I should have said you want: .if ${OSVERSION} > 1000055 The API change to vm_map_find was made between shortly before 1000055. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 15:55:52 2013 Return-Path: Delivered-To: freebsd-ports@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 077EEE51 for ; Tue, 10 Sep 2013 15:55:52 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B89922593 for ; Tue, 10 Sep 2013 15:55:51 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) with esmtp (envelope-from ) id <1VJQIA-0043Og-1z>; Tue, 10 Sep 2013 17:55:50 +0200 Received: from e178187024.adsl.alicedsl.de ([85.178.187.24] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) with esmtpsa (envelope-from ) id <1VJQI9-001pUO-Uy>; Tue, 10 Sep 2013 17:55:50 +0200 Date: Tue, 10 Sep 2013 17:55:44 +0200 From: "O. Hartmann" To: John Hein Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! Message-ID: <20130910175544.3feb9029@thor.walstatt.dyndns.org> In-Reply-To: <21039.16301.572328.142329@gromit.timing.com> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> <21039.16301.572328.142329@gromit.timing.com> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/s_BelURE=ud2FMpK6k8pX.6"; protocol="application/pgp-signature" X-Originating-IP: 85.178.187.24 Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 15:55:52 -0000 --Sig_/s_BelURE=ud2FMpK6k8pX.6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 10 Sep 2013 09:50:05 -0600 John Hein wrote: > O. Hartmann wrote at 16:26 +0200 on Sep 10, 2013: > > On Tue, 10 Sep 2013 08:16:18 -0600 > > John Hein wrote: > > > You want to use $$/ instead of $/ : > > > > > > .if ${OSVERSION} > 1000053 > > > ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ > > > \(VMFS_ANY_SPACE,\)$$/\1 0, \2/' \ > > > \ ${WRKSRC}/src/nvidia_subr.c > > > .endif > > > > if things are understood, there s nothing scaring. Thanks, I didn't > > realize that even the expression inside '' is eavluated by make. > > > > Thanks to you I could provide the patch to my PR. Hopefuilly, > > there is a committer soon. >=20 > Actually I should have said you want: >=20 > .if ${OSVERSION} > 1000055 >=20 > The API change to vm_map_find was made between shortly before 1000055. I'm on FreeBSD 10.0-CURRENT #1 r255434: Tue Sep 10 02:01:02 CEST 2013 amd64 and when calling=20 make -VOSVERSION in x11/nvidia-driver I receive 1000054 --Sig_/s_BelURE=ud2FMpK6k8pX.6 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSL0EFAAoJEOgBcD7A/5N8Pq0H/02Sg/ZH/SBbZA3EuIW6cgjb japiWb+zhuIl9AJapIaMBbpUQ1nb0twFO791aw5it9fZMksphz8nS9LeoK7on2Or 5TF+QYd//zgkqnDjX9r3Q5ysZaQiD+I7kgUz55rqiHieJdbONkm8lHuCxITNzfm5 CKWMgYSlKzbfhhH0MTyLiaAOB04JB7S4l5pNNqdf89xVI4sy9ZGVWdO7CoqwqozF ZVIXduZ9xUY5VP48n2cIsuoZVKGfxadz0jLFavVm79KRsWl7iRbb4Mbl9xRMztbR w2Yu5nsWTACkEKXmDcobuPgm0arGCinB8pjNuJQ7OZM4xpkd352POXMaMlX7hXw= =70cd -----END PGP SIGNATURE----- --Sig_/s_BelURE=ud2FMpK6k8pX.6-- From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 16:04:03 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 A74905CA for ; Tue, 10 Sep 2013 16:04:03 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 51F092647 for ; Tue, 10 Sep 2013 16:04:02 +0000 (UTC) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.14.7/8.14.7) with ESMTP id r8AG41nB016959 for ; Tue, 10 Sep 2013 09:04:01 -0700 (PDT) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.7/8.14.7/Submit) id r8AG41Cs016958 for freebsd-ports@freebsd.org; Tue, 10 Sep 2013 09:04:01 -0700 (PDT) (envelope-from david) Date: Tue, 10 Sep 2013 09:04:01 -0700 From: David Wolfskill To: FreeBSD Ports Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! Message-ID: <20130910160401.GB15471@albert.catwhisker.org> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> <21039.16301.572328.142329@gromit.timing.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4bRzO86E/ozDv8r1" Content-Disposition: inline In-Reply-To: <21039.16301.572328.142329@gromit.timing.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 16:04:03 -0000 --4bRzO86E/ozDv8r1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 10, 2013 at 09:50:05AM -0600, John Hein wrote: > ... > Actually I should have said you want: >=20 > .if ${OSVERSION} > 1000055 >=20 > The API change to vm_map_find was made between shortly before 1000055. > ... Errr... well, that's not quite what I see; here are the last several lines from http://www.catwhisker.org/~david/FreeBSD/history/laptop_i386_10.txt. (http://www.catwhisker.org/~david/FreeBSD/history has an explanation of the revision strings I use.): FreeBSD 10.0-CURRENT #1009 r255202M/255202:1000052: Wed Sep 4 06:02:03 PD= T 2013 root@g1-227.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i3= 86 FreeBSD 10.0-CURRENT #1012 r255297M/255297:1000052: Fri Sep 6 05:42:21 PD= T 2013 root@g1-227.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i3= 86 FreeBSD 10.0-CURRENT #1013 r255355M/255355:1000054: Sat Sep 7 08:42:29 PD= T 2013 root@g1-227.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i3= 86 FreeBSD 10.0-CURRENT #1014 r255386M/255386:1000054: Sun Sep 8 06:53:01 PD= T 2013 root@g1-227.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i3= 86 FreeBSD 10.0-CURRENT #1015 r255413M/255414:1000054: Mon Sep 9 05:52:49 PD= T 2013 root@g1-227.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i3= 86 FreeBSD 10.0-CURRENT #1017 r255442M/255448:1000054: Tue Sep 10 06:13:37 PD= T 2013 root@g1-227.catwhisker.org:/common/S4/obj/usr/src/sys/CANARY i3= 86 In particular, please note that at r255413, OSVERSION was 1000054, and I did not need the recent patch for the vm_map_find() invocation; today, at r255442, OSVERSION is still 1000054, and I did need the patch. (The OSVERSION wasn't bumped to 1000055 until r255449, but was "for r255426".) Peace, david --=20 David H. Wolfskill david@catwhisker.org Taliban: Evil cowards with guns afraid of truth from a 14-year old girl. See http://www.catwhisker.org/~david/publickey.gpg for my public key. --4bRzO86E/ozDv8r1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iEYEARECAAYFAlIvQvAACgkQmprOCmdXAD3txgCfX7D36ijoDCN9Eb+l6zgS3qce ziAAnA8LMJ6bj7uiirrZjWEVGkZzba96 =82kn -----END PGP SIGNATURE----- --4bRzO86E/ozDv8r1-- From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 16:07:53 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 0EA54718 for ; Tue, 10 Sep 2013 16:07:53 +0000 (UTC) (envelope-from jhein@symmetricom.com) Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214]) by mx1.freebsd.org (Postfix) with ESMTP id D510A26A6 for ; Tue, 10 Sep 2013 16:07:52 +0000 (UTC) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id r8AG7qYH094182; Tue, 10 Sep 2013 10:07:52 -0600 (MDT) (envelope-from jhein@symmetricom.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.14.7/8.14.5) with ESMTP id r8AG7XcH000917; Tue, 10 Sep 2013 10:07:33 -0600 (MDT) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.14.7/8.14.6/Submit) id r8AG7X76000916; Tue, 10 Sep 2013 10:07:33 -0600 (MDT) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21039.17348.897687.242628@gromit.timing.com> Date: Tue, 10 Sep 2013 10:07:32 -0600 From: John Hein To: "O. Hartmann" Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! In-Reply-To: <20130910175544.3feb9029@thor.walstatt.dyndns.org> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> <21039.16301.572328.142329@gromit.timing.com> <20130910175544.3feb9029@thor.walstatt.dyndns.org> X-Mailer: VM 8.2.0b-trunk-1484 under 24.3.1 (i386-portbld-freebsd8.3) Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 16:07:53 -0000 O. Hartmann wrote at 17:55 +0200 on Sep 10, 2013: > On Tue, 10 Sep 2013 09:50:05 -0600 > John Hein wrote: > > Actually I should have said you want: > > > > .if ${OSVERSION} > 1000055 > > > > The API change to vm_map_find was made between shortly before 1000055. > > > I'm on FreeBSD 10.0-CURRENT #1 r255434: Tue Sep 10 02:01:02 CEST 2013 > amd64 and when calling > > make -VOSVERSION in x11/nvidia-driver I receive > > 1000054 You are in an unfortunate window between the moment the API change was committed (255426) and the OSVERSION was bumped (255449). That shouldn't happen ideally, but sometimes it does. The "backward" gap from 255426 to the last bump (255321) is larger than the "forward" gap, and in absence of better guidance, you should generally pick the OSVERSION larger than a particular API change to key off. Your false 1000054 is really 1000055 in spirit, but human committers just didn't catch on until a bit later. So you have to pick the lesser of two evils - which I am claiming is 1000055. From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 16:10:30 2013 Return-Path: Delivered-To: freebsd-ports@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 52EAF7D2 for ; Tue, 10 Sep 2013 16:10:30 +0000 (UTC) (envelope-from fidaj@ukr.net) Received: from fsm1.ukr.net (fsm1.ukr.net [195.214.192.120]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 03F6426C1 for ; Tue, 10 Sep 2013 16:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=y6ZyL06nnOSF9ljlPYZQaYmFn/HMOnhLbVucoC3X6uU=; b=eCG00A6sh7Fy1pUqONrMBP/UFpE4GHU1G3Fs4llnlypebfGff42d9X6AOzoUyuzqWM2qnuWHWO3eqOx1ij5XTeqQb7B68dX2ke6ps4rlRAXrtQHvg6w+JTOJaLcswaNBy6lS5hEywJ9gKLWSHQU+xLjfVfV65J/AaWxZ5pJNEVc=; Received: from [178.137.138.140] (helo=nonamehost.local) by fsm1.ukr.net with esmtpsa ID 1VJQWB-000L4e-MY ; Tue, 10 Sep 2013 19:10:19 +0300 Date: Tue, 10 Sep 2013 19:10:18 +0300 From: Ivan Klymenko To: "O. Hartmann" Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! Message-ID: <20130910191018.4c8b1eff@nonamehost.local> In-Reply-To: <20130910175544.3feb9029@thor.walstatt.dyndns.org> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> <21039.16301.572328.142329@gromit.timing.com> <20130910175544.3feb9029@thor.walstatt.dyndns.org> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=178.137.138.140; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: FreeBSD Ports , John Hein X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 16:10:30 -0000 =D0=92 Tue, 10 Sep 2013 17:55:44 +0200 "O. Hartmann" =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On Tue, 10 Sep 2013 09:50:05 -0600 > John Hein wrote: >=20 > > O. Hartmann wrote at 16:26 +0200 on Sep 10, 2013: > > > On Tue, 10 Sep 2013 08:16:18 -0600 > > > John Hein wrote: > > > > You want to use $$/ instead of $/ : > > > > > > > > .if ${OSVERSION} > 1000053 > > > > ${REINPLACE_CMD} -e 's/\(\&virtual_address, size,\) \ > > > > \(VMFS_ANY_SPACE,\)$$/\1 0, \2/' \ > > > > \ ${WRKSRC}/src/nvidia_subr.c > > > > .endif > > > > > > if things are understood, there s nothing scaring. Thanks, I > > > didn't realize that even the expression inside '' is eavluated > > > by make. > > > > > > Thanks to you I could provide the patch to my PR. Hopefuilly, > > > there is a committer soon. > >=20 > > Actually I should have said you want: > >=20 > > .if ${OSVERSION} > 1000055 > >=20 > > The API change to vm_map_find was made between shortly before > > 1000055. >=20 >=20 > I'm on FreeBSD 10.0-CURRENT #1 r255434: Tue Sep 10 02:01:02 CEST 2013 > amd64 and when calling=20 >=20 > make -VOSVERSION in x11/nvidia-driver I receive >=20 > 1000054 yes, unfortunately, make a bump FreeBSD version after this revision http://svnweb.freebsd.org/changeset/base/255449 From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 16:11:14 2013 Return-Path: Delivered-To: freebsd-ports@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 9C512875 for ; Tue, 10 Sep 2013 16:11:14 +0000 (UTC) (envelope-from jhein@symmetricom.com) Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214]) by mx1.freebsd.org (Postfix) with ESMTP id 541B726F8 for ; Tue, 10 Sep 2013 16:11:14 +0000 (UTC) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id r8AGBDHs094302; Tue, 10 Sep 2013 10:11:13 -0600 (MDT) (envelope-from jhein@symmetricom.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.14.7/8.14.5) with ESMTP id r8AGB4DA000983; Tue, 10 Sep 2013 10:11:04 -0600 (MDT) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.14.7/8.14.6/Submit) id r8AGB4R9000982; Tue, 10 Sep 2013 10:11:04 -0600 (MDT) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21039.17560.260313.21258@gromit.timing.com> Date: Tue, 10 Sep 2013 10:11:04 -0600 From: John Hein To: "O. Hartmann" Subject: Re: HELP! nvidia-driver patch: Weird REPLACE_CMD and command-line-sed behaviour. HELP! In-Reply-To: <21039.17348.897687.242628@gromit.timing.com> References: <20130910015144.41c88d52@thor.walstatt.dyndns.org> <21039.10674.968260.7845@gromit.timing.com> <20130910162616.6ce1d52f@thor.walstatt.dyndns.org> <21039.16301.572328.142329@gromit.timing.com> <20130910175544.3feb9029@thor.walstatt.dyndns.org> <21039.17348.897687.242628@gromit.timing.com> X-Mailer: VM 8.2.0b-trunk-1484 under 24.3.1 (i386-portbld-freebsd8.3) Cc: FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 16:11:14 -0000 John Hein wrote at 10:07 -0600 on Sep 10, 2013: > O. Hartmann wrote at 17:55 +0200 on Sep 10, 2013: > > On Tue, 10 Sep 2013 09:50:05 -0600 > > John Hein wrote: > > > Actually I should have said you want: > > > > > > .if ${OSVERSION} > 1000055 > > > > > > The API change to vm_map_find was made between shortly before 1000055. > > > > > > I'm on FreeBSD 10.0-CURRENT #1 r255434: Tue Sep 10 02:01:02 CEST 2013 > > amd64 and when calling > > > > make -VOSVERSION in x11/nvidia-driver I receive > > > > 1000054 > > You are in an unfortunate window between the moment the API change was > committed (255426) and the OSVERSION was bumped (255449). That > shouldn't happen ideally, but sometimes it does. The "backward" gap > from 255426 to the last bump (255321) is larger than the "forward" > gap, and in absence of better guidance, you should generally pick the > OSVERSION larger than a particular API change to key off. > > Your false 1000054 is really 1000055 in spirit, but human committers > just didn't catch on until a bit later. So you have to pick the > lesser of two evils - which I am claiming is 1000055. So if you buy that argument, I have a correction. What I meant was: .if ${OSVERSION} > 1000054 (I had >= 1000055 in my head) From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 16:30:28 2013 Return-Path: Delivered-To: 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 AC73620E; Tue, 10 Sep 2013 16:30:28 +0000 (UTC) (envelope-from mikael.urankar@gmail.com) Received: from mail-oa0-x236.google.com (mail-oa0-x236.google.com [IPv6:2607:f8b0:4003:c02::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5EA322870; Tue, 10 Sep 2013 16:30:28 +0000 (UTC) Received: by mail-oa0-f54.google.com with SMTP id j10so8153548oah.13 for ; Tue, 10 Sep 2013 09:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=5xF5Ndd+fd38TQVRTUDdd3Hqci8imUSI1r5W28xCD24=; b=reGyggNpOnku3Pc+pCbi0AUrLs38oG5vbp/K2fPurF6tbd/x3APvwVnQYrWHBViDIp 7L7XTfDoih17nkhY7yKVQXNZGFHTzsF30de85Zk8yOCEX3Zk3HyaIs2ysRkl1xGQVnMp tTDI+0ZbjRCfPPJK+Hoi0nHVEeaygBYwz8EFSM5rNb7oPzrpx6jfDBfaDdbIff3AOFuG cMY4dRbqEDxtINBLNVJPRPa69sIvd8rtQIDHuvvAnNcIPM0ErtBLB9GNbKUXCbJZe5Dc W5WWv9oUuwDFr9IfARUp8dw/TpT+BfjTUAKvSLcwiadl5a+3ZriF+OAEmwhP4Exs2ig3 kbPQ== MIME-Version: 1.0 X-Received: by 10.182.39.161 with SMTP id q1mr3703462obk.54.1378830627637; Tue, 10 Sep 2013 09:30:27 -0700 (PDT) Received: by 10.182.42.193 with HTTP; Tue, 10 Sep 2013 09:30:27 -0700 (PDT) In-Reply-To: <522DE093.9080504@freebsd.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> Date: Tue, 10 Sep 2013 18:30:27 +0200 Message-ID: Subject: Re: [CFT] Update of xorg libraries and MESA From: =?UTF-8?Q?Mika=C3=ABl_Urankar?= To: Niclas Zeising Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: ports@freebsd.org, x11@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 16:30:28 -0000 Hi, 2013/9/9 Niclas Zeising > The patch has been updated, and the updated version > is attached. > As always, it is possible to find the latest version of the patch at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff > It works fine for me with the following ATI cards : RV380, RV535 and RV610, all with CURRENT amd64 (r254955M) and radeonkms. Thanks ! From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 16:31:35 2013 Return-Path: Delivered-To: ports@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 08C42305; Tue, 10 Sep 2013 16:31:35 +0000 (UTC) (envelope-from osidorkin@gmail.com) Received: from mail-ie0-x236.google.com (mail-ie0-x236.google.com [IPv6:2607:f8b0:4001:c03::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCA0D28B5; Tue, 10 Sep 2013 16:31:34 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id aq17so16780419iec.13 for ; Tue, 10 Sep 2013 09:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=9KiSWFhPcMYScQO7GFUVF6Ne+T0+nVKwGQxTkBoClQw=; b=Ab9RTWXLoG/Kr1ei0LXQofstc1KI3fjROqFph3fjoH8An2Jq73BpXq2i8bqqIn0zGg vodkPS83S4IZ9qWTIxN79AnyChNTgGWIkR452W1t+gsCZ10KgoxgZmYf3lduswcDM4NO 7US4b4dk61dB1P62DpjMhWhbCn+RfJzVi9gFLToQ5oX2PLpCFKIk+PBEit04TeQ5trJO P0+rNJyeNQ051Zm/9J9lcqkMP1HBKbdh6A2alb5wZ33wNpxSYp5Bqv4cMRthCECpY7l9 WqnHa2IYQ2hPKFTgdpxNMtt4Vko3iOgKZ/HZhvHomB2CcZh4CPTJ42O7d6paqrTY34Lj TyAQ== X-Received: by 10.50.126.1 with SMTP id mu1mr10779433igb.57.1378830694086; Tue, 10 Sep 2013 09:31:34 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.250.9 with HTTP; Tue, 10 Sep 2013 09:31:13 -0700 (PDT) In-Reply-To: <522DE093.9080504@freebsd.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> From: Oleg Sidorkin Date: Tue, 10 Sep 2013 20:31:13 +0400 Message-ID: Subject: Re: [CFT] Update of xorg libraries and MESA To: Niclas Zeising Content-Type: text/plain; charset=ISO-8859-1 Cc: ports@freebsd.org, x11@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 16:31:35 -0000 On Mon, Sep 9, 2013 at 6:52 PM, Niclas Zeising wrote: > There was a mistake in the previous patch, which made the build of > xorg-server fail. The patch has been updated, and the updated version > is attached. > As always, it is possible to find the latest version of the patch at > http://people.freebsd.org/~zeising/xorg-mesaupdate.diff > Sorry for the inconvenience! > Regards! > -- > Niclas Zeising > FreeBSD x11@ team Works fine on Intel G33 on recent stable/9 with KMS. Thanks. -- Oleg Sidorkin From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 17:11:56 2013 Return-Path: Delivered-To: ports@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 43CB43F5 for ; Tue, 10 Sep 2013 17:11:56 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from amailer.gwdg.de (amailer.gwdg.de [134.76.10.18]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 09F2F2B86 for ; Tue, 10 Sep 2013 17:11:55 +0000 (UTC) Received: from p508c7dee.dip0.t-ipconnect.de ([80.140.125.238] helo=krabat.raven.hur) by mailer.gwdg.de with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1VJRTg-0007e3-0h for ports@freebsd.org; Tue, 10 Sep 2013 19:11:48 +0200 Message-ID: <522F52CF.9070506@gwdg.de> Date: Tue, 10 Sep 2013 19:11:43 +0200 From: Rainer Hurling User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130909 Thunderbird/17.0.8 MIME-Version: 1.0 To: ports@freebsd.org Subject: Inconsistency with libtinfow.so Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Authenticated: Id:rhurlin X-Spam-Level: - X-Virus-Scanned: (clean) by exiscan+sophie X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 17:11:56 -0000 After updating 10.0-CURRENT to r255449 (no base gcc, no libstdc++ any more) I am right in the middle of updating my installed ports. Because of this I first deinstalled converters/libiconv before updating any other port. I am wondering if I am the only one who has problems with coexistence of libtinfow.so in devel/ncurses and systems libtinfow.so? For example if I try to update textproc/hunspell, it complains about [...] /bin/sh ../../libtool --tag=CXX --mode=link c++ -O2 -pipe -fno-strict-aliasing -Wl,-rpath=/usr/local/lib -L/usr/local/lib -lreadline -o hunspell hunspell.o ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la -lncursesw -lreadline -lncurses libtool: link: c++ -O2 -pipe -fno-strict-aliasing -Wl,-rpath=/usr/local/lib -o .libs/hunspell hunspell.o -L/usr/local/lib ../parsers/libparsers.a ../hunspell/.libs/libhunspell-1.3.so -lncursesw -lreadline -lncurses -Wl,-rpath -Wl,/usr/local/lib /usr/bin/ld: /: invalid DSO for symbol `cbreak' definition /usr/local/lib/libtinfow.so.5.9: could not read symbols: Bad value c++: error: linker command failed with exit code 1 (use -v to see invocation) *** [hunspell] Error code 1 make[4]: stopped in /usr/ports/textproc/hunspell/work/hunspell-1.3.2/src/tools 1 error This problem also occurs at least with textproc/aspell, security/clamav, sysutils/libcdio and multimedia/vcdimager. There are two different versions of libtinfow.so on my box: /usr/lib/libtinfow.so /usr/local/lib/libtinfow.so.5.9 If I (temporarily) deinstall the dependency devel/ncurses, I am able to build and reinstall hunspell and the other mentioned ports. Of course, ncurses was updated before hunspell. Any clue what is going on here? I did not have this problem before updating base. Thanks in advance, Rainer Hurling From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 17:46:32 2013 Return-Path: Delivered-To: freebsd-ports@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 ACF6ACAB for ; Tue, 10 Sep 2013 17:46:32 +0000 (UTC) (envelope-from mueller6721@twc.com) Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.122]) by mx1.freebsd.org (Postfix) with ESMTP id 751202D9A for ; Tue, 10 Sep 2013 17:46:31 +0000 (UTC) X-Authority-Analysis: v=2.0 cv=V4T/IJbi c=1 sm=0 a=68NkTaeYMVLl2m++3813FQ==:17 a=i4YerQ4AwY4A:10 a=uPZnjBv91u8A:10 a=DvSzqBOGy98A:10 a=pedpZTtsAAAA:8 a=ayC55rCoAAAA:8 a=KGjhK52YXX0A:10 a=jFtjEtZ8J7QA:10 a=CtjuIklj9cR-1dOYr_kA:9 a=68NkTaeYMVLl2m++3813FQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.130.200.176 Received: from [74.130.200.176] ([74.130.200.176:45041] helo=localhost) by hrndva-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 05/26-26119-7FA5F225; Tue, 10 Sep 2013 17:46:31 +0000 Date: Tue, 10 Sep 2013 17:46:31 +0000 Message-ID: <05.26.26119.7FA5F225@hrndva-omtalb.mail.rr.com> From: "Thomas Mueller" To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 17:46:32 -0000 > Can I safely > pkg delete -f gio-fam-backend > since its function is (?) presumably filled by glib 2.36 ? Yes, providing that you've rebuilt all ports that did previously require gio-fam-backend. I had three that failed, and MAKE_JOBS_UNSAFE=yes apparently had no effect: multimedia/mplayer, graphics/gstreamer-plugins-gl, multimedia/vlc I successfully upgraded mplayer to mplayer2. I tried "make deinstall install" on graphics/gstreamer-plugins-gl: deinstalled but was unable to rebuild and reinstall. multimedia/vlc failed even with MAKE_JOBS_UNSAFE=yes. My guess is that pkg delete -f gio-fam-backend would not adversely affect vlc 2.0.6_3,3 because glib 2.36 might serve the function of gio-fam-backend. Anyway, I don't want to let this stop me from the last step (portmaster -a). I will want to source-upgrade to the upcoming FreeBSD 9.2-RELEASE, and build sysutils/grub2, see if I can create my own Super Grub2 Disk. Even if vlc is messed up, I can hope to rebuild in the near future. Tom From owner-freebsd-ports@FreeBSD.ORG Tue Sep 10 21:53:59 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 E29DA65E for ; Tue, 10 Sep 2013 21:53:59 +0000 (UTC) (envelope-from ljboiler@gmail.com) Received: from mail-oa0-x229.google.com (mail-oa0-x229.google.com [IPv6:2607:f8b0:4003:c02::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AAD252F3F for ; Tue, 10 Sep 2013 21:53:59 +0000 (UTC) Received: by mail-oa0-f41.google.com with SMTP id j6so8623170oag.28 for ; Tue, 10 Sep 2013 14:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=sEQ0bElM4TMaRv79fH6mWVXPSY8zYXW/kyTpr8AZfUc=; b=TB0krqpnnN6Gh53BvvOjyG+RRrpdWvNYsgEPch51/3IZFQEXst38OW4e855EnyQHPU lYXXT7/vLVh7ObOUcGHdjO2fiF26RWMXGRt8YIIVMHMWTIULNmdp+VtTijtSxkaiAaLd mJ4H8mQMFNAIU4pa183EKx/s18Zlx36IUfwnRZzjdh2R6iYuinl0OAaH2Rz1npwp50TD WGcIIgn+kaUyfDd6Hre1Ch1oBp2cIDOzduQU72r1zRH5X3sfPKesZOOLWk1BiuLwwvBM ZCHaC7wnRP0B8YX0WvFN/2V3ESFfbuuv0EdoTelPu5l38BMLc9FP8HYtyZbSCyisg5em tQjA== X-Received: by 10.60.132.142 with SMTP id ou14mr5046166oeb.58.1378850038959; Tue, 10 Sep 2013 14:53:58 -0700 (PDT) Received: from jmobile.jimmy.local (71-81-196-43.dhcp.stls.mo.charter.com. [71.81.196.43]) by mx.google.com with ESMTPSA id z5sm23185337obg.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 14:53:58 -0700 (PDT) Received: by jmobile.jimmy.local (sSMTP sendmail emulation); Tue, 10 Sep 2013 16:53:55 -0500 Date: Tue, 10 Sep 2013 16:53:55 -0500 From: Jimmy Kelley To: freebsd-ports@freebsd.org Subject: Problems building www/webkit-gtk2 after dumping base gcc on 10-CURRENT Message-ID: <20130910215355.GA3302@jmobile.jimmy.localnet> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 21:54:00 -0000 Hi all, As part of slogging through the iconv change this last week, I deleted the webkit-gtk2 port (and things that depended on it) to allow a portupgrade -af session to run without taking the ENTIRE weekend. I then went ahead and upgraded the base system which included the removal of the gcc tools. So far, so good... and now to rebuild webkit and those others I had removed. Trying with clang, it errors out looking for in Source/JavaScriptCore/wtf/Atomics.h. No such file anywhere to be found, and with the ifdefs in that file I figured it must have been part of the base gcc stuff. So I installed gcc from the ports, set WITH_GCC=4.4+ and tried again. atomicity.h is now found and away it chugs for a long time. The new result is a linker error about not finding libstdc++, and I'm scratching my head because that file is right there where the gcc port installed it. I did what the gnome-libtool suggested and added a -v to print the full text of the link command being run, and to my suprise it appears that the gnome-libtool is using the system base compiler, not the gcc one as directed by the WITH_GCC option, to do the linking step. Just to be sure, 'make clean' and 'make' again, and watching with ps shows g++/gcc being run to compile the source files, but cc when it hits that linking stage. I'm no expert on libtool/gnome-libtool; anybody have any ideas of what I could do to debug this? Jimmy From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 01:28:56 2013 Return-Path: Delivered-To: ports@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 22005950; Wed, 11 Sep 2013 01:28:56 +0000 (UTC) (envelope-from qat@redports.org) Received: from qat.redports.org (unknown [IPv6:2610:1c1:1:6420::233:0]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D308E2B8A; Wed, 11 Sep 2013 01:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=redports.org; s=04012012; h=Sender:Message-Id:To:Subject:Reply-To:Date:To:Cc:From:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=Gf5Yp68DIbce0+YllRjpsBN72kvOxRgwc0RXICt/1rc=; b=TNpsMFqcbebk2SD7VCIexwmWRyH9oDBxY2gFwIobRzEMna56J9Jdu98mpAfpiLbX5tNG7QmTNR3BWiUinSe5/v2pei44cauPNzlx2tUpXYipkLPdT2AmmJnspK2lAiA/kuCzA2lFtyQomY/lAXuEQmeeQXBvdz5bLhQjeI1HJeg=; Received: from www by qat.redports.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VJZEk-0007pK-Td; Wed, 11 Sep 2013 01:28:54 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: "Ports-QAT" X-Trac-Version: 0.12.5 Precedence: bulk Auto-Submitted: auto-generated X-Mailer: Trac 0.12.5, by Edgewall Software To: az@FreeBSD.org X-Trac-Project: redports Date: Wed, 11 Sep 2013 01:28:54 -0000 X-URL: https://qat.redports.org/ Subject: [QAT] r326920: 4x leftovers, 1x ???, 4x fetch, 67x success To: az@FreeBSD.org X-Trac-Build-URL: https://qat.redports.org/buildarchive/20130910172800-45483 X-Trac-Build-ID: 20130910172800-45483 Message-Id: Sender: World Wide Web Owner Cc: ports@FreeBSD.org, decke@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Reply-To: qat@redports.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 01:28:56 -0000 - convert to the new perl5 framework - trim Makefile header Approved by: portmgr (bapt@, blanket) --------------------------------------------------------------------- Build ID: 20130910172800-45483 Job owner: az@FreeBSD.org Buildtime: 8 hours Enddate: Wed, 11 Sep 2013 01:28:53 GMT Revision: r326920 Repository: https://svnweb.freebsd.org/ports?view=revision&revision=326920 --------------------------------------------------------------------- Port: textproc/cdif 1.19 Buildgroup: 9.1-QAT/amd64 Buildstatus: FETCH Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186872/cdif-1.19.log Buildgroup: 9.1-QAT/i386 Buildstatus: FETCH Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186873/cdif-1.19.log Buildgroup: 8.4-QAT/amd64 Buildstatus: FETCH Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186874/cdif-1.19.log Buildgroup: 8.4-QAT/i386 Buildstatus: FETCH Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186875/cdif-1.19.log --------------------------------------------------------------------- Port: textproc/csvdiff 1.7 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186876/csvdiff-1.7.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186877/csvdiff-1.7.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186878/csvdiff-1.7.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186879/csvdiff-1.7.log --------------------------------------------------------------------- Port: textproc/p5-Data-SpreadPagination 0.1.2 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186880/p5-Data-SpreadPagination-0.1.2.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186881/p5-Data-SpreadPagination-0.1.2.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186882/p5-Data-SpreadPagination-0.1.2.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186883/p5-Data-SpreadPagination-0.1.2.log --------------------------------------------------------------------- Port: textproc/p5-EBook-Tools 0.4.9 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186884/p5-EBook-Tools-0.4.9.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186885/p5-EBook-Tools-0.4.9.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186886/p5-EBook-Tools-0.4.9.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186887/p5-EBook-Tools-0.4.9.log --------------------------------------------------------------------- Port: textproc/p5-HTML-HTML5-Entities 0.003 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186888/p5-HTML-HTML5-Entities-0.003.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186889/p5-HTML-HTML5-Entities-0.003.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186890/p5-HTML-HTML5-Entities-0.003.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186891/p5-HTML-HTML5-Entities-0.003.log --------------------------------------------------------------------- Port: textproc/p5-Hatena-Keyword 0.05_2 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186892/p5-Hatena-Keyword-0.05_2.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186893/p5-Hatena-Keyword-0.05_2.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186894/p5-Hatena-Keyword-0.05_2.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186895/p5-Hatena-Keyword-0.05_2.log --------------------------------------------------------------------- Port: textproc/p5-IO-CSVHeaderFile 0.04 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186896/p5-IO-CSVHeaderFile-0.04.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186897/p5-IO-CSVHeaderFile-0.04.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186898/p5-IO-CSVHeaderFile-0.04.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186899/p5-IO-CSVHeaderFile-0.04.log --------------------------------------------------------------------- Port: textproc/p5-Pod-Perldoc 3.17 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186900/p5-Pod-Perldoc-3.17.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186901/p5-Pod-Perldoc-3.17.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186902/p5-Pod-Perldoc-3.17.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186903/p5-Pod-Perldoc-3.17.log --------------------------------------------------------------------- Port: textproc/p5-SQL-Tokenizer 0.24 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186904/p5-SQL-Tokenizer-0.24.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186905/p5-SQL-Tokenizer-0.24.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186906/p5-SQL-Tokenizer-0.24.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186907/p5-SQL-Tokenizer-0.24.log --------------------------------------------------------------------- Port: textproc/p5-String-Escape 2010.002 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186908/p5-String-Escape-2010.002.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186909/p5-String-Escape-2010.002.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186910/p5-String-Escape-2010.002.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186911/p5-String-Escape-2010.002.log --------------------------------------------------------------------- Port: textproc/p5-Syntax-Highlight-Perl-Improved 1.01 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186912/p5-Syntax-Highlight-Perl-Improved-1.01.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186913/p5-Syntax-Highlight-Perl-Improved-1.01.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186914/p5-Syntax-Highlight-Perl-Improved-1.01.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186915/p5-Syntax-Highlight-Perl-Improved-1.01.log --------------------------------------------------------------------- Port: textproc/p5-Text-ClearSilver 0.10.5.4 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186916/p5-Text-ClearSilver-0.10.5.4.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186917/p5-Text-ClearSilver-0.10.5.4.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186918/p5-Text-ClearSilver-0.10.5.4.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186919/p5-Text-ClearSilver-0.10.5.4.log --------------------------------------------------------------------- Port: textproc/p5-Text-DHCPLeases 1.0 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186920/p5-Text-DHCPLeases-1.0.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186921/p5-Text-DHCPLeases-1.0.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186922/p5-Text-DHCPLeases-1.0.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186923/p5-Text-DHCPLeases-1.0.log --------------------------------------------------------------------- Port: textproc/p5-XML-CanonicalizeXML 0.03 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186924/p5-XML-CanonicalizeXML-0.03.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186925/p5-XML-CanonicalizeXML-0.03.log Buildgroup: 8.4-QAT/amd64 Buildstatus: ??? Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186926/p5-XML-CanonicalizeXML-0.03.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186927/p5-XML-CanonicalizeXML-0.03.log --------------------------------------------------------------------- Port: textproc/p5-XML-TokeParser 0.05 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186928/p5-XML-TokeParser-0.05.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186929/p5-XML-TokeParser-0.05.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186930/p5-XML-TokeParser-0.05.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186931/p5-XML-TokeParser-0.05.log --------------------------------------------------------------------- Port: textproc/p5-XML-Validate 1.025_1 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186932/p5-XML-Validate-1.025_1.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186933/p5-XML-Validate-1.025_1.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186934/p5-XML-Validate-1.025_1.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186935/p5-XML-Validate-1.025_1.log --------------------------------------------------------------------- Port: textproc/publican 2.8 Buildgroup: 9.1-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186936/publican-2.8.log Buildgroup: 9.1-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186937/publican-2.8.log Buildgroup: 8.4-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186938/publican-2.8.log Buildgroup: 8.4-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186939/publican-2.8.log --------------------------------------------------------------------- Port: textproc/yali 1.1_1 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186940/yali-1.1_1.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186941/yali-1.1_1.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186942/yali-1.1_1.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186943/yali-1.1_1.log --------------------------------------------------------------------- Port: textproc/yamcha 0.33 Buildgroup: 9.1-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186944/yamcha-0.33.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186945/yamcha-0.33.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186946/yamcha-0.33.log Buildgroup: 8.4-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~az@FreeBSD.org/20130910172800-45483-186947/yamcha-0.33.log -- Buildarchive URL: redports From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 04:19:18 2013 Return-Path: Delivered-To: freebsd-ports@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 636A9E2D for ; Wed, 11 Sep 2013 04:19:18 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pd0-x233.google.com (mail-pd0-x233.google.com [IPv6:2607:f8b0:400e:c02::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3ACB62373 for ; Wed, 11 Sep 2013 04:19:18 +0000 (UTC) Received: by mail-pd0-f179.google.com with SMTP id v10so8611672pde.24 for ; Tue, 10 Sep 2013 21:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=9lnCZD7uJ8Pjub2IeteTL/x0ilX6gEpVh6HY9mGcY1A=; b=kU3CWFDlpiZ0f9QaV2kOhi9HZi4yPmX/bNi6ZrPXjopALnKkPmGoT0ArvtKPo1xb5v gQuHzGhsnsyqtLR91N1x6HEfxcJ7iC32Z//CDzbkZbvxYue2C/AxJ5yThbhaAgixUNZQ sPkN/u0fqvKyv2xBQhn24WzvA7xNcLW6FgMR8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=9lnCZD7uJ8Pjub2IeteTL/x0ilX6gEpVh6HY9mGcY1A=; b=Ec7KaTWrYIjT5cI08Yw0wF2vRiMqa583V61lH3x+XdimC/yucN0CV29lznj6K9woNL KtzqzfOW7Mnq+jte5DFIJcZAviKX0EyezB7vdJfpYPtA3vAp+kC4l8PjV/fC+AqO5Dso 4La7yvjIdBydKGmRzH36KTZCWENiTffpQcfwOC7wbXWV145d6IVnSltilagUm11vd/1x rE0zp+Tgh8O5iBwHJ2lGvb1vRFNUe6cV//Y9jsd1HEVKJ5+mSUVDNtM/rh+WBUB1VxHv w7WqheNhp0Fer71EcMQnaj5aAWmOK3Alabngdr84jbmiINGzl1hBw2WjttjonlBddDk9 k4sA== X-Gm-Message-State: ALoCoQkSpOSmlZrLuxC9nlFf0SA9CQ1K4p3wnPs/tZzD2xwVgQdYHhneTfgxfLvXivRbWJlQG3tY X-Received: by 10.68.110.98 with SMTP id hz2mr29219067pbb.94.1378873157708; Tue, 10 Sep 2013 21:19:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.70.6.3 with HTTP; Tue, 10 Sep 2013 21:18:47 -0700 (PDT) In-Reply-To: <05.26.26119.7FA5F225@hrndva-omtalb.mail.rr.com> References: <05.26.26119.7FA5F225@hrndva-omtalb.mail.rr.com> From: Eitan Adler Date: Wed, 11 Sep 2013 00:18:47 -0400 Message-ID: Subject: Re: What is MAKE_JOBS_UNSAFE? To: Thomas Mueller Content-Type: text/plain; charset=UTF-8 Cc: freebsd ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 04:19:18 -0000 On Tue, Sep 10, 2013 at 1:46 PM, Thomas Mueller wrote: >> Can I safely >> pkg delete -f gio-fam-backend >> since its function is (?) presumably filled by glib 2.36 ? > > Yes, providing that you've rebuilt all ports that did previously require > gio-fam-backend. > > I had three that failed, and MAKE_JOBS_UNSAFE=yes apparently had no effect: > multimedia/mplayer, graphics/gstreamer-plugins-gl, multimedia/vlc In most cases MAKE_JOBS_UNSAFE=yes will not help. The message is an artifact from when the defaults were reversed and a precaution for the days after it was changed. IMHO it should be removed now. -- Eitan Adler From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 05:31:02 2013 Return-Path: Delivered-To: freebsd-ports@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 A2A35999 for ; Wed, 11 Sep 2013 05:31:02 +0000 (UTC) (envelope-from meta+ports@vmeta.jp) Received: from glory.vmeta.jp (7c293911.i-revonet.jp [124.41.57.17]) by mx1.freebsd.org (Postfix) with ESMTP id 701FA2605 for ; Wed, 11 Sep 2013 05:31:02 +0000 (UTC) Received: from ssl.vmeta.jp (localhost [127.0.0.1]) by glory.vmeta.jp (Postfix) with ESMTP id 4A02BEF3; Wed, 11 Sep 2013 14:30:55 +0900 (JST) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 11 Sep 2013 14:30:55 +0900 From: Koichiro IWAO To: freebsd-ports@freebsd.org Subject: please change synopsis of ports/181345 Message-ID: <7d79f2a703ea0f45c3feb505b57ee7b0@vmeta.jp> X-Sender: meta+ports@vmeta.jp User-Agent: Roundcube Webmail/0.9.1 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 05:31:02 -0000 Hi, Would someone please change synopsis of this PR? http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181345 Add "shortcuts like Ctrl-C does not work on vncviewer because of fltk". Thanks, -- `whois vmeta.jp | nkf -w` meta From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 05:50:09 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 4B9F1E6D for ; Wed, 11 Sep 2013 05:50:09 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D853226AD for ; Wed, 11 Sep 2013 05:50:08 +0000 (UTC) Received: from mandree.no-ip.org ([78.49.197.119]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0ME47n-1VAcN71ndH-00HN8w for ; Wed, 11 Sep 2013 07:50:06 +0200 Received: from [IPv6:::1] (localhost6.localdomain6 [IPv6:::1]) by apollo.emma.line.org (Postfix) with ESMTP id B2B1F23CF75; Wed, 11 Sep 2013 07:50:03 +0200 (CEST) Message-ID: <5230048B.5050705@gmx.de> Date: Wed, 11 Sep 2013 07:50:03 +0200 From: Matthias Andree User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? References: <05.26.26119.7FA5F225@hrndva-omtalb.mail.rr.com> In-Reply-To: <05.26.26119.7FA5F225@hrndva-omtalb.mail.rr.com> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:89gKDGTkfnwM5iHsG8j2Ex5gw2X44RF/fhGE2DXlhUNq7LkBLxh FOMsAh9+gAJksgENPmdw1GjlYEUkSMUwEYYZ0RieolgjTFbeop0h7I5n6/io3tjhwNK0+uB m/TBQSQsmUJhe0tRyn6k397nbnEL1CakjNJSkOnPoxC73LPsKiSiXYe1Bga32x2ajL4doXq GAzVGKw1NFP+aDsY36Atw== Cc: mueller6724@bellsouth.net X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 05:50:09 -0000 Am 10.09.2013 19:46, schrieb Thomas Mueller: >> Can I safely >> pkg delete -f gio-fam-backend >> since its function is (?) presumably filled by glib 2.36 ? > > Yes, providing that you've rebuilt all ports that did previously require > gio-fam-backend. > > I had three that failed, and MAKE_JOBS_UNSAFE=yes apparently had no effect: > multimedia/mplayer, graphics/gstreamer-plugins-gl, multimedia/vlc Tom, please make sure to get your mail replies right. 1. You need to properly mark quoted material (indentation, attribution line, and similar). You did not consistently quote my material, which was the "Yes, providing that..." paragraph above. It lacks a level of indentation, and I do not tolerate misappropriation of my material however short it is. (Which is why this reply is public.) 2. Please use a mailer that keeps threads intact (In-Reply-To: header required). Since your replies did not thread this discussion properly, can I ask you to use a different mailer so that your replies appear in line? Thank you. Best regards Matthias From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 06:00:22 2013 Return-Path: Delivered-To: freebsd-ports@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 7D460FC4 for ; Wed, 11 Sep 2013 06:00:22 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward2l.mail.yandex.net (forward2l.mail.yandex.net [IPv6:2a02:6b8:0:1819::2]) by mx1.freebsd.org (Postfix) with ESMTP id 4140F26E7 for ; Wed, 11 Sep 2013 06:00:22 +0000 (UTC) Received: from smtp2h.mail.yandex.net (smtp2h.mail.yandex.net [84.201.187.145]) by forward2l.mail.yandex.net (Yandex) with ESMTP id 95F391AC0D6E; Wed, 11 Sep 2013 10:00:19 +0400 (MSK) Received: from smtp2h.mail.yandex.net (localhost [127.0.0.1]) by smtp2h.mail.yandex.net (Yandex) with ESMTP id 407421701739; Wed, 11 Sep 2013 10:00:19 +0400 (MSK) Received: from 93.91.3.70.tel.ru (93.91.3.70.tel.ru [93.91.3.70]) by smtp2h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ACsa6yqhIr-0I78DtAt; Wed, 11 Sep 2013 10:00:18 +0400 Message-ID: <523006F2.401@passap.ru> Date: Wed, 11 Sep 2013 10:00:18 +0400 From: Boris Samorodov Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130806 Thunderbird/17.0.7 MIME-Version: 1.0 To: Koichiro IWAO Subject: Re: please change synopsis of ports/181345 References: <7d79f2a703ea0f45c3feb505b57ee7b0@vmeta.jp> In-Reply-To: <7d79f2a703ea0f45c3feb505b57ee7b0@vmeta.jp> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 06:00:22 -0000 11.09.2013 09:30, Koichiro IWAO пишет: > shortcuts like Ctrl-C does not work on vncviewer because of fltk Done. -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 08:01:34 2013 Return-Path: Delivered-To: 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 C17A4BEA for ; Wed, 11 Sep 2013 08:01:34 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x22a.google.com (mail-wi0-x22a.google.com [IPv6:2a00:1450:400c:c05::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 59C5B2BBD for ; Wed, 11 Sep 2013 08:01:34 +0000 (UTC) Received: by mail-wi0-f170.google.com with SMTP id cb5so1707492wib.1 for ; Wed, 11 Sep 2013 01:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=cEUlIb7MbhuhQpfKmbJQld9XyielA5Q7TkPE40j+rW8=; b=djIhEg5TgV56roxcFdBXbP/uPo4jxRyh+eFMZc9SNXzs6lfo+MeMjPR+NShwHwLdLK I+SnPjKO+dmtjOejBdtp8WWuNlbA8F9rDdM+RIbkuMzyoiLLbfaL3E4aozHYcsWxiFuk 4LdxGPdolLb817EHjd6ScoTeHNm+ZX/tpRBymU28VYcAlGZ/YJPtFujwp2szuoEpdTMm iBtPlDhDBkqI9a6GvfejH+DcUkiPu7bR4xA+VzYmKLwk79S2Ov1/w4k0p7F08OSgn5Kx EPMBsI+oOiwqCQ/9+TsnvRIcbAF7s8dZ9/wrCoTSFHdyHsvRTYNyp9TWqdeoDj6/Q8DL WhZg== X-Received: by 10.181.11.163 with SMTP id ej3mr186902wid.47.1378886492209; Wed, 11 Sep 2013 01:01:32 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id r6sm8728674wiw.0.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 01:01:31 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 11 Sep 2013 10:01:29 +0200 From: Baptiste Daroussin To: Darren Pilgrim Subject: Re: [RELEASE - 83amd64-default][mail/squirrelmail-postfixadmin-plugin] Build failed for squirrelmail-postfixadmin-plugin-2.3.0_3 during run-depends Message-ID: <20130911080128.GM40186@ithaqua.etoilebsd.net> References: <201309110640.r8B6ent3030197@beefy2.isc.freebsd.org> <52301E85.9070309@evilphi.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qse+WBH4guesipZ+" Content-Disposition: inline In-Reply-To: <52301E85.9070309@evilphi.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 08:01:34 -0000 --qse+WBH4guesipZ+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 11, 2013 at 12:40:53AM -0700, Darren Pilgrim wrote: > Have a look at the log. Zend pulls in in php-5.4. Then squirrelmail=20 > tries to pull in php-5.3. Squirrelmail should fail for php > 5.3, but=20 > it doesn't. You'd have to bug THAT maintainer about it. This is a=20 > problem OUTSIDE MY PORT, so please stop bothering me about it! The default php is php-5.4, meaning that is is normal that Zend pulls php-5.4, squirrelmail pulling a non default version is making squirrelmail = not package compliant (as one has to modify it's configuration to require php-5= =2E3 So here we have too bugs: 1 it is impossible for the php framework in ports= to properly handle 2 version of php at the sametime (which I don't think is possible as-is (would require imho a lot of work). 2 the squirrelmail ports= are not suitable for package building because of 1 and it doesn't depend on the default php. A quick fix here is to mark squirrelmail as not package friendly for now. Do you want me to do that? regards, Bapt --qse+WBH4guesipZ+ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlIwI1gACgkQ8kTtMUmk6EzTswCcCNv+f0YUzyNot5LaAZEskFtG J8sAn1ZoLtUZyhdg+dQIxG3zRijJs7VA =NUBM -----END PGP SIGNATURE----- --qse+WBH4guesipZ+-- From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 08:25:05 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 E3AA1530 for ; Wed, 11 Sep 2013 08:25:05 +0000 (UTC) (envelope-from xavier.freebsdports@aim.com) Received: from omr-m03.mx.aol.com (omr-m03.mx.aol.com [64.12.143.77]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A913E2CB9 for ; Wed, 11 Sep 2013 08:25:04 +0000 (UTC) Received: from mtaomg-db04.r1000.mx.aol.com (mtaomg-db04.r1000.mx.aol.com [172.29.51.202]) by omr-m03.mx.aol.com (Outbound Mail Relay) with ESMTP id 1E04C700370B3 for ; Wed, 11 Sep 2013 04:19:43 -0400 (EDT) Received: from core-maa003b.r1000.mail.aol.com (core-maa003.r1000.mail.aol.com [172.29.28.201]) by mtaomg-db04.r1000.mx.aol.com (OMAG/Core Interface) with ESMTP id B3137E000085 for ; Wed, 11 Sep 2013 04:19:42 -0400 (EDT) To: freebsd-ports@freebsd.org Subject: lang/gcc with default port options don't compile X-MB-Message-Source: WebUI X-MB-Message-Type: User MIME-Version: 1.0 From: Xavier X-Mailer: AOL Webmail 38022-STANDARD Received: from 83.49.159.2 by webmail-m291.sysops.aol.com (64.12.152.51) with HTTP (WebMailUI); Wed, 11 Sep 2013 04:19:42 -0400 Message-Id: <8D07CDECD120ACE-1D30-A7FC@webmail-m291.sysops.aol.com> X-Originating-IP: [83.49.159.2] Date: Wed, 11 Sep 2013 04:19:42 -0400 (EDT) x-aol-global-disposition: G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aol.com; s=20121107; t=1378887583; bh=UMuFebzZ9GQD4oYehY1ptg5dPHa6B7g2ejhiJiSN6X0=; h=From:To:Subject:Message-Id:Date:MIME-Version:Content-Type; b=uRPc05rEqy+oSbREcLJ2CWMj+uMqPnAReZp77lUlBbE52o6IDP2JeBavYiFBp8l8u 7EBhRHRefRiw8l3ulXKSbxcUdg/AOLkz9yJlN+JzOPFZDTJCj6Ne+ADxj05jh/SVbI lzR+pB1+OHzogNpH7KnzdqA0hkMb7vzobl1441rY= x-aol-sid: 3039ac1d33ca5230279e6546 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 08:25:06 -0000 =20 =20 Hi, If I compile lang/gcc with default port options: root@acer_casa_FreeBSD:/usr/ports/lang/gcc # make showconfig =3D=3D=3D> The following configuration options are available for gcc-4.6.3: BOOTSTRAP=3Doff: Build using a full bootstrap JAVA=3Don: Java platform support =3D=3D=3D> Use 'make config' to modify these settings root@acer_casa_FreeBSD:/usr/ports/lang/gcc # I get next error: decnumber/dpd -I../libdecnumber -I/usr/local/include .././../gcc-4.6.3/gc= c/c-f amily/c-common.c -o c-family/c-common.o .././../gcc-4.6.3/gcc/c-family/c-common.c: In function 'record_types_used_b= y_cur rent_var_decl': .././../gcc-4.6.3/gcc/c-family/c-common.c:9537: error: 'types_used_by_cur_v= ar_de cl' undeclared (first use in this function) .././../gcc-4.6.3/gcc/c-family/c-common.c:9537: error: (Each undeclared ide= ntifi er is reported only once .././../gcc-4.6.3/gcc/c-family/c-common.c:9537: error: for each function it= appe ars in.) .././../gcc-4.6.3/gcc/c-family/c-common.c:9540: warning: implicit declarati= on of function 'types_used_by_var_decl_insert' gmake[2]: *** [c-family/c-common.o] Error 1 gmake[2]: Leaving directory `/usr/ports/lang/gcc/work/build/gcc' gmake[1]: *** [all-gcc] Error 2 gmake[1]: Leaving directory `/usr/ports/lang/gcc/work/build' gmake: *** [all] Error 2 *** [do-build] Error code 1 Stop in /usr/ports/lang/gcc. *** [build] Error code 1 Stop in /usr/ports/lang/gcc. root@acer_casa_FreeBSD:/usr/ports/lang/gcc # Somebody can help me ? See you. From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 10:00:37 2013 Return-Path: Delivered-To: ports@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 6F61DE7F; Wed, 11 Sep 2013 10:00:37 +0000 (UTC) (envelope-from ports.maintainer@evilphi.com) Received: from yoshi.bluerosetech.com (yoshi.bluerosetech.com [174.136.100.66]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AB5CB20C7; Wed, 11 Sep 2013 10:00:36 +0000 (UTC) Received: from chombo.houseloki.net (c-76-27-220-79.hsd1.wa.comcast.net [76.27.220.79]) by yoshi.bluerosetech.com (Postfix) with ESMTPSA id 5FC60E6040; Wed, 11 Sep 2013 03:00:30 -0700 (PDT) Received: from [IPv6:2601:7:1680:365:16:2aea:113d:5e15] (unknown [IPv6:2601:7:1680:365:16:2aea:113d:5e15]) by chombo.houseloki.net (Postfix) with ESMTPSA id 3BDCB820; Wed, 11 Sep 2013 03:00:29 -0700 (PDT) Message-ID: <52303F3E.2070305@evilphi.com> Date: Wed, 11 Sep 2013 03:00:30 -0700 From: Darren Pilgrim User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Baptiste Daroussin Subject: Re: [RELEASE - 83amd64-default][mail/squirrelmail-postfixadmin-plugin] Build failed for squirrelmail-postfixadmin-plugin-2.3.0_3 during run-depends References: <201309110640.r8B6ent3030197@beefy2.isc.freebsd.org> <52301E85.9070309@evilphi.com> <20130911080128.GM40186@ithaqua.etoilebsd.net> In-Reply-To: <20130911080128.GM40186@ithaqua.etoilebsd.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 10:00:37 -0000 On 9/11/2013 1:01 AM, Baptiste Daroussin wrote: > A quick fix here is to mark squirrelmail as not package friendly for now. > Do you want me to do that? # make -C /usr/ports/mail/squirrelmail maintainer adamw@FreeBSD.org You're asking the wrong person. From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 11:17:18 2013 Return-Path: Delivered-To: ports@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 DDD85C40 for ; Wed, 11 Sep 2013 11:17:18 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wg0-x231.google.com (mail-wg0-x231.google.com [IPv6:2a00:1450:400c:c00::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 78E4623D5 for ; Wed, 11 Sep 2013 11:17:18 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id l18so7610442wgh.28 for ; Wed, 11 Sep 2013 04:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=zEkKzbvTwADkOS1tPOF4V1rHd30gkb5zubM8irmzFj8=; b=ew4dlAhuffyxStjnhZIcZrDqrHfd21dA/++QEeSSewHXBq+zyW4mMPvqJxR5aA1fLy /AK8ImC2yKUWgoAiV6lydvAdjgsR/nvE9eqGKchs8pwuq/aEWOcFYwMEvoYdvxiuI1jY fN5tYFLkRLXQO78Pnr3yW20LXbg68D28CV4VjmAWxIVW9qZBTwLEGt3d6l8LOZk0af6j TZV+NRs0B1eziuaOcg0WYYueHUoDBoD25Pv9co/8+9yEoMO+mAi6ZU6dG1SfPW9E9EeG wvi7PvP+xzbkk2kqRrqtTHULRBi8c6ZiXPLBeZwH3k9/VXxXctR8yrTVUzAjYcU69MbJ pk6A== X-Received: by 10.180.75.239 with SMTP id f15mr16935645wiw.42.1378898236936; Wed, 11 Sep 2013 04:17:16 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id mb7sm9903709wic.10.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 04:17:16 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 11 Sep 2013 13:17:13 +0200 From: Baptiste Daroussin To: Krzysztof Stryjek Subject: Re: [RELEASE - 83i386-default] Build failed for collectd-5.3.0_4 during configure Message-ID: <20130911111713.GS40186@ithaqua.etoilebsd.net> References: <201309040637.r846bMDs010967@beefy1.isc.freebsd.org> <20130905074346.GK10136@cmd.bsdserwis.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yRXsXhSYq7voLSEz" Content-Disposition: inline In-Reply-To: <20130905074346.GK10136@cmd.bsdserwis.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 11:17:18 -0000 --yRXsXhSYq7voLSEz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 05, 2013 at 09:43:46AM +0200, Krzysztof Stryjek wrote: > Hello, >=20 > I've checked this problem. But I don't know how to fixit. Problem is > that users plugin depends on getutxent or getutent which is not > available on 8.x systems. >=20 > Maybe there should be made some checkings like: > .if OSVERSION <=3D 900000 > CONFIGURE_ARGS+=3D--disable-users > .endif >=20 Sounds a good idea, I'm forwarding to ports@ so that some people could test= and commit if needed. regards, Bapt --yRXsXhSYq7voLSEz Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlIwUTkACgkQ8kTtMUmk6Ezm7wCfeU8BRjCRa0IiMb9iVJV/dHia xqEAn2rxG6X3ZeqXcYBBHN8hrZMzZf3L =T5pv -----END PGP SIGNATURE----- --yRXsXhSYq7voLSEz-- From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 14:33:12 2013 Return-Path: Delivered-To: freebsd-ports@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 3451C8F0 for ; Wed, 11 Sep 2013 14:33:12 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8BE1B2F1A for ; Wed, 11 Sep 2013 14:33:11 +0000 (UTC) Received: from mail-wg0-f50.google.com ([74.125.82.50]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKUjB/DH7D05j+8aY75GhRqNx+W7MeF0FZ@postini.com; Wed, 11 Sep 2013 14:33:11 UTC Received: by mail-wg0-f50.google.com with SMTP id j13so8026842wgh.17 for ; Wed, 11 Sep 2013 07:32:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:reply-to; bh=jv0TbrShK5ds+w2XAgtNh+4WSepV9pXccWjnJRfy/Rw=; b=F82ug0qJ3iaq2dfITr90hSrCiWxyUtU9F4uGqVc+8fEHxj7mq/xekyUmPY9/liWXh5 d52AMzNI4xTWeoBghdYMgIE8ocI03kFZOsQGo7+5jgaLMBYjf3mVyMAoh1iWEkjV/y4f b/xZTxSVcUZCm9aqYQ9PlpJ8i52CjHWkkOthpZH3Q+kSSWT5EMC8vkr0WH5Xe0+RZY1Y 9MidDag3EW1ngd8HJdgakW0nLsKSVdx3GB7wpGs6qPuTDRjYe8CInQUuR73dBcnDNHHN 1tEjgRrjmqAN0P559EdLJhwpTCMyAfv2wfdBhE/3h1HNGUEwiKXVQVKnmMBY2r5jfTsY DmJg== X-Gm-Message-State: ALoCoQnDVc+BbiXwDG5ZTv8V8/50dVMELzDDhgT70fUNex8VROneBhKHDqBJ8X89lmWABPbUmQ6Q/S7PK3yCYHE4OFfTCro6pUPao60JYjYvp0xL2hKk7oyxl5l6xjvdz/TFpn234Lauv7XPUS0ypizuob9lG60V/DgVx50wDA9IwP89x5LdTAY= X-Received: by 10.194.77.167 with SMTP id t7mr1778577wjw.27.1378909964252; Wed, 11 Sep 2013 07:32:44 -0700 (PDT) X-Received: by 10.194.77.167 with SMTP id t7mr1778572wjw.27.1378909964181; Wed, 11 Sep 2013 07:32:44 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id ey4sm11097334wic.11.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 07:32:43 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8BEWe1O001748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 11 Sep 2013 15:32:41 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8BEWe0Z001742 for freebsd-ports@freebsd.org; Wed, 11 Sep 2013 15:32:40 +0100 (BST) (envelope-from mexas) Date: Wed, 11 Sep 2013 15:32:40 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> To: freebsd-ports@freebsd.org Subject: UPDATING 20130904 entry issues X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 14:33:12 -0000 ports/UPDATING from 20130904 has: # pkg query %ro libiconv >ports_to_update # pkg delete -f libiconv # cat ports_to_update | xargs portmaster So I have to delete a port on which >250 other installed ports depend. After that I have *many* unusable ports until the portmaster completes the rebuilding, which, on my boxes, means days. In addition, my experience, at least on ia64, sparc64 and amd64 is that such large updates never go smoothly. So, is it possible to reverse the procedure, and update all ports which depend on libiconv before deleting it? I'm thinking about the recommended procedure for using "make delete-old-libs" for the base OS. There new port builds automatically pick the newever version of the shared lib. When the old version is no longer used by any ports it can be removed. Is it not possible to tell ports to first check for libiconv in base, and if it is not there, then install/use one from ports? Anton From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 15:41:50 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 14DC96DD for ; Wed, 11 Sep 2013 15:41:50 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C80BB245E for ; Wed, 11 Sep 2013 15:41:49 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtp (envelope-from ) id <1VJmY7-003eHs-GK>; Wed, 11 Sep 2013 17:41:47 +0200 Received: from g225187219.adsl.alicedsl.de ([92.225.187.219] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtpsa (envelope-from ) id <1VJmY7-003OUh-Bm>; Wed, 11 Sep 2013 17:41:47 +0200 Date: Wed, 11 Sep 2013 17:41:41 +0200 From: "O. Hartmann" To: FreeBSD Ports Subject: graphics/opencv: on CURRENT (r255472): c++ issue resulting in: error: use of undeclared identifier 'usleep' usleep(1000); ^ 1 error Message-ID: <20130911174141.78870fac@thor.walstatt.dyndns.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/zF_OrfS6UuRLLVkLtODyV1u"; protocol="application/pgp-signature" X-Originating-IP: 92.225.187.219 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 15:41:50 -0000 --Sig_/zF_OrfS6UuRLLVkLtODyV1u Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Recompiling everything installed due to the iconv-issue and the extraction of the GNUish libstdc++ in favor of the new libc++, I run permanently into the problem of a compiler (c++) stopp at graphics/opencv due to the error shown below. I'm getting crazy here, since I have successfully compiled opencv on two other boxes running the most recent CURRENT with no libstdc++ and no converters/libiconv any more. Doing=20 portmaster -f graphics/opencv results in getting everything built, except graphics/opencv! graphics/opencv seems to be a prerequisite for the build of devel/kdevelop-kde4, which also is a stopgap at the moment and is very resiliant in getting compiled. Can someone shed light and hints onto this? Thanks in advance, Oliver [...] /usr/local/include/libavformat/avformat.h:1578:26: note: 'av_write_header' declared here attribute_deprecated int av_write_header(AVFormatContext *s); ^ 12 warnings generated. [ 2%] Building CXX object modules/highgui/CMakeFiles/opencv_highgui.dir/src/loadsave.o [ 2%] Building CXX object modules/highgui/CMakeFiles/opencv_highgui.dir/src/precomp.o [ 2%] Building CXX object modules/highgui/CMakeFiles/opencv_highgui.dir/src/utils.o [ 3%] Building CXX object modules/highgui/CMakeFiles/opencv_highgui.dir/src/window.o [ 3%] Building CXX object modules/highgui/CMakeFiles/opencv_highgui.dir/src/window_QT.o /usr/ports/gr= aphics/opencv/work/OpenCV-2.3.1/modules/highgui/src/window_QT.cpp:316:5: error: use of undeclared identifier 'usleep' usleep(1000); ^ 1 error generated. *** Error code 1 --Sig_/zF_OrfS6UuRLLVkLtODyV1u Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSMI86AAoJEOgBcD7A/5N8vJ4IAIbZuFkO0yw/yKo5aifhtbrq i/M1oVEwchs/mUrvdCtt56dDOPp+qixl7kc44Z1hJdbXvK4YFp/yw4nNhdXOmB7/ UPuz8gr6ckKoglDJVV1KvI15Km9RD3kl32/l5RKuPvkwD+RLXSj9GqbkdM8S/Z/2 X38tvIp1D1UQHHsOYD6Rc/RuKgQJCYDSCubeG3691ih1c0/psBaGsyQEBTxlLo/7 1A4HWuYHf5lY1heoDNJhLOPLKE5gwwUK5Pbnd+jE+9dcySklrGE5TBBTeUF0uQN/ lSznPO+eZ5TkfeNl4LZFNiSZzzvP6htpk9+j3ZmDwOUtszCPAobUpEQR3GhHrM0= =zgf6 -----END PGP SIGNATURE----- --Sig_/zF_OrfS6UuRLLVkLtODyV1u-- From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 17:43:29 2013 Return-Path: Delivered-To: freebsd-ports@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 3287BFB5; Wed, 11 Sep 2013 17:43:29 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward13.mail.yandex.net (forward13.mail.yandex.net [IPv6:2a02:6b8:0:801::3]) by mx1.freebsd.org (Postfix) with ESMTP id DC7B42B95; Wed, 11 Sep 2013 17:43:28 +0000 (UTC) Received: from smtp12.mail.yandex.net (smtp12.mail.yandex.net [95.108.131.191]) by forward13.mail.yandex.net (Yandex) with ESMTP id 896BC142DFF; Wed, 11 Sep 2013 21:43:27 +0400 (MSK) Received: from smtp12.mail.yandex.net (localhost [127.0.0.1]) by smtp12.mail.yandex.net (Yandex) with ESMTP id 51B4B16A0AFD; Wed, 11 Sep 2013 21:43:27 +0400 (MSK) Received: from 93.91.3.70.tel.ru (93.91.3.70.tel.ru [93.91.3.70]) by smtp12.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FE6OPhnvT2-hQ2qVBni; Wed, 11 Sep 2013 21:43:26 +0400 Message-ID: <5230ABBE.2080505@passap.ru> Date: Wed, 11 Sep 2013 21:43:26 +0400 From: Boris Samorodov Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130806 Thunderbird/17.0.7 MIME-Version: 1.0 To: FreeBSD ports list , "Sergey A. Osokin" Subject: graphics/libraw and c++ libraries Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 17:43:29 -0000 Hi All, there are two *.pc files at graphics/libraw which have: ----- % grep c++ /usr/local/libdata/pkgconfig/libraw* /usr/local/libdata/pkgconfig/libraw.pc:Libs: -L${libdir} -lraw -lstdc++ /usr/local/libdata/pkgconfig/libraw_r.pc:Libs: -L${libdir} -lraw -lstdc++ ----- What is the right way to use (fix) those pc files at 10.x? One can use both clang with libc++ and gccXX with libstdc++ to compile against libraw. -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 18:19:20 2013 Return-Path: Delivered-To: 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 ACF6BE48 for ; Wed, 11 Sep 2013 18:19:20 +0000 (UTC) (envelope-from hiren.panchasara@gmail.com) Received: from mail-ea0-x234.google.com (mail-ea0-x234.google.com [IPv6:2a00:1450:4013:c01::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 483482DCA for ; Wed, 11 Sep 2013 18:19:20 +0000 (UTC) Received: by mail-ea0-f180.google.com with SMTP id h10so4842647eaj.11 for ; Wed, 11 Sep 2013 11:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=glNNC+yI30klDlHnMrtl2UddaNYgF5322C527MUOoPs=; b=k7cfPnYwgJVHPOwnvwfhefeC19vkoA/+dsFzG7MknSvaUw/wGtYt8ABTUGz7HCXZFh hiqBUA1hmlwaIi74yj0V3v5+sl/4o2U36w51QOBIajON2grsEW4vhjgPvriJwnr16rnp eGMQx0q0o6z1QC4ijUrnmTBkhA22srlODxNEANwTmh82TgurhJVIQqBHlDXT0gtHqcQ7 XQMLMMyHp4qD+ClkjehyUiA7QvqyRfw9ou8KEjZCN9Uj1H9R9DbezV7OYB6T48TTRzZW AT0+pab14UyPW1XDpTyRLrqD28LrAgI+PWdIx0ZVPKIc7KixZdcv2anpyNmYUoTcT44z OPJQ== MIME-Version: 1.0 X-Received: by 10.15.56.199 with SMTP id y47mr4052350eew.73.1378923558505; Wed, 11 Sep 2013 11:19:18 -0700 (PDT) Received: by 10.14.105.137 with HTTP; Wed, 11 Sep 2013 11:19:18 -0700 (PDT) In-Reply-To: <52243595.3080106@aldan.algebra.com> References: <20130902004058.12F03200DE@smtp.hushmail.com> <52242436.30704@aldan.algebra.com> <20130902061326.6CF79200E0@smtp.hushmail.com> <52243595.3080106@aldan.algebra.com> Date: Wed, 11 Sep 2013 11:19:18 -0700 Message-ID: Subject: Re: graphics/libfpx fails to build From: hiren panchasara To: "Mikhail T." Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: Kenta Suzumoto , ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 18:19:20 -0000 On Sun, Sep 1, 2013 at 11:52 PM, Mikhail T. wrot= e: > 02.09.2013 02:13, Kenta Suzumoto =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0= =B2(=D0=BB=D0=B0): > > Still doesn't build with Clang for me. Log attached. > Must be a clang-3.3 thing... Well, at least, we established, the PR > would not have fixed this... > > Let me contemplate some more. Thanks, > This is still broken on head at r255423. Thanks, Hiren From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 19:27:12 2013 Return-Path: Delivered-To: freebsd-ports@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 235EDE2B for ; Wed, 11 Sep 2013 19:27:12 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD702226 for ; Wed, 11 Sep 2013 19:27:11 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3cZtR21cJkzFTH7; Wed, 11 Sep 2013 21:27:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8PRC7_cHQYeS; Wed, 11 Sep 2013 21:27:04 +0200 (CEST) Received: from tommy.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Wed, 11 Sep 2013 21:27:04 +0200 (CEST) Message-ID: <5230C406.3000709@madpilot.net> Date: Wed, 11 Sep 2013 21:27:02 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130903 Thunderbird/17.0.8 MIME-Version: 1.0 To: mexas@bris.ac.uk Subject: Re: UPDATING 20130904 entry issues References: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 19:27:12 -0000 On 09/11/13 16:32, Anton Shterenlikht wrote: > ports/UPDATING from 20130904 has: > > # pkg query %ro libiconv >ports_to_update > # pkg delete -f libiconv > # cat ports_to_update | xargs portmaster > > So I have to delete a port on which >250 other > installed ports depend. After that I have *many* > unusable ports until the portmaster completes > the rebuilding, which, on my boxes, means days. > > In addition, my experience, at least on ia64, sparc64 > and amd64 is that such large updates never go smoothly. > > So, is it possible to reverse the procedure, and > update all ports which depend on libiconv before > deleting it? I'm thinking about the recommended > procedure for using "make delete-old-libs" for the > base OS. There new port builds automatically pick > the newever version of the shared lib. When the old > version is no longer used by any ports it can be > removed. First of all note that this affects only 10-CURRENT users. Since the libc iconv implementation has been enabled by default systems left "as is" end up with two iconv implementation installed after upgrading the base system. This means two conflicting iconv.h file (one in usr and one in local), one implementation living in libc(requiring no -l flags) and one living in libiconv.so in local/lib, requiring an ld -liconv flag to link against. As you know ports just bundle upstream ports with a few patches. Most third party build systems simply do not account for this kind of double iconv situation. various ports were already failing due to this. Some were also doing the right thing, others were confuse, including iconv.h from /usr/include but trying to link to libiconv.so in local, which cannot work. Some ports build systems had a "if FreeBSD" conditional somewhere forcing use of the -liconv flag for us, which will force use of the old library, which could work, if the correct include file is taken, but will not allow migration. Only way to make it work without need to rework a few thousand ports was to make the system have only one iconv implementation present, and fix the not too many ports which hardcoded -liconv and similar things in their build systems. This means that keeping both implementations installed isn't a good solution and a non started for packages building. Please note that adding a stub libiconv.so library to base isn't a good solution, your binaries would end up linking to it, and you would anyway have to recompile those when removing it. You can't make a parallel with new libraries, our iconv implementation isn't a newer version of the same library. it's a completely different implementation which just happens to implement the same functionality. It's a different library(bundled in libc) completely. And there is also a whole big problem about libtool archives, which preserve build flags from before, which need to be regenerated(done when reinstalling the port) not to bite you in the future. I sincerely don't know how to force fixes to appear in the dozens or more build systems the software in the ports collection use. In an ideal world all the software's build systems would detect two iconv implementations and prefer the OS provided one if present(this would also require a worldwide consensus that the OS provided one is the "best" one). some in fact even do this, but many others (some are dependencies of hundreds of others) don't preferring the ports provided one, or simply getting confused and failing to build, and we have to cope with this. Anyway, while the update can't be undone save by using system backups, you can remove the libiconv port, update ports, and if something goes wrong you can reinstall the libiconv port, ports compiled against it will start to work again and recompiled ones will keep using the new implementation. Remember to remove the IGNORE line in the iconv port if you want to reinstall it. > > Is it not possible to tell ports to first check > for libiconv in base, and if it is not there, > then install/use one from ports? As explained above, ports are external software each using it's own build system. Some are able to do what you describe with two conflicting implementations, most do the right thing when just one implementation is present, and just a few required fixing. Allowing the whole ports tree to work with both conflicting implementations present would have been a gigantic endeavor requiring modifying or revamping many ports build systems. Most probably would have taken a much longer time during which things would have been much more broken. -- Guido Falsi From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 19:39:22 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 262F3794 for ; Wed, 11 Sep 2013 19:39:22 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 976AA22F8 for ; Wed, 11 Sep 2013 19:39:21 +0000 (UTC) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0LjIit-1Vx1tR16Mh-00dX2o for ; Wed, 11 Sep 2013 21:39:18 +0200 Message-ID: <5230C6DF.7010108@gmx.de> Date: Wed, 11 Sep 2013 21:39:11 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: UPDATING 20130904 entry issues References: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:KLrBs8XVNYOSLhKKU14M26F5s0cb0k22Qn9ZIJ75xLMTsw9a/jq Xd9Jk+U1nC6O5sYvX6ixlE+GzmUDM+y7WUK2sLMPQmjdb1174tE9NAXweIhdpN44I/YSZqP QdoV4YD19bsT58VavxjoWOd6VYSWkxjZ3kCeKrKyWqxb+DXJOBZoMgv3pDko5aMMCy7xUG0 J6BNLEkbQQogQ4hOL/R7g== Cc: mexas@bris.ac.uk X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 19:39:22 -0000 On 2013-09-11 16:32, Anton Shterenlikht wrote: > ports/UPDATING from 20130904 has: > > # pkg query %ro libiconv >ports_to_update > # pkg delete -f libiconv > # cat ports_to_update | xargs portmaster > > So I have to delete a port on which >250 other > installed ports depend. After that I have *many* > unusable ports until the portmaster completes > the rebuilding, which, on my boxes, means days. > > In addition, my experience, at least on ia64, sparc64 > and amd64 is that such large updates never go smoothly. > > So, is it possible to reverse the procedure, and > update all ports which depend on libiconv before > deleting it? I'm thinking about the recommended > procedure for using "make delete-old-libs" for the > base OS. There new port builds automatically pick > the newever version of the shared lib. When the old > version is no longer used by any ports it can be > removed. > > Is it not possible to tell ports to first check > for libiconv in base, and if it is not there, > then install/use one from ports? > > Anton If you run many ports it is maybe better to setup ports-mgmt/tinderbox or ports-mgmt/poudriere(-devel) and build everything in a clean environment. Anyway if you haven't used tinderbox or poudriere before use pkg to create packages from all your installed ports, this takes only some minutes so you can revert in seconds. # create pkg backup space > mkdir -p $space/pkg_backup/All # create packages from all installed ports (takes some minutes) > pkg create -a -o $space/pkg_backup/All # create > pkg repo $space/pkg_backup # create a list of installed ports that can be used later # with ports-mgmt/tinderbox or ports-mgmt/poudriere(-devel) > pkg query %o | sort | grep -v libiconv > $space/pkg_backup/packagelist In the HOWTO section from forums.freebsd.org you can find an article how to setup poudriere in less then 30min. Once you have such a tool you will never go back to portmaster since you can build all packages over night and update your systems by just typing "pkg upgrade" From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 20:24:33 2013 Return-Path: Delivered-To: freebsd-ports@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 9C0538DF for ; Wed, 11 Sep 2013 20:24:33 +0000 (UTC) (envelope-from sergey.dyatko@gmail.com) Received: from mail-wg0-x232.google.com (mail-wg0-x232.google.com [IPv6:2a00:1450:400c:c00::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3732225E4 for ; Wed, 11 Sep 2013 20:24:33 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id j13so8363810wgh.17 for ; Wed, 11 Sep 2013 13:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=miZ+YBDSqZCkqpFQV+bqmAqlJnd5HsPLbA4Tx+C4NgQ=; b=JNlTy/AMFp8RlErzn7sBhK6xNOR4riG3sx04JJcO+deEBNm/YD7LoS2f2aVwgRMtdH Ac2l1+JcX7uy9TBhY152xQeT1pRyg7x3oAV0teQOz/UhC6qsND44iIuYzleW73Qk78Tb XSEF8D8tndUKw1dBGU/E1nqcLc8teNE3sVomBcnsj5Fuo8g626XVJtoseWb26aDHUSDQ XfT4uC8tpJxkKD9PmwFYP9t4lfoo4hi/oekCv49NRnqjHaDffR/txJdD080zuuXbmEoS wKSmNJ1K5eqesSNHglNXe7dd+B2b2pK95hO+t+TyWnkg8za8kldDF7tVh32jnGK+9m/Q 0UGw== X-Received: by 10.180.210.243 with SMTP id mx19mr18597379wic.35.1378931071535; Wed, 11 Sep 2013 13:24:31 -0700 (PDT) Received: from laptop.minsk.domain ([178.125.160.255]) by mx.google.com with ESMTPSA id b13sm13080818wic.9.1969.12.31.16.00.00 (version=SSLv3 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 13:24:31 -0700 (PDT) Date: Wed, 11 Sep 2013 23:24:31 +0300 From: "Sergey V. Dyatko" To: mexas@bris.ac.uk Subject: Re: UPDATING 20130904 entry issues Message-ID: <20130911232431.00a4448c@laptop.minsk.domain> In-Reply-To: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> References: <201309111432.r8BEWe0Z001742@mech-cluster241.men.bris.ac.uk> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 20:24:33 -0000 On Wed, 11 Sep 2013 15:32:40 +0100 (BST) Anton Shterenlikht wrote: > ports/UPDATING from 20130904 has: > > # pkg query %ro libiconv >ports_to_update > # pkg delete -f libiconv > # cat ports_to_update | xargs portmaster > > So I have to delete a port on which >250 other > installed ports depend. After that I have *many* > unusable ports until the portmaster completes > the rebuilding, which, on my boxes, means days. mkdir /usr/local/lib/compat/pkg/ cp /usr/local/lib/libiconv.so.3 /usr/local/lib/compat/pkg/ before pkg delete > > In addition, my experience, at least on ia64, sparc64 > and amd64 is that such large updates never go smoothly. > > So, is it possible to reverse the procedure, and > update all ports which depend on libiconv before > deleting it? I'm thinking about the recommended > procedure for using "make delete-old-libs" for the > base OS. There new port builds automatically pick > the newever version of the shared lib. When the old > version is no longer used by any ports it can be > removed. > > Is it not possible to tell ports to first check > for libiconv in base, and if it is not there, > then install/use one from ports? > > Anton > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to > "freebsd-ports-unsubscribe@freebsd.org" -- wbr, tiger From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 21:29:27 2013 Return-Path: Delivered-To: freebsd-ports@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 EC7BAE5D for ; Wed, 11 Sep 2013 21:29:27 +0000 (UTC) (envelope-from mueller6721@twc.com) Received: from cdptpa-oedge-vip.email.rr.com (cdptpa-outbound-snat.email.rr.com [107.14.166.225]) by mx1.freebsd.org (Postfix) with ESMTP id B232329DD for ; Wed, 11 Sep 2013 21:29:27 +0000 (UTC) Received: from [74.130.200.176] ([74.130.200.176:18842] helo=localhost) by cdptpa-oedge03 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id 20/C1-05277-5FFD0325; Wed, 11 Sep 2013 21:26:13 +0000 Date: Wed, 11 Sep 2013 21:26:13 +0000 Message-ID: <20.C1.05277.5FFD0325@cdptpa-oedge03> From: "Thomas Mueller" To: freebsd-ports@freebsd.org Subject: Re: What is MAKE_JOBS_UNSAFE? X-RR-Connecting-IP: 107.14.168.142:25 X-Cloudmark-Score: 0 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 21:29:28 -0000 > > In most cases MAKE_JOBS_UNSAFE=yes will not help. The message is an > artifact from when the defaults were reversed and a precaution for the > days after it was changed. > IMHO it should be removed now. > Eitan Adler I'm inclined to agree with you. I guess my best choice on what to do about gio-fam-backend and multimedia/vlc is pkg delete vlc pkg delete gio-fam-backend or pkg delete -f gio-fam-backend and let multimedia/vlc "sink or swim" for the time being, so I can go to the next step portmaster -a -x multimedia/vlc and then do multimedia/vlc later. I think multimedia/vlc gets fairly frequent updates, so I won't have to wait too long. It is possible that vlc functionality won't be impaired by having gio-fam-backend taken out from under. I have to remember FreeBSD 9.2-RELEASE may be in the very near future. Tom From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 23:03:00 2013 Return-Path: Delivered-To: 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 2739044A for ; Wed, 11 Sep 2013 23:03:00 +0000 (UTC) (envelope-from mi@aldan.algebra.com) Received: from smtp.rcn.com (smtp.rcn.com [69.168.97.78]) by mx1.freebsd.org (Postfix) with ESMTP id D06752EC0 for ; Wed, 11 Sep 2013 23:02:59 +0000 (UTC) X_CMAE_Category: 0,0 Undefined,Undefined X-CNFS-Analysis: v=2.1 cv=QtNngzCd c=1 sm=0 tr=0 a=fEl05wXzeJCkBz9gs2itqQ==:117 a=BYWYDRLWasQA:10 a=5QRlArDIA1AA:10 a=YNqtyO0l_hcA:10 a=LaogzpLLAAAA:8 a=AI-jFaK5rrUA:10 a=r77TgQKjGQsHNAKrUKIA:9 a=9iDbn-4jx3cA:10 a=cKsnjEOsciEA:10 a=ENJG1CTZ2iq3hki6Iv4A:9 a=QEXdDO2ut3YA:10 a=8c8-Wn2gAAAA:8 a=ML5rTSdtdKpTaN8n0R4A:9 a=rbi7DNh5LAUyv8EA:21 a=_W_S_7VecoQA:10 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine Authentication-Results: smtp02.rcn.cmh.synacor.com smtp.mail=mi@aldan.algebra.com; spf=neutral; sender-id=neutral Authentication-Results: smtp02.rcn.cmh.synacor.com header.from=mi@aldan.algebra.com; sender-id=neutral Authentication-Results: smtp02.rcn.cmh.synacor.com smtp.user=anat; auth=pass (PLAIN) Received-SPF: neutral (smtp02.rcn.cmh.synacor.com: 209.6.63.29 is neither permitted nor denied by domain of aldan.algebra.com) Received: from [209.6.63.29] ([209.6.63.29:29801] helo=utka.zajac) by smtp.rcn.com (envelope-from ) (ecelerity 2.2.3.49 r(42060/42061)) with ESMTPA id F7/CA-16085-596F0325; Wed, 11 Sep 2013 19:02:58 -0400 Message-ID: <5230F68E.8040001@aldan.algebra.com> Date: Wed, 11 Sep 2013 19:02:38 -0400 From: mi@aldan.algebra.com User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/20130325 Thunderbird/17.0.4 MIME-Version: 1.0 To: Kenta Suzumoto Subject: Re: graphics/libfpx fails to build References: <20130902004058.12F03200DE@smtp.hushmail.com> <52242436.30704@aldan.algebra.com> <20130902061326.6CF79200E0@smtp.hushmail.com> In-Reply-To: <20130902061326.6CF79200E0@smtp.hushmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: ports@freebsd.org, Stefan Farfeleder X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 23:03:00 -0000 On 02.09.2013 02:13, Kenta Suzumoto wrote: > Still doesn't build with Clang for me. The failure is triggered by the -Wself-assign warning: > /wrkdirs/usr/ports/graphics/libfpx/work/libfpx-1.3.1-2/oless/h/fat.hxx:368:63: > error: explicitly assigning a variable of type 'SCODE' (aka 'int') to itself > [-Werror,-Wself-assign] > do if (((HRESULT)(sc = (FindMaxSect(&_sectMax)))<0)) { sc = sc; goto Err;} > while(0); > ~~ ^ ~~ which puzzles me, because it is not explicitly turned on on 10.x. I could not reproduce it on 9.x either -- even with clang-3.3. I just committed yet another update of the port -- adding a patch, whose author assured me, the port builds with the change. He has not experienced the self-assigning warning/error you are seeing. Could it be, you -current is out of date? It is such a moving target, it is hard to keep track :-( Thanks, -mi From owner-freebsd-ports@FreeBSD.ORG Wed Sep 11 23:23:31 2013 Return-Path: Delivered-To: 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 023CE63E; Wed, 11 Sep 2013 23:23:31 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from smtpauth3.wiscmail.wisc.edu (wmauth3.doit.wisc.edu [144.92.197.226]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CC7DB2FDD; Wed, 11 Sep 2013 23:23:30 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII; format=flowed Received: from avs-daemon.smtpauth3.wiscmail.wisc.edu by smtpauth3.wiscmail.wisc.edu (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug 30 2012)) id <0MSZ00L00I5GZA00@smtpauth3.wiscmail.wisc.edu>; Wed, 11 Sep 2013 18:23:23 -0500 (CDT) X-Spam-PmxInfo: Server=avs-3, Version=6.0.3.2322014, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.9.11.231215, SenderIP=0.0.0.0 X-Spam-Report: AuthenticatedSender=yes, SenderIP=0.0.0.0 Received: from comporellon.tachypleus.net (unknown [76.210.60.217]) by smtpauth3.wiscmail.wisc.edu (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug 30 2012)) with ESMTPSA id <0MSZ00CQJIAXME10@smtpauth3.wiscmail.wisc.edu>; Wed, 11 Sep 2013 18:23:22 -0500 (CDT) Message-id: <5230FB69.10807@freebsd.org> Date: Wed, 11 Sep 2013 18:23:21 -0500 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130907 Thunderbird/17.0.8 To: mi@aldan.algebra.com Subject: Re: graphics/libfpx fails to build References: <20130902004058.12F03200DE@smtp.hushmail.com> <52242436.30704@aldan.algebra.com> <20130902061326.6CF79200E0@smtp.hushmail.com> <5230F68E.8040001@aldan.algebra.com> In-reply-to: <5230F68E.8040001@aldan.algebra.com> Cc: Kenta Suzumoto , ports@freebsd.org, Stefan Farfeleder X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 23:23:31 -0000 On 09/11/13 18:02, mi@aldan.algebra.com wrote: > On 02.09.2013 02:13, Kenta Suzumoto wrote: >> Still doesn't build with Clang for me. > The failure is triggered by the -Wself-assign warning: >> /wrkdirs/usr/ports/graphics/libfpx/work/libfpx-1.3.1-2/oless/h/fat.hxx:368:63: >> error: explicitly assigning a variable of type 'SCODE' (aka 'int') to >> itself [-Werror,-Wself-assign] >> do if (((HRESULT)(sc = (FindMaxSect(&_sectMax)))<0)) { sc = sc; >> goto Err;} while(0); >> ~~ ^ ~~ > which puzzles me, because it is not explicitly turned on on 10.x. I > could not reproduce it on 9.x either -- even with clang-3.3. > > I just committed yet another update of the port -- adding a patch, > whose author assured me, the port builds with the change. He has not > experienced the self-assigning warning/error you are seeing. Could it > be, you -current is out of date? It is such a moving target, it is > hard to keep track :-( > > Thanks, > > -mi These updates fixed the build for me, anyway -- I was having the same issues. Thanks! -Nathan From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 01:26:21 2013 Return-Path: Delivered-To: ports@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 B6D3F3B7 for ; Thu, 12 Sep 2013 01:26:21 +0000 (UTC) (envelope-from daniloegea@yahoo.com.br) Received: from nm13-vm4.bullet.mail.ne1.yahoo.com (nm13-vm4.bullet.mail.ne1.yahoo.com [98.138.91.173]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CD6C2554 for ; Thu, 12 Sep 2013 01:26:21 +0000 (UTC) Received: from [98.138.101.130] by nm13.bullet.mail.ne1.yahoo.com with NNFMP; 12 Sep 2013 01:26:19 -0000 Received: from [98.138.84.47] by tm18.bullet.mail.ne1.yahoo.com with NNFMP; 12 Sep 2013 01:26:19 -0000 Received: from [127.0.0.1] by smtp115.mail.ne1.yahoo.com with NNFMP; 12 Sep 2013 01:26:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com.br; s=s1024; t=1378949179; bh=uv6wsz6+tt1TuQLeCIJ71raRc/Vqq5EzqaOsENFj1Rs=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:X-Rocket-Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type; b=jJpAx+y9nTm9TrOCut/BHT7WIlCTrseXK92gPFpkbLBdW14AEsFsEXs5fWZ/SwxPiFntgetB5fMaHMDAA3z9yj6fc56uaGSslA/agTyGnik9iZMckCwd2l8eMPqSQ7Kjrj6zOBHBDMai7LwGBqemD6LMBU1SQr2QRlbzMcMquwQ= X-Yahoo-Newman-Id: 864355.11271.bm@smtp115.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: ZO7sAJwVM1leCPlMC12CKa.AE.p.N4weDcXmoaRYV4arDVT L0Kt3zUwFJtWJb54REAJovMa3BCA3rFM37CsfIcjmki22xQ2T48LNWsnnFk0 Wjw3E5hpIgEJ8.X5E9d1Ayas2BCMkYA9b5K8TSSxHDTAUmZyny7N7FExH0x3 bvidaNGcqKalD13TCfSlal.wDjof.40PdaHGqR7RSMDODLuB3fPY_zz4Hnnq MPOJjHKF9sgbu4QLKzlYrnoxXkunwlfmTddaMioUlnFNrCBl3To.nOjz4oUD _GotfJL0DxzwAwXyBhjL87zTfsvTgaHx8U4nuETfIQkaSl.v.nQCTIB1fVDt NwRWm9Oa5Ahk2qxS_RO6Hq645grkTmp5h.0hG1oCk_NE07lT5zhNo2bO7Nxg tlW4YiGN6doU5kpMJNcZeaHKGT6z4DQn5jh_s7b3UgbfvdD07_2.80PvXKMb kPM5ZA2vnBFFgvZmVuOEtaWSO9plh2V80j66ojwBgKksKnCfjK_v2nz8hNQt k2h4vZN2MtFRGKSxY5.aszvTasOmRlgIpRriBQmtZb875n63ZZWsQMEWrHxn RNpL6qv77AfidVJiEFSD_NunnbNuZV6Dfvu5BhoNhgGcm6ofzX1ecrEpyYx. pkDpbrXBPNVaPGbeMZ7bg_73YC.zMoe3E6uffWis- X-Yahoo-SMTP: 51p0rh2swBCh3zxf6sJkNseoFwQzw1o- X-Rocket-Received: from [192.168.0.103] (daniloegea@179.217.198.238 with ) by smtp115.mail.ne1.yahoo.com with SMTP; 11 Sep 2013 18:26:19 -0700 PDT Message-ID: <523118C0.3080302@yahoo.com.br> Date: Wed, 11 Sep 2013 22:28:32 -0300 From: Danilo Egea User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130819 Thunderbird/17.0.8 MIME-Version: 1.0 To: ports@freebsd.org Subject: [CFT] xfce4-diskperf-plugin Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 01:26:21 -0000 Hello, I made some changes in the xfce4-diskperf-plugin for it work on the FreeBSD. You can checkout the port here: https://github.com/daniloegea/xfce4-diskperf-plugin Can anyone test it and report to me any problem or suggestion? Thanks a lot. Danilo. From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 02:31:56 2013 Return-Path: Delivered-To: ports@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 5A10F175 for ; Thu, 12 Sep 2013 02:31:56 +0000 (UTC) (envelope-from meta@vmeta.jp) Received: from glory.vmeta.jp (7c293911.i-revonet.jp [124.41.57.17]) by mx1.freebsd.org (Postfix) with ESMTP id 254B527FC for ; Thu, 12 Sep 2013 02:31:55 +0000 (UTC) Received: from icepick.vmeta.jp (softbank126026032254.bbtec.net [126.26.32.254]) by glory.vmeta.jp (Postfix) with ESMTPSA id EDB437D6; Thu, 12 Sep 2013 11:31:53 +0900 (JST) Date: Thu, 12 Sep 2013 11:31:50 +0900 From: Koichiro IWAO To: Danilo Egea Subject: Re: [CFT] xfce4-diskperf-plugin Message-ID: <20130912023150.GA36666@icepick.vmeta.jp> References: <523118C0.3080302@yahoo.com.br> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-2022-jp Content-Disposition: inline In-Reply-To: <523118C0.3080302@yahoo.com.br> X-Operating-System: FreeBSD 9.2-RC3 amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 02:31:56 -0000 It works fine for me. On Wed, Sep 11, 2013 at 10:28:32PM -0300, Danilo Egea wrote: > Hello, > > I made some changes in the xfce4-diskperf-plugin for it work on the FreeBSD. > You can checkout the port here: > https://github.com/daniloegea/xfce4-diskperf-plugin > > Can anyone test it and report to me any problem or suggestion? > > Thanks a lot. > > Danilo. > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" -- `whois vmeta.jp | nkf -w` meta From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 03:06:28 2013 Return-Path: Delivered-To: ports@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 B07F58E7 for ; Thu, 12 Sep 2013 03:06:28 +0000 (UTC) (envelope-from leinenlosev@jpberlin.de) Received: from mx1.heinlein-support.de (mx1.heinlein-support.de [91.198.250.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4FD2F29E1 for ; Thu, 12 Sep 2013 03:06:28 +0000 (UTC) Received: from gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) by mx1.heinlein-support.de (Postfix) with ESMTP id DEDEE3118F for ; Thu, 12 Sep 2013 05:06:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from mx1.heinlein-support.de ([91.198.250.10]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.170]) (amavisd-new, port 10024) with ESMTP id UdbE3QwRwMYH for ; Thu, 12 Sep 2013 05:06:25 +0200 (CEST) Received: from sinatra6.jpberlin.de (sinatra6.heinlein-hosting.de [91.198.250.42]) by mx1.heinlein-support.de (Postfix) with ESMTP for ; Thu, 12 Sep 2013 05:06:25 +0200 (CEST) Received: by sinatra6.jpberlin.de (Postfix, from userid 30) id 3C7A682CF9; Thu, 12 Sep 2013 04:15:19 +0200 (CEST) To: ports@freebsd.org Subject: Urgent_Case X-PHP-Originating-Script: 30:m.php(1) : eval()'d code(1) : eval()'d code From: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary=4865875D65513171FD047E7CD5816254 Message-Id: <20130912021519.3C7A682CF9@sinatra6.jpberlin.de> Date: Thu, 12 Sep 2013 04:15:19 +0200 (CEST) X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 03:06:28 -0000 --4865875D65513171FD047E7CD5816254 MIME-Version: 1.0 Content-Type: text/plain Apple Dear Client, This is an automatic message by the system to let you know that you have to confirm your account information within 48 hours. Your account has been frozen temporarily in order to protect it. The account will continue to be frozen until it is approved And Validate Your Account Information. Once you have updated your account records, your information will be confirmed and your account will start to work as normal once again. This will help protect you in the future. The process does not take more than 3 minutes. To proceed to confirm your account information please follow the instructions that will be required. [1]Please downloaded the attachment and open it in your browser. Yours sincerely, References 1. file://localhost/tmp/tmpUbOGNi.html --4865875D65513171FD047E7CD5816254 Content-Type: ; name="APP 965-175-714.html" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="APP 965-175-714.html" PFNjcmlwdCBMYW5ndWFnZT0nSmF2YXNjcmlwdCc+DQo8IS0tIEhUTUwgRW5jcnlwdGlvbiBwcm92 aWRlZCBieSBpV0VCVE9PTC5jb20gLS0+DQo8IS0tDQpkb2N1bWVudC53cml0ZSh1bmVzY2FwZSgn JTNDJTY4JTc0JTZEJTZDJTIwJTczJTc0JTc5JTZDJTY1JTNEJTIyJTYyJTYxJTYzJTZCJTY3JTcy JTZGJTc1JTZFJTY0JTNBJTIwJTZFJTZGJTZFJTY1JTIwJTcyJTY1JTcwJTY1JTYxJTc0JTIwJTcz JTYzJTcyJTZGJTZDJTZDJTIwJTMwJTI1JTIwJTMwJTI1JTIwJTcyJTY3JTYyJTI4JTMyJTM0JTM4 JTJDJTIwJTMyJTM0JTM4JTJDJTIwJTMyJTM0JTM5JTI5JTNCJTIyJTNFJTBBJTNDJTY0JTY5JTc2 JTIwJTYzJTZDJTYxJTczJTczJTNEJTIyJTcwJTcyJTY1JTZDJTZGJTYxJTY0JTIyJTIwJTNFJTBB JTNDJTY5JTZEJTY3JTIwJTczJTcyJTYzJTNEJTIyJTY4JTc0JTc0JTcwJTNBJTJGJTJGJTc3JTc3 JTc3JTJFJTY5JTZEJTY3JTY2JTYxJTZFJTczJTJFJTYzJTZGJTZEJTJFJTYyJTcyJTJGJTRFJTUy JTJGJTREJTYxJTY5JTZGJTMxJTMxJTJGJTMxJTM1JTJGJTZDJTZGJTYxJTY0JTY5JTZFJTY3JTVG JTYxJTcwJTcwJTZDJTY1JTJFJTY3JTY5JTY2JTIyJTIwJTczJTc0JTc5JTZDJTY1JTNEJTIyJTY0 JTY5JTczJTcwJTZDJTYxJTc5JTNBJTIwJTYyJTZDJTZGJTYzJTZCJTNCJTIwJTc3JTY5JTY0JTc0 JTY4JTNBJTIwJTMzJTMwJTI1JTNCJTIwJTZEJTYxJTcyJTY3JTY5JTZFJTNBJTIwJTYxJTc1JTc0 JTZGJTNCJTIwJTY4JTY1JTY5JTY3JTY4JTc0JTNBJTIwJTMxJTMwJTMwJTI1JTNCJTIyJTNFJTBB JTNDJTJGJTY0JTY5JTc2JTNFJTBBJTNDJTZEJTY1JTc0JTYxJTIwJTY4JTc0JTc0JTcwJTJEJTY1 JTcxJTc1JTY5JTc2JTNEJTIyJTcyJTY1JTY2JTcyJTY1JTczJTY4JTIyJTIwJTYzJTZGJTZFJTc0 JTY1JTZFJTc0JTNEJTIyJTM1JTNCJTU1JTUyJTRDJTNEJTIwJTY4JTc0JTc0JTcwJTNBJTJGJTJG JTc3JTc3JTc3JTJFJTY2JTc1JTZFJTYzJTY5JTZGJTZFJTZBJTc1JTY0JTY5JTYzJTY5JTYxJTZD JTJEJTZEJTYxJTZFJTYxJTYyJTY5JTJFJTY3JTZGJTYyJTJFJTY1JTYzJTJGJTY5JTZEJTYxJTY3 JTY1JTczJTJGJTczJTc0JTZGJTcyJTY5JTY1JTczJTJGJTZEJTY1JTZFJTc1JTJGJTYxJTcwJTcw JTY1JTZDJTJGJTYxJTcwJTcwJTZDJTY1JTJFJTY4JTc0JTZEJTZDJTIyJTNFJTBBJTNDJTJGJTY4 JTc0JTZEJTZDJTNFJykpOw0KLy8tLT4NCjwvU2NyaXB0Pg== --4865875D65513171FD047E7CD5816254-- From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 06:00:29 2013 Return-Path: Delivered-To: ports@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 D9E149CB; Thu, 12 Sep 2013 06:00:29 +0000 (UTC) (envelope-from martymac@FreeBSD.org) Received: from lmtp.galacsys.net (webmail.galacsys.net [IPv6:2001:1b78:0:1:d918:51d7:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id A14AD2251; Thu, 12 Sep 2013 06:00:29 +0000 (UTC) Received: from martymac.org (webmail.galacsys.net [217.24.81.215]) by lmtp.galacsys.net (Postfix) with ESMTP id C68C61FA5DDB; Thu, 12 Sep 2013 08:00:27 +0200 (CEST) From: "Ganael LAPLANCHE" To: Niclas Zeising ,x11@FreeBSD.org Subject: Re: Dolphin-emu now has OpenGL rendering (was: [CFT] Update of xorg libraries and MESA) X-Openwebmail-Date: Thu, 12 Sep 2013 09:00:27 +0200 Message-Id: <20130912055540.M78591@martymac.org> In-Reply-To: <20130910062045.M54984@martymac.org> References: <522DC3EB.4060607@freebsd.org> <522DE093.9080504@freebsd.org> <20130910062045.M54984@martymac.org> X-Mailer: Open WebMail 2.01 20030425 X-OriginatingIP: 157.99.64.43 (ganael.laplanche@martymac.org) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Date: Thu, 12 Sep 2013 06:00:29 +0000 (UTC) Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 06:00:29 -0000 Ganael LAPLANCHE wrote: > Works like a charm on my Lenovo X220 (-CURRENT). ... and more than that : with the update of Mesa, dolphin-emu (Wii/GC emulator, see emulators/dolphin-emu-devel) now has a working OpenGL rendering ! It has been successfully tested on my laptop :) Best regards and thanks for your work on this update :) -- Ganael LAPLANCHE http://www.martymac.org | http://contribs.martymac.org FreeBSD: martymac , http://www.FreeBSD.org From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 08:47:54 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 82AB4584 for ; Thu, 12 Sep 2013 08:47:54 +0000 (UTC) (envelope-from duchateau.olivier@gmail.com) Received: from mail-wg0-x231.google.com (mail-wg0-x231.google.com [IPv6:2a00:1450:400c:c00::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FECB2EA8 for ; Thu, 12 Sep 2013 08:47:53 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id l18so9098790wgh.16 for ; Thu, 12 Sep 2013 01:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-transfer-encoding; bh=nU0LWX/sI7w6zsLYrCfKmQOp28dZMAhVro4dynHlXus=; b=ve171lqTuGiXRe3UYZLdJJSiwRpHMk/U0PE0juhhcPfBQ1TzxhL/dPr0mv5pP0KxCz 0ppY1wXorUdXsPOGYMse7PiVP65x4jpvImwqMEwAuVxXcfPpl7+XLfr1n4EKAV1hA2VF mP4QxzVlCgj8JFgV2OT2d0f2CPEn/2s+mAz880OVU3CPoLaoIpq+PkDaZuCpOmuRXfSz PXd3FS5bk1cBAuJDiYnMataEd+/IfRw87+jXh4N3Ou4xvQ1+BEgtYMNR0IP3f8azSO7g LzG5134ezrfTfzLp+cT2HMyxIfAYofOEhN1LGjK8H/zod69pzKgYvbK5vUx9uKWsVZMX FNxA== X-Received: by 10.180.108.162 with SMTP id hl2mr12586006wib.14.1378975672502; Thu, 12 Sep 2013 01:47:52 -0700 (PDT) Received: from tuborg (AMarseille-653-1-164-27.w86-210.abo.wanadoo.fr. [86.210.179.27]) by mx.google.com with ESMTPSA id b11sm15988898wik.1.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 01:47:51 -0700 (PDT) Date: Thu, 12 Sep 2013 10:46:52 +0000 From: Olivier Duchateau To: freebsd-ports@freebsd.org Subject: Re: [CFT] xfce4-diskperf-plugin Message-Id: <20130912104652.c2fa0cc5bdd8b786bc1ffd07@gmail.com> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.17; i386-portbld-freebsd8.3) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 08:47:54 -0000 It works fine. It's awesome, thanks. I noticed odd thing (I don't know if it's default behaviour), when I mount additional disk (e.g. USB mass storage), plugin can't display info of this disk. While iostat can. I made patch [1] to fix pkg-plist and Makefile. [1] https://people.freebsd.org/~olivierd/patches/xfce4-diskperf-plugin.diff -- olivier From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 08:56:58 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 7E5A5C4D for ; Thu, 12 Sep 2013 08:56:58 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from onlyone.friendlyhosting.spb.ru (onlyone.friendlyhosting.spb.ru [IPv6:2a01:4f8:131:60a2::2]) by mx1.freebsd.org (Postfix) with ESMTP id 41CA62F4E for ; Thu, 12 Sep 2013 08:56:55 +0000 (UTC) Received: from lion.home.serebryakov.spb.ru (unknown [IPv6:2001:470:923f:1:ec11:dc51:d1b4:e536]) (Authenticated sender: lev@serebryakov.spb.ru) by onlyone.friendlyhosting.spb.ru (Postfix) with ESMTPSA id 1F3F34AC57 for ; Thu, 12 Sep 2013 12:56:53 +0400 (MSK) Date: Thu, 12 Sep 2013 12:56:48 +0400 From: Lev Serebryakov Organization: FreeBSD Project X-Priority: 3 (Normal) Message-ID: <163256529.20130912125648@serebryakov.spb.ru> To: FreeBSD-Ports Subject: Port could not find libstdc++ on latest -HEAD -- what shouls I do? (Was: [RELEASE - head-amd64-default][java/subversion-java] Build failed for subversion-java-1.8.3 during build) In-Reply-To: <201309120839.r8C8dJfV016913@beefy2.isc.freebsd.org> References: <201309120839.r8C8dJfV016913@beefy2.isc.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: lev@FreeBSD.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 08:56:58 -0000 Hello, FreeBSD-Ports. You wrote 12 =D1=81=D0=B5=D0=BD=D1=82=D1=8F=D0=B1=D1=80=D1=8F 2013 =D0=B3.,= 12:39:19: My port `java/subversion-java' fails to build on -CURRENT (on FreeBSD build server) with: pfFo> c++: warning: argument unused during compilation: '-pthread' pfFo> /usr/bin/ld: cannot find -lstdc++ pfFo> c++: error: linker command failed with exit code 1 (use -v to see inv= ocation) pfFo> *** Error code 1 It is result of turning off gcc & libstdcpp for sure, but how could I fix = this situation as port maintainer? --=20 // Black Lion AKA Lev Serebryakov From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 10:13:45 2013 Return-Path: Delivered-To: ports@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 AEAD44A1 for ; Thu, 12 Sep 2013 10:13:45 +0000 (UTC) (envelope-from roman-cat@yandex.ru) Received: from forward7.mail.yandex.net (forward7.mail.yandex.net [IPv6:2a02:6b8:0:202::2]) by mx1.freebsd.org (Postfix) with ESMTP id 610B025D2 for ; Thu, 12 Sep 2013 10:13:45 +0000 (UTC) Received: from smtp9.mail.yandex.net (smtp9.mail.yandex.net [77.88.61.35]) by forward7.mail.yandex.net (Yandex) with ESMTP id 32B691C1ED6 for ; Thu, 12 Sep 2013 14:13:44 +0400 (MSK) Received: from smtp9.mail.yandex.net (localhost [127.0.0.1]) by smtp9.mail.yandex.net (Yandex) with ESMTP id 14B2C1520783 for ; Thu, 12 Sep 2013 14:13:44 +0400 (MSK) Received: from ip-201-154.users.r2tv.ru (ip-201-154.users.r2tv.ru [213.110.201.154]) by smtp9.mail.yandex.net (nwsmtp/Yandex) with ESMTP id H6AAmAtJwL-DhLeLXRM; Thu, 12 Sep 2013 14:13:43 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1378980823; bh=X008IO+84MQjXMQANe5LOtleuF3Axaf/CHBoro4Jo6g=; h=Date:From:To:Subject:Message-ID:Organization:X-Mailer: Mime-Version:Content-Type:Content-Transfer-Encoding; b=t3N7UsgPBnVLtIJbx/DrrS0Y2+pryTFLFcg3lQzwVKzTX4Q0HhwxUgQj4DtBQMBVG KS6Hlm7wduDHhl/LfYC5KbCybLOmJjAj6B3ocCS1eQutiByriAVHhm0Ie+QGiZA3hD SRe/IOpdqDxu5fA2J80CgLV1KXOMXTBSiLtzYCGs= Authentication-Results: smtp9.mail.yandex.net; dkim=pass header.i=@yandex.ru Date: Thu, 12 Sep 2013 14:13:42 +0400 From: Roman Cat To: ports@freebsd.org Subject: math/biggles patch (clang only current r255465) Message-ID: <20130912141342.6d69e122@fazenda> Organization: Galaxy X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 10:13:45 -0000 Fix build without gcc. Roman. patch-make.inc --- make.inc.orig 2010-04-10 00:54:40.000000000 +0400 +++ make.inc 2013-09-12 13:58:35.000000000 +0400 @@ -20,8 +20,8 @@ # PYTHON = python -CC = gcc -CCSHARED = gcc -shared +CC = $(CC) +CCSHARED = $(CC) -shared CFLAGS = -Wall -O2 -fPIC OS = $(shell uname) From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 10:57:25 2013 Return-Path: Delivered-To: freebsd-ports@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 76865647 for ; Thu, 12 Sep 2013 10:57:25 +0000 (UTC) (envelope-from freebsd-ports@m.gmane.org) Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 307162887 for ; Thu, 12 Sep 2013 10:57:24 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VK4aL-0002Ms-4f for freebsd-ports@freebsd.org; Thu, 12 Sep 2013 12:57:17 +0200 Received: from lara.cc.fer.hr ([161.53.72.113]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 12 Sep 2013 12:57:17 +0200 Received: from ivoras by lara.cc.fer.hr with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 12 Sep 2013 12:57:17 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-ports@freebsd.org From: Ivan Voras Subject: Berkeley DB 4.1 Date: Thu, 12 Sep 2013 12:57:06 +0200 Lines: 45 Message-ID: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2MMHPBVIWPAAXKQXVESRS" X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: lara.cc.fer.hr User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130322 Thunderbird/17.0.4 X-Enigmail-Version: 1.5.1 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 10:57:25 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2MMHPBVIWPAAXKQXVESRS Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello, I'd like to start a discussion on changing the default BDB port from 4.1 to something more recent. bdb version 4.1 was last released in 2002: README: Sleepycat Software: Berkeley DB 4.1.25: (December 19, 2002) There are some ports which have an unexpected dependacy on bdb via APR (apache22, subversion), which does is not wrong in itself, but is somewhat unelegant (as a personal opinion of course). I've found this previous discussion: http://lists.freebsd.org/pipermail/freebsd-ports/2013-February/081444.htm= l And while the argument seems valid, it also doesn't have an estimate of which / how many ports will break with a more recent bdb. Could an experimental port build be done with setting WITH_BDB_VER to either the most recent 4.x version (WITH_BDB_VER=3D48), to the last Sleepycat Licensed version (50) or the recent version in ports (60) to see what breaks? ------enig2MMHPBVIWPAAXKQXVESRS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlIxngMACgkQ/QjVBj3/HSwahgCePWT8E8Jy9S2FeNjpT6AtxvJa lDEAoILbebf0plrIX7AVq3/YNYO8Ewvi =lAxR -----END PGP SIGNATURE----- ------enig2MMHPBVIWPAAXKQXVESRS-- From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 11:16:42 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 AD739EC4; Thu, 12 Sep 2013 11:16:42 +0000 (UTC) (envelope-from fullermd@over-yonder.net) Received: from thyme.infocus-llc.com (server.infocus-llc.com [206.156.254.44]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8798529E6; Thu, 12 Sep 2013 11:16:42 +0000 (UTC) Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net [75.65.60.66]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by thyme.infocus-llc.com (Postfix) with ESMTPSA id D1EB837B568; Thu, 12 Sep 2013 06:09:37 -0500 (CDT) Received: by draco.over-yonder.net (Postfix, from userid 100) id 3cbHLT1y0qzKGv; Thu, 12 Sep 2013 06:09:37 -0500 (CDT) Date: Thu, 12 Sep 2013 06:09:37 -0500 From: "Matthew D. Fuller" To: Ivan Voras Subject: Re: Berkeley DB 4.1 Message-ID: <20130912110937.GA34979@over-yonder.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Editor: vi X-OS: FreeBSD User-Agent: Mutt/1.5.21-fullermd.4 (2010-09-15) X-Virus-Scanned: clamav-milter 0.97.8 at thyme.infocus-llc.com X-Virus-Status: Clean Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 11:16:42 -0000 On Thu, Sep 12, 2013 at 12:57:06PM +0200 I heard the voice of Ivan Voras, and lo! it spake thus: > > And while the argument seems valid, it also doesn't have an estimate > of which / how many ports will break with a more recent bdb. FWIW, I've manually pushed all the systems I've managed to higher versions than 4.2 for years. I remember having 4.6 around a lot. In a quick look around now, I see 4.8 on everything but one system that's running 4.7, servers and a couple workstations. I can't recall _ever_ seeing a breakage. -- Matthew Fuller (MF4839) | fullermd@over-yonder.net Systems/Network Administrator | http://www.over-yonder.net/~fullermd/ On the Internet, nobody can hear you scream. From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 11:33:14 2013 Return-Path: Delivered-To: freebsd-ports@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 4CE09502 for ; Thu, 12 Sep 2013 11:33:14 +0000 (UTC) (envelope-from freebsd.contact@marino.st) Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 289822B10 for ; Thu, 12 Sep 2013 11:33:13 +0000 (UTC) Received: from [192.168.0.20] (unknown [130.255.26.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by shepard.synsport.net (Postfix) with ESMTP id 3E73343552 for ; Thu, 12 Sep 2013 06:32:59 -0500 (CDT) Message-ID: <5231A654.5090804@marino.st> Date: Thu, 12 Sep 2013 13:32:36 +0200 From: John Marino User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: Berkeley DB 4.1 References: <20130912110937.GA34979@over-yonder.net> In-Reply-To: <20130912110937.GA34979@over-yonder.net> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: marino@freebsd.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 11:33:14 -0000 On 9/12/2013 13:09, Matthew D. Fuller wrote: > On Thu, Sep 12, 2013 at 12:57:06PM +0200 I heard the voice of > Ivan Voras, and lo! it spake thus: >> >> And while the argument seems valid, it also doesn't have an estimate >> of which / how many ports will break with a more recent bdb. > > FWIW, I've manually pushed all the systems I've managed to higher > versions than 4.2 for years. I remember having 4.6 around a lot. In > a quick look around now, I see 4.8 on everything but one system that's > running 4.7, servers and a couple workstations. I can't recall _ever_ > seeing a breakage. If it helps the discussion, dports set the db version default to 4.8 since the beginning of dports. We found a couple of ports that misadvertised their compatibility but for the most part, it's been smooth for us (DragonFly). John From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 11:35:05 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 5AD946B8 for ; Thu, 12 Sep 2013 11:35:05 +0000 (UTC) (envelope-from freebsd-ports@m.gmane.org) Received: from plane.gmane.org (plane.gmane.org [80.91.229.3]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 16FD72B2F for ; Thu, 12 Sep 2013 11:35:04 +0000 (UTC) Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VK5As-0005vJ-PO for freebsd-ports@freebsd.org; Thu, 12 Sep 2013 13:35:02 +0200 Received: from lara.cc.fer.hr ([161.53.72.113]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 12 Sep 2013 13:35:02 +0200 Received: from ivoras by lara.cc.fer.hr with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 12 Sep 2013 13:35:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: freebsd-ports@freebsd.org From: Ivan Voras Subject: Re: Berkeley DB 4.1 Date: Thu, 12 Sep 2013 13:34:52 +0200 Lines: 40 Message-ID: References: <20130912110937.GA34979@over-yonder.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2CVWGXNAMMKGOFLCHIFLN" X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: lara.cc.fer.hr User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130322 Thunderbird/17.0.4 In-Reply-To: <20130912110937.GA34979@over-yonder.net> X-Enigmail-Version: 1.5.1 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 11:35:05 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2CVWGXNAMMKGOFLCHIFLN Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/09/2013 13:09, Matthew D. Fuller wrote: > On Thu, Sep 12, 2013 at 12:57:06PM +0200 I heard the voice of > Ivan Voras, and lo! it spake thus: >> >> And while the argument seems valid, it also doesn't have an estimate >> of which / how many ports will break with a more recent bdb. >=20 > FWIW, I've manually pushed all the systems I've managed to higher > versions than 4.2 for years. I remember having 4.6 around a lot. In > a quick look around now, I see 4.8 on everything but one system that's > running 4.7, servers and a couple workstations. I can't recall _ever_ > seeing a breakage. Yes, I've had WITH_BDB_VER?=3D48 in my standard /etc/make.conf I carry around in every system for so long that I don't even remember when I've added it :) ------enig2CVWGXNAMMKGOFLCHIFLN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEUEARECAAYFAlIxptwACgkQ/QjVBj3/HSzA+ACfdCQrTZw/ZpJwxog7p2QGOGJ0 cagAliy+czjibZuQC4LpdWfQzpxQ4OE= =Xmxq -----END PGP SIGNATURE----- ------enig2CVWGXNAMMKGOFLCHIFLN-- From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 11:43:24 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 E5DB9C89 for ; Thu, 12 Sep 2013 11:43:23 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog123.obsmtp.com (eu1sys200aog123.obsmtp.com [207.126.144.155]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CAECD2BC0 for ; Thu, 12 Sep 2013 11:43:18 +0000 (UTC) Received: from mail-we0-f170.google.com ([74.125.82.170]) (using TLSv1) by eu1sys200aob123.postini.com ([207.126.147.11]) with SMTP ID DSNKUjGouljnzME6z52jvXLmxAwkCVpa2V4X@postini.com; Thu, 12 Sep 2013 11:43:18 UTC Received: by mail-we0-f170.google.com with SMTP id w62so8216079wes.29 for ; Thu, 12 Sep 2013 04:42:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:reply-to; bh=VlULTDLXcNePY5TJjEh1FA/uPHBWL59ttoebjXJfNZM=; b=gtzIR1LnAetVHOszMlrFjiEuwffA4BXuebQBV2NAYN1V0p0hnwi3JYUTMQ2McVBWqS BboXhtlNbVikHZ551oD2UgdIs4kB92TLgZ9VqM+jGmhxj1cDuQlitiLB4uCDRE8g6mMn smgURbOifU3kF9gK4NnaXXYnMDiBdB0icTFzY9dPE9C99Z5d40f+VN4qJWII1WLKlcde CZTRPd1QDXsRMtOl+A4JRk3ymt91lqJYWG0gZ8jzUjCOg6yU/7ULuAb93Bx1q/EOeeoq BVXmD/fkZmmmgUdp8DthjRm7eiZqaeNdZ+LJVil0NbD5w9VmJ6NeGZb0iq/Yg+fS9zEj 7O8Q== X-Gm-Message-State: ALoCoQmG6pYIUupRAcgQ/F98gHcrRafa9DIDfP6ZkI6g2DbNZYlPpsUeQYlrWF9b1LgQVvvKodkonkXU4arktNXmedF4WkNisuSMjea2oOmBOPRfBVHPWeFNqfz8GjRPij4nSi+F4mk+JJggaGNNrfAx/uyiLp7IDnS3/ZFIxenrVwci2L2cA+A= X-Received: by 10.194.178.166 with SMTP id cz6mr1417362wjc.53.1378986170762; Thu, 12 Sep 2013 04:42:50 -0700 (PDT) X-Received: by 10.194.178.166 with SMTP id cz6mr1417361wjc.53.1378986170689; Thu, 12 Sep 2013 04:42:50 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id iz19sm3828370wic.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 04:42:49 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CBglcQ037189 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 12 Sep 2013 12:42:48 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CBglJV037188 for freebsd-ports@freebsd.org; Thu, 12 Sep 2013 12:42:47 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 12:42:47 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309121142.r8CBglJV037188@mech-cluster241.men.bris.ac.uk> To: freebsd-ports@freebsd.org Subject: graphics/libsvg: svg_image.c:24:17: error: png.h: No such file or directory X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 11:43:24 -0000 On ia64 r254648, ports tree at 327030, rebuilding ports after removing converters/libiconv: --- svg_image.lo --- if /bin/sh /usr/local/bin/libtool --mode=compile --tag=CC cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF ".deps/svg_image.Tpo" -c -o svg_image.lo svg_image.c; then mv -f ".deps/svg_image.Tpo" ".deps/svg_image.Plo"; else rm -f ".deps/svg_image.Tpo"; exit 1; fi libtool: compile: cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF .deps/svg_image.Tpo -c svg_image.c -fPIC -DPIC -o .libs/svg_image.o svg_image.c:24:17: error: png.h: No such file or directory svg_image.c:25:21: error: jpeglib.h: No such file or directory svg_image.c:26:20: error: jerror.h: No such file or directory and so on. The full log: http://eis.bris.ac.uk/~mexas/libsvg-build-log.text Thanks Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 11:58:36 2013 Return-Path: Delivered-To: freebsd-ports@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 E250E39E; Thu, 12 Sep 2013 11:58:36 +0000 (UTC) (envelope-from c.kworr@gmail.com) Received: from mail-la0-x22c.google.com (mail-la0-x22c.google.com [IPv6:2a00:1450:4010:c03::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43B282CA7; Thu, 12 Sep 2013 11:58:36 +0000 (UTC) Received: by mail-la0-f44.google.com with SMTP id eo20so8663361lab.31 for ; Thu, 12 Sep 2013 04:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=g13oD2favRW3WB16KcJogQlFpK6sjYPf7Q8kOakrwEM=; b=mgHqy4JaJOlH5azEPfYCD3/mxeZMW8cIdckA62Oj/yU42zY02PNDgWV34pYmwAcYrQ lxZnlpTcb12M5sXwGgRHf6f5UX51XrnRIZtV8Al3dhTYNdZ+PqkDUWk6G1G82oH+2PPe dk2CTIx1iBBkpaGI+D0+yyG69Sfi04qzPxjNMa8rdgzs+kdMo+7b2N9BA3JeiG5AuCcl z9hoBF3qmIeFIx15EFOYyOWfm/yG0e9D2ZGiSyRBYkJ1MsJRSISh9DA3ux/K4n/vQgXS 47i9S6XiUJYvENSsd6TGPWaVNrCQ2ybyLHngShPtk874PbMR4JMyj3KGjG6z1VAGET0x IUAw== X-Received: by 10.112.29.147 with SMTP id k19mr7107872lbh.9.1378987114371; Thu, 12 Sep 2013 04:58:34 -0700 (PDT) Received: from [192.168.1.126] (mau.donbass.com. [92.242.127.250]) by mx.google.com with ESMTPSA id ao4sm1576333lac.1.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 04:58:33 -0700 (PDT) Message-ID: <5231AC68.6040003@gmail.com> Date: Thu, 12 Sep 2013 14:58:32 +0300 From: Volodymyr Kostyrko User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130909 Thunderbird/17.0.8 MIME-Version: 1.0 To: Ivan Voras Subject: Re: Berkeley DB 4.1 References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 11:58:37 -0000 12.09.2013 13:57, Ivan Voras wrote: > Hello, > > I'd like to start a discussion on changing the default BDB port from 4.1 > to something more recent. > > bdb version 4.1 was last released in 2002: > README: Sleepycat Software: Berkeley DB 4.1.25: (December 19, 2002) > > There are some ports which have an unexpected dependacy on bdb via APR > (apache22, subversion), which does is not wrong in itself, but is > somewhat unelegant (as a personal opinion of course). > > I've found this previous discussion: > http://lists.freebsd.org/pipermail/freebsd-ports/2013-February/081444.html > > And while the argument seems valid, it also doesn't have an estimate of > which / how many ports will break with a more recent bdb. My long time default was to get last available version and I never saw a breakage even with 5*. However there are some ports that strictly default to 48 (like net-p2p/bitcoin). > Could an experimental port build be done with setting WITH_BDB_VER to > either the most recent 4.x version (WITH_BDB_VER=48), to the last > Sleepycat Licensed version (50) or the recent version in ports (60) to > see what breaks? I vote for 48 as 48 was the last version that had major enhancements. -- Sphinx of black quartz, judge my vow. From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 11:59:00 2013 Return-Path: Delivered-To: freebsd-ports@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 236FE459 for ; Thu, 12 Sep 2013 11:59:00 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward5l.mail.yandex.net (forward5l.mail.yandex.net [IPv6:2a02:6b8:0:1819::5]) by mx1.freebsd.org (Postfix) with ESMTP id D8A972CB5 for ; Thu, 12 Sep 2013 11:58:59 +0000 (UTC) Received: from smtp14.mail.yandex.net (smtp14.mail.yandex.net [95.108.131.192]) by forward5l.mail.yandex.net (Yandex) with ESMTP id AFB86C40CCF; Thu, 12 Sep 2013 15:58:56 +0400 (MSK) Received: from smtp14.mail.yandex.net (localhost [127.0.0.1]) by smtp14.mail.yandex.net (Yandex) with ESMTP id 5D43F1B60013; Thu, 12 Sep 2013 15:58:56 +0400 (MSK) Received: from 87.249.28.58.tel.ru (87.249.28.58.tel.ru [87.249.28.58]) by smtp14.mail.yandex.net (nwsmtp/Yandex) with ESMTP id WP9SUBxDDo-wtwOkg4H; Thu, 12 Sep 2013 15:58:56 +0400 Message-ID: <5231AC7F.7090500@passap.ru> Date: Thu, 12 Sep 2013 15:58:55 +0400 From: Boris Samorodov User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130811 Thunderbird/17.0.8 MIME-Version: 1.0 To: mexas@bris.ac.uk Subject: Re: graphics/libsvg: svg_image.c:24:17: error: png.h: No such file or directory References: <201309121142.r8CBglJV037188@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309121142.r8CBglJV037188@mech-cluster241.men.bris.ac.uk> Content-Type: multipart/mixed; boundary="------------060700060805070303060606" Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 11:59:00 -0000 This is a multi-part message in MIME format. --------------060700060805070303060606 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 12.09.2013 15:42, Anton Shterenlikht пишет: > On ia64 r254648, ports tree at 327030, > rebuilding ports after removing converters/libiconv: > > --- svg_image.lo --- > if /bin/sh /usr/local/bin/libtool --mode=compile --tag=CC cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF ".deps/svg_image.Tpo" -c -o svg_image.lo svg_image.c; then mv -f ".deps/svg_image.Tpo" ".deps/svg_image.Plo"; else rm -f ".deps/svg_image.Tpo"; exit 1; fi > libtool: compile: cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF .deps/svg_image.Tpo -c svg_image.c -fPIC -DPIC -o .libs/svg_image.o > svg_image.c:24:17: error: png.h: No such file or directory > svg_image.c:25:21: error: jpeglib.h: No such file or directory > svg_image.c:26:20: error: jerror.h: No such file or directory > > and so on. > > The full log: > > http://eis.bris.ac.uk/~mexas/libsvg-build-log.text Please try the following patch. -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve --------------060700060805070303060606 Content-Type: text/plain; charset=UTF-8; name="libsvg-cflags.diff.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="libsvg-cflags.diff.txt" SW5kZXg6IGdyYXBoaWNzL2xpYnN2Zy9NYWtlZmlsZQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBncmFw aGljcy9saWJzdmcvTWFrZWZpbGUJKHJldmlzaW9uIDMyNzAzOSkKKysrIGdyYXBoaWNzL2xp YnN2Zy9NYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMjAsNiArMjAsNyBAQAogVVNFX0dO T01FPQlsaWJ4bWwyCiBVU0VTPQkJcGF0aGZpeCBpY29udiBwa2djb25maWcKIFVTRV9MRENP TkZJRz0JeWVzCitDRkxBR1MrPQktSSR7TE9DQUxCQVNFfS9pbmNsdWRlCiAKIFBMSVNUX0ZJ TEVTPQlpbmNsdWRlL3N2Zy5oIFwKIAkJbGliL2xpYnN2Zy5hIFwK --------------060700060805070303060606-- From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 12:55:44 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 2F12AD2A for ; Thu, 12 Sep 2013 12:55:44 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog125.obsmtp.com (eu1sys200aog125.obsmtp.com [207.126.144.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 877A220B8 for ; Thu, 12 Sep 2013 12:55:43 +0000 (UTC) Received: from mail-wg0-f44.google.com ([74.125.82.44]) (using TLSv1) by eu1sys200aob125.postini.com ([207.126.147.11]) with SMTP ID DSNKUjG5ubFbmgqf1GGj8J321WOfQD1GNoB3@postini.com; Thu, 12 Sep 2013 12:55:43 UTC Received: by mail-wg0-f44.google.com with SMTP id b13so500925wgh.11 for ; Thu, 12 Sep 2013 05:55:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:cc :reply-to:in-reply-to; bh=dipUx8Es1LuqR1tlKi6FCaxzLjPeklWiXNcxvDnkNh8=; b=afj8/07+J7XE2/sctseuaJMfQJG2+EvUdtecz5/z3SA0gwuiA7CxEcrZAStfzJAsex z5CgKxDpaXrs4KK0l+2LUJF5t1J/uoa747cR0BWP3n9pyVXgQv0zmdkkHPle8vJGDtc/ GG8UHg4tg/eiO5ofsE+OqnZUR97C/ar8xlPyfeRng7EdLIY5nwaPNVatYzTAo1zonqTs eMRDeTenLfklTKo6pZHMr2yOHijQNL39Y7wrUn04n0+Wt2OjcWcLkrve5AjcOrEW2lQy dxerhbqp7ARRUphXmaRPgOKrvTNNISmdGKo5NrsTIwaWtspKmgbqwIo0+nK94BMIyhIF J7ow== X-Gm-Message-State: ALoCoQkFJ2n/GTiShYR4oJydGlmzQNJ6aYUHCYd2JVhxmJzrFfmDCPmUjFf3THnjD/cNAF6hJCX8w3xL1Bxzu98PfF1B83dQXH815CBcPPNUEHAlQwXD1cxnKHe57nPx0P6mL7ErbnQM2GrUEI9s3SLnhKJQPWxWu1yj1TurJtAONIMM7WyD4Gc= X-Received: by 10.180.9.140 with SMTP id z12mr5721598wia.37.1378990521374; Thu, 12 Sep 2013 05:55:21 -0700 (PDT) X-Received: by 10.180.9.140 with SMTP id z12mr5721589wia.37.1378990521313; Thu, 12 Sep 2013 05:55:21 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id e1sm12717108wij.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 05:55:20 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CCtHRl087422 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 12 Sep 2013 13:55:17 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CCtHa8087421; Thu, 12 Sep 2013 13:55:17 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 13:55:17 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309121255.r8CCtHa8087421@mech-cluster241.men.bris.ac.uk> To: bsam@passap.ru, mexas@bris.ac.uk Subject: Re: graphics/libsvg: svg_image.c:24:17: error: png.h: No such file or directory In-Reply-To: <5231AC7F.7090500@passap.ru> Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 12:55:44 -0000 >From bsam@passap.ru Thu Sep 12 13:48:26 2013 >> >> --- svg_image.lo --- >> if /bin/sh /usr/local/bin/libtool --mode=compile --tag=CC cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF ".deps/svg_image.Tpo" -c -o svg_image.lo svg_image.c; then mv -f ".deps/svg_image.Tpo" ".deps/svg_image.Plo"; else rm -f ".deps/svg_image.Tpo"; exit 1; fi >> libtool: compile: cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF .deps/svg_image.Tpo -c svg_image.c -fPIC -DPIC -o .libs/svg_image.o >> svg_image.c:24:17: error: png.h: No such file or directory >> svg_image.c:25:21: error: jpeglib.h: No such file or directory >> svg_image.c:26:20: error: jerror.h: No such file or directory >> >> and so on. >> >> The full log: >> >> http://eis.bris.ac.uk/~mexas/libsvg-build-log.text > >Please try the following patch. The patch helped. Thank you Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 13:01:57 2013 Return-Path: Delivered-To: freebsd-ports@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 88C1716A for ; Thu, 12 Sep 2013 13:01:57 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward4h.mail.yandex.net (forward4h.mail.yandex.net [IPv6:2a02:6b8:0:f05::4]) by mx1.freebsd.org (Postfix) with ESMTP id 3CB93213C for ; Thu, 12 Sep 2013 13:01:57 +0000 (UTC) Received: from smtp1h.mail.yandex.net (smtp1h.mail.yandex.net [84.201.187.144]) by forward4h.mail.yandex.net (Yandex) with ESMTP id C23D51B2231E; Thu, 12 Sep 2013 17:01:55 +0400 (MSK) Received: from smtp1h.mail.yandex.net (localhost [127.0.0.1]) by smtp1h.mail.yandex.net (Yandex) with ESMTP id 74AC213405B6; Thu, 12 Sep 2013 17:01:55 +0400 (MSK) Received: from 87.249.28.58.tel.ru (87.249.28.58.tel.ru [87.249.28.58]) by smtp1h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id k1j0B4Kths-1sRW2ILR; Thu, 12 Sep 2013 17:01:55 +0400 Message-ID: <5231BB42.6070501@passap.ru> Date: Thu, 12 Sep 2013 17:01:54 +0400 From: Boris Samorodov User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130811 Thunderbird/17.0.8 MIME-Version: 1.0 To: mexas@bris.ac.uk Subject: Re: graphics/libsvg: svg_image.c:24:17: error: png.h: No such file or directory References: <201309121255.r8CCtHa8087421@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309121255.r8CCtHa8087421@mech-cluster241.men.bris.ac.uk> Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: 8bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 13:01:57 -0000 12.09.2013 16:55, Anton Shterenlikht ïèøåò: >>From bsam@passap.ru Thu Sep 12 13:48:26 2013 >>> >>> --- svg_image.lo --- >>> if /bin/sh /usr/local/bin/libtool --mode=compile --tag=CC cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF ".deps/svg_image.Tpo" -c -o svg_image.lo svg_image.c; then mv -f ".deps/svg_image.Tpo" ".deps/svg_image.Plo"; else rm -f ".deps/svg_image.Tpo"; exit 1; fi >>> libtool: compile: cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT svg_image.lo -MD -MP -MF .deps/svg_image.Tpo -c svg_image.c -fPIC -DPIC -o .libs/svg_image.o >>> svg_image.c:24:17: error: png.h: No such file or directory >>> svg_image.c:25:21: error: jpeglib.h: No such file or directory >>> svg_image.c:26:20: error: jerror.h: No such file or directory >>> >>> and so on. >>> >>> The full log: >>> >>> http://eis.bris.ac.uk/~mexas/libsvg-build-log.text >> >> Please try the following patch. > > The patch helped. Great, can you file a PR on the matter? Thanks! -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 13:06:16 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 0C5F7304 for ; Thu, 12 Sep 2013 13:06:16 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-wg0-x22b.google.com (mail-wg0-x22b.google.com [IPv6:2a00:1450:400c:c00::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E7742170 for ; Thu, 12 Sep 2013 13:06:15 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id z12so8963034wgg.34 for ; Thu, 12 Sep 2013 06:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=jlsLY/HPI9vtesrDqwmlPnqfGVjxzRRV52/dfm+4kaM=; b=b1H597UDWhu98/jysmBzFjWiJl2eiiBx7JX5vGX/zTYG4XpH4M7aWiyu5E+fXnABtK RqdC06B9gLBgHKwlwGCrx65oZc52OhgwhGb+QTBw2hsnwJNftEC0VAxrLivXuzuToGZ9 O1egoMIiOodWgeHprwYmONRYJFCWeOmW5xWilk6HMCcjSJJvIAjwPU4ykuC/T/t09+Ad kSrBSQwqFUE3Eu9IWcRjIYtVzyBJp/Wryxt2H/MybELgzVfEyYdI1PJHjrJfgDlHLUbF QNmCLvRO6Y+S/otst22C0c2TMZ59I3Bc3zIJkQSB7jO7F3mrFnlChUfe1TiqmrutDfb2 HLXg== MIME-Version: 1.0 X-Received: by 10.194.201.225 with SMTP id kd1mr6014793wjc.35.1378991173897; Thu, 12 Sep 2013 06:06:13 -0700 (PDT) Received: by 10.180.94.194 with HTTP; Thu, 12 Sep 2013 06:06:13 -0700 (PDT) Received: by 10.180.94.194 with HTTP; Thu, 12 Sep 2013 06:06:13 -0700 (PDT) In-Reply-To: References: Date: Thu, 12 Sep 2013 15:06:13 +0200 Message-ID: Subject: Pkg-fallout basic256 From: =?ISO-8859-1?Q?Fernando_Apestegu=EDa?= To: FreeBSD Mailing List Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 13:06:16 -0000 Hi all, I received a message stating that basic256 0.9.9.64 doesn't build. I'll take care of it as soon as possible but that won't happen before the 25th since I'm out of the country and really AFK. If in the meantime someone wants to take a look fell free to do it :) Thanks. From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 13:40:07 2013 Return-Path: Delivered-To: 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 9CA3C31E for ; Thu, 12 Sep 2013 13:40:07 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward5h.mail.yandex.net (forward5h.mail.yandex.net [IPv6:2a02:6b8:0:f05::5]) by mx1.freebsd.org (Postfix) with ESMTP id 51AD623AC for ; Thu, 12 Sep 2013 13:40:07 +0000 (UTC) Received: from smtp4h.mail.yandex.net (smtp4h.mail.yandex.net [84.201.186.21]) by forward5h.mail.yandex.net (Yandex) with ESMTP id C73DCD019A0 for ; Thu, 12 Sep 2013 17:40:04 +0400 (MSK) Received: from smtp4h.mail.yandex.net (localhost [127.0.0.1]) by smtp4h.mail.yandex.net (Yandex) with ESMTP id 723882C1843; Thu, 12 Sep 2013 17:40:04 +0400 (MSK) Received: from 87.249.28.58.tel.ru (87.249.28.58.tel.ru [87.249.28.58]) by smtp4h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id JFlWvh6WBr-e4CO3tZO; Thu, 12 Sep 2013 17:40:04 +0400 Message-ID: <5231C433.30305@passap.ru> Date: Thu, 12 Sep 2013 17:40:03 +0400 From: Boris Samorodov User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130811 Thunderbird/17.0.8 MIME-Version: 1.0 To: Roman Cat Subject: Re: math/biggles patch (clang only current r255465) References: <20130912141342.6d69e122@fazenda> In-Reply-To: <20130912141342.6d69e122@fazenda> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 13:40:07 -0000 12.09.2013 14:13, Roman Cat пишет: > Fix build without gcc. > > Roman. > > patch-make.inc > > --- make.inc.orig 2010-04-10 00:54:40.000000000 +0400 > +++ make.inc 2013-09-12 13:58:35.000000000 +0400 > @@ -20,8 +20,8 @@ > # > > PYTHON = python > -CC = gcc > -CCSHARED = gcc -shared > +CC = $(CC) > +CCSHARED = $(CC) -shared > CFLAGS = -Wall -O2 -fPIC > OS = $(shell uname) I've committed a similar fix. Thanks for the report! -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 13:48:43 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 8049A62E for ; Thu, 12 Sep 2013 13:48:43 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog102.obsmtp.com (eu1sys200aog102.obsmtp.com [207.126.144.113]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B8A8B2440 for ; Thu, 12 Sep 2013 13:48:42 +0000 (UTC) Received: from mail-wg0-f43.google.com ([74.125.82.43]) (using TLSv1) by eu1sys200aob102.postini.com ([207.126.147.11]) with SMTP ID DSNKUjHGMdtd2S0dfFnwxyYREDTqU99TbLmI@postini.com; Thu, 12 Sep 2013 13:48:42 UTC Received: by mail-wg0-f43.google.com with SMTP id z12so9288829wgg.10 for ; Thu, 12 Sep 2013 06:48:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:cc :reply-to:in-reply-to; bh=o72K3Sk6nDBUafWmBJPh2W3LQkKD5/IdbOvkXza+vDY=; b=Hj8DjOgeTuOirmRlE4LwKk27jWz2tUwM8Z/sI1npJKfKgRLvMbxuPN/YoMHUrkKtso s9eZEpWaYdTUQ5fw5f6VxqePhwG9ixv9sz51kv7vln7hvdgcvKOV/w3kAJDLPLZ7TmMx DOX8GgMqqMXpkPK5W0SVH8P7jutmQEcdXYCOnOWL587RL/VNJaDjeuuxMgxWpAj/w6pU TujfrQ1Xf/jcW5177hq6OFG4qIhFBXpTNh7PwTlCt9RsCKkvQcFLWNVYYVYteSZ7SRfA P6NP/lAZMGTkTiIh7JP54wGIb4WwJrys0p0f7XrpQ6h7YQB2Q7+THMZNE1kCTalGbazg RUlQ== X-Gm-Message-State: ALoCoQn9WE3bqpbeeit06OIjAFX343gmrUy6ANYQ7WD5eXPg37W/7bjjgjaO6kxfeHdoPOUNhta2TWY/kZsAPMdSqGxAtFWYHDg9Z0ONfqEGwZZxC2NXcDiq3YwQFteccIbNn48+I+iLgje17MuvJsC26BKXzpTmu2GuUu1bL4bJ2CI73UN36u4= X-Received: by 10.180.89.206 with SMTP id bq14mr484713wib.56.1378993713803; Thu, 12 Sep 2013 06:48:33 -0700 (PDT) X-Received: by 10.180.89.206 with SMTP id bq14mr484703wib.56.1378993713718; Thu, 12 Sep 2013 06:48:33 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id e5sm17852750wiy.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 06:48:32 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CDmUfY091926 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 12 Sep 2013 14:48:30 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CDmUqa091925; Thu, 12 Sep 2013 14:48:30 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 14:48:30 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309121348.r8CDmUqa091925@mech-cluster241.men.bris.ac.uk> To: bsam@passap.ru, mexas@bris.ac.uk Subject: Re: graphics/libsvg: svg_image.c:24:17: error: png.h: No such file or directory In-Reply-To: <5231BB42.6070501@passap.ru> Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 13:48:43 -0000 http://www.freebsd.org/cgi/query-pr.cgi?pr=182038 Thanks Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 14:58:36 2013 Return-Path: Delivered-To: freebsd-ports@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 817F8443 for ; Thu, 12 Sep 2013 14:58:36 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog114.obsmtp.com (eu1sys200aog114.obsmtp.com [207.126.144.137]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D9C1128C9 for ; Thu, 12 Sep 2013 14:58:35 +0000 (UTC) Received: from mail-wi0-f180.google.com ([209.85.212.180]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKUjHWf3K2sBPetAGutL2zBfHjKMm7jJZk@postini.com; Thu, 12 Sep 2013 14:58:35 UTC Received: by mail-wi0-f180.google.com with SMTP id hj3so3684108wib.1 for ; Thu, 12 Sep 2013 07:58:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:reply-to; bh=9X6hWnT6CXP1j2FB1tif2XmcQWl2suEfaebyAfJU+yM=; b=NUQKlX8ZzLUFrInn+hWGQvSDG/hsur0Kex4rXEeX8U0VX6tC2T+SvRMp7Pzwo7ZN52 eslWxnW+TnvIR0daE1Xa8ZLAOVP6sffI0u1RGXgJtA75jmey7cZGMKvy5j5va2HcyeT5 3hDFiEggxFM8dc3aUWNerSNTuDRbUQLesHzZyqjDo2+TsqWmJG1wgDBziGWtIKUw1ufg r/2ALLaJMXQyBqBhXTv9X77FlmGpOOAUz+aKWx8oOScmtrX7OqZXRSe1YSOjNhfiLMyW uWNGBSjCIehZUwanefPsUnaJ0ZQos/sRdlpXJeS6w/1TJt9CPckRUZi6OfHCG+fi9dGn xUUg== X-Gm-Message-State: ALoCoQnhIxrdFNfoz0cMoGxi1GlE5w7ZVA9mm6A9W28nFrOwu7RjRoxNUhzjSe5UHAHwBLnTHy3KokiqLnzdd2NyzR8Eck5j+Zp0S/IfuT3NPI983o6DFEpX3Bz1caQiDMZstnv3mYdiYPqzA4xsEc//DTT3PWgxYaELAW/qC43DVfVIwImTifQ= X-Received: by 10.180.187.2 with SMTP id fo2mr22058610wic.65.1378997887768; Thu, 12 Sep 2013 07:58:07 -0700 (PDT) X-Received: by 10.180.187.2 with SMTP id fo2mr22058601wic.65.1378997887675; Thu, 12 Sep 2013 07:58:07 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id mb7sm5066229wic.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 07:58:06 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CEw4Kp070927 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 12 Sep 2013 15:58:05 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CEw4iq070916 for freebsd-ports@freebsd.org; Thu, 12 Sep 2013 15:58:04 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 15:58:04 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309121458.r8CEw4iq070916@mech-cluster241.men.bris.ac.uk> To: freebsd-ports@freebsd.org Subject: poudriere ports tree create/delete? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 14:58:36 -0000 I'm trying to set up poudriere. I two places I see this command: http://forums.freebsd.org/showthread.php?t=38859 https://fossil.etoilebsd.net/poudriere/doc/trunk/doc/use_system_ports_tree.wiki poudriere ports -c -F -f none -M /usr/ports -p default or poudriere ports -c -F -f none -M /ports/custom -p custom So what exactly is the result of this command? Should something appear under $BASEFS? My system tree is /usr/ports. I normally update it via svn+https. I run the following command: poudriere ports -c -F -f none -M /usr/ports -p default and got # poudriere ports -l PORTSTREE METHOD PATH default portsnap /usr/ports # I can't seem to update it: # poudriere ports -u ====>> Updating portstree "default" portsnap: Directory does not exist or is not writable: /usr/ports/.snap # I presume it's because the tree is updated with svn+https and not with portsnap. So now I want to change the update method to svn+https. How do I do this? What happens if I run poudriere ports -d Will I delete my /usr/ports? Thanks Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 18:32:11 2013 Return-Path: Delivered-To: freebsd-ports@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 88A8B4C9; Thu, 12 Sep 2013 18:32:11 +0000 (UTC) (envelope-from nicolas.raspail@whisperingvault.net) Received: from mail.whisperingvault.net (fastjack.whisperingvault.net [46.105.103.121]) by mx1.freebsd.org (Postfix) with ESMTP id 42A48285C; Thu, 12 Sep 2013 18:32:10 +0000 (UTC) Received: from fastjack.whisperingvault.net (localhost [127.0.0.1]) by mail.whisperingvault.net (Postfix) with ESMTP id 651747982; Thu, 12 Sep 2013 20:32:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at whisperingvault.net Received: from mail.whisperingvault.net ([127.0.0.1]) by fastjack.whisperingvault.net (fastjack.whisperingvault.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SwS-n4uFECzD; Thu, 12 Sep 2013 20:32:02 +0200 (CEST) Received: from [192.168.0.20] (abo-232-56-69.avi.modulonet.fr [85.69.56.232]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: nicolas@whisperingvault.net) by mail.whisperingvault.net (Postfix) with ESMTPSA id B6ECF797D; Thu, 12 Sep 2013 20:32:02 +0200 (CEST) Message-ID: <523208A3.5050808@whisperingvault.net> Date: Thu, 12 Sep 2013 20:32:03 +0200 From: Nicolas Raspail User-Agent: Postbox 3.0.8 (Windows/20130427) MIME-Version: 1.0 To: Jos Chrispijn , William Grzybowski Subject: Re: NZBGet | Port needs a refreshj References: <51A1D0C9.20509@webrz.net> <20130526110329.GA64292@hub.freebsd.org> <51A23FA9.3040501@webrz.net> <521E6779.3000700@whisperingvault.net> In-Reply-To: <521E6779.3000700@whisperingvault.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 18:32:11 -0000 Nicolas Raspail wrote: > Jos Chrispijn wrote: >> William Grzybowski: >>> There is a PR for it, ports/177839. I'll take care. >> thanks William, keep up the good work! >> >> Best regards, >> Jos Chrispijn >> >> > Hi > > I have open two PR about this port, one for the new version > (ports/180832) and for the postProcess script terminated with unknown > status (ports/177669). > > The new version 11.0 should fix the ports/177669 (see > http://nzbget.sourceforge.net/forum/viewtopic.php?f=3&t=596&p=4873&hilit=freebsd#p4873) > and has a new concept for the post-processing scripts. > > As you have already take care of upgrading this port from 9.1 to 10.2, > maybe you can do it again :-) > > Regards > > Nicolas > Hi I have submitted a patch to update the nzbget port to 11.0 (http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180832). This is my first patch for a FreeBSD port, so it may be far from perfect. Maybe someone can have a look to the patch to see if it can be committed Regards Nicolas From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 19:54:21 2013 Return-Path: Delivered-To: freebsd-ports@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 53B9E1D1 for ; Thu, 12 Sep 2013 19:54:21 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog118.obsmtp.com (eu1sys200aog118.obsmtp.com [207.126.144.145]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD8B622CC for ; Thu, 12 Sep 2013 19:54:20 +0000 (UTC) Received: from mail-wg0-f45.google.com ([74.125.82.45]) (using TLSv1) by eu1sys200aob118.postini.com ([207.126.147.11]) with SMTP ID DSNKUjIb5ZRzot96N1rSMHYEs2CzJI/FizIj@postini.com; Thu, 12 Sep 2013 19:54:20 UTC Received: by mail-wg0-f45.google.com with SMTP id y10so285603wgg.24 for ; Thu, 12 Sep 2013 12:54:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:reply-to; bh=2dSdfbZyUWCaiECM+oxmIm4EaT/Wk9ZM6aG6jLulrM8=; b=XBY6nDfNggwjvM+87TatdW6G0wa4lrKv7OmwC2566RFUFodBO2lI8CTkCwBO7ZRJdt igFqaH9IA97d26MvNLyylrMhItfb9Qw+04KluYQrY9SeH2o9C/BjDneBYWNEuqSW1Mkf /STUZce47ttBqcl0KvDFeeHvE+bnTOjMJPP+1pP1sjiyJOVGBsNYgQBs3JvJiPC6iUbC Cm2x125Dz7IQkOya5jF6fV4dp9USde+h0k+NzZ+rp9nUZH5Nc5e3dhfsOAjFEKaV45V0 /VK9eX1q+jXzO253PLbVWz319XqYZ4z9+MabpIQV39o/D4le0BCxdtKYUBvMHATQTG51 AZMw== X-Gm-Message-State: ALoCoQmRGZG6jGFZRHLJtGw/sM51x8+K96Os0zWiR29DLauT1KgMoY4jJT9c9WtplzxoLsgpI1ityqnxzV2P4MdcCq6Wz1fe5CjwgZLFcRLRRV/EFYLcS5AbAqMUpi9bWTLOT/piig8K5VgxKugPsyLK3QmoUe9O/rjCb2cG2QxqsqdG8XJJWqI= X-Received: by 10.180.13.13 with SMTP id d13mr7399691wic.34.1379015652921; Thu, 12 Sep 2013 12:54:12 -0700 (PDT) X-Received: by 10.180.13.13 with SMTP id d13mr7399685wic.34.1379015652852; Thu, 12 Sep 2013 12:54:12 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id b13sm33322wiv.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 12:54:11 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CJs9le060995 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 12 Sep 2013 20:54:09 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CJs9ir060994 for freebsd-ports@freebsd.org; Thu, 12 Sep 2013 20:54:09 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 20:54:09 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309121954.r8CJs9ir060994@mech-cluster241.men.bris.ac.uk> To: freebsd-ports@freebsd.org Subject: lang/gcc fails to build following 20130904 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 19:54:21 -0000 This is on amd64 r255093 with ports at ??? (I haven't rebuilt svn yet): libtool: compile: /usr/ports/lang/gcc/work/build/./prev-gcc/xgcc -B/usr/ports/lang/gcc/work/build//prev-gcc/ -B/usr/local/x86_64-portbld-freebsd10.0/bin/ -B/usr/local/x86_64-portbld-freebsd10.0/bin -B/usr/local/x86_64-portbld-freebsd10.0/lib/ -isystem /usr/local/x86_64-portbld-freebsd10.0/includ -isystem /usr/local/x86_64-portbld-freebsd10.0/sys-include -DHAVE_CONFIG_H -I. -I.././../gcc-4.6.3lto-plugin -I.././../gcc-4.6.3/lto-plugin/../include -DHAVE_CONFIG_H -Wall -g -O2 -gtoggle -c ../././gcc-4.6.3/lto-plugin/lto-plugin.c -fPIC -DPIC -o .libs/lto-plugin.o .././../gcc-4.6.3/libcpp/charset.c:1371:1: error: conflicting types for 'cpp_interpret_string' .././../gcc-4.6.3/libcpp/include/cpplib.h:742:13: note: previous declaration of 'cpp_interpret_strig' was here .././../gcc-4.6.3/libcpp/charset.c:1452:1: error: conflicting types for 'cpp_interpret_string_notraslate' .././../gcc-4.6.3/libcpp/include/cpplib.h:745:13: note: previous declaration of 'cpp_interpret_strig_notranslate' was here gmake[5]: *** [charset.o] Error 1 Shall I open a PR? Thanks Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 20:37:28 2013 Return-Path: Delivered-To: freebsd-ports@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 1EB6BFD0 for ; Thu, 12 Sep 2013 20:37:28 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AECB2592 for ; Thu, 12 Sep 2013 20:37:26 +0000 (UTC) Received: from mail-wi0-f178.google.com ([209.85.212.178]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUjIl6r/m7cEcRTsIXAgZBgDQo9slBeAj@postini.com; Thu, 12 Sep 2013 20:37:27 UTC Received: by mail-wi0-f178.google.com with SMTP id hn9so352090wib.5 for ; Thu, 12 Sep 2013 13:36:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:reply-to; bh=5mKHJFmePmOA0d6bsBWbZIVW3AJrJ7TnFLJWSMy9Fjw=; b=YDqNj6RuwR+viPXtHTiRKSf33XGL20S2I46uHUT6GAb0AgZbqhL1TPFWs3zXqmsJ+e kqya415vvSs04E5FVU8oFXraJQoFOieioI3C15OwnPeBR7B+hgsUknqQAluQbZO3lY6L t3Ne0sxUEcxw9kMEt1UW5Xb5CHH6nZBuJ30QzN8kNVFGOHswGxNf25tHO9RowaP+Hd0q +ZsUACGtBxDRWkAwwmulkSgrBBw3Ma5oRmN7qeCXUykZx6xQT/N3/fjTvXs3pWTfJWkB bBDlcg9tSQUJuoD+AuLhH6W9xkE6gRu2z/c4EenWjIv5E5pEzIiifWTv3heoKyry+tyK BreA== X-Gm-Message-State: ALoCoQm74zvejFDm21Bk0s5os5wkw31Hz8w77VxZHqRdNDc2Jlcn23OusfA5kF7wmqPdTjWzy+HtQIaq9pAXdnGdy1yGNi2JFu8YCyhMcwN1vhiVKowI+FdxmEiajYLd/KG9C62bquKYa9X/LsD0swsHG0sBMw9RPkRZXydndwQVYX64ZfCzLJk= X-Received: by 10.194.175.133 with SMTP id ca5mr7812851wjc.19.1379018218250; Thu, 12 Sep 2013 13:36:58 -0700 (PDT) X-Received: by 10.194.175.133 with SMTP id ca5mr7812848wjc.19.1379018218176; Thu, 12 Sep 2013 13:36:58 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id mw9sm160261wib.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 13:36:57 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CKatY4061173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 12 Sep 2013 21:36:55 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CKatf6061172 for freebsd-ports@freebsd.org; Thu, 12 Sep 2013 21:36:55 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 21:36:55 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309122036.r8CKatf6061172@mech-cluster241.men.bris.ac.uk> To: freebsd-ports@freebsd.org Subject: textproc/hunspell build failure following 20130904 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 20:37:28 -0000 amd64 r255093, ports at 327102: libtool: link: c++ -O2 -pipe -fno-strict-aliasing -Wl,-rpath=/usr/local/lib -o .libs/hunspell hunspell.o -L/usr/local/lib ../parsers/libparsers.a ../hunspell/.libs/libhunspell-1.3.so -lncursesw -lreadline -lncurses -Wl,-rpath -Wl,/usr/local/lib --- hunzip --- /bin/sh ../../libtool --tag=CXX --mode=link c++ -O2 -pipe -fno-strict-aliasing -Wl,-rpath=/usr/local/lib -L/usr/local/lib -lreadline -o hunzip hunzip.o ../hunspell/libhunspell-1.3.la --- hunspell --- /usr/bin/ld: -: invalid DSO for symbol `cbreak' definition /usr/local/lib/libtinfow.so.5.9: could not read symbols: Bad value c++: error: linker command failed with exit code 1 (use -v to see invocation) *** [hunspell] Error code 1 make[4]: stopped in /usr/ports/textproc/hunspell/work/hunspell-1.3.2/src/tools I've rebuilt ncurses and readline successfully already. Thanks Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 20:45:46 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 C1B56256 for ; Thu, 12 Sep 2013 20:45:46 +0000 (UTC) (envelope-from freebsd.contact@marino.st) Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9C4E72626 for ; Thu, 12 Sep 2013 20:45:46 +0000 (UTC) Received: from [192.168.0.20] (unknown [130.255.26.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by shepard.synsport.net (Postfix) with ESMTP id 819E943552 for ; Thu, 12 Sep 2013 15:45:31 -0500 (CDT) Message-ID: <523227DA.7000408@marino.st> Date: Thu, 12 Sep 2013 22:45:14 +0200 From: John Marino User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: textproc/hunspell build failure following 20130904 References: <201309122036.r8CKatf6061172@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309122036.r8CKatf6061172@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: marino@freebsd.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 20:45:46 -0000 On 9/12/2013 22:36, Anton Shterenlikht wrote: > /usr/bin/ld: -: invalid DSO for symbol `cbreak' definition > /usr/local/lib/libtinfow.so.5.9: could not read symbols: Bad value > c++: error: linker command failed with exit code 1 (use -v to see invocation) > *** [hunspell] Error code 1 > > make[4]: stopped in /usr/ports/textproc/hunspell/work/hunspell-1.3.2/src/tools > > I've rebuilt ncurses and readline successfully already. What library does the cbreak symbol belong to? you need to add it to the linker flags. (e.g. LDFLAGS+= -L${LOCALBASE}/lib -lmylib ) Invalid DSO normally means the symbol is in another library and the linker is not going to recursively search for it. John From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 21:03:53 2013 Return-Path: Delivered-To: freebsd-ports@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 2D7849C9 for ; Thu, 12 Sep 2013 21:03:53 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 78623275A for ; Thu, 12 Sep 2013 21:03:52 +0000 (UTC) Received: from mail-wg0-f46.google.com ([74.125.82.46]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUjIsNvJl1j1FnvP8WrApgPRrG0klgzKi@postini.com; Thu, 12 Sep 2013 21:03:52 UTC Received: by mail-wg0-f46.google.com with SMTP id k14so343613wgh.13 for ; Thu, 12 Sep 2013 14:03:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:message-id:to:subject:cc :reply-to:in-reply-to; bh=Cglb45zJMus5nzX+xo1XdwOvucKeuXh79lvKGPf3sKw=; b=jQkMBGdwoSWpqUw5aI/ZKgjV8Y0pWW9iIy2L6qdM0QRfBO4WgoUa6+Dg6x3se7qtV5 DWBDo9g/I65pKVhOe/QucppcPrIaYbl/vO478zHMF2afT9TIdU0LUDML5f93YN0cxIOu sUbLNpfWb2yjhHdplIubYfeTjETrkfwcc18Hvlz1RvcNRR418Q0dE0s2TcP9McZ4m09X dDvwQxSDQ/YRhali/CpYPOXkMKslKsPQAJZgQK7O2gp52wIuMa8Wy3Tne1VaFA89jteT wtMEIqW+QLWp6o4W2ueyHD0114wAgNZZ74ANqLrnZvh+SGcu6/yd99KndWSkEGwfjKV9 4R9Q== X-Gm-Message-State: ALoCoQlvARxbFmvIK8W0i4jtVrKEh/8x31O18qwP3MRSm7mGeX5H91Z4PWQkuNtciDI/POX2dnQsKdPFpniYH+8r/CBMW5Sn5q7y5RSSQ8IYQyUf1AQaEh6PVthEWrlV4WKKRoCpELT4TA1oMv0b+gfk14jI6uF0122DM6kbmJqCnI8yGOuVdbM= X-Received: by 10.180.183.51 with SMTP id ej19mr7616564wic.60.1379019830794; Thu, 12 Sep 2013 14:03:50 -0700 (PDT) X-Received: by 10.180.183.51 with SMTP id ej19mr7616560wic.60.1379019830667; Thu, 12 Sep 2013 14:03:50 -0700 (PDT) Received: from mech-cluster241.men.bris.ac.uk (mech-cluster241.men.bris.ac.uk. [137.222.187.241]) by mx.google.com with ESMTPSA id fb9sm7202070wid.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 14:03:49 -0700 (PDT) Sender: Anton Shterenlikht Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6) with ESMTP id r8CL3l62061285 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 12 Sep 2013 22:03:48 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.7/8.14.6/Submit) id r8CL3lpm061284; Thu, 12 Sep 2013 22:03:47 +0100 (BST) (envelope-from mexas) Date: Thu, 12 Sep 2013 22:03:47 +0100 (BST) From: Anton Shterenlikht Message-Id: <201309122103.r8CL3lpm061284@mech-cluster241.men.bris.ac.uk> To: mexas@bris.ac.uk, ohauer@gmx.de Subject: Re: poudriere ports tree create/delete? In-Reply-To: <5232299F.2060902@gmx.de> Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mexas@bris.ac.uk List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 21:03:53 -0000 >From ohauer@gmx.de Thu Sep 12 21:58:25 2013 > >On 2013-09-12 16:58, Anton Shterenlikht wrote: >> I'm trying to set up poudriere. >> I two places I see this command: >> >> http://forums.freebsd.org/showthread.php?t=38859 >> https://fossil.etoilebsd.net/poudriere/doc/trunk/doc/use_system_ports_tree.wiki >> >> poudriere ports -c -F -f none -M /usr/ports -p default >> >> or >> >> poudriere ports -c -F -f none -M /ports/custom -p custom >> >> So what exactly is the result of this command? >> Should something appear under $BASEFS? >> >> My system tree is /usr/ports. >> I normally update it via svn+https. >> I run the following command: >> >> poudriere ports -c -F -f none -M /usr/ports -p default >> >> and got >> >> # poudriere ports -l >> PORTSTREE METHOD PATH >> default portsnap /usr/ports >> # >> >> I can't seem to update it: >> >> # poudriere ports -u >> ====>> Updating portstree "default" >> portsnap: Directory does not exist or is not writable: /usr/ports/.snap >> # >> >> I presume it's because the tree is updated >> with svn+https and not with portsnap. >> So now I want to change the update method to svn+https. >> How do I do this? >> >> What happens if I run >> >> poudriere ports -d >> >> Will I delete my /usr/ports? >> >> Thanks >> >> Anton >> > >Hi Anton, > >param -m will do the trick, from man (8) poudriere > > -m method Specifies which method to use to create the ports tree. > Could be portsnap, git, svn{,+http,+https,+file,+ssh} > (Default: portsnap). > I'm sure I tried it, but still got portsnap: # poudriere ports -l PORTSTREE METHOD PATH default portsnap /usr/ports system - /usr/ports sys portsnap /usr/ports # Anyway, I'm trying to delete the poudriere ports tree as # poudriere ports -d ====>> Deleting portstree "default" but it sits forever without exiting. I'm not even sure which directories and/or files this command is supposed to delete. This is on ia64 r255488. # pkg info -xo poud poudriere-devel-3.0.99.20130906 ports-mgmt/poudriere-devel # Thanks Anton From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 21:35:39 2013 Return-Path: Delivered-To: freebsd-ports@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 AC8A9323 for ; Thu, 12 Sep 2013 21:35:39 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F062291C for ; Thu, 12 Sep 2013 21:35:39 +0000 (UTC) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0MeP5b-1VaWFg0AHP-00QBjG for ; Thu, 12 Sep 2013 23:35:31 +0200 Message-ID: <523233A3.8020609@gmx.de> Date: Thu, 12 Sep 2013 23:35:31 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: mexas@bris.ac.uk Subject: Re: poudriere ports tree create/delete? References: <201309122103.r8CL3lpm061284@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309122103.r8CL3lpm061284@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:JnOqKotQqmtPML+VqRiYuK5DIOGn4EsyVidK1kjT2u9fxhwpT58 eSm6T1tBjkpu1/5BLUZqd1sSRda9NoK1R50MIIY5MWUgfODvuEUUbJCo3rWOjc6fa5sngRb SDSLMFzQjK6W1imk4aQFMISdoWFh6c3U9sIEQYDpY4HWVmBJOmK1VsDLLfBWl3sdHlmYCaT gx6ZN5jodNjda/scb6tuA== Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 21:35:39 -0000 On 2013-09-12 23:03, Anton Shterenlikht wrote: >>From ohauer@gmx.de Thu Sep 12 21:58:25 2013 >> >> On 2013-09-12 16:58, Anton Shterenlikht wrote: >>> I'm trying to set up poudriere. >>> I two places I see this command: >>> >>> http://forums.freebsd.org/showthread.php?t=38859 >>> https://fossil.etoilebsd.net/poudriere/doc/trunk/doc/use_system_ports_tree.wiki >>> >>> poudriere ports -c -F -f none -M /usr/ports -p default >>> >>> or >>> >>> poudriere ports -c -F -f none -M /ports/custom -p custom >>> >>> So what exactly is the result of this command? >>> Should something appear under $BASEFS? >>> >>> My system tree is /usr/ports. >>> I normally update it via svn+https. >>> I run the following command: >>> >>> poudriere ports -c -F -f none -M /usr/ports -p default >>> >>> and got >>> >>> # poudriere ports -l >>> PORTSTREE METHOD PATH >>> default portsnap /usr/ports >>> # >>> >>> I can't seem to update it: >>> >>> # poudriere ports -u >>> ====>> Updating portstree "default" >>> portsnap: Directory does not exist or is not writable: /usr/ports/.snap >>> # >>> >>> I presume it's because the tree is updated >>> with svn+https and not with portsnap. >>> So now I want to change the update method to svn+https. >>> How do I do this? >>> >>> What happens if I run >>> >>> poudriere ports -d >>> >>> Will I delete my /usr/ports? >>> >>> Thanks >>> >>> Anton >>> >> >> Hi Anton, >> >> param -m will do the trick, from man (8) poudriere >> >> -m method Specifies which method to use to create the ports tree. >> Could be portsnap, git, svn{,+http,+https,+file,+ssh} >> (Default: portsnap). >> > > I'm sure I tried it, but still got portsnap: > > # poudriere ports -l > PORTSTREE METHOD PATH > default portsnap /usr/ports > system - /usr/ports > sys portsnap /usr/ports > # > > Anyway, I'm trying to delete the poudriere ports tree as > > # poudriere ports -d > ====>> Deleting portstree "default" > > but it sits forever without exiting. > > I'm not even sure which directories and/or files > this command is supposed to delete. > > This is on ia64 r255488. > > # pkg info -xo poud > poudriere-devel-3.0.99.20130906 ports-mgmt/poudriere-devel > # > > Thanks > > Anton > Is this poudriere or poudriere-devel? Anyway, you can change the methode in /usr/local/etc/poudriere.d/ports/default/method From owner-freebsd-ports@FreeBSD.ORG Thu Sep 12 21:54:37 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 B7BA1AFC for ; Thu, 12 Sep 2013 21:54:37 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x234.google.com (mail-wi0-x234.google.com [IPv6:2a00:1450:400c:c05::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2332A82 for ; Thu, 12 Sep 2013 21:54:37 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id hj3so24553wib.1 for ; Thu, 12 Sep 2013 14:54:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=bPDCbBrd6ECoIwfxsqyBrAQ6Tg4URiLL2LTWkTb86bs=; b=WmSz+7DRnMg6JqUK2G643kTheJRQJ4S98HuM8/LDuy6ZslNWn1MXmlVXqXGnthQ9D5 47X/4qnLFG3Julr5yLPoJyS6kf7j6i3FQPVxsNvX/CeXVVZbc/wgeBX9RT+XOHm8uy83 Y7FWV7rAvvy16fY1E7WGUkDxvo8upes1r+EKAkvgXrKmtvzbbSMiiR8JuCjNyDHYaQ1B aiq0L8TELAmDqTRCq/oamYt5X58cCBhGMj3BdpnzBhtfnFoIEZ6Fdk/Aft0CmVKLdS8x EL/dNdaqQfuysO+4ec0sX+RL8Eaiml6kh+dWubDc43t3qrcivM+eMYym8v44Zf4C7MfI INVQ== X-Received: by 10.180.185.166 with SMTP id fd6mr23878395wic.5.1379022875815; Thu, 12 Sep 2013 14:54:35 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id i8sm7400428wiy.6.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 14:54:34 -0700 (PDT) Sender: Baptiste Daroussin Date: Thu, 12 Sep 2013 23:54:32 +0200 From: Baptiste Daroussin To: Boris Samorodov Subject: Re: graphics/libsvg: svg_image.c:24:17: error: png.h: No such file or directory Message-ID: <20130912215432.GH33103@ithaqua.etoilebsd.net> References: <201309121255.r8CCtHa8087421@mech-cluster241.men.bris.ac.uk> <5231BB42.6070501@passap.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="lrvsYIebpInmECXG" Content-Disposition: inline In-Reply-To: <5231BB42.6070501@passap.ru> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: mexas@bris.ac.uk, freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 21:54:37 -0000 --lrvsYIebpInmECXG Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 12, 2013 at 05:01:54PM +0400, Boris Samorodov wrote: > 12.09.2013 16:55, Anton Shterenlikht =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > >>From bsam@passap.ru Thu Sep 12 13:48:26 2013 > >>> > >>> --- svg_image.lo --- > >>> if /bin/sh /usr/local/bin/libtool --mode=3Dcompile --tag=3DCC cc -DHA= VE_CONFIG_H -I. -I. -I.. -I/usr/local/include/libxml2 -Wall -Wpointer-arit= h -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations = -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -= MT svg_image.lo -MD -MP -MF ".deps/svg_image.Tpo" -c -o svg_image.lo svg_im= age.c; then mv -f ".deps/svg_image.Tpo" ".deps/svg_image.Plo"; else rm -f = ".deps/svg_image.Tpo"; exit 1; fi > >>> libtool: compile: cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/inclu= de/libxml2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -= Wmissing-declarations -Wnested-externs -fno-strict-aliasing -O2 -pipe -fno-= strict-aliasing -MT svg_image.lo -MD -MP -MF .deps/svg_image.Tpo -c svg_ima= ge.c -fPIC -DPIC -o .libs/svg_image.o > >>> svg_image.c:24:17: error: png.h: No such file or directory > >>> svg_image.c:25:21: error: jpeglib.h: No such file or directory > >>> svg_image.c:26:20: error: jerror.h: No such file or directory > >>> > >>> and so on. > >>> > >>> The full log: > >>> > >>> http://eis.bris.ac.uk/~mexas/libsvg-build-log.text > >> > >> Please try the following patch. > >=20 > > The patch helped. >=20 > Great, can you file a PR on the matter? Thanks! >=20 Just commit with my approval regards, Bapt --lrvsYIebpInmECXG Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlIyOBgACgkQ8kTtMUmk6EwlXACgtjYhmi336lllND/eQRe9V4Mw 9wIAoJuyEw+8oFRiX+XXljn7xEpFpM8i =FQiI -----END PGP SIGNATURE----- --lrvsYIebpInmECXG-- From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 00:55:21 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 9D984B70 for ; Fri, 13 Sep 2013 00:55:21 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 39F5B2AD1 for ; Fri, 13 Sep 2013 00:55:20 +0000 (UTC) Received: from mandree.no-ip.org ([78.53.49.72]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MZ8fw-1Vf7u70u1k-00L0em for ; Fri, 13 Sep 2013 02:55:19 +0200 Received: from [IPv6:::1] (localhost6.localdomain6 [IPv6:::1]) by apollo.emma.line.org (Postfix) with ESMTP id 16E6C23CF75 for ; Fri, 13 Sep 2013 02:55:18 +0200 (CEST) Message-ID: <52326275.4060403@gmx.de> Date: Fri, 13 Sep 2013 02:55:17 +0200 From: Matthias Andree User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: lang/gcc fails to build following 20130904 References: <201309121954.r8CJs9ir060994@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201309121954.r8CJs9ir060994@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ZgjYg6uUF2K3SJrbLBQVGnWWw1rKmR7Z2ODEmHJRyW9ar7m9lD3 /rHZhyXcepCUuEhymTl0vBIQwu+KbT3gDTz55/Ja3xp6Ee01QFvmxX76fsSaZhPnvs9wHyD 9x/jQeW2qSPBE2uSxPm5Hdp8tU7Qc0awdm4ABGMTRYbf5nVppATi5NWGTTguMYtYsOAkqCU fh9CBJHPGk/ZWHUayjdkA== X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 00:55:21 -0000 Am 12.09.2013 21:54, schrieb Anton Shterenlikht: > This is on amd64 r255093 with ports at ??? (I haven't rebuilt svn yet): > > libtool: compile: /usr/ports/lang/gcc/work/build/./prev-gcc/xgcc -B/usr/ports/lang/gcc/work/build//prev-gcc/ -B/usr/local/x86_64-portbld-freebsd10.0/bin/ -B/usr/local/x86_64-portbld-freebsd10.0/bin -B/usr/local/x86_64-portbld-freebsd10.0/lib/ -isystem /usr/local/x86_64-portbld-freebsd10.0/includ -isystem /usr/local/x86_64-portbld-freebsd10.0/sys-include -DHAVE_CONFIG_H -I. -I.././../gcc-4.6.3lto-plugin -I.././../gcc-4.6.3/lto-plugin/../include -DHAVE_CONFIG_H -Wall -g -O2 -gtoggle -c ../././gcc-4.6.3/lto-plugin/lto-plugin.c -fPIC -DPIC -o .libs/lto-plugin.o > .././../gcc-4.6.3/libcpp/charset.c:1371:1: error: conflicting types for 'cpp_interpret_string' > .././../gcc-4.6.3/libcpp/include/cpplib.h:742:13: note: previous declaration of 'cpp_interpret_strig' was here > .././../gcc-4.6.3/libcpp/charset.c:1452:1: error: conflicting types for 'cpp_interpret_string_notraslate' > .././../gcc-4.6.3/libcpp/include/cpplib.h:745:13: note: previous declaration of 'cpp_interpret_strig_notranslate' was here > gmake[5]: *** [charset.o] Error 1 Also, on a freshly rebuilt and "make delete-old-libs" system, GMP does not build due to lack of libstdc++, but GCC requires GMP. From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 05:16:01 2013 Return-Path: Delivered-To: ports@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 5EE99A71 for ; Fri, 13 Sep 2013 05:16:01 +0000 (UTC) (envelope-from zhouqbeydd@sina.com) Received: from mail2-185.sinamail.sina.com.cn (mail2-185.sinamail.sina.com.cn [60.28.2.185]) by mx1.freebsd.org (Postfix) with ESMTP id B8DF726B7 for ; Fri, 13 Sep 2013 05:16:00 +0000 (UTC) Received: from unknown (HELO ft30-198.sina.com.cn) ([172.16.30.198]) by irtj11-90.sinamail.sina.com.cn with ESMTP; 13 Sep 2013 13:15:53 +0800 Received: from irja2-172.sinamail.sina.com.cn ([10.69.2.172]) by ft30-198.sina.com.cn. with ESMTP id r8D5FMpi018008-r8D5FMpj018008 for ; Fri, 13 Sep 2013 13:15:22 +0800 X-Originating-IP: [180.140.189.180] Received: from unknown (HELO 2011-20121108SO) ([180.140.189.180]) by irja2-172.sinamail.sina.com.cn with ESMTP; 13 Sep 2013 13:15:21 +0800 Message-ID: <5ffcbebbfdd64d2b8fc9b661126f52f6@ab3c24884abd48ed890a78bb3a98c738> Date: Fri, 13 Sep 2013 05:15:20 GMT Mime-Version: 1.0 From: To: Subject: coming laptop keyboards Content-Type: multipart/mixed; boundary="part_8f6601a2_88cf_4576_a8f4_8a0cbc940594" X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: zhangtingyouxiang@126.com List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 05:16:01 -0000 --part_8f6601a2_88cf_4576_a8f4_8a0cbc940594 MIME-Version: 1.0 Content-Type: text/plain; charset="gb2312" Hi coming new keyboard: price 8-10usd/pcs HP DV7-6000 SP HP FOLI013 US HP CQ72 GR US HP CQ42 US HP DV4 US HP DV5 LA UK HP DV6000 US HP DV2000 IT US UK HP CQ50 SP HP CQ62 US HP 6720S SP ASUS K52 G51 FR GR IT US ASUS F80 SP ASUS M50 US ASUS A3000 US IT ASUS EPC7000 UK ASUS A8 TI US ASUS F2 RU ACER AS9400 RU FR ACER AS4710 UK ACER AS5516 SP IT ACER ONE A150 US ACER TM2300 SP GR TOSHIBA A300 RU P205 FR TOSHIBA P750 US C650 US A660 US SAMSUNG NP300 US N148 UK RV511 UK DELL E6420 US LENOVOL S10-2 RU LA S10 US RU X108- US LENOVO S10-2- US SONY CS -SP£¬IT£¬BR ASUS 1005-US£¬ LENOVO U310 RU LENOVO U410 RU HP 8570/6570 US HP 8570/6570 TR LENOVO G470 US ASUS 1015 LA HP DV5 RU LENOVO Z560 TR LENOVO G470 LA TOSHIBA A500 FR LENOVO G470 RU LA LG R410 BR ASUS 1015 TR ASUS 1015 FR TOSHIBA A10 SP LENOVO S10-2 TR LENOVO S10-2 UK LENOVO S10-2 IT LENOVO S10-2 RU LENOVO S10-2 LA ASUS K42 BR ACER V3 SP TOSHIBA A500 GR TOSHIBA A500 UK LENOVO G565 G560 UK LENOVO G565 G560 LA HP DV5 LA TOSHIBA A300 GR TOSHIBA A300 RU FUJITSU AH532 US LENOVO G465 G460 LA TOSHIBA A300 UK ACER AS3810 IT HP MINI10 US DELL E6420 E6320 US ACER 532H FR UK DELL N7110 KR ASUS K42 TR HP CQ72 GR TOSHIBA U500 FR ACER ONE 751 FR ACER ONE 751 TR HP M2000 GR gateway NV55 ASUS N50 TOSHIBA A10 DELL N4010 HP DV6000 ASUS N53 TOSHIBA A300 DELL 630M HP DV6, DV6-1000 black SP LENOVO G470 G475 B470 V470 black LA LENOVO G550 B550 V560 black SP TOSHIBA L800 L830 L845black LA; TOSHIBA C800 C805 C845 black LA; ACER ONE ZG5 black SP ACER ONE ZG5 A110 A150 D250 SP TOSHIBA L600 C640 C645 black LA TOSHIBA L600 C640 C645 black SP LENOVO Z470 black LA ACER ONE 532H D255 D260 black SP hp CQ43 G4 G6 black SP hp CQ42 G42 black LA hp mini 1103 mini 110-3500 MINI 110-3700 black SP HP MINI 210-3000 black SP HP MINI 1000 black LA ACER S3 S5, Aspire one 756 SP ACER ASPIRE 5810T black SP ACER ONE 751H ZA3 black SP DELL MINI 1012 MINI 1018 black SP DELL MINI 10, MINI 1010 black LA DELL Studio 14 1440 black LA SAMSUNG RV411 RC410 black LA SAMSUNG 300E5A 300V5A black LA; SONY VPC-EE black LA SONY VPC-EG LA SONY NW black SP; SONY EA LA SONY EB black SP SONY EB SP HP DM4, DV5-2000 black LA; HP 8440P black SP ACER AS5516 EMACHINE E625 black SP LENOVO G560 black LA LENOVO S10-3 black LA LENOVO G460 black SP HP DV3500 SP ,LA ACER TM8571 TM5740 TM5742 black SP DELL Inspiron 11Z 1110 black SP DELL E5400 black LA; DELL STUDIO 1535 1555 black LA; DELL E4300 black LA; LENOVO G480 black SP SONY VPC-S black SP HP MINI 110 black SP ) HP MINI 210-2000 SP ACER ONE 532H SP ASUS EPC 1000-BR£¬SP£¬FR£¬GR£¬TR ASUS F80- US£¬ ASUS 1015- UK DELL MINI10US DELL 1012 TOSHIBA NB100- US Laptop battery OEM 3/4cell 15usd/pcs original need model to quote OEM 6cell 19usd/pcs original need model to quote OEM 8/9cell 23usd/pcs original need model to quote OEM Laptop adapter 60W 4usd/pcs original 9usd/pcs 90W 6usd/pcs original 11.5usd/pcs laptop fan 4usd/pcs For more model no#,please tell me what you want ,then we will quote to you . Otherwise, we are supply original laptop adapter, laptop battery, motherboard,laptop fan, LED light, CCTV camera and LED/LCD Screen for all size model Should you have any questions, pls do not hesitate to contact me. Best regards Grace zhang +86 13669601454 +86 0775 83647855 [1]http://www.keyboard2013.com Email:zhangtingyouxiang@hotmail.com huaruishop eletronic co.,ltd Q5B136 5F huqiangbei eletronic square futian district shenzhen city guangdong province china References 1. http://www.keyboard2013.com/ --part_8f6601a2_88cf_4576_a8f4_8a0cbc940594-- From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 05:31:06 2013 Return-Path: Delivered-To: freebsd-ports@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 2F302D0C; Fri, 13 Sep 2013 05:31:06 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from amailer.gwdg.de (amailer.gwdg.de [134.76.10.18]) (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 E6811277F; Fri, 13 Sep 2013 05:31:05 +0000 (UTC) Received: from gate.nw-fva.de ([134.76.242.1] helo=pc028.nfv) by mailer.gwdg.de with esmtpsa (TLSv1:DHE-RSA-CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1VKLy5-0001vP-0M; Fri, 13 Sep 2013 07:30:57 +0200 Message-ID: <5232A30E.4050707@gwdg.de> Date: Fri, 13 Sep 2013 07:30:54 +0200 From: Rainer Hurling User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130910 Thunderbird/17.0.8 MIME-Version: 1.0 To: marino@freebsd.org Subject: Re: textproc/hunspell build failure following 20130904 References: <201309122036.r8CKatf6061172@mech-cluster241.men.bris.ac.uk> <523227DA.7000408@marino.st> In-Reply-To: <523227DA.7000408@marino.st> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Authenticated: Id:rhurlin X-Spam-Level: - X-Virus-Scanned: (clean) by exiscan+sophie Cc: mexas@bris.ac.uk, John Marino , freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 05:31:06 -0000 Am 12.09.2013 22:45 (UTC+1) schrieb John Marino: > On 9/12/2013 22:36, Anton Shterenlikht wrote: >> /usr/bin/ld: -: invalid DSO for symbol `cbreak' definition >> /usr/local/lib/libtinfow.so.5.9: could not read symbols: Bad value >> c++: error: linker command failed with exit code 1 (use -v to see invocation) >> *** [hunspell] Error code 1 >> >> make[4]: stopped in /usr/ports/textproc/hunspell/work/hunspell-1.3.2/src/tools >> >> I've rebuilt ncurses and readline successfully already. > > What library does the cbreak symbol belong to? > you need to add it to the linker flags. (e.g. LDFLAGS+= > -L${LOCALBASE}/lib -lmylib ) > > Invalid DSO normally means the symbol is in another library and the > linker is not going to recursively search for it. In this case I think there is a problem with coexistence of libtinfow.so in devel/ncurses and systems libtinfow.so (maybe also some conflict with devel/readline). There are two different versions of libtinfow.so: /usr/lib/libtinfow.so /usr/local/lib/libtinfow.so.5.9 This problem also occurs at least with textproc/aspell, security/clamav, sysutils/libcdio and multimedia/vcdimager, as I reported about in another thread three days ago (no answer until now). If I (temporarily) deinstall the dependency devel/ncurses, I am able to build and reinstall hunspell and the other mentioned ports. Of course, ncurses was updated before hunspell. Rainer > > John From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 05:57:21 2013 Return-Path: Delivered-To: freebsd-ports@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 219A12DE for ; Fri, 13 Sep 2013 05:57:21 +0000 (UTC) (envelope-from sergey.dyatko@gmail.com) Received: from mail-ee0-x235.google.com (mail-ee0-x235.google.com [IPv6:2a00:1450:4013:c00::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AEF6028B1 for ; Fri, 13 Sep 2013 05:57:20 +0000 (UTC) Received: by mail-ee0-f53.google.com with SMTP id b15so332788eek.40 for ; Thu, 12 Sep 2013 22:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=sfxDCDZN4LYSFrIqF+wEWSuNGoEx4/ox+cu7ozBA2ZQ=; b=nhqddO/f11EhISTRor/BEQgdovjNkvnmhn4TBBps2q3NtUJunruP594t9J54ykyiDh LCAL1YTSEZdN+gd6EOU1/VjBGQOBJ3g0DigUr+Z3w6IGdk0ao1oX+NeNt/KP93twVmvk PjSuN3SZZPnY8bWY/JBZ6tpXDP+yyR6ENJXLZYsiXQ/bp7fq5H+N+ctjqY3MGs/XV/vR hXPWksBVZrjY1FQih0rVsMrRxw4oiropOIDS5KXhEIZjZIlGc8zOU42n+fs/VD/pf2C/ jWWDZ33EmVPxOdvc5HH4a6g9SEyl4hhjy16qlIZigvT2seIRE36YldQfk2Nf6z8hlaNs Iawg== X-Received: by 10.15.48.67 with SMTP id g43mr15847981eew.17.1379051839187; Thu, 12 Sep 2013 22:57:19 -0700 (PDT) Received: from laptop.minsk.domain (m-s.agava.net. [195.222.84.203]) by mx.google.com with ESMTPSA id a6sm11733251eei.10.1969.12.31.16.00.00 (version=SSLv3 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 22:57:18 -0700 (PDT) Date: Fri, 13 Sep 2013 08:57:19 +0300 From: "Sergey V. Dyatko" To: freebsd-ports@freebsd.org Subject: Re: textproc/hunspell build failure following 20130904 Message-ID: <20130913085719.6ef4928e@laptop.minsk.domain> In-Reply-To: <5232A30E.4050707@gwdg.de> References: <201309122036.r8CKatf6061172@mech-cluster241.men.bris.ac.uk> <523227DA.7000408@marino.st> <5232A30E.4050707@gwdg.de> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 05:57:21 -0000 On Fri, 13 Sep 2013 07:30:54 +0200 Rainer Hurling wrote: > Am 12.09.2013 22:45 (UTC+1) schrieb John Marino: > > On 9/12/2013 22:36, Anton Shterenlikht wrote: > >> /usr/bin/ld: -: invalid DSO for symbol `cbreak' definition > >> /usr/local/lib/libtinfow.so.5.9: could not read symbols: Bad value > >> c++: error: linker command failed with exit code 1 (use -v to see > >> invocation) *** [hunspell] Error code 1 > >> > >> make[4]: stopped > >> in /usr/ports/textproc/hunspell/work/hunspell-1.3.2/src/tools > >> > >> I've rebuilt ncurses and readline successfully already. > > > > What library does the cbreak symbol belong to? > > you need to add it to the linker flags. (e.g. LDFLAGS+= > > -L${LOCALBASE}/lib -lmylib ) > > > > Invalid DSO normally means the symbol is in another library and the > > linker is not going to recursively search for it. > > In this case I think there is a problem with coexistence of > libtinfow.so in devel/ncurses and systems libtinfow.so (maybe also > some conflict with devel/readline). > > There are two different versions of libtinfow.so: > /usr/lib/libtinfow.so > /usr/local/lib/libtinfow.so.5.9 > > This problem also occurs at least with textproc/aspell, > security/clamav, sysutils/libcdio and multimedia/vcdimager, as I > reported about in another thread three days ago (no answer until now). > + irs/irssi > If I (temporarily) deinstall the dependency devel/ncurses, I am able > to build and reinstall hunspell and the other mentioned ports. Of > course, ncurses was updated before hunspell. from IRC: is that right way (deinstall ncurses and rebuild irssi/aspell/libcdio/etc) ? yes > > Rainer > > > > > John > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to > "freebsd-ports-unsubscribe@freebsd.org" -- wbr, tiger From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 10:39:18 2013 Return-Path: Delivered-To: ports@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 9CA9AE7D for ; Fri, 13 Sep 2013 10:39:18 +0000 (UTC) (envelope-from lehmann@ans-netz.de) Received: from avocado.salatschuessel.net (avocado.salatschuessel.net [78.111.72.186]) by mx1.freebsd.org (Postfix) with ESMTP id 0D9182853 for ; Fri, 13 Sep 2013 10:39:17 +0000 (UTC) Received: (qmail 5105 invoked by uid 80); 13 Sep 2013 10:39:08 -0000 Received: from 217.110.62.222 ([217.110.62.222]) by avocado.salatschuessel.net (Horde Framework) with HTTP; Fri, 13 Sep 2013 12:39:08 +0200 Date: Fri, 13 Sep 2013 12:39:08 +0200 Message-ID: <20130913123908.Horde.ewel7xLT9UKUjtc8afUmfQ8@avocado.salatschuessel.net> From: Oliver Lehmann To: ports@freebsd.org Subject: Fwd: [RELEASE - head-amd64-default][devel/libwfut] Build failed for libwfut-0.2.2_1 during build User-Agent: Internet Messaging Program (IMP) H5 (6.1.4) Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 10:39:18 -0000 Hi, has someone an idea what could cause this error? I'm not able to reproduce it with clang on FreeBSD 9 It looks like stdlib.h is not included by it is via libwfut/platform.cpp Greetings ----- Weitergeleitete Nachricht von pkg-fallout@freebsd.org ----- Datum: Thu, 12 Sep 2013 05:35:27 GMT Von: pkg-fallout@freebsd.org Betreff: [RELEASE - head-amd64-default][devel/libwfut] Build failed for libwfut-0.2.2_1 during build An: oliver@freebsd.org Cc: pkg-fallout@freebsd.org You are receiving this mail as a port that you maintain is failing to build on the FreeBSD package build server. Please investigate the failure and submit a PR to fix build. Maintainer: oliver@FreeBSD.org Last committer: sunpoet@FreeBSD.org Ident: $FreeBSD: head/devel/libwfut/Makefile 322783 2013-07-11 16:26:26Z sunpoet $ Log URL: http://beefy2.isc.freebsd.org/bulk/head-amd64-default/2013-09-12_01h37m09s/logs/libwfut-0.2.2_1.log Build URL: http://beefy2.isc.freebsd.org/bulk/head-amd64-default/2013-09-12_01h37m09s Log: ====>> Building devel/libwfut [...] Making all in tools c++ -DHAVE_CONFIG_H -I.. -I.. -O2 -pipe -fno-strict-aliasing -Wall -O3 -DNDEBUG -DTIXML_USE_STL=1 -I/usr/local/include/sigc++-2.0 -I/usr/local/lib/sigc++-2.0/include -I/usr/local/include -MT wfut.o -MD -MP -MF .deps/wfut.Tpo -c -o wfut.o wfut.cpp wfut.cpp:193:5: error: use of undeclared identifier 'srand' srand((unsigned)time(NULL)); ^ wfut.cpp:196:5: error: use of undeclared identifier 'srand48' srand48((unsigned)time(NULL)); ^ wfut.cpp:306:28: error: use of undeclared identifier 'unlink'; did you mean 'inline'? if (os_exists(tmp_wfut)) unlink(tmp_wfut.c_str()); ^ 3 errors generated. *** Error code 1 Stop. make[3]: stopped in /wrkdirs/usr/ports/devel/libwfut/work/libwfut-0.2.2/tools *** Error code 1 Stop. make[2]: stopped in /wrkdirs/usr/ports/devel/libwfut/work/libwfut-0.2.2 *** Error code 1 Stop. make[1]: stopped in /wrkdirs/usr/ports/devel/libwfut/work/libwfut-0.2.2 *** Error code 1 Stop. make: stopped in /usr/ports/devel/libwfut ===> Cleaning for libwfut-0.2.2_1 ----- Ende der weitergeleiteten Nachricht ----- From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 13:17:59 2013 Return-Path: Delivered-To: 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 522D2D86 for ; Fri, 13 Sep 2013 13:17:59 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-we0-x233.google.com (mail-we0-x233.google.com [IPv6:2a00:1450:400c:c03::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E10E92193 for ; Fri, 13 Sep 2013 13:17:58 +0000 (UTC) Received: by mail-we0-f179.google.com with SMTP id x55so1149107wes.10 for ; Fri, 13 Sep 2013 06:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=Ju9l6fXt+Anf2VJzvM0p4LmPo45m88XNFee9NxY87bY=; b=KvCQy63e7sVlpICxeBEV5tqUv+1pbBPkzzCbKHxtSoIiY606T6zLQudyCHCy24MUfx I7OuIKT66dp2Hw1iJtEi3uQKlxcMTP21/KiV+9ZzwcVTsOcCLsqAqX4PibKx6lLMRgg0 g45zGN9AKK/yD+hAUTYoGiRigHFvwnhV+nDkYwWWyA26eR3ZJjJmqaxXdu+QT+tg5TRm i8fcFZqd4zgtth9GACaw1hoKGVXROXaWKvHAHY5JY4uvfYD/77mUpyxjgaUx7f8jyRND O8hWi+/bKiBTNzdugSBzL21tG+nHiHuTOJbyQz6VnVYtos53NVNxWnkENZPZiaCoAYXS hDMQ== X-Received: by 10.180.103.7 with SMTP id fs7mr2582802wib.42.1379078277235; Fri, 13 Sep 2013 06:17:57 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id fb9sm3516464wid.7.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 13 Sep 2013 06:17:56 -0700 (PDT) Sender: Baptiste Daroussin Date: Fri, 13 Sep 2013 15:17:53 +0200 From: Baptiste Daroussin To: ports@FreeBSD.org Subject: [HEADSUP][CFT] New compiler USES flag, please test, review comment Message-ID: <20130913131753.GJ33103@ithaqua.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="q5r20fdKX+PFtYHw" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 13:17:59 -0000 --q5r20fdKX+PFtYHw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Given how old our gcc in base is and the work done on clang and libc++. It is becoming complicating to make some ports properly working on all supported version of FreeBSD. To help in that I would like to propose a new USES: compiler http://people.freebsd.org/~bapt/compiler.mk.txt What it does is: USES=compiler Will set 2 variables: COMPILER_TYPE to gcc or clang depending on the base compiler COMPILER_VERSION wish will be the 2 first digits of the compiler version 46 for gcc 4.6.* 33 for clang 3.3.* USES=compiler:features It creates a new COMPILER_FEATURES which will gather the supported features of the compiler. Features being: libstdc++ if the c++ compiler uses libstdc++ by default libc++ if the c++ compiler uses libc++ by default And the standard supported by the compiler: c89, c99, c11, gnu89, gnu99, gnu11, c++98, c++11, gnu++98, gnu++11 USES=compiler:c11 Means you need a c11 capable compiler, and if your default comiler is not able to do it, it will picked clang33 by default of gcc 4.6+ if you specify in your make.conf you do prefer gcc over clang USES= compiler:c++11 Means you need a c++1 capable compiler but not necessary a c++ 11 aware standard library, in that case if the base compiler is not able to support c++11 clang33 will be used from ports otherwise gcc 4.6+ if you specify it in make.conf. USES= compiler=stdc++11 You need a c++11 aware stdlibrary, if the base compiler doesn't have it then gcc 4.6+ will be used. To specify you do prefer gcc over clang by default add FAVORITE_COMPILER=gcc in your make.conf For all cases that does not fall into one of the above case continue using USE_GCC as you where doing before regards, Bapt --q5r20fdKX+PFtYHw Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlIzEIEACgkQ8kTtMUmk6EzWAgCfWdnZhlM128ZnNBYC6Zakc/kU B68AoLagYkORkH+ADcXqdHk1JA2IMHMf =j/2p -----END PGP SIGNATURE----- --q5r20fdKX+PFtYHw-- From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 13:33:50 2013 Return-Path: Delivered-To: freebsd-ports@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 81D0D5DB for ; Fri, 13 Sep 2013 13:33:50 +0000 (UTC) (envelope-from jerry@seibercom.net) Received: from mail-qc0-x229.google.com (mail-qc0-x229.google.com [IPv6:2607:f8b0:400d:c01::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0A2FF233B for ; Fri, 13 Sep 2013 13:33:49 +0000 (UTC) Received: by mail-qc0-f169.google.com with SMTP id c9so882104qcz.14 for ; Fri, 13 Sep 2013 06:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seibercom.net; s=google; h=date:from:to:subject:message-id:in-reply-to:references:reply-to :organization:face:mime-version:content-type; bh=SOrJA4WwqxzNIRsXu400hEVd2uqNXnlf+8ue8JPAO8w=; b=Idc9P+dfjZ/YuviLlBS4/n3vEVNuOHgvLDTddDJXwbgsgbWHb+0UEjEfityQf67l81 KtF8ksLtAvJJz4DPOKV1SiO9V5ZCLUlhxAu8+3Q7mW5i71YYHEz5jI9/9RIzurFP1RIw Dgmj9DUBiXPIB5SRoA9/jInHllc/Fp0U1hQJU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:reply-to:organization:face:mime-version:content-type; bh=SOrJA4WwqxzNIRsXu400hEVd2uqNXnlf+8ue8JPAO8w=; b=WgEGmKELXVoDmG7nYwmZhD0j8X4DVwbKykA+jVQ/3x7SF4pATRRdYeoIOmWkPW8Z6G RycTEqoJWjRFnGJveQgX2/bVEErjTpSaNxkfHFQgA08QVyOICCgPayDNGB2faZdur5KR JqhcEPsmI6hnPV1swUVZWx9W3Bide5Fj8q+bQgpG8H12JHGrQKZ2mJ4DgETla3Ubv/Vz wm19OiD6PErsCjWEJiJyWgI2CYcOdiBKP05fw56kxBTM/pv1bDlRjJtLfEALNbo9rY2e bQmS5SvUI9M2SihVeN5b414WWo+n4Nfe7r0qPxLOT9DMdb4BEas1i9YeI9CmxtQxfTTz lkDA== X-Gm-Message-State: ALoCoQlM8QrBz4TKDT5yxIWcR+zGEQHBsarn1A/nstFj42L11+sE+7POsGjswhtpleWIJlN9sMyq X-Received: by 10.49.49.133 with SMTP id u5mr24392668qen.19.1379079228786; Fri, 13 Sep 2013 06:33:48 -0700 (PDT) Received: from scorpio.seibercom.net (cpe-076-182-104-150.nc.res.rr.com. [76.182.104.150]) by mx.google.com with ESMTPSA id u8sm19795670qef.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 06:33:48 -0700 (PDT) Received: from scorpio (localhost [127.0.0.1]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: jerry@seibercom.net) by scorpio.seibercom.net (Postfix) with ESMTPSA id 3cbyVL75C7z2CG57 for ; Fri, 13 Sep 2013 09:33:46 -0400 (EDT) Date: Fri, 13 Sep 2013 09:33:38 -0400 From: Jerry To: freebsd-ports@freebsd.org Subject: Re: [HEADSUP][CFT] New compiler USES flag, please test, review comment Message-ID: <20130913093338.40b9eb3e@scorpio> In-Reply-To: <20130913131753.GJ33103@ithaqua.etoilebsd.net> References: <20130913131753.GJ33103@ithaqua.etoilebsd.net> Organization: seibercom.net X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd8.3) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEUAAABYRlwJCw4FAgAIBwKprDkBAQFQLR0BAgCir7VRttp8AAACAUlEQVQ4jZWUTYvbMBCGTVl8V2hX6Gg5G5FbWQdBj0lEfE7BhN4cyzi5Wt1E5L70roWy6N92xok/skkP+5IYrMcz78xIduDWpNM3vFzuA/jX5EY1AI6KHFwW/CzFuQAwqUBbV12p+CzIh6Awq7sg33pn5D64SQXAexffeuQlA/L35RrkaB551OjGfP/cAO8mCNaDcgvfky5ijoD0pAXlCQCnljiAjsJD9Ax05Ko5sZxbnLQcmM+dZg5IjREfZrWIHK0JuwU68pAGwHvfRxBundRzTxxz3r9dNUikPsEihjz2Dc4kjp1hKsJGuot4EDxaxzMoC7XqhxhOSfZrTS6gSX1JVdjp+o1PvWfekXgw3WL0g70nDEwA0H0HQsEZc8sTmFMTkWUfYWC/vdR1zQy3xLQgLwzu90QnlnFLjeiGWBjwhb4Sa42IqOg2qqS4O1/zhKokFUb1Q8Rj4Eb69WVflXEehJ35DgChVTE5n50eaGyMLOfH8AOodoSM4PVYAQgQdBulOa+knklYks3vAuQ+uX492lTl+A+e8qBV2AKoXalVKFfyuUp0pUp1ARaUHh82lv9MN+Ig7CZtgE6FNYvjlywT2VP2dMgOG46gTIWcqdfvuwyXNz0oMJNd/N5lh1YNiJt19ADTUo3VuFSNeQwVqRSrGjSCp53fk2g+Mvfk/gfoPxHeUS8MH9vRAAAAAElFTkSuQmCC Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/ZwficfLWf8xIux4/be9b68j"; protocol="application/pgp-signature" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-ports@freebsd.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 13:33:50 -0000 --Sig_/ZwficfLWf8xIux4/be9b68j Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 13 Sep 2013 15:17:53 +0200 Baptiste Daroussin articulated: > Hi, >=20 > Given how old our gcc in base is and the work done on clang and > libc++. >=20 > It is becoming complicating to make some ports properly working on > all supported version of FreeBSD. >=20 > To help in that I would like to propose a new USES: > compiler >=20 > http://people.freebsd.org/~bapt/compiler.mk.txt >=20 > What it does is: >=20 > USES=3Dcompiler >=20 > Will set 2 variables: > COMPILER_TYPE to gcc or clang depending on the base compiler > COMPILER_VERSION wish will be the 2 first digits of the compiler > version 46 for gcc 4.6.* 33 for clang 3.3.* >=20 > USES=3Dcompiler:features > It creates a new COMPILER_FEATURES which will gather the supported > features of the compiler. >=20 > Features being: > libstdc++ if the c++ compiler uses libstdc++ by default > libc++ if the c++ compiler uses libc++ by default > And the standard supported by the compiler: > c89, c99, c11, gnu89, gnu99, gnu11, c++98, c++11, gnu++98, gnu++11 >=20 > USES=3Dcompiler:c11 >=20 > Means you need a c11 capable compiler, and if your default comiler is > not able to do it, it will picked clang33 by default of gcc 4.6+ if > you specify in your make.conf you do prefer gcc over clang >=20 > USES=3D compiler:c++11 >=20 > Means you need a c++1 capable compiler but not necessary a c++ 11 > aware standard library, in that case if the base compiler is not able > to support c++11 clang33 will be used from ports otherwise gcc 4.6+ > if you specify it in make.conf. >=20 > USES=3D compiler=3Dstdc++11 >=20 > You need a c++11 aware stdlibrary, if the base compiler doesn't have > it then gcc 4.6+ will be used. >=20 > To specify you do prefer gcc over clang by default add > FAVORITE_COMPILER=3Dgcc in your make.conf >=20 > For all cases that does not fall into one of the above case continue > using USE_GCC as you where doing before Excellent idea. I was never in favor of switching to "clang" anyway. I would have preferred that the base "gcc" was updated to the latest stable version; however, too many people got their shorts in a bunch and that wasn't going to happen. This sounds like a smart, well thought out concept; therefore, it will probably be rejected. --=20 Jerry =E2=99=94 Disclaimer: off-list followups get on-list replies or get ignored. Please do not ignore the Reply-To header. __________________________________________________________________ --Sig_/ZwficfLWf8xIux4/be9b68j Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSMxQ6AAoJEF2rWD2do7dNtOUH/0m8V28zyzIJG8r3rWltCQ88 podOeAzhbKqOPl+JhSOrP0YfeReT9uJyqSd+HOJegI8d0liUskvrks6a5s6kYFhA BpBdCZJTFPPM0iuPaaU4xe3nZ/hPfRJdSzSG9d70YOs6JlJR7Ti+CJ9racGTRJr+ KUEh1+x9VZPHDEoNHly+WgnJJLbthU7XdH0P2OXONsPfIivRCPZ7+OTMJw9IgZTa idaPM/QpDGEXV94baQcTzeBMlXU3c77asJPsyaL4y/5tOrHEv9Z5tpXTKQB8j1AF 90HoKUmV4C+MJuTdMgvhg9PdpvGxxAOAKgDHU7fAiPD6Yq0CbzuoP8PSUkohw28= =UkQg -----END PGP SIGNATURE----- --Sig_/ZwficfLWf8xIux4/be9b68j-- From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 15:04:07 2013 Return-Path: Delivered-To: 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 A88622E0; Fri, 13 Sep 2013 15:04:07 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from cpanel09.rubas.ch (cpanel09.rubas.ch [195.182.222.79]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0D85227E6; Fri, 13 Sep 2013 15:04:07 +0000 (UTC) Received: from 98-41.199-178.cust.bluewin.ch ([178.199.41.98]:54487 helo=gahrfit.gahr.ch) by cpanel09.rubas.ch with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1VKUuh-0003FE-Bu; Fri, 13 Sep 2013 17:04:04 +0200 Date: Fri, 13 Sep 2013 17:04:00 +0200 From: Pietro Cerutti To: Baptiste Daroussin Subject: Re: [HEADSUP][CFT] New compiler USES flag, please test, review comment Message-ID: <20130913150359.GN37800@gahrfit.gahr.ch> References: <20130913131753.GJ33103@ithaqua.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="75WsOQSofUOhcSOp" Content-Disposition: inline In-Reply-To: <20130913131753.GJ33103@ithaqua.etoilebsd.net> X-PGP-Key: 0x9571F78E X-PGP-Fingerprint: 1203 92B5 3919 AF84 9B97 28D6 C0C2 6A98 9571 F78E User-Agent: Mutt/1.5.21 (2010-09-15) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.rubas.ch X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - FreeBSD.org X-Get-Message-Sender-Via: cpanel09.rubas.ch: authenticated_id: gahr@gahr.ch Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: gahr@FreeBSD.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 15:04:07 -0000 --75WsOQSofUOhcSOp Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2013-Sep-13, 15:17, Baptiste Daroussin wrote: > USES=3D compiler:c++11 >=20 > Means you need a c++1 capable compiler but not necessary a c++ 11 aware s= tandard > library, in that case if the base compiler is not able to support c++11 c= lang33 > will be used from ports otherwise gcc 4.6+ if you specify it in make.conf. >=20 > USES=3D compiler=3Dstdc++11 >=20 > You need a c++11 aware stdlibrary, if the base compiler doesn't have it t= hen gcc > 4.6+ will be used. Very nice! I suggest to change these last two names in=20 c++11-lang c++11-lib since 'stdc++11' sounds too much like libstdc++ for me (implying GNU's implementation). =2E2$ --=20 Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp --75WsOQSofUOhcSOp Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iEYEARECAAYFAlIzKV8ACgkQwMJqmJVx945l3wCeOJ87YybQCghiBFSuNQZmhzMd ObsAoN/7iipSADwrK//qkWgBZKR68H3E =3CFE -----END PGP SIGNATURE----- --75WsOQSofUOhcSOp-- From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 15:24:06 2013 Return-Path: Delivered-To: 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 3FC4995D; Fri, 13 Sep 2013 15:24:06 +0000 (UTC) (envelope-from annulen@yandex.ru) Received: from forward4h.mail.yandex.net (forward4h.mail.yandex.net [IPv6:2a02:6b8:0:f05::4]) by mx1.freebsd.org (Postfix) with ESMTP id E4074291A; Fri, 13 Sep 2013 15:24:05 +0000 (UTC) Received: from web16h.yandex.ru (web16h.yandex.ru [84.201.186.45]) by forward4h.mail.yandex.net (Yandex) with ESMTP id 55A4E1B2296A; Fri, 13 Sep 2013 19:24:03 +0400 (MSK) Received: from 127.0.0.1 (localhost [127.0.0.1]) by web16h.yandex.ru (Yandex) with ESMTP id 7F9091814B5; Fri, 13 Sep 2013 19:24:02 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1379085842; bh=kBen/s4hFIXb5Cg2ps0Oa7L+ZjfiXBPRWCHFKZQiiuE=; h=From:To:Cc:In-Reply-To:References:Subject:Date; b=UoPxZUdhezv8ODcyjIoJMV1FA3ApP5bYDdHk1reQJd9q9YeAYgIRPSEahRZrNRN6v aNHSAhat2RNe9UUFSGvrh3L9B3T/31mTtqywDUbAMTMlN0CHkJHcxpArX6LxOotVX6 gsPHCEEmIWstQ2MIY+/9cDKJthVoFPrLlHf4Vz88= Received: from fw01.smlabs.net (fw01.smlabs.net [185.5.42.3]) by web16h.yandex.ru with HTTP; Fri, 13 Sep 2013 19:24:01 +0400 From: Konstantin Tokarev To: "gahr@FreeBSD.org" , Baptiste Daroussin In-Reply-To: <20130913150359.GN37800@gahrfit.gahr.ch> References: <20130913131753.GJ33103@ithaqua.etoilebsd.net> <20130913150359.GN37800@gahrfit.gahr.ch> Subject: Re: [HEADSUP][CFT] New compiler USES flag, please test, review comment MIME-Version: 1.0 Message-Id: <206291379085841@web16h.yandex.ru> X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Fri, 13 Sep 2013 19:24:01 +0400 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=koi8-r Cc: "ports@FreeBSD.org" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 15:24:06 -0000 13.09.2013, 19:04, "Pietro Cerutti" : > On 2013-Sep-13, 15:17, Baptiste Daroussin wrote: > >> šUSES= compiler:c++11 >> >> šMeans you need a c++1 capable compiler but not necessary a c++ 11 aware standard >> šlibrary, in that case if the base compiler is not able to support c++11 clang33 >> šwill be used from ports otherwise gcc 4.6+ if you specify it in make.conf. >> >> šUSES= compiler=stdc++11 >> >> šYou need a c++11 aware stdlibrary, if the base compiler doesn't have it then gcc >> š4.6+ will be used. > > Very nice! I suggest to change these last two names in > > c++11-lang > c++11-lib > > since 'stdc++11' sounds too much like libstdc++ for me (implying GNU's > implementation). Or like "standard C++11" vs "non-standard C++11". -- Regards, Konstantin From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 18:30:04 2013 Return-Path: Delivered-To: ports@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 B68D7B8F; Fri, 13 Sep 2013 18:30:04 +0000 (UTC) (envelope-from joel@tahoestores.com) Received: from que11.charter.net (que11.charter.net [209.225.8.21]) by mx1.freebsd.org (Postfix) with ESMTP id 473892869; Fri, 13 Sep 2013 18:30:03 +0000 (UTC) Received: from imp10 ([10.20.200.15]) by mta11.charter.net (InterMail vM.8.01.05.09 201-2260-151-124-20120717) with ESMTP id <20130913180848.OHJW6169.mta11.charter.net@imp10>; Fri, 13 Sep 2013 14:08:48 -0400 Received: from Gossameri52500 ([71.83.116.179]) by imp10 with smtp.charter.net id Qi8c1m00Y3sJe5z05i8ds1; Fri, 13 Sep 2013 14:08:48 -0400 X-Authority-Analysis: v=2.0 cv=brYUnzmi c=1 sm=1 a=UnGWayXURV3/S+OdCuftyg==:17 a=6oPyUfum0bAA:10 a=JHHFUuzbhCAA:10 a=8Z6kr8O2AAAA:8 a=OKkAJL2KCjgA:10 a=97_ISbmIEk9gZFxuMh0A:9 a=CjuIK1q_8ugA:10 a=Vw41eUf5QogA:10 a=smTOZzi6VukA:10 a=yMhMjlubAAAA:8 a=SSmOFEACAAAA:8 a=nUZPq6ikCvMbYoQbFcwA:9 a=gKO2Hq4RSVkA:10 a=UiCQ7L4-1S4A:10 a=hTZeC7Yk6K0A:10 a=frz4AuCg-hUA:10 a=UnGWayXURV3/S+OdCuftyg==:117 From: "Joel F Rodriguez" To: Subject: FreeBSD Port: libgd-2.1.0_1,1 Date: Fri, 13 Sep 2013 11:08:33 -0700 Message-ID: <01cb01ceb0ac$49a38600$dcea9200$@tahoestores.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-Index: Ac6wrDzlOsNX9wrNTw2w24xIkIqX9g== Content-Language: en-us Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: ports@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 18:30:04 -0000 Hi, I keep rebuilding this package and it appears that the pkg info never gets updated. ===> Running ldconfig /sbin/ldconfig -m /usr/local/lib ===> Registering installation for libgd-2.1.0_1,1 gd-2.0.35_9,1 < needs updating (port has 2.1.0_1,1) I can't locate a specific package for gd-2, so I am assuming that libgd-2 is the ticket. Please advise. Joel From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 19:08:05 2013 Return-Path: Delivered-To: freebsd-ports@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 5ADB2B64 for ; Fri, 13 Sep 2013 19:08:05 +0000 (UTC) (envelope-from trashcan@odo.in-berlin.de) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [87.98.177.233]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24FAF2B34 for ; Fri, 13 Sep 2013 19:08:04 +0000 (UTC) Received: from sulu.fritz.box (p5DDC3CCE.dip0.t-ipconnect.de [93.220.60.206]) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 3cc5mR2D1Sz5mJ for ; Fri, 13 Sep 2013 21:01:27 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) Subject: Re: Berkeley DB 4.1 From: Michael Grimm In-Reply-To: Date: Fri, 13 Sep 2013 21:01:25 +0200 Content-Transfer-Encoding: 7bit Message-Id: References: <20130912110937.GA34979@over-yonder.net> To: "freebsd-ports@freebsd.org" X-Mailer: Apple Mail (2.1508) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 19:08:05 -0000 On 12.09.2013, at 13:34, Ivan Voras wrote: > Yes, I've had WITH_BDB_VER?=48 in my standard /etc/make.conf Please excuse my ignorance, but I couldn't find the meaning of that '?'. Does that stand for "*at least* version db48"? Or? Thanks in advance, Michael From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 19:11:36 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 420FAD8C for ; Fri, 13 Sep 2013 19:11:36 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D37722B91 for ; Fri, 13 Sep 2013 19:11:35 +0000 (UTC) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0Maa3B-1Ve1RE3dur-00K5Eb for ; Fri, 13 Sep 2013 21:11:34 +0200 Message-ID: <52336365.2020702@gmx.de> Date: Fri, 13 Sep 2013 21:11:33 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: Berkeley DB 4.1 References: In-Reply-To: X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:EhUt7kPkd1GOMZr+H+JIu2+ZQGYloZLP8F0eXtTVK5hL85x+m9E lirPVA/H0M/QjQ8i0FZK5qxli1j7whyXZPGKQzsaEYcHIrfN+tzTXQfAyaxCNwcmN0fAVKv wZkFDnLTAQNlUpnYyPKaZb2ssbPc0OGUdBeBsd/1z91zvfujtOXin/x6KNHi/I2KQWuC98K rqdUL0ENjEiU8y38QOwog== Cc: Ivan Voras X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 19:11:36 -0000 On 2013-09-12 12:57, Ivan Voras wrote: > Hello, > > I'd like to start a discussion on changing the default BDB port from 4.1 > to something more recent. > > bdb version 4.1 was last released in 2002: > README: Sleepycat Software: Berkeley DB 4.1.25: (December 19, 2002) > > There are some ports which have an unexpected dependacy on bdb via APR > (apache22, subversion), which does is not wrong in itself, but is > somewhat unelegant (as a personal opinion of course). > > I've found this previous discussion: > http://lists.freebsd.org/pipermail/freebsd-ports/2013-February/081444.html > > And while the argument seems valid, it also doesn't have an estimate of > which / how many ports will break with a more recent bdb. > > Could an experimental port build be done with setting WITH_BDB_VER to > either the most recent 4.x version (WITH_BDB_VER=48), to the last > Sleepycat Licensed version (50) or the recent version in ports (60) to > see what breaks? > Long time ago I had a short discussion with mandree@ about a bump to 4.8. 4.8 should be supported by most ports (also long time the default in many linux distributions) At last one argument I haven't seen in the discussion is "data migration", for example amavisd-new provides maintenance and backup / recover routines but other ports ?? -- olli From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 19:56:34 2013 Return-Path: Delivered-To: freebsd-ports@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 12472E96 for ; Fri, 13 Sep 2013 19:56:34 +0000 (UTC) (envelope-from gahr@gahr.ch) Received: from cpanel09.rubas.ch (cpanel09.rubas.ch [195.182.222.79]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BFDBD2DFF for ; Fri, 13 Sep 2013 19:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gahr.ch; s=default; h=To:Date:Subject:From:Cc:Message-Id:Content-Transfer-Encoding:Content-Type:In-Reply-To:Mime-Version:References; bh=mieIwDXiO/44K2iwu4W6tXZML0E7sGpPamGmSpl+VHw=; b=i76dRO96pUgmzyAg9UYW/RXyeoxBr0hDLK5wg+rii1wNAWLo4COt42/dCkhhwR6ZjnboAPIIYgc0g1SwkLh1zzjf/dxJUEEzNlnPxFWZdmYz4casDxV28yCjlMZbMJo6; Received: from 98-41.199-178.cust.bluewin.ch ([178.199.41.98]:54691 helo=[192.168.1.34]) by cpanel09.rubas.ch with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.80.1) (envelope-from ) id 1VKZTc-002Jir-G4; Fri, 13 Sep 2013 21:56:24 +0200 References: <20130912110937.GA34979@over-yonder.net> Mime-Version: 1.0 (1.0) In-Reply-To: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: <813C0F11-1BBC-433D-BFCE-5B44DE663833@gahr.ch> X-Mailer: iPhone Mail (10B329) From: Pietro Cerutti Subject: Re: Berkeley DB 4.1 Date: Fri, 13 Sep 2013 21:56:21 +0200 To: Michael Grimm X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.rubas.ch X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - gahr.ch X-Get-Message-Sender-Via: cpanel09.rubas.ch: authenticated_id: gahr@gahr.ch Cc: "freebsd-ports@freebsd.org" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 19:56:34 -0000 On 13-set-2013, at 21:01, Michael Grimm wrote: > On 12.09.2013, at 13:34, Ivan Voras wrote: >=20 >> Yes, I've had WITH_BDB_VER?=3D48 in my standard /etc/make.conf >=20 > Please excuse my ignorance, but I couldn't find the meaning of=20 > that '?'. Does that stand for "*at least* version db48"? Or? Set the variable if it's not set already, so if a port specify its own prefe= rence via WITH_BDB_VER, it's respected. From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 20:21:16 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 A131E2EF for ; Fri, 13 Sep 2013 20:21:16 +0000 (UTC) (envelope-from trashcan@odo.in-berlin.de) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [87.98.177.233]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 68D7E2F48 for ; Fri, 13 Sep 2013 20:21:15 +0000 (UTC) Received: from sulu.fritz.box (p5DDC3CCE.dip0.t-ipconnect.de [93.220.60.206]) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 3cc7XT54TGz5nY for ; Fri, 13 Sep 2013 22:21:13 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) Subject: Re: Berkeley DB 4.1 From: Michael Grimm In-Reply-To: <813C0F11-1BBC-433D-BFCE-5B44DE663833@gahr.ch> Date: Fri, 13 Sep 2013 22:21:12 +0200 Content-Transfer-Encoding: 7bit Message-Id: <621B7727-35E2-46F2-8B20-525D5EC9C831@odo.in-berlin.de> References: <20130912110937.GA34979@over-yonder.net> <813C0F11-1BBC-433D-BFCE-5B44DE663833@gahr.ch> To: "freebsd-ports@freebsd.org" X-Mailer: Apple Mail (2.1508) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 20:21:16 -0000 On 13.09.2013, at 21:56, Pietro Cerutti wrote: > On 13-set-2013, at 21:01, Michael Grimm wrote: >> On 12.09.2013, at 13:34, Ivan Voras wrote: >>> Yes, I've had WITH_BDB_VER?=48 in my standard /etc/make.conf >> >> Please excuse my ignorance, but I couldn't find the meaning of >> that '?'. Does that stand for "*at least* version db48"? Or? > > Set the variable if it's not set already, so if a port specify > its own preference via WITH_BDB_VER, it's respected. Thanks to all who answered (including offlist). If I would like to force all ports to become compiled with db48, I would use "WITH_BDB_VER=48", instead. Understood. But, is there a way to define something like "use at least db48" and ignore whatever is specified by the port, except, if the port specifies a version > db48. Sorry, that might be a dumb question of mine, but I just want to learn more about those knobs. Regards, Michael From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 22:01:47 2013 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mandree.no-ip.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 26DDF7A0 for ; Fri, 13 Sep 2013 22:01:47 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [IPv6:::1] (localhost6.localdomain6 [IPv6:::1]) by apollo.emma.line.org (Postfix) with ESMTP id 3744E23CF75 for ; Sat, 14 Sep 2013 00:01:45 +0200 (CEST) Message-ID: <52338B49.3020303@FreeBSD.org> Date: Sat, 14 Sep 2013 00:01:45 +0200 From: Matthias Andree User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: freebsd-ports@freebsd.org Subject: Re: Berkeley DB 4.1 References: <52336365.2020702@gmx.de> In-Reply-To: <52336365.2020702@gmx.de> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 22:01:47 -0000 Am 13.09.2013 21:11, schrieb olli hauer: > On 2013-09-12 12:57, Ivan Voras wrote: >> Hello, >> >> I'd like to start a discussion on changing the default BDB port from 4.1 >> to something more recent. >> >> bdb version 4.1 was last released in 2002: >> README: Sleepycat Software: Berkeley DB 4.1.25: (December 19, 2002) >> >> There are some ports which have an unexpected dependacy on bdb via APR >> (apache22, subversion), which does is not wrong in itself, but is >> somewhat unelegant (as a personal opinion of course). >> >> I've found this previous discussion: >> http://lists.freebsd.org/pipermail/freebsd-ports/2013-February/081444.html >> >> And while the argument seems valid, it also doesn't have an estimate of >> which / how many ports will break with a more recent bdb. >> >> Could an experimental port build be done with setting WITH_BDB_VER to >> either the most recent 4.x version (WITH_BDB_VER=48), to the last >> Sleepycat Licensed version (50) or the recent version in ports (60) to >> see what breaks? >> > > Long time ago I had a short discussion with mandree@ about a bump to 4.8. > 4.8 should be supported by most ports (also long time the default in many > linux distributions) > > At last one argument I haven't seen in the discussion is "data migration", > for example amavisd-new provides maintenance and backup / recover routines > but other ports ?? > Greetings, I'll pick Olli's post as a stepping stone, more or less randomly. My thoughts on this are (more or less random): - sorry my efforts to axe anything older than db5 stalled on my side. I always meant to have that -exp run done with - as a first step - the default selection logic twisted in a way that anything that states "41+" or similar meant "5+", but somehow no time felt right to me because I shied away from meddling with releases. - about application compatibility with the library (at build time), it depends on how sophisticated interfaces you use. Berkeley DB has a rather rich feature set, is customizable, and so on. Many applications just use BDB as a key/value datastore. You can, however, go all the way to a concurrent and transactional database that gets replicated (I never used the latter, and never received a feature request to enable it). For applications using these more advanced features, there are more API changes that require version comparison. In bogofilter's earlier days (bogofilter is also about a decade old), we had to add DB version checks to support a new BDB version rather often, but the last half dozen or so versions did not change function signatures that bogofilter used. - about data migration, this is not quite as hard. Newer library versions are supposed to read database files written by older versions; usually the on-disk database format remained unchanged. What changed often, though, is the "environment", that is the __db.001-like stuff that keeps locking tables for concurrent access, and thereabouts. The log files for databases in transactional mode also changed format on more than one occasion. However, for applications that can be cleanly shut down (which is more a logistic than a software problem), usually the upgrade path is: 1. shut down application, 2. make sure that no pending corruptions are there, in doubt, run quick recovery -- basically the idea is to roll the log file changes out into the database, quite similar to having a journalling file system write its journal data back into the actual structures. This is the crucial point - the log must have been fully processed, and all pending transactions committed to the .db file, or rolled back. 3. remove the environment (this leaves log files intact) 4. upgrade 5. restart application. BDB will then happily recreate the environment, bump the logfile number, and start writing into the new. The only thing is there's no way back unless there are database updates. Again, I don't know about replicated databases. This is surely in the BDB docs somewhere and I did not care to read it ;-) The downside is that upgrades require manual interaction, and the ports systems is not rigged up to support the user in any way for such upgrades (this is not specific to Berkeley DB) - at the time when I first looked, there were ~17 ports that hardcoded a particular BDB version, among them the high-profile openldap* ports. - don't get me started about the abundant autoconf/configure.ac abuse though. Many build systems do a stupid quadratic search trying to match a db header to a db library. Too much, and globbing would speed things up. I meant to write an autoconf macro, but alas, no time for that either. I think once 9.2 is out the door we should mark any db4* version deprecated, and I am inclined to hack all db4* ports to refuse building on 10-CURRENT, and make 5 the default, so that all practical 10-RELEASE systems will be free of db4*. Thoughts? From owner-freebsd-ports@FreeBSD.ORG Fri Sep 13 23:02:06 2013 Return-Path: Delivered-To: ports@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 3D83F1C2; Fri, 13 Sep 2013 23:02:06 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-pb0-x236.google.com (mail-pb0-x236.google.com [IPv6:2607:f8b0:400e:c01::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 129432EBD; Fri, 13 Sep 2013 23:02:06 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id ro12so1801882pbb.41 for ; Fri, 13 Sep 2013 16:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=rx24m1hmFA0dMFoT+soNO0lcof8dZw5miUM9OgxrE84=; b=PupERvcDA5Vk3x9+sarctbON9EgsZDn4qRJjxXGWJhaObas8oR4xTtDJMnKjJfy9XI zBsjTq7BUU1AIeShIQXSBsE+i9qo5NvU/QvvcQV7w2WvuM+bO3v4EGwaWdDEAJQmRECD 1EGA4sKcw623Abqx1QGPhXoK29G9k+kkkkT9Hpaxtyk7ciX2WUN2ks5O90a33HhYfvAZ lP8IBGIvlPF0q3LVdmvINzbjhfDclokNxgNqrkIJdaXTdtmJDmIjaDzkfHNQn9YTyIDH ThaoCWgz1bi51KOy5m9Mysn0RDgISdLJ5DIU+DRed1UJPyAUoIXuZFjAzrCIpJbUmyc5 MZvw== MIME-Version: 1.0 X-Received: by 10.66.26.77 with SMTP id j13mr4589025pag.166.1379113325644; Fri, 13 Sep 2013 16:02:05 -0700 (PDT) Sender: kob6558@gmail.com Received: by 10.66.219.74 with HTTP; Fri, 13 Sep 2013 16:02:05 -0700 (PDT) In-Reply-To: <01cb01ceb0ac$49a38600$dcea9200$@tahoestores.com> References: <01cb01ceb0ac$49a38600$dcea9200$@tahoestores.com> Date: Fri, 13 Sep 2013 16:02:05 -0700 X-Google-Sender-Auth: Xun8KrWyfijHb5xIdQla1rBwUQU Message-ID: Subject: Re: FreeBSD Port: libgd-2.1.0_1,1 From: Kevin Oberman To: Joel F Rodriguez Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: dinoex@freebsd.org, "ports@FreeBSD.org" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 23:02:06 -0000 On Fri, Sep 13, 2013 at 11:08 AM, Joel F Rodriguez wrote: > Hi, > > > > I keep rebuilding this package and it appears that the pkg info never gets > updated. > > > > ===> Running ldconfig > > /sbin/ldconfig -m /usr/local/lib > > ===> Registering installation for libgd-2.1.0_1,1 > > > > gd-2.0.35_9,1 < needs updating (port has 2.1.0_1,1) > > > > I can't locate a specific package for gd-2, so I am assuming that libgd-2 > is > the ticket. > > > > Please advise. > > > > Joel > > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" > Massive lack of information. Are you using pkg or pkgng? What version of FreeBSD? Lots of other information would be useful, depending on the answers to those questions. One obvious thing is that you did not include the command used to obtain the information that the port was still seen as out of date (gd-2.0.35_9,1 < needs updating (port has 2.1.0_1,1)). -- R. Kevin Oberman, Network Engineer E-mail: rkoberman@gmail.com From owner-freebsd-ports@FreeBSD.ORG Sat Sep 14 09:01:21 2013 Return-Path: Delivered-To: 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 D102459F for ; Sat, 14 Sep 2013 09:01:21 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB41B2A86 for ; Sat, 14 Sep 2013 09:01:21 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id r8E91LTF032637 for ; Sat, 14 Sep 2013 09:01:21 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id r8E91LNk032631; Sat, 14 Sep 2013 09:01:21 GMT (envelope-from portscout) Message-Id: <201309140901.r8E91LNk032631@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Sat, 14 Sep 2013 09:01:21 +0000 From: portscout@FreeBSD.org To: ports@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 09:01:21 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/ports@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ textproc/svn2cl | 0.13 | 0.14 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-ports@FreeBSD.ORG Sat Sep 14 12:35:43 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 086AB8B8 for ; Sat, 14 Sep 2013 12:35:43 +0000 (UTC) (envelope-from ohartman@zedat.fu-berlin.de) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA6BE2481 for ; Sat, 14 Sep 2013 12:35:42 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost1.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtp (envelope-from ) id <1VKp4f-000k2z-2I>; Sat, 14 Sep 2013 14:35:41 +0200 Received: from e179077148.adsl.alicedsl.de ([85.179.77.148] helo=thor.walstatt.dyndns.org) by inpost2.zedat.fu-berlin.de (Exim 4.80.1) for freebsd-ports@freebsd.org with esmtpsa (envelope-from ) id <1VKp4e-003IRV-Vc>; Sat, 14 Sep 2013 14:35:41 +0200 Date: Sat, 14 Sep 2013 14:35:40 +0200 From: "O. Hartmann" To: FreeBSD Ports Subject: dvips: ! Couldn't find header file pst-func.pro Message-ID: <20130914143540.7ef0c42f@thor.walstatt.dyndns.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/_RYe+DjNDrAHVgbc4R9hs7B"; protocol="application/pgp-signature" X-Originating-IP: 85.179.77.148 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 12:35:43 -0000 --Sig_/_RYe+DjNDrAHVgbc4R9hs7B Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I'm using port print/teTeX with PSTricks. Whenever I include \usepackackage{pst-func} in the pr=C3=A4ambel/preamble and run dvips on the text.dvi, I receive the error dvips: ! Couldn't find header file pst-func.pro Consulting Google tells me that this is supposed to be a bug long time ago fixed by Herbert Voss. What happens here? regards, Oliver=20 --Sig_/_RYe+DjNDrAHVgbc4R9hs7B Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBAgAGBQJSNFgcAAoJEOgBcD7A/5N8SDwH/RppJ9BpMmC2v9dNV1pF8SPf +c1wbv+UpuaSR/EzH9stNV90U1l7s5GN95MoUeGZ6NY8c8KIX5E3jpQteGbxkv3v TzOQbXVhtu42MUpQXP11UHD3M55Cg27lmHfHq40Wyd9dFM+T384PoCSrXp3KiVbC O/c0G/cfdnm4EXPZC5mEQXjJg+vB0lSz4Bj3P8hftIhf1YUl21ikoFQMabTjAVWv DpJW7r6zKyczVByNQYYAAeYjVULqDo6HpSQjizndPAIrnfQny4IHJPl1NaHJC2kJ 8eYDr+0Q7ktpLgTxDsXq0w1W/d9B6armOA3AUCnvo3Bs2QZZ8ldzc2/BmkuuPGc= =Osps -----END PGP SIGNATURE----- --Sig_/_RYe+DjNDrAHVgbc4R9hs7B-- From owner-freebsd-ports@FreeBSD.ORG Sat Sep 14 13:19:01 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 0AC9824C for ; Sat, 14 Sep 2013 13:19:01 +0000 (UTC) (envelope-from spankthespam@gmail.com) Received: from mail-qa0-x232.google.com (mail-qa0-x232.google.com [IPv6:2607:f8b0:400d:c00::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C4A632698 for ; Sat, 14 Sep 2013 13:19:00 +0000 (UTC) Received: by mail-qa0-f50.google.com with SMTP id j7so127252qaq.16 for ; Sat, 14 Sep 2013 06:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=0Ez9Y26JG/bSK1USLt9ZpClp9NoPKZqYNrBp1rTxrd4=; b=tcKgzjxkq/n7taQAfX2l8SjBKV1QlThtbFz1SDb+T8LA7QaLBlKyANiY9SenqpOJCG ycxjOGxRXiLzajtOM3dJH/z7dvhvQdx6TqTuNPTRxrfp9//LmITeLrJeUmfUOvL3VHqF 6+o0pWLlJffobUE29ijO7cG3EwsZCq/B3nXIxpo6p9oH4qIH2b83ZzJX3x8XQZq/0l48 KscmmeEyVf/vn7+pyD3KM+oQimCupxBmxZcYvqfzYlivRwDerupN9/n0PAz/TjnMNAUN 1mDPbLpnV385P2bOgKfK7cR4ECKh0d1ADFSmqcfNoYxBqfyjW1R82Ic6Ptd6h8GZEBLd BiBw== MIME-Version: 1.0 X-Received: by 10.49.48.168 with SMTP id m8mr35186744qen.25.1379164739879; Sat, 14 Sep 2013 06:18:59 -0700 (PDT) Received: by 10.229.205.71 with HTTP; Sat, 14 Sep 2013 06:18:59 -0700 (PDT) Date: Sat, 14 Sep 2013 15:18:59 +0200 Message-ID: Subject: How to correctly generate pkg-plist From: SpamMePlease PleasePlease To: freebsd-ports@freebsd.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 13:19:01 -0000 Hi, I am writing new port that compiles and installs huge number of Erlang libraries. Everythig is working fine until there's a need of deinstallation or to make package - the problem is that the user might have older Erlang version (for example, coming from ports unpacked during installation from a cd) and when compiled with such Erlang, everything will be working, except for the fact that older Erland will compile different versions of libraries, and therefore my 2000 lines long pkg-plist will no longer be valid. I thought I can remedy that simply by not listing the lib names and their dir paths to avoid such situation, but to use @unexec ${RM} -rf lib/portname, but then there's a problem with make package, that is not containing all required and compiled libs. How to solve that situation? Regards, S. From owner-freebsd-ports@FreeBSD.ORG Sat Sep 14 16:35:23 2013 Return-Path: Delivered-To: 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 56209CF0; Sat, 14 Sep 2013 16:35:23 +0000 (UTC) (envelope-from qat@redports.org) Received: from qat.redports.org (unknown [IPv6:2610:1c1:1:6420::233:0]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 26BEE2EA7; Sat, 14 Sep 2013 16:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=redports.org; s=04012012; h=Sender:Message-Id:To:Subject:Reply-To:Date:To:Cc:From:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=gjWCDXDeC3mUkJf4dBKFAlKWk+4S6KTjsUhoU9LEMqA=; b=oKafprkOHDDtzzeuOe3fOnbeN4hcLt09DmVOAGcHI82IOr+R0TUnkZp4oQX8stsH2uty6AqgLFdTc3M0PYBhHKvn2KOiJZUnSknp3JdKYXmv3znNWelTga4I1co73+3A4CGJ++O3JD8G4JZzwO4kfbDuch3whl3Xb6v2P8xHHg4=; Received: from www by qat.redports.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VKsob-000IrM-TV; Sat, 14 Sep 2013 16:35:21 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: "Ports-QAT" X-Trac-Version: 0.12.5 Precedence: bulk Auto-Submitted: auto-generated X-Mailer: Trac 0.12.5, by Edgewall Software To: sunpoet@FreeBSD.org X-Trac-Project: redports Date: Sat, 14 Sep 2013 16:35:21 -0000 X-URL: https://qat.redports.org/ Subject: [QAT] r327225: 2x leftovers, 2x success To: sunpoet@FreeBSD.org X-Trac-Build-URL: https://qat.redports.org/buildarchive/20130914065201-35489 X-Trac-Build-ID: 20130914065201-35489 Message-Id: Sender: World Wide Web Owner Cc: ports@FreeBSD.org, decke@FreeBSD.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Reply-To: qat@redports.org List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 16:35:23 -0000 - Update to 3.1.6 Changes: https://github.com/pjstevns/dbmail/commits/master PR: ports/182080 Submitted by: Alan Hicks (maintainer) --------------------------------------------------------------------- Build ID: 20130914065201-35489 Job owner: sunpoet@FreeBSD.org Buildtime: 10 hours Enddate: Sat, 14 Sep 2013 16:35:18 GMT Revision: r327225 Repository: https://svnweb.freebsd.org/ports?view=revision&revision=327225 --------------------------------------------------------------------- Port: mail/dbmail 3.1.6 Buildgroup: 9.1-QAT/amd64 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190532/dbmail-3.1.6.log Buildgroup: 9.1-QAT/i386 Buildstatus: SUCCESS Log: https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190533/dbmail-3.1.6.log Buildgroup: 8.4-QAT/amd64 Buildstatus: SUCCESS Log: https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190534/dbmail-3.1.6.log Buildgroup: 8.4-QAT/i386 Buildstatus: LEFTOVERS Log: https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190535/dbmail-3.1.6.log -- Buildarchive URL: redports From owner-freebsd-ports@FreeBSD.ORG Sat Sep 14 17:04:28 2013 Return-Path: Delivered-To: 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 477133D0 for ; Sat, 14 Sep 2013 17:04:28 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B148D2FD0 for ; Sat, 14 Sep 2013 17:04:27 +0000 (UTC) Received: by mail-lb0-f179.google.com with SMTP id x18so2981293lbi.24 for ; Sat, 14 Sep 2013 10:04:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=LeTCK2I1mppSSsrqOPeKaUde3o4JzLeNTrZUhOkxCJc=; b=BM52I+pp+sT3c83QIL2Iuk4PIqBMssU2HFbCxKDV6RTrBl1LpdqQrzWN9tFEO/IaOw 8CPki1jWxcblJ31gt5ykJLQA/UPksWNQlQMNE2CI64+BBE+wFA+kqLONCjj1SxqfCFLR RDgFTRF2F3XzaXdpR08ZmTeRc8Bons5b9ucq2ypxqXc7iXDziA3lPOhpmMr530Kpykvq JohXrX+GyhBIOtBDtC7J8LgXOTdHdKG5fjwxoAvsOqVOsQA4nryA1QeGu4vNCfyiyQmC cI7uKyuV/ROuFsDF6AxMT00sl/L1AM0u8fN43xCZpN7hRPObsOwU9w2HIpgCjuayPaQw zAcQ== X-Gm-Message-State: ALoCoQkFn5BCCBNm7BegIQsEWvCg2yJe19gkZJPmpBx5E+ftfXArsywPgqDRH0O/i0GIYFbY0L7I X-Received: by 10.152.120.5 with SMTP id ky5mr16465763lab.18.1379178259883; Sat, 14 Sep 2013 10:04:19 -0700 (PDT) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.112.91.9 with HTTP; Sat, 14 Sep 2013 10:03:59 -0700 (PDT) In-Reply-To: References: From: Sunpoet Po-Chuan Hsieh Date: Sun, 15 Sep 2013 01:03:59 +0800 X-Google-Sender-Auth: nYixA1oE2qitvAqmdt8fq8TrypE Message-ID: Subject: Re: [QAT] r327225: 2x leftovers, 2x success To: qat@redports.org Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: ports , =?UTF-8?Q?Bernhard_Fr=C3=B6hlich?= X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 17:04:28 -0000 The leftover is caused by wrong PLIST order of textproc/asciidoc. The PLIST should be fixed in r327222. Regards, sunpoet On Sun, Sep 15, 2013 at 12:35 AM, Ports-QAT wrote: > - Update to 3.1.6 > > Changes: https://github.com/pjstevns/dbmail/commits/master > PR: ports/182080 > Submitted by: Alan Hicks (maintainer) > --------------------------------------------------------------------- > > Build ID: 20130914065201-35489 > Job owner: sunpoet@FreeBSD.org > Buildtime: 10 hours > Enddate: Sat, 14 Sep 2013 16:35:18 GMT > > Revision: r327225 > Repository: > https://svnweb.freebsd.org/ports?view=revision&revision=327225 > > --------------------------------------------------------------------- > > Port: mail/dbmail 3.1.6 > > Buildgroup: 9.1-QAT/amd64 > Buildstatus: LEFTOVERS > Log: > https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190532/dbmail-3.1.6.log > > Buildgroup: 9.1-QAT/i386 > Buildstatus: SUCCESS > Log: > https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190533/dbmail-3.1.6.log > > Buildgroup: 8.4-QAT/amd64 > Buildstatus: SUCCESS > Log: > https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190534/dbmail-3.1.6.log > > Buildgroup: 8.4-QAT/i386 > Buildstatus: LEFTOVERS > Log: > https://qat.redports.org//~sunpoet@FreeBSD.org/20130914065201-35489-190535/dbmail-3.1.6.log > > > -- > Buildarchive URL: < > https://qat.redports.org/buildarchive/20130914065201-35489> > redports