From owner-svn-ports-head@freebsd.org Fri Aug 24 07:45:54 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89C371082507; Fri, 24 Aug 2018 07:45:54 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3B6D07B8FC; Fri, 24 Aug 2018 07:45:54 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 154076405; Fri, 24 Aug 2018 07:45:54 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7O7jrMq090370; Fri, 24 Aug 2018 07:45:53 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7O7jr9T090368; Fri, 24 Aug 2018 07:45:53 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201808240745.w7O7jr9T090368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Fri, 24 Aug 2018 07:45:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477944 - in head/net/ceph: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/net/ceph: . files X-SVN-Commit-Revision: 477944 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2018 07:45:54 -0000 Author: jhale Date: Fri Aug 24 07:45:53 2018 New Revision: 477944 URL: https://svnweb.freebsd.org/changeset/ports/477944 Log: - Fix rc.d script (too many parameters) - Fix distinfo (checksum and size were corrupted in last update) - Remove security/crytopp dependency that the port does not use - Fix typo in IGNORE message - Move pkgconf dependency to USES - Depend on python ports correctly - Remove CMAKE_BUILD_TYPE - it already is set to "Release" by the framework - Bump PORTREVISION for dependency changes PR: 230665 Submitted by: Willem Jan Withagen (maintainer) Modified: head/net/ceph/Makefile head/net/ceph/distinfo head/net/ceph/files/ceph.in Modified: head/net/ceph/Makefile ============================================================================== --- head/net/ceph/Makefile Fri Aug 24 07:40:22 2018 (r477943) +++ head/net/ceph/Makefile Fri Aug 24 07:45:53 2018 (r477944) @@ -4,7 +4,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 12.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= wjw@digiware.nl @@ -15,12 +15,11 @@ LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 -IGNORE_FreeBSD_10= Doesnt build for FreeBSD 10.x +IGNORE_FreeBSD_10= Does not build for FreeBSD 10.x BUILD_DEPENDS= \ yasm:devel/yasm \ - pkgconf:devel/pkgconf \ - sphinx-build:textproc/py-sphinx \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ @@ -28,7 +27,6 @@ LIB_DEPENDS= \ libboost_thread.so:devel/boost-libs \ libleveldb.so:databases/leveldb \ libnss3.so:security/nss \ - libcryptopp.so:security/cryptopp \ libsnappy.so:archivers/snappy \ libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 \ @@ -42,13 +40,14 @@ RUN_DEPENDS= \ xml:textproc/xmlstarlet \ jq:textproc/jq \ flock:sysutils/flock \ - virtualenv:devel/py-virtualenv \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} CONFLICTS_INSTALL= ceph-devel PORTSCOUT= limit:^v12\. -USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix ssl +USES= cmake:outsource,noninja fuse gettext-runtime gmake \ + pkgconfig python:2.7 shebangfix ssl USE_PYTHON= cython USE_OPENLDAP= yes USE_GITHUB= yes @@ -68,7 +67,6 @@ GH_TUPLE+= ceph:rocksdb:e15382c:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd -CMAKE_BUILD_TYPE= Release CMAKE_ARGS= \ -D WITH_SYSTEM_BOOST:BOOL=ON \ -D CEPH_MAN_DIR:STRING=man \ Modified: head/net/ceph/distinfo ============================================================================== --- head/net/ceph/distinfo Fri Aug 24 07:40:22 2018 (r477943) +++ head/net/ceph/distinfo Fri Aug 24 07:45:53 2018 (r477944) @@ -1,8 +1,8 @@ -TIMESTAMP = 1531846602 +TIMESTAMP = 1534510854 SHA256 (ceph-ceph-v12.2.7_GH0.tar.gz) = 742dd402686b6c48824687be9bff951ede7608d41736cbcd55b130f7bd94f086 SIZE (ceph-ceph-v12.2.7_GH0.tar.gz) = 12236446 -SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490 -SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656 +SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 466f7185015df8d13f8b2b9a17ee30ab419bcd667284ce2b6d32a1128c4640f1 +SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3634266 SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214 SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192 SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd Modified: head/net/ceph/files/ceph.in ============================================================================== --- head/net/ceph/files/ceph.in Fri Aug 24 07:40:22 2018 (r477943) +++ head/net/ceph/files/ceph.in Fri Aug 24 07:45:53 2018 (r477944) @@ -32,5 +32,5 @@ stop_cmd="%%PREFIX%%/bin/init-ceph $*" restart_cmd="%%PREFIX%%/bin/init-ceph $*" condrestart_cmd="%%PREFIX%%/bin/init-ceph $*" -run_rc_command "$1" "$*" +run_rc_command "$1"