kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update from 1.1.0 to 1.1.1

Browse source 
- Add desktop-file-utils to USES
- Add stage support

PR:		ports/184846
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
This commit is contained in:
Danilo Egea Gondolfo 2013-12-18 23:33:20 +00:00
parent d33080bb7d
commit 745314a17b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=336862
5 changed files with 38 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
science/avogadro/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= avogadro
PORTVERSION= 1.1.0
PORTREVISION= 1
PORTVERSION= 1.1.1
CATEGORIES= science
MASTER_SITES= SF
@ -12,14 +11,15 @@ COMMENT= Advanced molecular editor and viewer
LICENSE= GPLv2 # (or later)
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
BUILD_DEPENDS= eigen2>2:${PORTSDIR}/math/eigen2
LIB_DEPENDS= libopenbabel.so:${PORTSDIR}/science/openbabel
OPTIONS_DEFINE= PYTHON
OPTIONS_DEFAULT=PYTHON
OPTIONS_SUB= yes
USE_BZIP2= yes
USES= cmake pkgconfig
USES= cmake desktop-file-utils pkgconfig
USE_GL= glu
USE_QT4= gui network opengl \
linguist_build moc_build qmake_build rcc_build uic_build
@ -27,26 +27,23 @@ CMAKE_ARGS= -DENABLE_GLSL=OFF \
-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
USE_LDCONFIG= yes
CFLAGS+= -idirafter ${LOCALBASE}/include
CFLAGS+= -idirafter ${LOCALBASE}/include/eigen2 \
-idirafter ${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAN1= avogadro.1 avopkg.1
NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTHON}
CMAKE_ARGS+= -DENABLE_PYTHON=ON
USE_PYTHON= -2.7
USE_PYTHON= 2
BUILD_DEPENDS+= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
LIB_DEPENDS+= libboost_python.so:${PORTSDIR}/devel/boost-python-libs
RUN_DEPENDS+= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
PLIST_SUB+= PYTHON=""
CMAKE_ARGS+= -DENABLE_PYTHON=ON \
-DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
.else
CMAKE_ARGS+= -DENABLE_PYTHON=OFF
PLIST_SUB+= PYTHON="@comment "
.endif
post-patch:
@ -56,4 +53,15 @@ post-patch:
@${REINPLACE_CMD} -e \
's|share/man|man|' ${WRKSRC}/doc/CMakeLists.txt
pre-configure:
.if ${PORT_OPTIONS:MPYTHON}
@${MKDIR} ${WRKDIR}/include/${PYTHON_VERSION}
@${FIND} ${PYTHON_INCLUDEDIR} ! -name "pyport.h" -type f \
-maxdepth 1 | ${XARGS} -J % ${LN} -sf % \
${WRKDIR}/include/${PYTHON_VERSION}
@${SED} -e 's|^#ifdef _PY_PORT_CTYPE_UTF8_ISSUE|#if 0|' \
${PYTHON_INCLUDEDIR}/pyport.h > \
${WRKDIR}/include/${PYTHON_VERSION}/pyport.h
.endif
.include <bsd.port.mk>

4
science/avogadro/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (avogadro-1.1.0.tar.bz2) = 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0
SIZE (avogadro-1.1.0.tar.bz2) = 10741835
SHA256 (avogadro-1.1.1.tar.bz2) = fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14
SIZE (avogadro-1.1.1.tar.bz2) = 11118046

41
science/avogadro/files/patch-git_f518cdf4d281ac6da124b179a7f9b4b71ca90cb0
View file

@ -1,41 +0,0 @@
From f518cdf4d281ac6da124b179a7f9b4b71ca90cb0 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 14 May 2013 23:03:57 +0300
Subject: [PATCH] Treat "amd64" as a possible value for CMAKE_SYSTEM_PROCESSOR.
The BSDs (and maybe OS X) report 64-bits sytems as "amd64" instead of
"x86_64", so accept that value when deciding whether to pass -fPIC to the
compiler too.
---
libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
index fb88316..8ee7d71 100644
--- ./libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
+++ ./libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
@@ -20,6 +20,6 @@ add_library(spglib STATIC ${spglib_SRCS})
set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
# Set -fPIC on x86_64
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
endif()
diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
index 0cd0c3e..62adfe3 100644
--- ./libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
+++ ./libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
# Set -fPIC on x86_64
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
endif()
--
1.8.2.3

16
science/avogadro/pkg-plist
View file

@ -48,6 +48,7 @@ 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
@ -80,6 +81,7 @@ 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
@ -110,12 +112,14 @@ lib/avogadro/AvogadroTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/avogadro/AvogadroTargets.cmake
lib/libavogadro.so
lib/libavogadro.so.1
lib/libavogadro.so.1.1.0
lib/libavogadro.so.1.1.1
lib/libavogadro_OpenQube.so
lib/libavogadro_OpenQube.so.0
lib/libavogadro_OpenQube.so.0.1.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so
libdata/pkgconfig/avogadro.pc
man/man1/avogadro.1.gz
man/man1/avopkg.1.gz
share/applications/avogadro.desktop
%%DATADIR%%/builder/amino/d-ala.zmat
%%DATADIR%%/builder/amino/d-arg.zmat
@ -1060,11 +1064,13 @@ share/applications/avogadro.desktop
%%DATADIR%%/i18n/avogadro_en_CA.qm
%%DATADIR%%/i18n/avogadro_en_GB.qm
%%DATADIR%%/i18n/avogadro_es.qm
%%DATADIR%%/i18n/avogadro_et.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_hi.qm
%%DATADIR%%/i18n/avogadro_hr.qm
%%DATADIR%%/i18n/avogadro_hu.qm
%%DATADIR%%/i18n/avogadro_id.qm
@ -1072,6 +1078,7 @@ share/applications/avogadro.desktop
%%DATADIR%%/i18n/avogadro_ja.qm
%%DATADIR%%/i18n/avogadro_kn.qm
%%DATADIR%%/i18n/avogadro_ko.qm
%%DATADIR%%/i18n/avogadro_ms.qm
%%DATADIR%%/i18n/avogadro_nb.qm
%%DATADIR%%/i18n/avogadro_nl.qm
%%DATADIR%%/i18n/avogadro_oc.qm
@ -1080,8 +1087,11 @@ share/applications/avogadro.desktop
%%DATADIR%%/i18n/avogadro_pt_BR.qm
%%DATADIR%%/i18n/avogadro_ru.qm
%%DATADIR%%/i18n/avogadro_sk.qm
%%DATADIR%%/i18n/avogadro_sl.qm
%%DATADIR%%/i18n/avogadro_sq.qm
%%DATADIR%%/i18n/avogadro_sr.qm
%%DATADIR%%/i18n/avogadro_sv.qm
%%DATADIR%%/i18n/avogadro_ta.qm
%%DATADIR%%/i18n/avogadro_th.qm
%%DATADIR%%/i18n/avogadro_tr.qm
%%DATADIR%%/i18n/avogadro_ug.qm
@ -1102,6 +1112,7 @@ share/applications/avogadro.desktop
%%DATADIR%%/i18n/libavogadro_en_CA.qm
%%DATADIR%%/i18n/libavogadro_en_GB.qm
%%DATADIR%%/i18n/libavogadro_es.qm
%%DATADIR%%/i18n/libavogadro_et.qm
%%DATADIR%%/i18n/libavogadro_eu.qm
%%DATADIR%%/i18n/libavogadro_fi.qm
%%DATADIR%%/i18n/libavogadro_fr.qm
@ -1114,6 +1125,7 @@ share/applications/avogadro.desktop
%%DATADIR%%/i18n/libavogadro_ja.qm
%%DATADIR%%/i18n/libavogadro_kn.qm
%%DATADIR%%/i18n/libavogadro_ko.qm
%%DATADIR%%/i18n/libavogadro_ms.qm
%%DATADIR%%/i18n/libavogadro_nb.qm
%%DATADIR%%/i18n/libavogadro_nl.qm
%%DATADIR%%/i18n/libavogadro_oc.qm
@ -1122,6 +1134,8 @@ share/applications/avogadro.desktop
%%DATADIR%%/i18n/libavogadro_pt_BR.qm
%%DATADIR%%/i18n/libavogadro_ru.qm
%%DATADIR%%/i18n/libavogadro_sk.qm
%%DATADIR%%/i18n/libavogadro_sl.qm
%%DATADIR%%/i18n/libavogadro_sq.qm
%%DATADIR%%/i18n/libavogadro_sr.qm
%%DATADIR%%/i18n/libavogadro_sv.qm
%%DATADIR%%/i18n/libavogadro_tr.qm

2
science/kalzium/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= kalzium
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= science kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src