From owner-svn-ports-all@FreeBSD.ORG Sat Dec 1 06:32:48 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DE22422; Sat, 1 Dec 2012 06:32:48 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 78EFE8FC12; Sat, 1 Dec 2012 06:32:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB16WmPG042833; Sat, 1 Dec 2012 06:32:48 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB16WmHa042830; Sat, 1 Dec 2012 06:32:48 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201212010632.qB16WmHa042830@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Sat, 1 Dec 2012 06:32:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308063 - in head/science/avogadro: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 06:32:48 -0000 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 (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 -# +# Created by: Troels Kofoed Jacobsen # $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 -.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