svn commit: r390100 - in head/science/orthanc: . files

[Wen Heping]

Author: wen
Date: Fri Jun 19 02:24:08 2015
New Revision: 390100
URL: https://svnweb.freebsd.org/changeset/ports/390100

Log:
  - Update from 0.8.6 to 0.9.0
  - Mark as ignored for anything except 10.1
  - Run unit tests during port build
  - Fix config installation
  
  PR:		200683
  Submitted by:	mp39590 at gmail.com(maintainer)

Deleted:
  head/science/orthanc/files/patch-CMakeLists.txt
  head/science/orthanc/files/patch-Core_Compression_HierarchicalZipWriter.cpp
  head/science/orthanc/files/patch-Core_ImageFormats_ImageProcessing.cpp
  head/science/orthanc/files/patch-Core_MultiThreading_Mutex.cpp
  head/science/orthanc/files/patch-Core_MultiThreading_ThreadedCommandProcessor.cpp
  head/science/orthanc/files/patch-Core_Toolbox.cpp
  head/science/orthanc/files/patch-OrthancServer_Internals_StoreScp.cpp
  head/science/orthanc/files/patch-Plugins_Engine_PluginsManager.cpp
  head/science/orthanc/files/patch-Plugins_Engine_SharedLibrary.cpp
  head/science/orthanc/files/patch-Resources_CMake_AutoGeneratedCode.cmake
  head/science/orthanc/files/patch-Resources_CMake_BoostConfiguration.cmake
  head/science/orthanc/files/patch-Resources_CMake_Compiler.cmake
  head/science/orthanc/files/patch-Resources_CMake_SQLiteConfiguration.cmake
Modified:
  head/science/orthanc/Makefile
  head/science/orthanc/distinfo
  head/science/orthanc/pkg-plist

Modified: head/science/orthanc/Makefile
==============================================================================
--- head/science/orthanc/Makefile	Fri Jun 19 01:58:25 2015	(r390099)
+++ head/science/orthanc/Makefile	Fri Jun 19 02:24:08 2015	(r390100)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	orthanc
-PORTVERSION=	0.8.6
+PORTVERSION=	0.9.0
 CATEGORIES=	science graphics net
 MASTER_SITES=	SF/orthancserver/:main \
 		http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose
@@ -16,6 +16,7 @@ COMMENT=	RESTful DICOM server for health
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	gtest-config:${PORTSDIR}/devel/googletest
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
@@ -28,12 +29,10 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/
 CMAKE_ARGS=	-DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
 		-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
 		-DUSE_SYSTEM_MONGOOSE=OFF \
-		-DBUILD_UNIT_TESTS=OFF
+		-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF
 
 USES=		cmake:outsource python:build lua:51 dos2unix
 DOS2UNIX_FILES=	CMakeLists.txt
-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/jsoncpp
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	orthanc
@@ -52,12 +51,34 @@ GROUPS=		orthanc
 post-extract:
 	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/mongoose-3.8.tgz ${WRKSRC}/ThirdPartyDownloads
+	# Orthanc hardcodes /usr/local paths for libs and includes.
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt
+
+# There is no way to disable building of test units without a patch, on other
+# hand it brings only one build dependency (devel/googletest) and running it was
+# helpful in early bug detection in Debian.
+# Some tests require connections to be made to the outside world, this is
+# definitely unsupported behaviour and therefor those tests are disabled with
+# cmake variable above (-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF).
+post-build:
+	@cd ${BUILD_WRKSRC} && ./UnitTests
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
 	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
 	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-	${WRKSRC}/Resources/Configuration.json > ${STAGEDIR}${ETCDIR}/orthanc.json.sample
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Resources/Configuration.json
+	${CP} ${WRKSRC}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample
+	${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/libServeFolders.so.0.9.0
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1001000
+IGNORE=	supported only on 10.1 by upstream, not all unit tests are passed
+.endif
+
+.if ${OSVERSION} > 1100000
+IGNORE=	unit tests are crashing, bug 200544
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/science/orthanc/distinfo
==============================================================================
--- head/science/orthanc/distinfo	Fri Jun 19 01:58:25 2015	(r390099)
+++ head/science/orthanc/distinfo	Fri Jun 19 02:24:08 2015	(r390100)
@@ -1,4 +1,4 @@
-SHA256 (orthanc/Orthanc-0.8.6.tar.gz) = 0668e23dbdf4aa12bf417cf22bfb7b50379797fc6b1132a582789289d1728e69
-SIZE (orthanc/Orthanc-0.8.6.tar.gz) = 716036
+SHA256 (orthanc/Orthanc-0.9.0.tar.gz) = f75f76a2aaa79951c8ece2137046f2572a91e96e31efe9e0ce99b644e4320d0a
+SIZE (orthanc/Orthanc-0.9.0.tar.gz) = 676749
 SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e
 SIZE (orthanc/mongoose-3.8.tgz) = 1577314

Modified: head/science/orthanc/pkg-plist
==============================================================================
--- head/science/orthanc/pkg-plist	Fri Jun 19 01:58:25 2015	(r390099)
+++ head/science/orthanc/pkg-plist	Fri Jun 19 02:24:08 2015	(r390100)
@@ -5,8 +5,7 @@
 @sample(orthanc,orthanc,600) %%ETCDIR%%/orthanc.json.sample
 include/orthanc/OrthancCDatabasePlugin.h
 include/orthanc/OrthancCPlugin.h
-include/orthanc/OrthancCppClient.h
 include/orthanc/OrthancCppDatabasePlugin.h
-lib/libOrthancClient.so
-lib/libOrthancClient.so.0.8
+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ServeFolders.so
+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ServeFolders.so.0.9.0
 sbin/Orthanc