Attachment 217277 Details for Bug 242552 – Diff / the latest version of science/orthanc-mysql (orthanc-mysql-2.0_3), diff based on r545144)

[patch] Diff / the latest version of science/orthanc-mysql (orthanc-mysql-2.0_3), diff based on r545144)

orthanc-mysql.r545144.diff (text/plain), 6.69 KB, created by Frank Scholl on 2020-08-17 09:39:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Scholl

Created: 2020-08-17 09:39:24 UTC

Size: 6.69 KB

patch

obsolete

>Index: science/Makefile
>===================================================================
>--- science/Makefile	(revision 545144)
>+++ science/Makefile	(working copy)
>@@ -178,6 +178,7 @@
>     SUBDIR += opensim-core
>     SUBDIR += opensph
>     SUBDIR += opsin
>+    SUBDIR += orthanc-mysql
>     SUBDIR += p5-Algorithm-SVMLight
>     SUBDIR += p5-Chemistry-3DBuilder
>     SUBDIR += p5-Chemistry-Bond-Find
>Index: science/orthanc-mysql/Makefile
>===================================================================
>--- science/orthanc-mysql/Makefile	(nonexistent)
>+++ science/orthanc-mysql/Makefile	(working copy)
>@@ -0,0 +1,58 @@
>+# Created by: maintainer.freebsd@xpoundit.com
>+# $FreeBSD$
>+
>+PORTNAME=	orthanc-mysql
>+PORTVERSION=	2.0
>+PORTREVISION=	3
>+CATEGORIES=	science
>+MASTER_SITES=	http://orthanc-server.com/downloads/get.php?path=/plugin-mysql/:main \
>+		http://orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
>+		http://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty
>+DISTFILES=      OrthancMySQL-${PORTVERSION}.tar.gz:main \
>+		Orthanc-1.7.1.tar.gz:framework \
>+		e2fsprogs-1.44.5.tar.gz:thirdparty
>+DIST_SUBDIR=	orthanc
>+EXTRACT_ONLY=	OrthancMySQL-${PORTVERSION}.tar.gz
>+
>+MAINTAINER=	maintainer.freebsd@xpoundit.com
>+COMMENT=	Orthanc plugin to use MySQL or MariaDB for indexing or storage
>+
>+LICENSE=	AGPLv3
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCDatabasePlugin.h:science/orthanc
>+LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
>+		libboost_filesystem.so:devel/boost-libs \
>+		libjsoncpp.so:devel/jsoncpp \
>+		libpugixml.so:textproc/pugixml \
>+		libgtest.so:devel/googletest
>+
>+USES=		cmake mysql:client localbase python:build
>+
>+WRKSRC=		${WRKDIR}/OrthancMySQL-${PORTVERSION}
>+CMAKE_SOURCE_PATH=	${WRKSRC}/MySQL
>+CMAKE_ARGS=	-DUSE_SYSTEM_UUID=OFF \
>+		-DUSE_SYSTEM_ORTHANC_SDK=OFF \
>+		-DORTHANC_FRAMEWORK_SOURCE=path \
>+		-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.7.1 \
>+		-DBUILD_UNIT_TESTS=OFF
>+CXXFLAGS+=	-I${LOCALBASE}/include \
>+		-DNDEBUG
>+CFLAGS+=	-DORTHANC_ENABLE_LOGGING_PLUGIN \
>+		-DNDEBUG
>+USE_LDCONFIG=	yes
>+PLIST_FILES=	share/orthanc/plugins/libOrthancMySQLIndex.so \
>+		share/orthanc/plugins/libOrthancMySQLIndex.so.${PORTVERSION} \
>+		share/orthanc/plugins/libOrthancMySQLStorage.so \
>+		share/orthanc/plugins/libOrthancMySQLStorage.so.${PORTVERSION}
>+
>+post-extract:
>+		${MKDIR} ${WRKSRC}/MySQL/ThirdPartyDownloads
>+		${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
>+		${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.7.1.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
>+		${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.7.1.tar.gz
>+
>+post-patch:
>+		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Resources/CMake/*.cmake
>+
>+.include <bsd.port.mk>
>
>Property changes on: science/orthanc-mysql/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/orthanc-mysql/distinfo
>===================================================================
>--- science/orthanc-mysql/distinfo	(nonexistent)
>+++ science/orthanc-mysql/distinfo	(working copy)
>@@ -0,0 +1,7 @@
>+TIMESTAMP = 1593008797
>+SHA256 (orthanc/OrthancMySQL-2.0.tar.gz) = b44e0b092e5d70c95962383142f93adba64da283e3a3fd140e1a5f0e2464971e
>+SIZE (orthanc/OrthancMySQL-2.0.tar.gz) = 166832
>+SHA256 (orthanc/Orthanc-1.7.1.tar.gz) = b131c12a0b70a531e5fb2a38ffb258cbced2ab304231a52e491de22d69df8ffc
>+SIZE (orthanc/Orthanc-1.7.1.tar.gz) = 1640397
>+SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc
>+SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237
>
>Property changes on: science/orthanc-mysql/distinfo
>___________________________________________________________________
>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: science/orthanc-mysql/files/patch-Resources_CMake_MariaDBConfiguration.cmake
>===================================================================
>--- science/orthanc-mysql/files/patch-Resources_CMake_MariaDBConfiguration.cmake	(nonexistent)
>+++ science/orthanc-mysql/files/patch-Resources_CMake_MariaDBConfiguration.cmake	(working copy)
>@@ -0,0 +1,27 @@
>+--- Resources/CMake/MariaDBConfiguration.cmake.orig	2019-01-23 19:14:24 UTC
>++++ Resources/CMake/MariaDBConfiguration.cmake
>+@@ -148,10 +148,21 @@ else()
>+     message(FATAL_ERROR "Please install the libmysqlclient-dev package")
>+   endif()
>+ 
>+-  check_library_exists(mysqlclient mysql_init "" HAVE_MYSQL_CLIENT_LIB)
>+-  if (NOT HAVE_MYSQL_CLIENT_LIB)
>++  find_library(MYSQL_CLIENT_LIB NAMES mysqlclient PATHS
>++    /usr/lib/mysql
>++    /usr/local/lib/mysql
>++    )
>++  
>++  if (MYSQL_CLIENT_LIB)
>++    check_library_exists(${MYSQL_CLIENT_LIB} mysql_init "" HAVE_MYSQL_CLIENT_LIB)
>++    if (NOT HAVE_MYSQL_CLIENT_LIB)
>++      message(FATAL_ERROR "Unable to use mysql_init from mysqlclient library")
>++    endif()
>++    get_filename_component(MYSQL_CLIENT_LIB_PATH ${MYSQL_CLIENT_LIB} DIRECTORY)
>++    link_directories(${MYSQL_CLIENT_LIB_PATH})
>++    link_libraries(mysqlclient)
>++  else()
>+     message(FATAL_ERROR "Unable to find the mysqlclient library")
>+   endif()
>+ 
>+-  link_libraries(mysqlclient)
>+ endif()
>
>Property changes on: science/orthanc-mysql/files/patch-Resources_CMake_MariaDBConfiguration.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: science/orthanc-mysql/pkg-descr
>===================================================================
>--- science/orthanc-mysql/pkg-descr	(nonexistent)
>+++ science/orthanc-mysql/pkg-descr	(working copy)
>@@ -0,0 +1,5 @@
>+Orthanc can be extended with two plugins that replace the default SQLite
>+engine of Orthanc with a MySQL back-end. These plugins are compatible with
>+MariaDB as well.
>+
>+WWW: https://www.orthanc-server.com/static.php?page=mysql
>
>Property changes on: science/orthanc-mysql/pkg-descr
>___________________________________________________________________
>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

Flags:

maintainer.freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 242552: 209837 | 215940 | 217277 | 225066 | 225336 | 225594 | 225649 | 225705