From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 2 13:00:29 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2E1F8106567D for ; Wed, 2 May 2012 13:00:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0640C8FC14 for ; Wed, 2 May 2012 13:00:29 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q42D0SPk021222 for ; Wed, 2 May 2012 13:00:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q42D0SZq021221; Wed, 2 May 2012 13:00:28 GMT (envelope-from gnats) Resent-Date: Wed, 2 May 2012 13:00:28 GMT Resent-Message-Id: <201205021300.q42D0SZq021221@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 99EA01065670 for ; Wed, 2 May 2012 12:57:39 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 842FF8FC08 for ; Wed, 2 May 2012 12:57:39 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q42CvdMq058159 for ; Wed, 2 May 2012 12:57:39 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q42CvdcX058158; Wed, 2 May 2012 12:57:39 GMT (envelope-from nobody) Message-Id: <201205021257.q42CvdcX058158@red.freebsd.org> Date: Wed, 2 May 2012 12:57:39 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/167525: science/avogadro: update to 1.0.3 and fix build with Qt-4.8.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2012 13:00:29 -0000 >Number: 167525 >Category: ports >Synopsis: science/avogadro: update to 1.0.3 and fix build with Qt-4.8.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 02 13:00:28 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 9.0-STABLE amd64 >Organization: >Environment: FreeBSD mercury.ph.man.ac.uk 9.0-STABLE FreeBSD 9.0-STABLE #6 r231390: Tue Feb 14 22:55:59 UTC 2012 root@mercury.ph.man.ac.uk:/usr/obj/usr/freebsd/stable/9/src/sys/MERCURY amd64 >Description: Update to 1.0.3 Add patches to fix build with upcoming Qt Sort plist >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/science/avogadro/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 6 Sep 2011 23:30:43 -0000 1.13 +++ Makefile 2 May 2012 10:26:47 -0000 @@ -6,8 +6,7 @@ # PORTNAME= avogadro -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.3 CATEGORIES= science MASTER_SITES= SF @@ -19,11 +18,13 @@ USE_LDCONFIG= yes USE_BZIP2= yes +USE_GL= glu USE_QT_VER= 4 QT_COMPONENTS= gui opengl network linguist_build \ qmake_build moc_build rcc_build uic_build USE_CMAKE= yes -CMAKE_ARGS= -DENABLE_GLSL=OFF +CMAKE_ARGS= -DENABLE_GLSL=OFF \ + -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs USE_GCC= 4.4+ MAKE_JOBS_SAFE= yes Index: distinfo =================================================================== RCS file: /home/pcvs/ports/science/avogadro/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 3 Jul 2011 13:22:11 -0000 1.8 +++ distinfo 1 May 2012 21:49:43 -0000 @@ -1,2 +1,2 @@ -SHA256 (avogadro-1.0.1.tar.bz2) = e1bd3e29cf9658ecb2668c1707af62adc8fd472e08cc9e333c5bc7b4b1e0549e -SIZE (avogadro-1.0.1.tar.bz2) = 4891506 +SHA256 (avogadro-1.0.3.tar.bz2) = efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 +SIZE (avogadro-1.0.3.tar.bz2) = 4971989 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/science/avogadro/pkg-plist,v retrieving revision 1.8 diff -u -r1.8 pkg-plist --- pkg-plist 16 Jul 2010 01:29:59 -0000 1.8 +++ pkg-plist 1 May 2012 22:41:45 -0000 @@ -43,8 +43,6 @@ include/avogadro/undosequence.h include/avogadro/zmatrix.h lib/avogadro/1_0/AvogadroBuildSettings.cmake -lib/avogadro/AvogadroConfig.cmake -lib/avogadro/AvogadroConfigVersion.cmake lib/avogadro/1_0/AvogadroLibraryDeps.cmake lib/avogadro/1_0/AvogadroUse.cmake lib/avogadro/1_0/cmake/FindEigen2.cmake @@ -98,10 +96,11 @@ lib/avogadro/1_0/tools/manipulatetool.so lib/avogadro/1_0/tools/navigatetool.so lib/avogadro/1_0/tools/selectrotatetool.so +lib/avogadro/AvogadroConfig.cmake +lib/avogadro/AvogadroConfigVersion.cmake lib/libavogadro.so lib/libavogadro.so.1 -lib/libavogadro.so.1.0.1 -share/qt4/mkspecs/features/avogadro.prf +lib/libavogadro.so.1.0.3 %%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so %%DATADIR%%/builder/amino/d-ala.zmat %%DATADIR%%/builder/amino/d-arg.zmat @@ -371,15 +370,19 @@ %%DATADIR%%/i18n/avogadro_ar.qm %%DATADIR%%/i18n/avogadro_bg.qm %%DATADIR%%/i18n/avogadro_ca.qm +%%DATADIR%%/i18n/avogadro_ca@valencia.qm %%DATADIR%%/i18n/avogadro_cs.qm %%DATADIR%%/i18n/avogadro_da.qm %%DATADIR%%/i18n/avogadro_de.qm %%DATADIR%%/i18n/avogadro_el.qm +%%DATADIR%%/i18n/avogadro_en_AU.qm %%DATADIR%%/i18n/avogadro_en_CA.qm %%DATADIR%%/i18n/avogadro_en_GB.qm %%DATADIR%%/i18n/avogadro_es.qm +%%DATADIR%%/i18n/avogadro_eu.qm %%DATADIR%%/i18n/avogadro_fi.qm %%DATADIR%%/i18n/avogadro_fr.qm +%%DATADIR%%/i18n/avogadro_gl.qm %%DATADIR%%/i18n/avogadro_he.qm %%DATADIR%%/i18n/avogadro_hr.qm %%DATADIR%%/i18n/avogadro_hu.qm @@ -396,23 +399,32 @@ %%DATADIR%%/i18n/avogadro_pt_BR.qm %%DATADIR%%/i18n/avogadro_ru.qm %%DATADIR%%/i18n/avogadro_sk.qm +%%DATADIR%%/i18n/avogadro_sr.qm %%DATADIR%%/i18n/avogadro_sv.qm +%%DATADIR%%/i18n/avogadro_th.qm %%DATADIR%%/i18n/avogadro_tr.qm +%%DATADIR%%/i18n/avogadro_ug.qm %%DATADIR%%/i18n/avogadro_uk.qm +%%DATADIR%%/i18n/avogadro_vi.qm %%DATADIR%%/i18n/avogadro_zh_CN.qm %%DATADIR%%/i18n/avogadro_zh_TW.qm %%DATADIR%%/i18n/libavogadro_ar.qm %%DATADIR%%/i18n/libavogadro_bg.qm +%%DATADIR%%/i18n/libavogadro_bs.qm %%DATADIR%%/i18n/libavogadro_ca.qm +%%DATADIR%%/i18n/libavogadro_ca@valencia.qm %%DATADIR%%/i18n/libavogadro_cs.qm %%DATADIR%%/i18n/libavogadro_da.qm %%DATADIR%%/i18n/libavogadro_de.qm %%DATADIR%%/i18n/libavogadro_el.qm +%%DATADIR%%/i18n/libavogadro_en_AU.qm %%DATADIR%%/i18n/libavogadro_en_CA.qm %%DATADIR%%/i18n/libavogadro_en_GB.qm %%DATADIR%%/i18n/libavogadro_es.qm +%%DATADIR%%/i18n/libavogadro_eu.qm %%DATADIR%%/i18n/libavogadro_fi.qm %%DATADIR%%/i18n/libavogadro_fr.qm +%%DATADIR%%/i18n/libavogadro_gl.qm %%DATADIR%%/i18n/libavogadro_he.qm %%DATADIR%%/i18n/libavogadro_hi.qm %%DATADIR%%/i18n/libavogadro_hu.qm @@ -429,13 +441,17 @@ %%DATADIR%%/i18n/libavogadro_pt_BR.qm %%DATADIR%%/i18n/libavogadro_ru.qm %%DATADIR%%/i18n/libavogadro_sk.qm +%%DATADIR%%/i18n/libavogadro_sr.qm %%DATADIR%%/i18n/libavogadro_sv.qm %%DATADIR%%/i18n/libavogadro_tr.qm +%%DATADIR%%/i18n/libavogadro_ug.qm %%DATADIR%%/i18n/libavogadro_uk.qm +%%DATADIR%%/i18n/libavogadro_vi.qm %%DATADIR%%/i18n/libavogadro_zh_CN.qm %%DATADIR%%/i18n/libavogadro_zh_TW.qm %%PYTHON%%share/libavogadro/engineScripts/wireframe.py %%PYTHON%%share/libavogadro/extensionScripts/example.py +share/qt4/mkspecs/features/avogadro.prf @dirrm share/libavogadro/extensionScripts @dirrm share/libavogadro/engineScripts @dirrm share/libavogadro Index: files/patch-libavogadro__src__camera.cpp =================================================================== RCS file: files/patch-libavogadro__src__camera.cpp diff -N files/patch-libavogadro__src__camera.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libavogadro__src__camera.cpp 1 May 2012 22:05:49 -0000 @@ -0,0 +1,11 @@ +--- ./libavogadro/src/camera.cpp.orig 2011-04-25 05:22:18.000000000 +0000 ++++ ./libavogadro/src/camera.cpp 2012-05-01 21:59:52.241696067 +0000 +@@ -26,6 +26,8 @@ + #include "glwidget.h" + #include + ++#include ++ + using namespace Eigen; + + namespace Avogadro Index: files/patch-libavogadro__src__glpainter_p.cpp =================================================================== RCS file: files/patch-libavogadro__src__glpainter_p.cpp diff -N files/patch-libavogadro__src__glpainter_p.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libavogadro__src__glpainter_p.cpp 1 May 2012 22:05:49 -0000 @@ -0,0 +1,11 @@ +--- ./libavogadro/src/glpainter_p.cpp.orig 2011-04-25 05:22:18.000000000 +0000 ++++ ./libavogadro/src/glpainter_p.cpp 2012-05-01 21:59:50.998695297 +0000 +@@ -43,6 +43,8 @@ + #include + #include + ++#include ++ + namespace Avogadro + { + Index: files/patch-libavogadro__src__glwidget.cpp =================================================================== RCS file: files/patch-libavogadro__src__glwidget.cpp diff -N files/patch-libavogadro__src__glwidget.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libavogadro__src__glwidget.cpp 1 May 2012 22:05:49 -0000 @@ -0,0 +1,11 @@ +--- ./libavogadro/src/glwidget.cpp.orig 2011-04-25 05:22:18.000000000 +0000 ++++ ./libavogadro/src/glwidget.cpp 2012-05-01 22:02:14.170695198 +0000 +@@ -64,6 +64,8 @@ + #include + #endif + ++#include ++ + #include + #include + #include Index: files/patch-libavogadro__src__tools__selectrotatetool.cpp =================================================================== RCS file: files/patch-libavogadro__src__tools__selectrotatetool.cpp diff -N files/patch-libavogadro__src__tools__selectrotatetool.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libavogadro__src__tools__selectrotatetool.cpp 1 May 2012 22:05:49 -0000 @@ -0,0 +1,11 @@ +--- ./libavogadro/src/tools/selectrotatetool.cpp.orig 2011-04-25 05:22:18.000000000 +0000 ++++ ./libavogadro/src/tools/selectrotatetool.cpp 2012-05-01 22:05:46.053696029 +0000 +@@ -44,6 +44,8 @@ + #include + #include + ++#include ++ + using namespace std; + using namespace OpenBabel; + using namespace Eigen; >Release-Note: >Audit-Trail: >Unformatted: