From owner-svn-ports-head@freebsd.org Thu Aug 25 17:00:48 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72E15BC5FF5; Thu, 25 Aug 2016 17:00:48 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 4AFDD13E2; Thu, 25 Aug 2016 17:00:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7PH0lgE062619; Thu, 25 Aug 2016 17:00:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7PH0l2x062615; Thu, 25 Aug 2016 17:00:47 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608251700.u7PH0l2x062615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 25 Aug 2016 17:00:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420863 - in head/science/orthanc: . files X-SVN-Group: ports-head 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.22 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: Thu, 25 Aug 2016 17:00:48 -0000 Author: amdmi3 Date: Thu Aug 25 17:00:46 2016 New Revision: 420863 URL: https://svnweb.freebsd.org/changeset/ports/420863 Log: - Update to 1.1.0 - Switch to USES=ssl PR: 211263 Submitted by: mp39590@gmail.com (maintainer) Added: head/science/orthanc/files/patch-OrthancServer_FromDcmtkBridge.cpp (contents, props changed) Deleted: head/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake Modified: head/science/orthanc/Makefile head/science/orthanc/distinfo head/science/orthanc/pkg-plist Modified: head/science/orthanc/Makefile ============================================================================== --- head/science/orthanc/Makefile Thu Aug 25 16:54:32 2016 (r420862) +++ head/science/orthanc/Makefile Thu Aug 25 17:00:46 2016 (r420863) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= orthanc -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= science graphics net www MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/orthanc/:main \ http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose @@ -18,9 +17,6 @@ COMMENT= RESTful DICOM server for health LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= Does not build - -BUILD_DEPENDS= gtest-config:devel/googletest LIB_DEPENDS= libcurl.so:ftp/curl \ libjsoncpp.so:devel/jsoncpp \ libuuid.so:misc/e2fsprogs-libuuid \ @@ -34,18 +30,22 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libcharls.so:devel/dcmtk \ libdcmjpls.so:devel/dcmtk \ libsqlite3.so:databases/sqlite3 \ + libpng16.so:graphics/png \ + libgtest.so:devel/googletest \ libpugixml.so:textproc/pugixml +BROKEN_powerpc64= Does not build + CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \ -DDCMTK_DIR="${LOCALBASE}" \ -DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \ -DUSE_SYSTEM_MONGOOSE=OFF \ -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF -USES= cmake:outsource dos2unix lua:51 python:build +USES= cmake:outsource dos2unix jpeg lua:51 python:build ssl +CFLAGS+= -I${LOCALBASE}/include DOS2UNIX_FILES= CMakeLists.txt USE_LDCONFIG= yes -USE_OPENSSL= yes USE_RC_SUBR= orthanc WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION} USERS= orthanc Modified: head/science/orthanc/distinfo ============================================================================== --- head/science/orthanc/distinfo Thu Aug 25 16:54:32 2016 (r420862) +++ head/science/orthanc/distinfo Thu Aug 25 17:00:46 2016 (r420863) @@ -1,4 +1,5 @@ -SHA256 (orthanc/Orthanc-1.0.0.tar.gz) = 3fc37a0fc91e597cc4004934b14726595b5e97b7e328e03dedb4454096bd1bbb -SIZE (orthanc/Orthanc-1.0.0.tar.gz) = 1164342 +TIMESTAMP = 1469014978 +SHA256 (orthanc/Orthanc-1.1.0.tar.gz) = e8e7ce79dc327b8d0cd4917a520d867260eb58a34a2eea5e24a56db3540edbd4 +SIZE (orthanc/Orthanc-1.1.0.tar.gz) = 1152366 SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e SIZE (orthanc/mongoose-3.8.tgz) = 1577314 Added: head/science/orthanc/files/patch-OrthancServer_FromDcmtkBridge.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/orthanc/files/patch-OrthancServer_FromDcmtkBridge.cpp Thu Aug 25 17:00:46 2016 (r420863) @@ -0,0 +1,11 @@ +--- OrthancServer/FromDcmtkBridge.cpp.orig 2016-07-20 11:36:11 UTC ++++ OrthancServer/FromDcmtkBridge.cpp +@@ -197,7 +197,7 @@ namespace Orthanc + LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM); + LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE); + +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) ++#elif defined(__linux__) || defined(__FreeBSD__) + std::string path = DCMTK_DICTIONARY_DIR; + + const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE); Modified: head/science/orthanc/pkg-plist ============================================================================== --- head/science/orthanc/pkg-plist Thu Aug 25 16:54:32 2016 (r420862) +++ head/science/orthanc/pkg-plist Thu Aug 25 17:00:46 2016 (r420863) @@ -15,4 +15,5 @@ include/orthanc/OrthancCppDatabasePlugin %%DATADIR%%/plugins/libServeFolders.so.%%PORTVERSION%% %%DATADIR%%/plugins/libModalityWorklists.so %%DATADIR%%/plugins/libModalityWorklists.so.%%PORTVERSION%% +bin/OrthancRecoverCompressedFile sbin/Orthanc