Index: head/net/ceph14/Makefile =================================================================== --- head/net/ceph14/Makefile (revision 526953) +++ head/net/ceph14/Makefile (revision 526954) @@ -1,171 +1,172 @@ # Created by: Willem Jan Withagen # $FreeBSD$ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.7 +PORTREVISION= 1 CATEGORIES= net PKGNAMESUFFIX= 14 MAINTAINER= wjw@digiware.nl COMMENT= Ceph delivers object, block, and file storage in a unified system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ + gperf:devel/gperf \ yasm:devel/yasm \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ - gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ - ${LOCALBASE}/bin/ld:devel/binutils \ - npm:www/npm + ${LOCALBASE}/bin/ld:devel/binutils LIB_DEPENDS= \ ${PY_BOOST} \ libboost_thread.so:devel/boost-libs \ libleveldb.so:databases/leveldb \ libnss3.so:security/nss \ libcryptopp.so:security/cryptopp \ liboath.so:security/oath-toolkit \ libsnappy.so:archivers/snappy \ libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 \ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ libtcmalloc.so:devel/google-perftools \ librabbitmq.so:net/rabbitmq-c RUN_DEPENDS= \ bash:shells/bash \ - ${LOCALBASE}/bin/getopt:misc/getopt \ - xml:textproc/xmlstarlet \ - jq:textproc/jq \ flock:sysutils/flock \ + jq:textproc/jq \ + xml:textproc/xmlstarlet \ + ${LOCALBASE}/bin/getopt:misc/getopt \ ${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \ ${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} -USES= cmake:noninja dos2unix fuse gettext-runtime gmake pkgconfig python:3.7 \ - shebangfix ssl +USES= cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \ + pkgconfig python:3.7+ shebangfix ssl USE_PYTHON= cython USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT DOS2UNIX_FILES= src/pybind/mgr/diskprediction_cloud/common/__init__.py CONFLICTS_INSTALL= ceph PORTSCOUT= limit:^v14\. GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus GH_TUPLE+= ceph:civetweb:bb99e93:civetweb/src/civetweb GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto GH_TUPLE+= ceph:dmclock:4496dbc:dmclock/src/dmclock GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure GH_TUPLE+= ceph:googletest:fdb8504:googletest/src/googletest GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson GH_TUPLE+= ceph:rocksdb:4c736f1:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd CMAKE_BUILD_TYPE= Release -CMAKE_ON= WITH_SYSTEM_BOOST WITH_FUSE WITH_SYSTEM_NPM -CMAKE_OFF= WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \ - WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS \ - WITH_MGR_DASHBOARD_FRONTEND -CMAKE_ARGS= -D WITH_PYTHON2=OFF -D WITH_PYTHON3=3.7 -DMGR_PYTHON_VERSION=3.7 \ +CMAKE_ON= WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3 +CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \ + WITH_SPDK WITH_RDMA WITH_RADOSGW_BEAST_FRONTEND \ + WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \ + WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2 +CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \ -D CEPH_MAN_DIR:STRING=man SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ src/ceph-create-keys USE_RC_SUBR= ceph USE_LDCONFIG= yes USERS= ceph GROUPS= ceph PLIST_SUB= CMAKE_BUILD_TYPE_regex=\bdebug\b .include # 11.2 and 12.0 RELEASE has clang60 and will give versioning errors .if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099) BUILD_DEPENDS+= ${LOCALBASE}/bin/clang80:devel/llvm80 CC= clang80 CXX= clang++80 ASM= clang80 .endif .include pre-configure: [ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version post-install: # To install a ceph.conf sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample # Get logging and rotation working ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} files/file-newsyslog_ceph-log.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d # Create directories used bij daemons ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/mon ${MKDIR} ${STAGEDIR}/var/lib/ceph/osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp ${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw # For PID files and command sockets and log files ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}/var/run/ceph # Use the Ceph init.d script as the interface to regular # starting and stopping daemons. rc.d work is done thru # a separate rc.d/ceph script calling init-ceph again. ${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph # remove files not packaged ${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config ${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf ${RMDIR} ${STAGEDIR}${DOCSDIR} ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d .include Index: head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake =================================================================== --- head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake (nonexistent) +++ head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake (revision 526954) @@ -0,0 +1,11 @@ +--- cmake/modules/FindPython3Interp.cmake.orig 2019-09-13 18:07:41 UTC ++++ cmake/modules/FindPython3Interp.cmake +@@ -69,7 +69,7 @@ + + unset(_Python3_NAMES) + +-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(Python3Interp_FIND_VERSION) + if(Python3Interp_FIND_VERSION_COUNT GREATER 1) Property changes on: head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake =================================================================== --- head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake (nonexistent) +++ head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake (revision 526954) @@ -0,0 +1,11 @@ +--- cmake/modules/FindPython3Libs.cmake.orig 2019-09-13 18:07:41 UTC ++++ cmake/modules/FindPython3Libs.cmake +@@ -101,7 +101,7 @@ endif() + # To avoid picking up the system Python.h pre-maturely. + set(CMAKE_FIND_FRAMEWORK LAST) + +-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(Python3Libs_FIND_VERSION) + if(Python3Libs_FIND_VERSION_COUNT GREATER 1) Property changes on: head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/ceph14/pkg-message =================================================================== --- head/net/ceph14/pkg-message (revision 526953) +++ head/net/ceph14/pkg-message (revision 526954) @@ -1,17 +1,18 @@ [ { type: install message: <