Index: science/avogadro/Makefile =================================================================== --- science/avogadro/Makefile (revision 482237) +++ science/avogadro/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= avogadro -PORTVERSION= 1.1.1 -PORTREVISION= 16 +DISTVERSION= 1.2.0 CATEGORIES= science MASTER_SITES= SF @@ -20,12 +19,13 @@ # We need to add a RUN_DEPENDS on eigen2, as the cmake file shiped with # avogadro to use it, contains 'find_package(Eigen2 REQUIRED)'. -USES= cmake desktop-file-utils eigen:2,build,run pkgconfig qt:4 tar:bzip2 +USES= cmake desktop-file-utils eigen:2,build,run gl pkgconfig qt:4 USE_GL= glu gl -USE_QT= gui network opengl \ +USE_QT= corelib gui network opengl \ linguisttools_build moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DENABLE_GLSL=OFF \ -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs +USE_XORG= x11 USE_LDCONFIG= yes CFLAGS+= -idirafter ${LOCALBASE}/include/eigen2 \ Index: science/avogadro/distinfo =================================================================== --- science/avogadro/distinfo (revision 482237) +++ science/avogadro/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (avogadro-1.1.1.tar.bz2) = fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14 -SIZE (avogadro-1.1.1.tar.bz2) = 11118046 +TIMESTAMP = 1539715101 +SHA256 (avogadro-1.2.0.tar.gz) = 6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b +SIZE (avogadro-1.2.0.tar.gz) = 16779635 Index: science/avogadro/files/patch-CMakeLists.txt =================================================================== --- science/avogadro/files/patch-CMakeLists.txt (revision 482237) +++ science/avogadro/files/patch-CMakeLists.txt (working copy) @@ -7,16 +7,47 @@ already try to link against libX11. Sent upstream: https://github.com/cryos/avogadro/pull/13 ---- CMakeLists.txt +--- CMakeLists.txt.orig 2016-06-08 14:19:45 UTC +++ CMakeLists.txt -@@ -230,6 +230,10 @@ if(NOT Linguist_FOUND) +@@ -114,7 +114,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) + endif() + # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS, + # they will not replace them. +- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") ++# set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}") + set(CMAKE_CXX_FLAGS_DEBUG "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}") +@@ -196,8 +196,8 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES Inte + endif() + endif() + +- set(CMAKE_C_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") +- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") ++# set(CMAKE_C_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") ++# set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ipo1 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s") + + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}") +@@ -231,7 +231,11 @@ if(NOT Linguist_FOUND) message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") endif() +-find_package(Eigen3) # find and setup Eigen3 if available +if(Q_WS_X11) + find_package(X11 REQUIRED) # avogadro/src/main.cpp calls XInitThread(). +endif() + - find_package(Eigen3) # find and setup Eigen3 if available ++#find_package(Eigen3) # find and setup Eigen3 if available # not ready for Eigen3, see https://github.com/cryos/avogadro/issues/915 if(NOT EIGEN3_FOUND) message(STATUS "Cannot find Eigen3, trying Eigen2") + find_package(Eigen2 REQUIRED) # Some version is required +@@ -521,7 +525,7 @@ if(UNIX) + "${CMAKE_CURRENT_SOURCE_DIR}/avogadro.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/avogadro.pc" @ONLY) + set(PC_FILES "${CMAKE_CURRENT_BINARY_DIR}/avogadro.pc") +- install(FILES ${PC_FILES} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ++ install(FILES ${PC_FILES} DESTINATION libdata/pkgconfig) + endif() + + # avopkg Index: science/avogadro/files/patch-libavogadro__src__camera.cpp =================================================================== --- science/avogadro/files/patch-libavogadro__src__camera.cpp (revision 482237) +++ science/avogadro/files/patch-libavogadro__src__camera.cpp (working copy) @@ -1,8 +1,8 @@ ---- ./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 +--- libavogadro/src/camera.cpp.orig 2016-06-08 14:19:45 UTC ++++ libavogadro/src/camera.cpp +@@ -36,6 +36,8 @@ + # include + #endif +#include + Index: science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp =================================================================== --- science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp (revision 482237) +++ science/avogadro/files/patch-libavogadro__src__glpainter_p.cpp (working copy) @@ -1,8 +1,8 @@ ---- ./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 +--- libavogadro/src/glpainter_p.cpp.orig 2016-06-08 14:19:45 UTC ++++ libavogadro/src/glpainter_p.cpp +@@ -53,6 +53,8 @@ + # include + #endif +#include + Index: science/avogadro/files/patch-libavogadro__src__glwidget.cpp =================================================================== --- science/avogadro/files/patch-libavogadro__src__glwidget.cpp (revision 482237) +++ science/avogadro/files/patch-libavogadro__src__glwidget.cpp (working copy) @@ -1,7 +1,7 @@ ---- ./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 +--- libavogadro/src/glwidget.cpp.orig 2016-06-08 14:19:45 UTC ++++ libavogadro/src/glwidget.cpp +@@ -84,6 +84,8 @@ + #include #endif +#include Index: science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp =================================================================== --- science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp (revision 482237) +++ science/avogadro/files/patch-libavogadro__src__tools__selectrotatetool.cpp (working copy) @@ -1,8 +1,8 @@ ---- ./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 +--- libavogadro/src/tools/selectrotatetool.cpp.orig 2016-06-08 14:19:45 UTC ++++ libavogadro/src/tools/selectrotatetool.cpp +@@ -57,6 +57,8 @@ + # include + #endif +#include + Index: science/avogadro/files/patch-libavogadro_src_extensions_crystallography_crystallographyextension.cpp =================================================================== --- science/avogadro/files/patch-libavogadro_src_extensions_crystallography_crystallographyextension.cpp (revision 482237) +++ science/avogadro/files/patch-libavogadro_src_extensions_crystallography_crystallographyextension.cpp (working copy) @@ -1,6 +1,6 @@ ---- libavogadro/src/extensions/crystallography/crystallographyextension.cpp.orig 2013-12-06 15:50:04 UTC +--- libavogadro/src/extensions/crystallography/crystallographyextension.cpp.orig 2016-06-08 14:19:45 UTC +++ libavogadro/src/extensions/crystallography/crystallographyextension.cpp -@@ -51,6 +51,11 @@ +@@ -53,6 +53,11 @@ #include #include Index: science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.c =================================================================== --- science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.c (nonexistent) +++ science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.c (working copy) @@ -0,0 +1,18 @@ +--- libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig 2018-10-16 20:56:21 UTC ++++ libavogadro/src/extensions/symmetry/libmsym/src/orbital.c +@@ -67,13 +67,13 @@ msym_error_t orbitalFromQuantumNumbers(i + } + case 2 : { + //o->v = dpolynomial[m+l]; +- char *d = (signbit(m) == 1 ? "-" : "+"); ++ char *d = (signbit((double)m) == 1 ? "-" : "+"); // signbit is misused, see https://github.com/cryos/avogadro/issues/916 + snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d); + break; + } + default : { + char t = 'f' - 3 + l; +- char *d = (signbit(m) == 1 ? "-" : "+"); ++ char *d = (signbit((double)m) == 1 ? "-" : "+"); // signbit is misused, see https://github.com/cryos/avogadro/issues/916 + snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d); + } + } Property changes on: science/avogadro/files/patch-libavogadro_src_extensions_symmetry_libmsym_src_orbital.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: science/avogadro/pkg-plist =================================================================== --- science/avogadro/pkg-plist (revision 482237) +++ science/avogadro/pkg-plist (working copy) @@ -1,5 +1,6 @@ bin/avogadro bin/avopkg +bin/qube include/avogadro/animation.h include/avogadro/atom.h include/avogadro/bond.h @@ -7,6 +8,7 @@ include/avogadro/color.h include/avogadro/color3f.h include/avogadro/colorbutton.h +include/avogadro/config.h include/avogadro/cube.h include/avogadro/dockextension.h include/avogadro/dockwidget.h @@ -46,76 +48,86 @@ include/avogadro/toolgroup.h include/avogadro/undosequence.h include/avogadro/zmatrix.h -lib/avogadro/1_1/AvogadroUse.cmake -lib/avogadro/1_1/cmake/FindEigen2.cmake -lib/avogadro/1_1/cmake/FindEigen3.cmake -lib/avogadro/1_1/cmake/FindGLEW.cmake -lib/avogadro/1_1/colors/atomindexcolor.so -lib/avogadro/1_1/colors/chargecolor.so -lib/avogadro/1_1/colors/customcolor.so -lib/avogadro/1_1/colors/distancecolor.so -lib/avogadro/1_1/colors/residuecolor.so -lib/avogadro/1_1/colors/smartscolor.so -lib/avogadro/1_1/engines/axesengine.so -lib/avogadro/1_1/engines/cartoonengine.so -lib/avogadro/1_1/engines/dipoleengine.so -lib/avogadro/1_1/engines/forceengine.so -lib/avogadro/1_1/engines/hbondengine.so -lib/avogadro/1_1/engines/labelengine.so -lib/avogadro/1_1/engines/polygonengine.so -lib/avogadro/1_1/engines/qtaimengine.so -lib/avogadro/1_1/engines/ribbonengine.so -lib/avogadro/1_1/engines/ringengine.so -lib/avogadro/1_1/engines/simplewireengine.so -lib/avogadro/1_1/engines/sphereengine.so -lib/avogadro/1_1/engines/stickengine.so -lib/avogadro/1_1/engines/surfaceengine.so -lib/avogadro/1_1/engines/wireengine.so -lib/avogadro/1_1/extensions/animationextension.so -lib/avogadro/1_1/extensions/cartesianextension.so -lib/avogadro/1_1/extensions/crystallographyextension.so -lib/avogadro/1_1/extensions/fileimportextension.so -lib/avogadro/1_1/extensions/forcefieldextension.so -lib/avogadro/1_1/extensions/gamessextension.so -lib/avogadro/1_1/extensions/gl2psextension.so -lib/avogadro/1_1/extensions/h2methylextension.so -lib/avogadro/1_1/extensions/hydrogensextension.so -lib/avogadro/1_1/extensions/inputfileextension.so -lib/avogadro/1_1/extensions/insertdnaextension.so -lib/avogadro/1_1/extensions/insertfragmentextension.so -lib/avogadro/1_1/extensions/insertpeptideextension.so -lib/avogadro/1_1/extensions/invertchiralextension.so -lib/avogadro/1_1/extensions/molecularpropextension.so -lib/avogadro/1_1/extensions/networkfetchextension.so -lib/avogadro/1_1/extensions/orbitalextension.so -lib/avogadro/1_1/extensions/povrayextension.so -lib/avogadro/1_1/extensions/propextension.so -%%PYTHON%%lib/avogadro/1_1/extensions/pythonterminal.so -lib/avogadro/1_1/extensions/qtaimextension.so -lib/avogadro/1_1/extensions/selectextension.so -lib/avogadro/1_1/extensions/spectraextension.so -lib/avogadro/1_1/extensions/supercellextension.so -lib/avogadro/1_1/extensions/surfaceextension.so -lib/avogadro/1_1/extensions/swcntbuilderextension.so -lib/avogadro/1_1/extensions/vibrationextension.so -lib/avogadro/1_1/tools/aligntool.so -lib/avogadro/1_1/tools/autoopttool.so -lib/avogadro/1_1/tools/autorotatetool.so -lib/avogadro/1_1/tools/bondcentrictool.so -lib/avogadro/1_1/tools/clickmeasuretool.so -lib/avogadro/1_1/tools/drawtool.so -lib/avogadro/1_1/tools/manipulatetool.so -lib/avogadro/1_1/tools/selectrotatetool.so +include/libmsym/msym.h +include/libmsym/msym_error.h +lib/avogadro/1_2/AvogadroUse.cmake +lib/avogadro/1_2/cmake/FindEigen2.cmake +lib/avogadro/1_2/cmake/FindEigen3.cmake +lib/avogadro/1_2/cmake/FindGLEW.cmake +lib/avogadro/1_2/colors/atomindexcolor.so +lib/avogadro/1_2/colors/chargecolor.so +lib/avogadro/1_2/colors/customcolor.so +lib/avogadro/1_2/colors/distancecolor.so +lib/avogadro/1_2/colors/residuecolor.so +lib/avogadro/1_2/colors/smartscolor.so +lib/avogadro/1_2/engines/axesengine.so +lib/avogadro/1_2/engines/cartoonengine.so +lib/avogadro/1_2/engines/dipoleengine.so +lib/avogadro/1_2/engines/forceengine.so +lib/avogadro/1_2/engines/hbondengine.so +lib/avogadro/1_2/engines/labelengine.so +lib/avogadro/1_2/engines/polygonengine.so +lib/avogadro/1_2/engines/qtaimengine.so +lib/avogadro/1_2/engines/ribbonengine.so +lib/avogadro/1_2/engines/ringengine.so +lib/avogadro/1_2/engines/simplewireengine.so +lib/avogadro/1_2/engines/sphereengine.so +lib/avogadro/1_2/engines/stickengine.so +lib/avogadro/1_2/engines/surfaceengine.so +lib/avogadro/1_2/engines/wireengine.so +lib/avogadro/1_2/extensions/animationextension.so +lib/avogadro/1_2/extensions/cartesianextension.so +lib/avogadro/1_2/extensions/crystallographyextension.so +lib/avogadro/1_2/extensions/fileimportextension.so +lib/avogadro/1_2/extensions/forcefieldextension.so +lib/avogadro/1_2/extensions/gamessextension.so +lib/avogadro/1_2/extensions/gl2psextension.so +lib/avogadro/1_2/extensions/h2methylextension.so +lib/avogadro/1_2/extensions/hydrogensextension.so +lib/avogadro/1_2/extensions/inputfileextension.so +lib/avogadro/1_2/extensions/insertdnaextension.so +lib/avogadro/1_2/extensions/insertfragmentextension.so +lib/avogadro/1_2/extensions/insertpeptideextension.so +lib/avogadro/1_2/extensions/invertchiralextension.so +lib/avogadro/1_2/extensions/molecularpropextension.so +lib/avogadro/1_2/extensions/networkfetchextension.so +lib/avogadro/1_2/extensions/orbitalextension.so +lib/avogadro/1_2/extensions/orcaextension.so +lib/avogadro/1_2/extensions/povrayextension.so +lib/avogadro/1_2/extensions/propextension.so +%%PYTHON%%lib/avogadro/1_2/extensions/pythonterminal.so +lib/avogadro/1_2/extensions/qtaimextension.so +lib/avogadro/1_2/extensions/selectextension.so +lib/avogadro/1_2/extensions/spectraextension.so +lib/avogadro/1_2/extensions/supercellextension.so +lib/avogadro/1_2/extensions/surfaceextension.so +lib/avogadro/1_2/extensions/swcntbuilderextension.so +lib/avogadro/1_2/extensions/symmetryextension.so +lib/avogadro/1_2/extensions/vibrationextension.so +lib/avogadro/1_2/extensions/vrmlextension.so +lib/avogadro/1_2/tools/aligntool.so +lib/avogadro/1_2/tools/autoopttool.so +lib/avogadro/1_2/tools/autorotatetool.so +lib/avogadro/1_2/tools/bondcentrictool.so +lib/avogadro/1_2/tools/clickmeasuretool.so +lib/avogadro/1_2/tools/drawtool.so +lib/avogadro/1_2/tools/manipulatetool.so +lib/avogadro/1_2/tools/selectrotatetool.so lib/avogadro/AvogadroConfig.cmake lib/avogadro/AvogadroConfigVersion.cmake lib/avogadro/AvogadroTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/avogadro/AvogadroTargets.cmake +lib/cmake/libmsym/libmsymConfig.cmake +lib/cmake/libmsym/libmsymConfigVersion.cmake +lib/cmake/libmsym/libmsymTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libmsym/libmsymTargets.cmake lib/libavogadro.so lib/libavogadro.so.1 -lib/libavogadro.so.1.1.1 +lib/libavogadro.so.1.2.0 lib/libavogadro_OpenQube.so lib/libavogadro_OpenQube.so.0 lib/libavogadro_OpenQube.so.0.1.0 +lib/libmsym.a %%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so libdata/pkgconfig/avogadro.pc man/man1/avogadro.1.gz @@ -190,7 +202,7 @@ %%DATADIR%%/crystals/clays/Al2Si4O12Ca0.5-Montmorillonite.cif %%DATADIR%%/crystals/clays/Al4KSi2O12-Illite.cif %%DATADIR%%/crystals/clays/AlSi2O6H-Pyrophyllite.cif -%%DATADIR%%/crystals/clays/Fe2.25Cl0.5H2.75-Fougerite.cif +%%DATADIR%%/crystals/clays/Fe2.25Cl0.5H%%PYTHON_VER%%5-Fougerite.cif %%DATADIR%%/crystals/clays/FeSi2O6H-Nontronite.cif %%DATADIR%%/crystals/clays/Lepidolite.cif %%DATADIR%%/crystals/clays/Mg2Al2SiO9H4-Amesite.cif @@ -1068,6 +1080,7 @@ %%DATADIR%%/i18n/avogadro_eu.qm %%DATADIR%%/i18n/avogadro_fi.qm %%DATADIR%%/i18n/avogadro_fr.qm +%%DATADIR%%/i18n/avogadro_fr_CA.qm %%DATADIR%%/i18n/avogadro_gl.qm %%DATADIR%%/i18n/avogadro_he.qm %%DATADIR%%/i18n/avogadro_hi.qm @@ -1092,6 +1105,7 @@ %%DATADIR%%/i18n/avogadro_sr.qm %%DATADIR%%/i18n/avogadro_sv.qm %%DATADIR%%/i18n/avogadro_ta.qm +%%DATADIR%%/i18n/avogadro_te.qm %%DATADIR%%/i18n/avogadro_th.qm %%DATADIR%%/i18n/avogadro_tr.qm %%DATADIR%%/i18n/avogadro_ug.qm @@ -1138,6 +1152,7 @@ %%DATADIR%%/i18n/libavogadro_sq.qm %%DATADIR%%/i18n/libavogadro_sr.qm %%DATADIR%%/i18n/libavogadro_sv.qm +%%DATADIR%%/i18n/libavogadro_th.qm %%DATADIR%%/i18n/libavogadro_tr.qm %%DATADIR%%/i18n/libavogadro_ug.qm %%DATADIR%%/i18n/libavogadro_uk.qm