diff options
| author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2012-12-01 06:32:48 +0000 |
|---|---|---|
| committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2012-12-01 06:32:48 +0000 |
| commit | 32133fd8998f6f820af673eb4663eb4b41a9a140 (patch) | |
| tree | 7d64d36f4de2638d86543945bca042b50c4bb15d /science | |
| parent | Update to 5.3.11. (diff) | |
- add patch to fix build with latest boost 1.48
while here:
- trim Makefile header
- remove indefinite article from COMMENT
- convert to optionsng
- strict python version to 2.x, because avogadro python code isn't 3.x-aware
- use PYTHON_PKGNAMEPREFIX in dependencies
- update WWW
PR: 173944
Submitted by: Troels Kofoed Jacobsen <tkjacobsen@gmail.com> (maintainer)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=308063
Diffstat (limited to 'science')
| -rw-r--r-- | science/avogadro/Makefile | 18 | ||||
| -rw-r--r-- | science/avogadro/files/patch-libavogadro__CMakeLists.txt | 12 | ||||
| -rw-r--r-- | science/avogadro/pkg-descr | 2 |
3 files changed, 20 insertions, 12 deletions
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile index c02ef9086ff1..4e138a50948a 100644 --- a/science/avogadro/Makefile +++ b/science/avogadro/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: avogadro -# Date created: 19 May 2009 -# Whom: Troels Kofoed Jacobsen <tkjacobsen@gmail.com> -# +# Created by: Troels Kofoed Jacobsen <tkjacobsen@gmail.com> # $FreeBSD$ -# PORTNAME= avogadro PORTVERSION= 1.0.3 @@ -12,7 +8,7 @@ CATEGORIES= science MASTER_SITES= SF MAINTAINER= tkjacobsen@gmail.com -COMMENT= An advanced molecular editor and viewer +COMMENT= Advanced molecular editor and viewer BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 LIB_DEPENDS= openbabel.3:${PORTSDIR}/science/openbabel @@ -28,19 +24,19 @@ CMAKE_ARGS= -DENABLE_GLSL=OFF \ USE_GCC= 4.4+ MAKE_JOBS_SAFE= yes -OPTIONS= PYTHON "Enable python support" off +OPTIONS_DEFINE= PYTHON MAN1= avogadro.1 avopkg.1 .include <bsd.port.options.mk> -.if defined (WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} CMAKE_ARGS+= -DENABLE_PYTHON=ON -USE_PYTHON= 2.5+ +USE_PYTHON= -2.7 BUILD_DEPENDS+= ${PYNUMPY} \ - sip:${PORTSDIR}/devel/py-sip + ${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip RUN_DEPENDS+= ${PYNUMPY} \ - sip:${PORTSDIR}/devel/py-sip + ${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs PLIST_SUB+= PYTHON="" .else diff --git a/science/avogadro/files/patch-libavogadro__CMakeLists.txt b/science/avogadro/files/patch-libavogadro__CMakeLists.txt new file mode 100644 index 000000000000..0596b8353e93 --- /dev/null +++ b/science/avogadro/files/patch-libavogadro__CMakeLists.txt @@ -0,0 +1,12 @@ +--- libavogadro/CMakeLists.txt.orig 2012-11-26 21:38:12.000000000 +0100 ++++ libavogadro/CMakeLists.txt 2012-11-26 21:39:47.000000000 +0100 +@@ -18,7 +18,8 @@ + # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp + # We should probably scan the header to verify the Q_OBJECT macro is used + string(REPLACE ".cpp" ".h" hdr_list "${src_list}") +- qt4_wrap_cpp(moc_files ${hdr_list}) ++ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS ++ -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + # Now sort out the ui and qrc files, process them as appropriate + set(ui_plugin_files) + set(qrc_plugin_files) diff --git a/science/avogadro/pkg-descr b/science/avogadro/pkg-descr index 528e68586d54..e5f9c3aa5bed 100644 --- a/science/avogadro/pkg-descr +++ b/science/avogadro/pkg-descr @@ -3,4 +3,4 @@ computational chemistry, molecular modeling, bioinformatics, materials science, and related areas. It offers flexible rendering and a powerful plugin architecture. -WWW: http://avogadro.openmolecules.net/ +WWW: http://avogadro.openmolecules.net/wiki/Main_Page |