- Update to 1.0.3

- Add patches and explicit dependency on graphics/libGLU to fix build
  with upcoming Qt-4.8.1
- Sort plist

PR:		ports/167525
Approved by:	Troels Kofoed Jacobsen (maintainer)

7 files changed, 70 insertions, 9 deletions

diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index 1c1f4889e96f..da22617261a3 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -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 @@ LIB_DEPENDS=	openbabel.3:${PORTSDIR}/science/openbabel
 
 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
 
diff --git a/science/avogadro/distinfo b/science/avogadro/distinfo
index 4b4125fda6b6..3912f23272e7 100644
--- a/science/avogadro/distinfo
+++ b/science/avogadro/distinfo
@@ -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
diff --git a/science/avogadro/files/patch-libavogadro__src__camera.cpp b/science/avogadro/files/patch-libavogadro__src__camera.cpp
new file mode 100644
index 000000000000..53d83c29c9e0
--- /dev/null
+++ b/science/avogadro/files/patch-libavogadro__src__camera.cpp
@@ -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 <avogadro/molecule.h>
+ 
++#include <GL/glu.h>
++
+ using namespace Eigen;
+ 
+ namespace Avogadro
diff --git a/science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp b/science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp
new file mode 100644
index 000000000000..06cdc5de9692
--- /dev/null
+++ b/science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp
@@ -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 <QVarLengthArray>
+ #include <Eigen/Geometry>
+ 
++#include <GL/glu.h>
++
+ namespace Avogadro
+ {
+ 
diff --git a/science/avogadro/files/patch-libavogadro__src__glwidget.cpp b/science/avogadro/files/patch-libavogadro__src__glwidget.cpp
new file mode 100644
index 000000000000..7c7d30c863cb
--- /dev/null
+++ b/science/avogadro/files/patch-libavogadro__src__glwidget.cpp
@@ -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 <QMutex>
+ #endif
+ 
++#include <GL/glu.h>
++
+ #include <cstdio>
+ #include <vector>
+ #include <cstdlib>
diff --git a/science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp b/science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp
new file mode 100644
index 000000000000..7cded764b439
--- /dev/null
+++ b/science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp
@@ -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 <QComboBox>
+ #include <QDebug>
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace OpenBabel;
+ using namespace Eigen;
diff --git a/science/avogadro/pkg-plist b/science/avogadro/pkg-plist
index 9a988296c493..701e900af250 100644
--- a/science/avogadro/pkg-plist
+++ b/science/avogadro/pkg-plist
@@ -43,8 +43,6 @@ include/avogadro/toolgroup.h
 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/drawtool.so
 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 @@ share/qt4/mkspecs/features/avogadro.prf
 %%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 @@ share/qt4/mkspecs/features/avogadro.prf
 %%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 @@ share/qt4/mkspecs/features/avogadro.prf
 %%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