svn commit: r308063 - in head/science/avogadro: . files
Ruslan Mahmatkhanov
rm at FreeBSD.org
Sat Dec 1 06:32:48 UTC 2012
Author: rm
Date: Sat Dec 1 06:32:48 2012
New Revision: 308063
URL: http://svnweb.freebsd.org/changeset/ports/308063
Log:
- 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 at gmail.com> (maintainer)
Feature safe: yes
Added:
head/science/avogadro/files/patch-libavogadro__CMakeLists.txt (contents, props changed)
Modified:
head/science/avogadro/Makefile
head/science/avogadro/pkg-descr
Modified: head/science/avogadro/Makefile
==============================================================================
--- head/science/avogadro/Makefile Sat Dec 1 05:13:11 2012 (r308062)
+++ head/science/avogadro/Makefile Sat Dec 1 06:32:48 2012 (r308063)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: avogadro
-# Date created: 19 May 2009
-# Whom: Troels Kofoed Jacobsen <tkjacobsen at gmail.com>
-#
+# Created by: Troels Kofoed Jacobsen <tkjacobsen at gmail.com>
# $FreeBSD$
-#
PORTNAME= avogadro
PORTVERSION= 1.0.3
@@ -12,7 +8,7 @@ CATEGORIES= science
MASTER_SITES= SF
MAINTAINER= tkjacobsen at 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
Added: head/science/avogadro/files/patch-libavogadro__CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/science/avogadro/files/patch-libavogadro__CMakeLists.txt Sat Dec 1 06:32:48 2012 (r308063)
@@ -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)
Modified: head/science/avogadro/pkg-descr
==============================================================================
--- head/science/avogadro/pkg-descr Sat Dec 1 05:13:11 2012 (r308062)
+++ head/science/avogadro/pkg-descr Sat Dec 1 06:32:48 2012 (r308063)
@@ -3,4 +3,4 @@ computational chemistry, molecular model
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
More information about the svn-ports-all
mailing list