Attachment #217277 for bug #242552

Lines 178-183 Link Here

(-)science/Makefile (+1 lines)
178	SUBDIR += opensim-core	178	SUBDIR += opensim-core
179	SUBDIR += opensph	179	SUBDIR += opensph
180	SUBDIR += opsin	180	SUBDIR += opsin
		181	SUBDIR += orthanc-mysql
181	SUBDIR += p5-Algorithm-SVMLight	182	SUBDIR += p5-Algorithm-SVMLight
182	SUBDIR += p5-Chemistry-3DBuilder	183	SUBDIR += p5-Chemistry-3DBuilder
183	SUBDIR += p5-Chemistry-Bond-Find	184	SUBDIR += p5-Chemistry-Bond-Find




# 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>

Line 0 Link Here

(-)science/orthanc-mysql/distinfo (+7 lines)
	1	TIMESTAMP = 1593008797
	2	SHA256 (orthanc/OrthancMySQL-2.0.tar.gz) = b44e0b092e5d70c95962383142f93adba64da283e3a3fd140e1a5f0e2464971e
	3	SIZE (orthanc/OrthancMySQL-2.0.tar.gz) = 166832
	4	SHA256 (orthanc/Orthanc-1.7.1.tar.gz) = b131c12a0b70a531e5fb2a38ffb258cbced2ab304231a52e491de22d69df8ffc
	5	SIZE (orthanc/Orthanc-1.7.1.tar.gz) = 1640397
	6	SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc
	7	SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237




--- 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()

Line 0 Link Here

(-)science/orthanc-mysql/pkg-descr (+5 lines)
	1	Orthanc can be extended with two plugins that replace the default SQLite
	2	engine of Orthanc with a MySQL back-end. These plugins are compatible with
	3	MariaDB as well.
	4
	5	WWW: https://www.orthanc-server.com/static.php?page=mysql

Return to bug 242552

Line 0 Link Here

(-)science/orthanc-mysql/Makefile (+58 lines)
	1	# Created by: maintainer.freebsd@xpoundit.com
	2	# $FreeBSD$
	3
	4	PORTNAME= orthanc-mysql
	5	PORTVERSION= 2.0
	6	PORTREVISION= 3
	7	CATEGORIES= science
	8	MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/plugin-mysql/:main \
	9	http://orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
	10	http://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty
	11	DISTFILES= OrthancMySQL-${PORTVERSION}.tar.gz:main \
	12	Orthanc-1.7.1.tar.gz:framework \
	13	e2fsprogs-1.44.5.tar.gz:thirdparty
	14	DIST_SUBDIR= orthanc
	15	EXTRACT_ONLY= OrthancMySQL-${PORTVERSION}.tar.gz
	16
	17	MAINTAINER= maintainer.freebsd@xpoundit.com
	18	COMMENT= Orthanc plugin to use MySQL or MariaDB for indexing or storage
	19
	20	LICENSE= AGPLv3
	21	LICENSE_FILE= ${WRKSRC}/COPYING
	22
	23	BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCDatabasePlugin.h:science/orthanc
	24	LIB_DEPENDS= libgdcmCommon.so:devel/gdcm \
	25	libboost_filesystem.so:devel/boost-libs \
	26	libjsoncpp.so:devel/jsoncpp \
	27	libpugixml.so:textproc/pugixml \
	28	libgtest.so:devel/googletest
	29
	30	USES= cmake mysql:client localbase python:build
	31
	32	WRKSRC= ${WRKDIR}/OrthancMySQL-${PORTVERSION}
	33	CMAKE_SOURCE_PATH= ${WRKSRC}/MySQL
	34	CMAKE_ARGS= -DUSE_SYSTEM_UUID=OFF \
	35	-DUSE_SYSTEM_ORTHANC_SDK=OFF \
	36	-DORTHANC_FRAMEWORK_SOURCE=path \
	37	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.7.1 \
	38	-DBUILD_UNIT_TESTS=OFF
	39	CXXFLAGS+= -I${LOCALBASE}/include \
	40	-DNDEBUG
	41	CFLAGS+= -DORTHANC_ENABLE_LOGGING_PLUGIN \
	42	-DNDEBUG
	43	USE_LDCONFIG= yes
	44	PLIST_FILES= share/orthanc/plugins/libOrthancMySQLIndex.so \
	45	share/orthanc/plugins/libOrthancMySQLIndex.so.${PORTVERSION} \
	46	share/orthanc/plugins/libOrthancMySQLStorage.so \
	47	share/orthanc/plugins/libOrthancMySQLStorage.so.${PORTVERSION}
	48
	49	post-extract:
	50	${MKDIR} ${WRKSRC}/MySQL/ThirdPartyDownloads
	51	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
	52	${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.7.1.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
	53	${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.7.1.tar.gz
	54
	55	post-patch:
	56	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' ${WRKSRC}/Resources/CMake/*.cmake
	57
	58	.include <bsd.port.mk>

Line 0 Link Here

(-)science/orthanc-mysql/files/patch-Resources_CMake_MariaDBConfiguration.cmake (+27 lines)
	1	--- Resources/CMake/MariaDBConfiguration.cmake.orig 2019-01-23 19:14:24 UTC
	2	+++ Resources/CMake/MariaDBConfiguration.cmake
	3	@@ -148,10 +148,21 @@ else()
	4	message(FATAL_ERROR "Please install the libmysqlclient-dev package")
	5	endif()
	6
	7	- check_library_exists(mysqlclient mysql_init "" HAVE_MYSQL_CLIENT_LIB)
	8	- if (NOT HAVE_MYSQL_CLIENT_LIB)
	9	+ find_library(MYSQL_CLIENT_LIB NAMES mysqlclient PATHS
	10	+ /usr/lib/mysql
	11	+ /usr/local/lib/mysql
	12	+ )
	13	+
	14	+ if (MYSQL_CLIENT_LIB)
	15	+ check_library_exists(${MYSQL_CLIENT_LIB} mysql_init "" HAVE_MYSQL_CLIENT_LIB)
	16	+ if (NOT HAVE_MYSQL_CLIENT_LIB)
	17	+ message(FATAL_ERROR "Unable to use mysql_init from mysqlclient library")
	18	+ endif()
	19	+ get_filename_component(MYSQL_CLIENT_LIB_PATH ${MYSQL_CLIENT_LIB} DIRECTORY)
	20	+ link_directories(${MYSQL_CLIENT_LIB_PATH})
	21	+ link_libraries(mysqlclient)
	22	+ else()
	23	message(FATAL_ERROR "Unable to find the mysqlclient library")
	24	endif()
	25
	26	- link_libraries(mysqlclient)
	27	endif()