aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuri <yuri@FreeBSD.org>2018-10-03 07:11:15 +0800
committeryuri <yuri@FreeBSD.org>2018-10-03 07:11:15 +0800
commitf2d5c815fba2fdc3fc279fb7586fc2340541aea3 (patch)
treeb0823fe1d065780151b79a304b365c2597294e8f
parent74b9c1d82308f6bf74422ff421da21bd591d36f6 (diff)
downloadfreebsd-ports-gnome-f2d5c815fba2fdc3fc279fb7586fc2340541aea3.tar.gz
freebsd-ports-gnome-f2d5c815fba2fdc3fc279fb7586fc2340541aea3.tar.zst
freebsd-ports-gnome-f2d5c815fba2fdc3fc279fb7586fc2340541aea3.zip
science/PETSc: Update 3.9.4->3.10.1; math/py-petsc4py: Update 3.9.1->3.10.0; math/slepc: Update 3.9.2->3.10.0; math/py-slepc4py: Update 3.9.0->3.10.0
Bump math/sundials and math/petiga. On commit because they depend on each other and don't build unless versions match.
-rw-r--r--math/petiga/Makefile2
-rw-r--r--math/py-petsc4py/Makefile6
-rw-r--r--math/py-petsc4py/distinfo8
-rw-r--r--math/py-petsc4py/pkg-plist1
-rw-r--r--math/py-slepc4py/Makefile7
-rw-r--r--math/py-slepc4py/distinfo10
-rw-r--r--math/slepc/Makefile4
-rw-r--r--math/slepc/distinfo6
-rw-r--r--math/slepc/files/patch-config_install.py9
-rw-r--r--math/slepc/files/patch-makefile8
-rw-r--r--math/slepc/pkg-plist6
-rw-r--r--math/sundials/Makefile2
-rw-r--r--science/PETSc/Makefile3
-rw-r--r--science/PETSc/distinfo6
-rw-r--r--science/PETSc/pkg-plist21
15 files changed, 52 insertions, 47 deletions
diff --git a/math/petiga/Makefile b/math/petiga/Makefile
index deb017604a12..afe79e2c641f 100644
--- a/math/petiga/Makefile
+++ b/math/petiga/Makefile
@@ -2,7 +2,7 @@
PORTNAME= petiga
DISTVERSION= g20180518
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math python
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
diff --git a/math/py-petsc4py/Makefile b/math/py-petsc4py/Makefile
index 951368d62187..b6c3631708d9 100644
--- a/math/py-petsc4py/Makefile
+++ b/math/py-petsc4py/Makefile
@@ -1,15 +1,11 @@
# $FreeBSD$
PORTNAME= petsc4py
-DISTVERSION= 3.9.1
-PORTREVISION= 1
+DISTVERSION= 3.10.0
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PATCH_SITES= https://bitbucket.org/petsc/petsc4py/commits/
-PATCHFILES= ab877906425e/raw:-p1
-
MAINTAINER= yuri@FreeBSD.org
COMMENT= PETSc for Python
diff --git a/math/py-petsc4py/distinfo b/math/py-petsc4py/distinfo
index cd4feb9981a6..c1673d59fb3d 100644
--- a/math/py-petsc4py/distinfo
+++ b/math/py-petsc4py/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1528554205
-SHA256 (petsc4py-3.9.1.tar.gz) = 0ccee912216f100d9b08637e036df00e043a530303ff8afd7c3ac7c454681fb9
-SIZE (petsc4py-3.9.1.tar.gz) = 1651526
-SHA256 (ab877906425e/raw) = ef07a5622ce5a55dc555455aff5c59a6395bdef74b11aa576d58642db7c4ccfc
-SIZE (ab877906425e/raw) = 2706
+TIMESTAMP = 1538518191
+SHA256 (petsc4py-3.10.0.tar.gz) = 45d4bc6be668052a68dff311c0177171b9ceced69a398252c487f6ad9b790332
+SIZE (petsc4py-3.10.0.tar.gz) = 1683666
diff --git a/math/py-petsc4py/pkg-plist b/math/py-petsc4py/pkg-plist
deleted file mode 100644
index e74aeb3ae4ac..000000000000
--- a/math/py-petsc4py/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/petsc4py/lib/PETSc.so
diff --git a/math/py-slepc4py/Makefile b/math/py-slepc4py/Makefile
index 23965bab071f..b47350912258 100644
--- a/math/py-slepc4py/Makefile
+++ b/math/py-slepc4py/Makefile
@@ -1,16 +1,11 @@
# $FreeBSD$
PORTNAME= slepc4py
-DISTVERSION= 3.9.0
-PORTREVISION= 2
+DISTVERSION= 3.10.0
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-# https://bitbucket.org/slepc/slepc4py/issues/34/freebsd-compatibility-patches
-PATCH_SITES= https://bitbucket.org/petsc/petsc4py/commits/
-PATCHFILES= ab877906425e/raw:-p1 ecf673e8b8da/raw:-p1
-
MAINTAINER= yuri@FreeBSD.org
COMMENT= SLEPc for Python
diff --git a/math/py-slepc4py/distinfo b/math/py-slepc4py/distinfo
index ff34a7f6f4df..f6131da2b9b7 100644
--- a/math/py-slepc4py/distinfo
+++ b/math/py-slepc4py/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1529916157
-SHA256 (slepc4py-3.9.0.tar.gz) = 67ed4ffed36c076448d6a0148edfad65d6610b9838df97c79f6fc5d7ec06b90b
-SIZE (slepc4py-3.9.0.tar.gz) = 829386
-SHA256 (ab877906425e/raw) = ef07a5622ce5a55dc555455aff5c59a6395bdef74b11aa576d58642db7c4ccfc
-SIZE (ab877906425e/raw) = 2706
-SHA256 (ecf673e8b8da/raw) = a2e66c9ef4f502499236fe171fc5f7723a91f3c48122fa20de63070fbb6e704f
-SIZE (ecf673e8b8da/raw) = 923
+TIMESTAMP = 1538521030
+SHA256 (slepc4py-3.10.0.tar.gz) = 326cbab709836cd5fe8e4adb60eaabe4e24537715bededd2812f3bc47c4b0474
+SIZE (slepc4py-3.10.0.tar.gz) = 835166
diff --git a/math/slepc/Makefile b/math/slepc/Makefile
index e7e80a1653a1..30eddbba6a5b 100644
--- a/math/slepc/Makefile
+++ b/math/slepc/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= slepc
-DISTVERSION= 3.9.2
-PORTREVISION= 2
+DISTVERSION= 3.10.0
CATEGORIES= math devel
MASTER_SITES= http://slepc.upv.es/download/distrib/
@@ -19,6 +18,7 @@ LIB_DEPENDS= libblas.so:math/blas \
USES= gmake fortran python:2.7 shebangfix
SHEBANG_FILES= configure
+SHEBANG_GLOB= *.py
MAKEFILE= makefile
MAKE_ENV= PETSC_DIR=${LOCALBASE} PETSC_ARCH="" SLEPC_DIR=${WRKSRC} FREEBSD_STAGEDIR=${STAGEDIR} PYTHON=${PYTHON_CMD}
USE_XORG= x11 # not really needed, but is inherited from the PETSc setup
diff --git a/math/slepc/distinfo b/math/slepc/distinfo
index 6cb04115cb46..3771d4c5feb5 100644
--- a/math/slepc/distinfo
+++ b/math/slepc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530608431
-SHA256 (slepc-3.9.2.tar.gz) = 247585b3f8c10bf50b9464cb8ef7b5f22bead6f96524384897a37ec4146eb03e
-SIZE (slepc-3.9.2.tar.gz) = 4478227
+TIMESTAMP = 1538519652
+SHA256 (slepc-3.10.0.tar.gz) = 069d7a579995e0be1567c5bc869251e29c00044369a786933ca3040149d0412a
+SIZE (slepc-3.10.0.tar.gz) = 4565134
diff --git a/math/slepc/files/patch-config_install.py b/math/slepc/files/patch-config_install.py
index 374309fdd9b0..b31bde13af62 100644
--- a/math/slepc/files/patch-config_install.py
+++ b/math/slepc/files/patch-config_install.py
@@ -1,18 +1,21 @@
---- config/install.py.orig 2018-06-25 08:07:05 UTC
+--- config/install.py.orig 2018-10-02 22:50:33 UTC
+++ config/install.py
-@@ -295,11 +295,11 @@ for dir in dirs:
+@@ -311,13 +311,13 @@ for dir in dirs:
def installShare(self):
self.copies.extend(self.copytree(self.rootShareDir, self.destShareDir))
+- examplesdir=os.path.join(self.destShareDir,'slepc','examples')
- if os.path.exists(os.path.join(self.destShareDir,'slepc','examples')):
- shutil.rmtree(os.path.join(self.destShareDir,'slepc','examples'))
- os.mkdir(os.path.join(self.destShareDir,'slepc','examples'))
- self.copyExamples(self.rootDir,os.path.join(self.destShareDir,'slepc','examples'))
-- self.fixExamplesMakefile(os.path.join(self.destShareDir,'slepc','examples','makefile'))
++ examplesdir=os.path.join(self.destShareDir,'examples','slepc')
+ if os.path.exists(os.path.join(self.destShareDir,'examples','slepc')):
+ shutil.rmtree(os.path.join(self.destShareDir,'examples','slepc'))
+ os.mkdir(os.path.join(self.destShareDir,'examples','slepc'))
+ self.copyExamples(self.rootDir,os.path.join(self.destShareDir,'examples','slepc'))
+ self.copyConfig(self.rootDir,examplesdir)
+- self.fixExamplesMakefile(os.path.join(self.destShareDir,'slepc','examples','makefile'))
+ self.fixExamplesMakefile(os.path.join(self.destShareDir,'examples','slepc','makefile'))
return
diff --git a/math/slepc/files/patch-makefile b/math/slepc/files/patch-makefile
index 645efb523d7c..3221be9ca2db 100644
--- a/math/slepc/files/patch-makefile
+++ b/math/slepc/files/patch-makefile
@@ -1,11 +1,11 @@
---- makefile.orig 2018-05-02 15:18:14 UTC
+--- makefile.orig 2018-10-02 22:42:08 UTC
+++ makefile
-@@ -254,7 +254,7 @@ chk_slepc_dir:
+@@ -210,7 +210,7 @@ chk_slepc_dir:
# Install relevant files in the prefix directory
#
install:
-- -@${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB};
-+ -@${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${FREEBSD_STAGEDIR}${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB};
+- @${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB};
++ @${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${FREEBSD_STAGEDIR}${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB};
# ------------------------------------------------------------------
#
diff --git a/math/slepc/pkg-plist b/math/slepc/pkg-plist
index e2d4bb0289eb..4ec6dc67f120 100644
--- a/math/slepc/pkg-plist
+++ b/math/slepc/pkg-plist
@@ -72,10 +72,10 @@ include/slepcsysdef.mod
include/slepcvec.h
include/slepcversion.h
lib/libslepc.so
-lib/libslepc.so.3.9
-lib/libslepc.so.3.9.2
+lib/libslepc.so.3.10
+lib/libslepc.so.3.10.0
lib/slepc/conf/SLEPcBuildInternal.cmake
-lib/slepc/conf/modules/slepc/3.9.2-installed-arch-%%PYTHON_PLATFORM%%-c-debug
+lib/slepc/conf/modules/slepc/3.10.0-installed-arch-%%PYTHON_PLATFORM%%-c-debug
lib/slepc/conf/reconfigure-installed-arch-%%PYTHON_PLATFORM%%-c-debug.py
lib/slepc/conf/slepc_common
lib/slepc/conf/slepc_rules
diff --git a/math/sundials/Makefile b/math/sundials/Makefile
index 6a2607e72954..170609c38228 100644
--- a/math/sundials/Makefile
+++ b/math/sundials/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sundials
DISTVERSION= 3.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= https://computation.llnl.gov/projects/sundials/download/
diff --git a/science/PETSc/Makefile b/science/PETSc/Makefile
index 76d91cb3f5e0..4ea90fd328b8 100644
--- a/science/PETSc/Makefile
+++ b/science/PETSc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= PETSc
-DISTVERSION= 3.9.4
-PORTREVISION= 1
+DISTVERSION= 3.10.1
CATEGORIES= science devel
MASTER_SITES= http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
DISTNAME= ${PORTNAME:tl}-${DISTVERSION}
diff --git a/science/PETSc/distinfo b/science/PETSc/distinfo
index 2ebbd54b9575..93279dc4162d 100644
--- a/science/PETSc/distinfo
+++ b/science/PETSc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536731079
-SHA256 (petsc-3.9.4.tar.gz) = ecc647c9b1ef565a2c113936454c65632eedc1626e0fc99b5a36accb91195a63
-SIZE (petsc-3.9.4.tar.gz) = 29400362
+TIMESTAMP = 1538517416
+SHA256 (petsc-3.10.1.tar.gz) = b6e64ce062113ee0e2e2a6cfffb4d33c085ec91d5bc3afeb33781074aa5a22a5
+SIZE (petsc-3.10.1.tar.gz) = 30858694
diff --git a/science/PETSc/pkg-plist b/science/PETSc/pkg-plist
index 34ecb287151f..fb528daa8626 100644
--- a/science/PETSc/pkg-plist
+++ b/science/PETSc/pkg-plist
@@ -26,6 +26,7 @@ include/petsc/private/bagimpl.h
include/petsc/private/characteristicimpl.h
include/petsc/private/dmadaptorimpl.h
include/petsc/private/dmdaimpl.h
+include/petsc/private/dmfieldimpl.h
include/petsc/private/dmforestimpl.h
include/petsc/private/dmimpl.h
include/petsc/private/dmlabelimpl.h
@@ -40,11 +41,18 @@ include/petsc/private/f90impl.h
include/petsc/private/fortranimpl.h
include/petsc/private/glvisvecimpl.h
include/petsc/private/glvisviewerimpl.h
-include/petsc/private/hash.h
+include/petsc/private/hashmap.h
+include/petsc/private/hashmapi.h
+include/petsc/private/hashmapij.h
+include/petsc/private/hashset.h
+include/petsc/private/hashseti.h
+include/petsc/private/hashsetij.h
+include/petsc/private/hashtable.h
include/petsc/private/isimpl.h
include/petsc/private/kernels/blockinvert.h
include/petsc/private/kernels/blockmatmult.h
include/petsc/private/kernels/blocktranspose.h
+include/petsc/private/kernels/khash.h
include/petsc/private/kernels/petscaxpy.h
include/petsc/private/kspimpl.h
include/petsc/private/linesearchimpl.h
@@ -54,6 +62,7 @@ include/petsc/private/matorderimpl.h
include/petsc/private/pcgamgimpl.h
include/petsc/private/pcimpl.h
include/petsc/private/pcmgimpl.h
+include/petsc/private/pcpatchimpl.h
include/petsc/private/petscconvestimpl.h
include/petsc/private/petscdsimpl.h
include/petsc/private/petscfeimpl.h
@@ -66,6 +75,9 @@ include/petsc/private/taoimpl.h
include/petsc/private/taolinesearchimpl.h
include/petsc/private/tsimpl.h
include/petsc/private/vecimpl.h
+include/petsc/private/vecscatterimpl.h
+include/petsc/private/vieweradios2impl.h
+include/petsc/private/vieweradiosimpl.h
include/petsc/private/viewerimpl.h
include/petscao.h
include/petscao.mod
@@ -92,6 +104,7 @@ include/petscdmdadef.mod
include/petscdmdatypes.h
include/petscdmdef.mod
include/petscdmdefdummy.mod
+include/petscdmfield.h
include/petscdmforest.h
include/petscdmforest.mod
include/petscdmforestdef.mod
@@ -207,6 +220,7 @@ lib/petsc/conf/petscvariables
lib/petsc/conf/reconfigure-arch-%%PYTHON_PLATFORM%%-c-debug.py
lib/petsc/conf/rules
lib/petsc/conf/test
+lib/petsc/conf/test.common
lib/petsc/conf/variables
libdata/pkgconfig/PETSc.pc
%%DATADIR%%/datafiles/matrices/amesos2_test_mat0.mtx
@@ -240,6 +254,8 @@ libdata/pkgconfig/PETSc.pc
%%DATADIR%%/datafiles/meshes/TwoQuads.exo
%%DATADIR%%/datafiles/meshes/annulus-20.exo
%%DATADIR%%/datafiles/meshes/blockcylinder-50.exo
+%%DATADIR%%/datafiles/meshes/blockcylinder-50.h5
+%%DATADIR%%/datafiles/meshes/blockcylinder-50.xmf
%%DATADIR%%/datafiles/meshes/cow.msh
%%DATADIR%%/datafiles/meshes/cube_5tets.cas
%%DATADIR%%/datafiles/meshes/cube_5tets_ascii.cas
@@ -249,6 +265,8 @@ libdata/pkgconfig/PETSc.pc
%%DATADIR%%/datafiles/meshes/doublet-tet.msh
%%DATADIR%%/datafiles/meshes/grid_c.cgns
%%DATADIR%%/datafiles/meshes/horse.ply.bz2
+%%DATADIR%%/datafiles/meshes/hybrid_tetwedge.msh
+%%DATADIR%%/datafiles/meshes/hybrid_triquad.msh
%%DATADIR%%/datafiles/meshes/sevenside-quad-15.exo
%%DATADIR%%/datafiles/meshes/sevenside-quad.exo
%%DATADIR%%/datafiles/meshes/sevenside.exo
@@ -262,6 +280,7 @@ libdata/pkgconfig/PETSc.pc
%%DATADIR%%/datafiles/meshes/square_periodic_bin.msh
%%DATADIR%%/datafiles/meshes/square_quad.msh
%%DATADIR%%/datafiles/meshes/squaremotor-30.exo
+%%DATADIR%%/datafiles/meshes/surfacesphere_bin.msh
%%DATADIR%%/datafiles/meshes/texas.msh
%%DATADIR%%/datafiles/meshes/tut21.cgns
%%DATADIR%%/matlab/@PetscOpenFile/PetscOpenFile.m