Attachment 214064 Details for Bug 246144 – patch

[patch] patch

openkim.patch (text/plain), 10.30 KB, created by Yuri Victorovich on 2020-05-03 16:59:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2020-05-03 16:59:32 UTC

Size: 10.30 KB

patch

obsolete

>Index: science/openkim/Makefile
>===================================================================
>--- science/openkim/Makefile	(revision 533794)
>+++ science/openkim/Makefile	(working copy)
>@@ -1,50 +1,20 @@
> # $FreeBSD$
> 
> PORTNAME=	openkim
>-PORTVERSION=	1.1.1
>-PORTREVISION=	10
>+DISTVERSION=	2.1.3
> CATEGORIES=	science
>-MASTER_SITES=	http://s3.openkim.org/openkim-api/
>-DISTNAME=	${PORTNAME}-api-v${PORTVERSION}
>+MASTER_SITES=	https://s3.openkim.org/kim-api/
>+DISTNAME=	kim-api-${DISTVERSION}
> 
> MAINTAINER=	jwb@FreeBSD.org
> COMMENT=	Knowledgebase of Interatomic Models
> 
> LICENSE=	CDDL
>+LICENSE_FILE=	${WRKSRC}/LICENSE.CDDL
> 
>-MAKE_ENV+=	KIM_DIR=${WRKSRC}
>+BUILD_DEPENDS=	xxd:editors/vim-console
> 
>-USES=		gmake fortran tar:tgz
>+USES=		cmake fortran tar:txz
>+USE_LDCONFIG=	yes
> 
>-MAKE_JOBS_UNSAFE=yes
>-
>-.include <bsd.port.options.mk>
>-
>-# determine if we are on a 32-bit arch
>-.if ! ${ARCH:M*64*}
>-MAKE_ENV+=	KIM_SYSTEM32="yes"
>-.endif
>-
>-post-patch:
>-	${REINPLACE_CMD} \
>-		-e "s|gcc|${CC}|g" \
>-		-e "s|g++|${CXX}|g" \
>-		-e "s|= gfortran|= ${FC}|g" \
>-		-e "s|-O3|${CFLAGS}|g" \
>-		-e "s|LINKLIBFLAG =|LINKLIBFLAG = ${LDFLAGS}|" \
>-		${WRKSRC}/KIM_API/GNU_compiler_settings.mk
>-
>-# Required for main build to succeed
>-pre-build:
>-	(cd ${WRKSRC} && ${MAKE_CMD} KIM_DIR=${WRKSRC} examples)
>-
>-do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/include/KIM_API
>-	${INSTALL_DATA} ${WRKSRC}/KIM_API/libkim.a ${STAGEDIR}${PREFIX}/lib
>-	${INSTALL_DATA} ${WRKSRC}/KIM_API/*.h ${STAGEDIR}${PREFIX}/include/KIM_API
>-
>-do-test:
>-	(cd ${WRKSRC}/TESTs/ex_test_Ar_free_cluster_CLUSTER_F90 && \
>-		${ECHO_CMD} "ex_model_Ar_P_MLJ_CLUSTER_C" | ./ex_test_Ar_free_cluster_CLUSTER_F90)
>-
> .include <bsd.port.mk>
>Index: science/openkim/distinfo
>===================================================================
>--- science/openkim/distinfo	(revision 533794)
>+++ science/openkim/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (openkim-api-v1.1.1.tgz) = 683bda8011754b2525e6f935f52909c141e9d39c2184cefb98babb9e4e5e0959
>-SIZE (openkim-api-v1.1.1.tgz) = 1529043
>+TIMESTAMP = 1588524299
>+SHA256 (kim-api-2.1.3.txz) = 88a5416006c65a2940d82fad49de0885aead05bfa8b59f87d287db5516b9c467
>+SIZE (kim-api-2.1.3.txz) = 296492
>Index: science/openkim/files/patch-KIM_API__GNU_compiler_settings.mk
>===================================================================
>--- science/openkim/files/patch-KIM_API__GNU_compiler_settings.mk	(revision 533794)
>+++ science/openkim/files/patch-KIM_API__GNU_compiler_settings.mk	(nonexistent)
>@@ -1,10 +0,0 @@
>---- KIM_API/GNU_compiler_settings.mk.orig	2012-08-19 23:13:47.000000000 +0200
>-+++ KIM_API/GNU_compiler_settings.mk	2014-02-21 16:11:02.000000000 +0100
>-@@ -53,7 +53,3 @@
>-    # Add libforgranbegin if needed.
>-    LINKLIBFLAG += -lgfortranbegin
>- endif
>--ifdef KIM_DYNAMIC
>--   # Add libdl if dynamic linking is being used
>--   LINKLIBFLAG += -ldl
>--endif
>
>Property changes on: science/openkim/files/patch-KIM_API__GNU_compiler_settings.mk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: science/openkim/pkg-plist
>===================================================================
>--- science/openkim/pkg-plist	(revision 533794)
>+++ science/openkim/pkg-plist	(working copy)
>@@ -1,8 +1,150 @@
>-include/KIM_API/KIM_API.h
>-include/KIM_API/KIM_API_C.h
>-include/KIM_API/KIM_API_status.h
>-include/KIM_API/KIM_AUX.h
>-include/KIM_API/Unit_Handling.h
>-include/KIM_API/model_init_include.h
>-include/KIM_API/model_kim_str_include.h
>-lib/libkim.a
>+bin/kim-api-collections-management
>+etc/bash_completion.d/kim-api-collections-management.bash
>+etc/zsh_completion.d/_kim-api-collections-management
>+etc/zsh_completion.d/kim-api-collections-management.bash
>+include/kim-api/KIM_ChargeUnit.h
>+include/kim-api/KIM_ChargeUnit.hpp
>+include/kim-api/KIM_Collection.h
>+include/kim-api/KIM_Collection.hpp
>+include/kim-api/KIM_CollectionItemType.h
>+include/kim-api/KIM_CollectionItemType.hpp
>+include/kim-api/KIM_Collections.h
>+include/kim-api/KIM_Collections.hpp
>+include/kim-api/KIM_ComputeArgumentName.h
>+include/kim-api/KIM_ComputeArgumentName.hpp
>+include/kim-api/KIM_ComputeArguments.h
>+include/kim-api/KIM_ComputeArguments.hpp
>+include/kim-api/KIM_ComputeCallbackName.h
>+include/kim-api/KIM_ComputeCallbackName.hpp
>+include/kim-api/KIM_DataType.h
>+include/kim-api/KIM_DataType.hpp
>+include/kim-api/KIM_EnergyUnit.h
>+include/kim-api/KIM_EnergyUnit.hpp
>+include/kim-api/KIM_FunctionTypes.h
>+include/kim-api/KIM_FunctionTypes.hpp
>+include/kim-api/KIM_LOG_DEFINES.inc
>+include/kim-api/KIM_LanguageName.h
>+include/kim-api/KIM_LanguageName.hpp
>+include/kim-api/KIM_LengthUnit.h
>+include/kim-api/KIM_LengthUnit.hpp
>+include/kim-api/KIM_Log.h
>+include/kim-api/KIM_Log.hpp
>+include/kim-api/KIM_LogMacros.h
>+include/kim-api/KIM_LogMacros.hpp
>+include/kim-api/KIM_LogVerbosity.h
>+include/kim-api/KIM_LogVerbosity.hpp
>+include/kim-api/KIM_Model.h
>+include/kim-api/KIM_Model.hpp
>+include/kim-api/KIM_ModelCompute.h
>+include/kim-api/KIM_ModelCompute.hpp
>+include/kim-api/KIM_ModelComputeArguments.h
>+include/kim-api/KIM_ModelComputeArguments.hpp
>+include/kim-api/KIM_ModelComputeArgumentsCreate.h
>+include/kim-api/KIM_ModelComputeArgumentsCreate.hpp
>+include/kim-api/KIM_ModelComputeArgumentsDestroy.h
>+include/kim-api/KIM_ModelComputeArgumentsDestroy.hpp
>+include/kim-api/KIM_ModelCreate.h
>+include/kim-api/KIM_ModelCreate.hpp
>+include/kim-api/KIM_ModelDestroy.h
>+include/kim-api/KIM_ModelDestroy.hpp
>+include/kim-api/KIM_ModelDriverCreate.h
>+include/kim-api/KIM_ModelDriverCreate.hpp
>+include/kim-api/KIM_ModelDriverHeaders.h
>+include/kim-api/KIM_ModelDriverHeaders.hpp
>+include/kim-api/KIM_ModelExtension.h
>+include/kim-api/KIM_ModelExtension.hpp
>+include/kim-api/KIM_ModelHeaders.h
>+include/kim-api/KIM_ModelHeaders.hpp
>+include/kim-api/KIM_ModelRefresh.h
>+include/kim-api/KIM_ModelRefresh.hpp
>+include/kim-api/KIM_ModelRoutineName.h
>+include/kim-api/KIM_ModelRoutineName.hpp
>+include/kim-api/KIM_ModelWriteParameterizedModel.h
>+include/kim-api/KIM_ModelWriteParameterizedModel.hpp
>+include/kim-api/KIM_Numbering.h
>+include/kim-api/KIM_Numbering.hpp
>+include/kim-api/KIM_SemVer.h
>+include/kim-api/KIM_SemVer.hpp
>+include/kim-api/KIM_SimulatorHeaders.h
>+include/kim-api/KIM_SimulatorHeaders.hpp
>+include/kim-api/KIM_SimulatorModel.h
>+include/kim-api/KIM_SimulatorModel.hpp
>+include/kim-api/KIM_SpeciesName.h
>+include/kim-api/KIM_SpeciesName.hpp
>+include/kim-api/KIM_SupportStatus.h
>+include/kim-api/KIM_SupportStatus.hpp
>+include/kim-api/KIM_SupportedExtensions.h
>+include/kim-api/KIM_SupportedExtensions.hpp
>+include/kim-api/KIM_TemperatureUnit.h
>+include/kim-api/KIM_TemperatureUnit.hpp
>+include/kim-api/KIM_TimeUnit.h
>+include/kim-api/KIM_TimeUnit.hpp
>+include/kim-api/KIM_UnitSystem.h
>+include/kim-api/KIM_UnitSystem.hpp
>+include/kim-api/KIM_Version.h
>+include/kim-api/KIM_Version.hpp
>+lib/kim-api/cmake/KIM_SharedLibrarySchema.hpp
>+lib/kim-api/cmake/item-compiled-with-version.txt.in
>+lib/kim-api/cmake/item-info.txt.in
>+lib/kim-api/cmake/item-wrapper.cpp.in
>+lib/kim-api/mod/kim_charge_unit_module.mod
>+lib/kim-api/mod/kim_collection_item_type_module.mod
>+lib/kim-api/mod/kim_collection_module.mod
>+lib/kim-api/mod/kim_collections_module.mod
>+lib/kim-api/mod/kim_compute_argument_name_module.mod
>+lib/kim-api/mod/kim_compute_arguments_module.mod
>+lib/kim-api/mod/kim_compute_callback_name_module.mod
>+lib/kim-api/mod/kim_data_type_module.mod
>+lib/kim-api/mod/kim_energy_unit_module.mod
>+lib/kim-api/mod/kim_language_name_module.mod
>+lib/kim-api/mod/kim_length_unit_module.mod
>+lib/kim-api/mod/kim_log_module.mod
>+lib/kim-api/mod/kim_log_verbosity_module.mod
>+lib/kim-api/mod/kim_model_compute_arguments_create_module.mod
>+lib/kim-api/mod/kim_model_compute_arguments_destroy_module.mod
>+lib/kim-api/mod/kim_model_compute_arguments_module.mod
>+lib/kim-api/mod/kim_model_compute_module.mod
>+lib/kim-api/mod/kim_model_create_module.mod
>+lib/kim-api/mod/kim_model_destroy_module.mod
>+lib/kim-api/mod/kim_model_driver_create_module.mod
>+lib/kim-api/mod/kim_model_driver_headers_module.mod
>+lib/kim-api/mod/kim_model_extension_module.mod
>+lib/kim-api/mod/kim_model_headers_module.mod
>+lib/kim-api/mod/kim_model_module.mod
>+lib/kim-api/mod/kim_model_refresh_module.mod
>+lib/kim-api/mod/kim_model_routine_name_module.mod
>+lib/kim-api/mod/kim_model_write_parameterized_model_module.mod
>+lib/kim-api/mod/kim_numbering_module.mod
>+lib/kim-api/mod/kim_sem_ver_module.mod
>+lib/kim-api/mod/kim_simulator_headers_module.mod
>+lib/kim-api/mod/kim_simulator_model_module.mod
>+lib/kim-api/mod/kim_species_name_module.mod
>+lib/kim-api/mod/kim_support_status_module.mod
>+lib/kim-api/mod/kim_supported_extensions_module.mod
>+lib/kim-api/mod/kim_temperature_unit_module.mod
>+lib/kim-api/mod/kim_time_unit_module.mod
>+lib/kim-api/mod/kim_unit_system_module.mod
>+lib/kim-api/model-drivers/LennardJones612__MD_414112407348_003/libkim-api-model-driver.so
>+lib/kim-api/model-drivers/ex_model_driver_P_LJ/libkim-api-model-driver.so
>+lib/kim-api/model-drivers/ex_model_driver_P_Morse/libkim-api-model-driver.so
>+lib/kim-api/portable-models/LennardJones612_UniversalShifted__MO_959249795837_003/libkim-api-portable-model.so
>+lib/kim-api/portable-models/LennardJones_Ar/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_P_LJ/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_P_MLJ_Fortran/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_P_Morse/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_P_Morse_07C/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_P_Morse_07C_w_Extensions/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_P_Morse_MultiCutoff/libkim-api-portable-model.so
>+lib/kim-api/portable-models/ex_model_Ar_SLJ_MultiCutoff/libkim-api-portable-model.so
>+lib/kim-api/simulator-models/Sim_LAMMPS_LJcut_AkersonElliott_Alchemy_PbAu/libkim-api-simulator-model.so
>+lib/libkim-api.so
>+lib/libkim-api.so.2
>+libdata/pkgconfig/libkim-api.pc
>+libexec/kim-api/kim-api-collections-info
>+libexec/kim-api/kim-api-shared-library-test
>+libexec/kim-api/kim-api-simulator-model
>+share/cmake/Modules/FindKIM-API.cmake
>+share/cmake/kim-api/kim-api-config-version.cmake
>+share/cmake/kim-api/kim-api-config.cmake
>+share/emacs/site-lisp/kim-api/kim-api-c-style.el
>+@dir share/doc/kim-api

Actions: View | Diff

Attachments on bug 246144: 214064 | 214065