Index: Makefile =================================================================== --- Makefile (revision 418326) +++ Makefile (working copy) @@ -2,56 +2,32 @@ # $FreeBSD$ PORTNAME= galera -PORTVERSION= 25.3.5 -DISTVERSIONSUFFIX= -src -PORTREVISION= 2 +PORTVERSION= 25.3.16 +DISTVERSIONPREFIX= 3- CATEGORIES= databases -MASTER_SITES= https://launchpadlibrarian.net/170877450/ +MASTER_SITES= http://releases.galeracluster.com/source/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= brnrd@FreeBSD.org COMMENT= Synchronous multi-master replication engine LICENSE= GPLv2 BUILD_DEPENDS= checkmk:devel/libcheck \ - doxygen:devel/doxygen \ - ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme + LIB_DEPENDS= libboost_date_time.so:devel/boost-libs -USES= execinfo python:build scons shebangfix +USES= execinfo scons shebangfix ssl USE_CXXSTD= c++11 -USE_GCC= yes USE_LDCONFIG= yes -USE_OPENSSL= yes -LDFLAGS+= -lboost_program_options -lboost_system -MAKE_ARGS+= --config=force +LDFLAGS+= -lboost_program_options -lboost_system -lssl -lcrypto -SHEBANG_FILES= docs/sphinx-* - PLIST_FILES= lib/libgalera_smm.so \ lib/libgalera.so -PORTDOCS= * +PORTDOCS= AUTHORS README -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= AUTHORS README - -DOCSRCDIR2= ${DOCSRCDIR1}/docs/build/doc - -DOCSRCDIR3= ${DOCSRCDIR1}/galerautils -DOCSDIR3= ${DOCSDIR}/galerautils -DOC_FILES3= ChangeLog README - -DOCSRCDIR4= ${DOCSRCDIR1}/gcache -DOCSDIR4= ${DOCSDIR}/gcache -DOC_FILES4= AUTHORS README - -DOCSRCDIR5= ${DOCSRCDIR1}/gcs -DOCSDIR5= ${DOCSDIR}/gcs -DOC_FILES5= ChangeLog README doc/*.txt doc/*.odt doc/*.png - OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG DOCS TEST OPTIONS_GROUP= DOCS OPTIONS_GROUP_DOCS= EPUB JSON LATEX PICKLE @@ -82,9 +58,13 @@ ${WRKSRC}/SConstruct @${REINPLACE_CMD} -e '/#\/asio/d; s|asio.hpp|boost/&|; \ s|asio/ssl.hpp|boost/&|' ${WRKSRC}/SConstruct - @${REINPLACE_CMD} -e 's|asio.hpp|boost/&|; s|asio/ssl.hpp|boost/&|' \ - ${WRKSRC}/galera/src/ist.hpp \ - ${WRKSRC}/gcomm/src/asio_protonet.hpp + @${REINPLACE_CMD} -e 's|asio.hpp|boost/&|' -e 's|asio/ssl.hpp|boost/&|' \ + -e 's|gu_boost/asio.hpp|gu_asio.hpp|' \ + -e 's|asio::error_code|::boost::system::error_code|g' \ + -e 's|asio::system_error|::boost::system::system_error|g' \ + -e 's|asio::|::boost::asio::|g' \ + ${WRKSRC}/galerautils/src/gu_asio.hpp \ + ${WRKSRC}/galerautils/src/gu_asio.cpp @${REINPLACE_CMD} -e 's|asio::system_error|::boost::system::system_error|g' \ ${WRKSRC}/galera/src/ist.cpp \ ${WRKSRC}/gcomm/src/asio_tcp.cpp \ @@ -96,7 +76,6 @@ @${REINPLACE_CMD} -e 's|asio::|boost::&|g' \ ${WRKSRC}/galera/src/ist.*pp \ ${WRKSRC}/galera/src/ist_proto.hpp \ - ${WRKSRC}/gcomm/src/asio_addr.hpp \ ${WRKSRC}/gcomm/src/asio_protonet.*pp \ ${WRKSRC}/gcomm/src/asio_tcp.*pp \ ${WRKSRC}/gcomm/src/asio_udp.*pp @@ -113,9 +92,6 @@ ${WRKSRC}/galera/SConscript .endif - @${REINPLACE_CMD} -e "s|\[u'Codership Oy'\], 1|\[u'Codership Oy'\], 8|" \ - ${WRKSRC}/docs/pasture/source/conf.py - .for d in galerautils gcomm gcs @${REINPLACE_CMD} -e 's|= ./|= ../../docs/build/doc/${d}|; \ s|= man|= ../../man|' ${WRKSRC}/${d}/doc/Doxyfile @@ -130,57 +106,10 @@ . endif .endfor -post-build: - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b man \ - -d build/doctrees source build/man/man1) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b man \ - -d build/doctrees/pasture pasture/source build/man/man8) +post-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/AUTHORS ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MDOCS} - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b html \ - -d build/doctrees source build/doc/galera/html) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b text \ - -d build/doctrees source build/doc/galera/text) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b html \ - -d build/doctrees/pasture pasture/source build/doc/pasture/html) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b text \ - -d build/doctrees/pasture pasture/source build/doc/pasture/text) - -. if ${PORT_OPTIONS:MEPUB} - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b epub \ - -d build/doctrees source build/doc/galera/epub) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b epub \ - -d build/doctrees/pasture pasture/source build/doc/pasture/epub) -. endif - -. if ${PORT_OPTIONS:MJSON} - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b json \ - -d build/doctrees source build/doc/galera/json) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b json \ - -d build/doctrees/pasture pasture/source build/doc/pasture/json) -. endif - -. if ${PORT_OPTIONS:MLATEX} - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b latex \ - -d build/doctrees source build/doc/galera/latex) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b latex \ - -d build/doctrees/pasture pasture/source \ - build/doc/pasture/latex) -. endif - -. if ${PORT_OPTIONS:MPICKLE} - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b pickle \ - -d build/doctrees source build/doc/galera/pickle) - @(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b pickle \ - -d build/doctrees/pasture \ - pasture/source build/doc/pasture/pickle) -. endif -.endif - - @(cd ${BUILD_WRKSRC}/galerautils/doc && doxygen Doxyfile) - @(cd ${BUILD_WRKSRC}/gcomm/doc && doxygen Doxyfile) - @(cd ${BUILD_WRKSRC}/gcs/doc && doxygen Doxyfile) - do-install: ${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/libgalera_smm.so \ ${STAGEDIR}${PREFIX}/lib/ @@ -187,25 +116,4 @@ @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \ libgalera.so) - @(cd ${WRKSRC}/docs/build/man/man1 && ${INSTALL_MAN} \ - ${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/) - @(cd ${WRKSRC}/docs/build/man/man3 && ${RM} _*.3 && ${INSTALL_MAN} \ - *.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/) - @(cd ${WRKSRC}/docs/build/man/man8 && ${INSTALL_MAN} \ - ${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/) - - @cd ${STAGEDIR}${MANPREFIX} && \ - ${FIND} -H -s man/man*/ -maxdepth 1 -type f -print | \ - ${SED} 's|$$|.gz|' >> ${TMPPLIST} - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR4} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - (cd ${DOCSRCDIR2} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3} - ${INSTALL_DATA} ${DOC_FILES4:S|^|${DOCSRCDIR4}/|} ${STAGEDIR}${DOCSDIR4} - ${INSTALL_DATA} ${DOC_FILES5:S|^|${DOCSRCDIR5}/|} ${STAGEDIR}${DOCSDIR5} -.endif - .include Index: distinfo =================================================================== --- distinfo (revision 418326) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (galera-25.3.5-src.tar.gz) = 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 -SIZE (galera-25.3.5-src.tar.gz) = 3820268 +TIMESTAMP = 1464264483 +SHA256 (galera-3-25.3.16.tar.gz) = e123a7c5a054e377f94c6113eb62295bb7da82b5ab03cbf9505a0903ddbf995b +SIZE (galera-3-25.3.16.tar.gz) = 2999062 Index: files/patch-SConstruct =================================================================== --- files/patch-SConstruct (revision 418326) +++ files/patch-SConstruct (working copy) @@ -1,15 +1,15 @@ ---- ./SConstruct.orig 2014-08-01 16:33:09.000000000 -0400 -+++ ./SConstruct 2014-08-01 16:34:45.000000000 -0400 -@@ -153,7 +153,7 @@ +--- SConstruct.orig 2016-03-12 10:07:22.000000000 +0100 ++++ SConstruct 2016-03-26 22:31:19.381845557 +0100 +@@ -171,7 +171,7 @@ env.Replace(CCFLAGS = os.getenv('CCFLA + env.Replace(CFLAGS = os.getenv('CFLAGS', '')) + env.Replace(CXXFLAGS = os.getenv('CXXFLAGS', '')) + env.Replace(LINKFLAGS = os.getenv('LDFLAGS', link_arch)) +-env.Replace(LIBPATH = [os.getenv('LIBPATH', '')]) ++env.Replace(RPATH = [os.getenv('RPATH', '')]) - # Initialize CPPFLAGS and LIBPATH from environment to get user preferences - env.Replace(CPPFLAGS = os.getenv('CPPFLAGS', '')) --env.Replace(LIBPATH = [os.getenv('LIBPATH', '')]) -+env.Replace(RPATH = [os.getenv('RPATH', '')]) - # Set -pthread flag explicitly to make sure that pthreads are # enabled on all platforms. -@@ -165,6 +165,9 @@ +@@ -183,6 +183,9 @@ if sysname == 'freebsd' or sysname == 's env.Append(CPPFLAGS = ' -I/usr/local/include ') if sysname == 'sunos': env.Replace(SHLINKFLAGS = '-shared ') Index: files/patch-galerautils__src__gu_errno.h =================================================================== --- files/patch-galerautils__src__gu_errno.h (revision 418326) +++ files/patch-galerautils__src__gu_errno.h (working copy) @@ -1,47 +0,0 @@ ---- ./galerautils/src/gu_errno.h.orig 2014-07-31 17:55:31.000000000 -0400 -+++ ./galerautils/src/gu_errno.h 2014-07-31 17:56:57.000000000 -0400 -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2013 Codership Oy -+ * Copyright (C) 2014 Codership Oy - */ - - #ifndef GU_ERRNO_H -@@ -8,14 +8,29 @@ - #include - - #if defined(__APPLE__) || defined(__FreeBSD__) --# define EBADFD (ELAST+1) /* the largest errno + 1 */ --# define EREMCHG (ELAST+2) --# define ENOTUNIQ (ELAST+3) --# define ERESTART (ELAST+4) --# if defined(__FreeBSD__) --# define ENOTRECOVERABLE (ELAST+5) --# define ENODATA (ELAST+6) --# endif -+# define GU_ELAST ELAST -+#else -+/* must be high enough to not collide with system errnos but lower than 256 */ -+# define GU_ELAST 200 -+#endif -+ -+#ifndef EBADFD -+# define EBADFD (GU_ELAST+1) -+#endif -+#ifndef EREMCHG -+# define EREMCHG (GU_ELAST+2) -+#endif -+#ifndef ENOTUNIQ -+# define ENOTUNIQ (GU_ELAST+3) -+#endif -+#ifndef ERESTART -+# define ERESTART (GU_ELAST+4) -+#endif -+#ifndef ENOTRECOVERABLE -+# define ENOTRECOVERABLE (GU_ELAST+5) -+#endif -+#ifndef ENODATA -+# define ENODATA (GU_ELAST+6) - #endif - - #endif /* GU_STR_H */