From owner-svn-ports-all@freebsd.org Tue Jul 28 14:48:34 2015 Return-Path: Delivered-To: svn-ports-all@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 975019ADDD4; Tue, 28 Jul 2015 14:48:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 86695305; Tue, 28 Jul 2015 14:48:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6SEmYVE057764; Tue, 28 Jul 2015 14:48:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6SEmWNc057757; Tue, 28 Jul 2015 14:48:32 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201507281448.t6SEmWNc057757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 28 Jul 2015 14:48:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393082 - in head/science: . orthanc-postgresql orthanc-postgresql/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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2015 14:48:34 -0000 Author: amdmi3 Date: Tue Jul 28 14:48:32 2015 New Revision: 393082 URL: https://svnweb.freebsd.org/changeset/ports/393082 Log: - Add science/orthanc-postgresql The plugin replaces the default SQLite engine of Orthanc with a PostgreSQL back-end. WWW: http://www.orthanc-server.com/ PR: 201673 Submitted by: mp39590@gmail.com Added: head/science/orthanc-postgresql/ head/science/orthanc-postgresql/Makefile (contents, props changed) head/science/orthanc-postgresql/distinfo (contents, props changed) head/science/orthanc-postgresql/files/ head/science/orthanc-postgresql/files/patch-CMakeLists.txt (contents, props changed) head/science/orthanc-postgresql/pkg-descr (contents, props changed) Modified: head/science/Makefile Modified: head/science/Makefile ============================================================================== --- head/science/Makefile Tue Jul 28 14:45:55 2015 (r393081) +++ head/science/Makefile Tue Jul 28 14:48:32 2015 (r393082) @@ -98,6 +98,7 @@ SUBDIR += openbabel SUBDIR += openkim SUBDIR += orthanc + SUBDIR += orthanc-postgresql SUBDIR += orthanc-webviewer SUBDIR += p5-Algorithm-SVMLight SUBDIR += p5-Chemistry-3DBuilder Added: head/science/orthanc-postgresql/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/orthanc-postgresql/Makefile Tue Jul 28 14:48:32 2015 (r393082) @@ -0,0 +1,38 @@ +# Created by: mp39590@gmail.com +# $FreeBSD$ + +PORTNAME= orthanc-portgresql +PORTVERSION= 1.1 +CATEGORIES= science graphics +MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-postgresql/ +DISTNAME= OrthancPostgreSQL-${PORTVERSION} +DIST_SUBDIR= orthanc + +MAINTAINER= mp39590@gmail.com +COMMENT= PostgreSQL plugin for Orthanc + +LICENSE= AGPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCPlugin.h:${PORTSDIR}/science/orthanc +LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libjsoncpp.so:${PORTSDIR}/devel/jsoncpp + +## UnitTests require running PostgreSQL server, so it's pointless to build/run them +CMAKE_ARGS= -DBUILD_UNIT_TESTS=OFF + +CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +USES= cmake:outsource pgsql python:build +WRKSRC= ${WRKDIR}/OrthancPostgreSQL-${PORTVERSION} + +PLIST_FILES= share/orthanc/plugins/libOrthancPostgreSQLIndex.so \ + share/orthanc/plugins/libOrthancPostgreSQLIndex.so.${PORTVERSION} \ + share/orthanc/plugins/libOrthancPostgreSQLStorage.so \ + share/orthanc/plugins/libOrthancPostgreSQLStorage.so.${PORTVERSION} + +post-extract: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Resources/CMake/*.cmake + +.include Added: head/science/orthanc-postgresql/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/orthanc-postgresql/distinfo Tue Jul 28 14:48:32 2015 (r393082) @@ -0,0 +1,2 @@ +SHA256 (orthanc/OrthancPostgreSQL-1.1.tar.gz) = f68d98a1f282ad31ac3fde2ff11449db840a5daf8a9605f3a9d5678691bd9b84 +SIZE (orthanc/OrthancPostgreSQL-1.1.tar.gz) = 56750 Added: head/science/orthanc-postgresql/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/orthanc-postgresql/files/patch-CMakeLists.txt Tue Jul 28 14:48:32 2015 (r393082) @@ -0,0 +1,54 @@ +--- CMakeLists.txt.orig 2015-07-03 09:22:49 UTC ++++ CMakeLists.txt +@@ -32,6 +32,7 @@ set(USE_SYSTEM_JSONCPP ON CACHE BOOL "Us + set(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") + set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") + set(USE_SYSTEM_LIBPQ ON CACHE BOOL "Use the system version of the PostgreSQL client library") ++set(BUILD_UNIT_TESTS ON CACHE BOOL "Build UnitTests") + + # Distribution-specific settings + set(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") +@@ -47,7 +48,10 @@ include(${CMAKE_SOURCE_DIR}/Resources/CM + include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake) + include(${CMAKE_SOURCE_DIR}/Resources/CMake/PostgreSQLConfiguration.cmake) + include(${CMAKE_SOURCE_DIR}/Resources/CMake/JsonCppConfiguration.cmake) +-include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) ++ ++if (BUILD_UNIT_TESTS) ++ include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) ++endif() + + + # Check that the Orthanc SDK headers are available or download them +@@ -123,14 +127,21 @@ set_target_properties(OrthancPostgreSQLI + SOVERSION ${ORTHANC_POSTGRESQL_VERSION} + ) + ++install( ++ TARGETS OrthancPostgreSQLStorage OrthancPostgreSQLIndex ++ RUNTIME DESTINATION lib # Destination for Windows ++ LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux ++) + +-add_executable(UnitTests +- ${CORE_SOURCES} +- ${GTEST_SOURCES} +- ${AUTOGENERATED_SOURCES} +- ${CMAKE_SOURCE_DIR}/IndexPlugin/PostgreSQLWrapper.cpp +- ${CMAKE_SOURCE_DIR}/StoragePlugin/PostgreSQLStorageArea.cpp +- ${CMAKE_SOURCE_DIR}/UnitTestsSources/UnitTestsMain.cpp +- ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp +- ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp +- ) ++if (BUILD_UNIT_TESTS) ++ add_executable(UnitTests ++ ${CORE_SOURCES} ++ ${GTEST_SOURCES} ++ ${AUTOGENERATED_SOURCES} ++ ${CMAKE_SOURCE_DIR}/IndexPlugin/PostgreSQLWrapper.cpp ++ ${CMAKE_SOURCE_DIR}/StoragePlugin/PostgreSQLStorageArea.cpp ++ ${CMAKE_SOURCE_DIR}/UnitTestsSources/UnitTestsMain.cpp ++ ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp ++ ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp ++ ) ++endif() Added: head/science/orthanc-postgresql/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/orthanc-postgresql/pkg-descr Tue Jul 28 14:48:32 2015 (r393082) @@ -0,0 +1,4 @@ +The plugin replaces the default SQLite engine of Orthanc with a +PostgreSQL back-end. + +WWW: http://www.orthanc-server.com/