From owner-svn-ports-all@FreeBSD.ORG  Mon Jun 15 21:49:52 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EA12F1AF;
 Mon, 15 Jun 2015 21:49:52 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7C1974C;
 Mon, 15 Jun 2015 21:49:52 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FLnqEv094292;
 Mon, 15 Jun 2015 21:49:52 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FLnqvw094291;
 Mon, 15 Jun 2015 21:49:52 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201506152149.t5FLnqvw094291@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 15 Jun 2015 21:49:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r389757 - head/science/avogadro/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2015 21:49:53 -0000

Author: rakuco
Date: Mon Jun 15 21:49:52 2015
New Revision: 389757
URL: https://svnweb.freebsd.org/changeset/ports/389757

Log:
  Add patch to fix the build with CMake 3.2.
  
  Explicitly look for X11, since FindOpenGL.cmake no longer does that
  automatically.

Added:
  head/science/avogadro/files/patch-CMakeLists.txt   (contents, props changed)

Added: head/science/avogadro/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/avogadro/files/patch-CMakeLists.txt	Mon Jun 15 21:49:52 2015	(r389757)
@@ -0,0 +1,22 @@
+Explicitly look for X11 when using it.
+
+This fixes the build with CMake 3.2, whose FindOpenGL.cmake stopped
+calling find_package(X11).
+
+Instead, do that ourselves when Q_WS_X11 is true, since that is when we
+already try to link against libX11.
+
+Sent upstream: https://github.com/cryos/avogadro/pull/13
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -230,6 +230,10 @@ if(NOT Linguist_FOUND)
+   message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
+ endif()
+ 
++if(Q_WS_X11)
++  find_package(X11 REQUIRED) # avogadro/src/main.cpp calls XInitThread().
++endif()
++
+ find_package(Eigen3) # find and setup Eigen3 if available
+ if(NOT EIGEN3_FOUND)
+    message(STATUS "Cannot find Eigen3, trying Eigen2")