Attachment #172370 for bug #208109




# $FreeBSD$

PORTNAME=	galera
PORTVERSION=	25.3.16
DISTVERSIONPREFIX=	3-
PORTREVISION=	2
CATEGORIES=	databases
MASTER_SITES=	http://releases.galeracluster.com/source/

MAINTAINER=	brnrd@FreeBSD.org
COMMENT=	Synchronous multi-master replication engine

LICENSE=	GPLv2

BUILD_DEPENDS=	checkmk:devel/libcheck \

		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme
LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs

USES=		execinfo scons shebangfix ssl

USE_CXXSTD=	c++11
USE_GCC=	yes
USE_LDCONFIG=	yes
USE_OPENSSL=	yes

LDFLAGS+=	-lboost_program_options -lboost_system -lssl -lcrypto
MAKE_ARGS+=	--config=force

SHEBANG_FILES=	docs/sphinx-*

PLIST_FILES=	lib/libgalera_smm.so \
		lib/libgalera.so

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

		${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/&|' -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 \

	@${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

		${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

. endif
.endfor

post-install:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b man \
		-d build/doctrees/pasture pasture/source build/man/man8)

.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/

	@(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 <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (galera-25.3.5-src.tar.gz) = 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3	1	TIMESTAMP = 1464264483
2	SIZE (galera-25.3.5-src.tar.gz) = 3820268	2	SHA256 (galera-3-25.3.16.tar.gz) = e123a7c5a054e377f94c6113eb62295bb7da82b5ab03cbf9505a0903ddbf995b
		3	SIZE (galera-3-25.3.16.tar.gz) = 2999062




--- 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.
@@ -183,6 +183,9 @@ if sysname == 'freebsd' or sysname == 's
     env.Append(CPPFLAGS = ' -I/usr/local/include ')
 if sysname == 'sunos':
    env.Replace(SHLINKFLAGS = '-shared ')




--- ./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 <info@codership.com>
+ * Copyright (C) 2014 Codership Oy <info@codership.com>
  */
 
 #ifndef GU_ERRNO_H
@@ -8,14 +8,29 @@
 #include <errno.h>
 
 #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 */

Return to bug 208109

Lines 2-57 Link Here

(-)Makefile (-110 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= galera	4	PORTNAME= galera
5	PORTVERSION= 25.3.5	5	PORTVERSION= 25.3.16
6	DISTVERSIONSUFFIX= -src	6	DISTVERSIONPREFIX= 3-
7	PORTREVISION= 2
8	CATEGORIES= databases	7	CATEGORIES= databases
9	MASTER_SITES= https://launchpadlibrarian.net/170877450/	8	MASTER_SITES= http://releases.galeracluster.com/source/
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= brnrd@FreeBSD.org
12	COMMENT= Synchronous multi-master replication engine	11	COMMENT= Synchronous multi-master replication engine
13		12
14	LICENSE= GPLv2	13	LICENSE= GPLv2
15		14
16	BUILD_DEPENDS= checkmk:devel/libcheck \	15	BUILD_DEPENDS= checkmk:devel/libcheck \
17	doxygen:devel/doxygen \	16
18	${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme
19	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs	17	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs
20		18
21	USES= execinfo python:build scons shebangfix	19	USES= execinfo scons shebangfix ssl
22		20
23	USE_CXXSTD= c++11	21	USE_CXXSTD= c++11
24	USE_GCC= yes
25	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
26	USE_OPENSSL= yes
27		23
28	LDFLAGS+= -lboost_program_options -lboost_system	24	LDFLAGS+= -lboost_program_options -lboost_system -lssl -lcrypto
29	MAKE_ARGS+= --config=force
30		25
31	SHEBANG_FILES= docs/sphinx-*
32
33	PLIST_FILES= lib/libgalera_smm.so \	26	PLIST_FILES= lib/libgalera_smm.so \
34	lib/libgalera.so	27	lib/libgalera.so
35		28
36	PORTDOCS= *	29	PORTDOCS= AUTHORS README
37		30
38	DOCSRCDIR1= ${WRKSRC}
39	DOC_FILES1= AUTHORS README
40
41	DOCSRCDIR2= ${DOCSRCDIR1}/docs/build/doc
42
43	DOCSRCDIR3= ${DOCSRCDIR1}/galerautils
44	DOCSDIR3= ${DOCSDIR}/galerautils
45	DOC_FILES3= ChangeLog README
46
47	DOCSRCDIR4= ${DOCSRCDIR1}/gcache
48	DOCSDIR4= ${DOCSDIR}/gcache
49	DOC_FILES4= AUTHORS README
50
51	DOCSRCDIR5= ${DOCSRCDIR1}/gcs
52	DOCSDIR5= ${DOCSDIR}/gcs
53	DOC_FILES5= ChangeLog README doc/.txt doc/.odt doc/*.png
54
55	OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG DOCS TEST	31	OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG DOCS TEST
56	OPTIONS_GROUP= DOCS	32	OPTIONS_GROUP= DOCS
57	OPTIONS_GROUP_DOCS= EPUB JSON LATEX PICKLE	33	OPTIONS_GROUP_DOCS= EPUB JSON LATEX PICKLE
Lines 82-90 Link Here
82	${WRKSRC}/SConstruct	58	${WRKSRC}/SConstruct
83	@${REINPLACE_CMD} -e '/#\/asio/d; s\|asio.hpp\|boost/&\|; \	59	@${REINPLACE_CMD} -e '/#\/asio/d; s\|asio.hpp\|boost/&\|; \
84	s\|asio/ssl.hpp\|boost/&\|' ${WRKSRC}/SConstruct	60	s\|asio/ssl.hpp\|boost/&\|' ${WRKSRC}/SConstruct
85	@${REINPLACE_CMD} -e 's\|asio.hpp\|boost/&\|; s\|asio/ssl.hpp\|boost/&\|' \	61	@${REINPLACE_CMD} -e 's\|asio.hpp\|boost/&\|' -e 's\|asio/ssl.hpp\|boost/&\|' \
86	${WRKSRC}/galera/src/ist.hpp \	62	-e 's\|gu_boost/asio.hpp\|gu_asio.hpp\|' \
87	${WRKSRC}/gcomm/src/asio_protonet.hpp	63	-e 's\|asio::error_code\|::boost::system::error_code\|g' \
		64	-e 's\|asio::system_error\|::boost::system::system_error\|g' \
		65	-e 's\|asio::\|::boost::asio::\|g' \
		66	${WRKSRC}/galerautils/src/gu_asio.hpp \
		67	${WRKSRC}/galerautils/src/gu_asio.cpp
88	@${REINPLACE_CMD} -e 's\|asio::system_error\|::boost::system::system_error\|g' \	68	@${REINPLACE_CMD} -e 's\|asio::system_error\|::boost::system::system_error\|g' \
89	${WRKSRC}/galera/src/ist.cpp \	69	${WRKSRC}/galera/src/ist.cpp \
90	${WRKSRC}/gcomm/src/asio_tcp.cpp \	70	${WRKSRC}/gcomm/src/asio_tcp.cpp \
Lines 96-102 Link Here
96	@${REINPLACE_CMD} -e 's\|asio::\|boost::&\|g' \	76	@${REINPLACE_CMD} -e 's\|asio::\|boost::&\|g' \
97	${WRKSRC}/galera/src/ist.*pp \	77	${WRKSRC}/galera/src/ist.*pp \
98	${WRKSRC}/galera/src/ist_proto.hpp \	78	${WRKSRC}/galera/src/ist_proto.hpp \
99	${WRKSRC}/gcomm/src/asio_addr.hpp \
100	${WRKSRC}/gcomm/src/asio_protonet.*pp \	79	${WRKSRC}/gcomm/src/asio_protonet.*pp \
101	${WRKSRC}/gcomm/src/asio_tcp.*pp \	80	${WRKSRC}/gcomm/src/asio_tcp.*pp \
102	${WRKSRC}/gcomm/src/asio_udp.*pp	81	${WRKSRC}/gcomm/src/asio_udp.*pp
Lines 113-121 Link Here
113	${WRKSRC}/galera/SConscript	92	${WRKSRC}/galera/SConscript
114	.endif	93	.endif
115		94
116	@${REINPLACE_CMD} -e "s\|\[u'Codership Oy'\], 1\|\[u'Codership Oy'\], 8\|" \
117	${WRKSRC}/docs/pasture/source/conf.py
118
119	.for d in galerautils gcomm gcs	95	.for d in galerautils gcomm gcs
120	@${REINPLACE_CMD} -e 's\|= ./\|= ../../docs/build/doc/${d}\|; \	96	@${REINPLACE_CMD} -e 's\|= ./\|= ../../docs/build/doc/${d}\|; \
121	s\|= man\|= ../../man\|' ${WRKSRC}/${d}/doc/Doxyfile	97	s\|= man\|= ../../man\|' ${WRKSRC}/${d}/doc/Doxyfile
Lines 130-186 Link Here
130	. endif	106	. endif
131	.endfor	107	.endfor
132		108
133	post-build:	109	post-install:
134	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b man \	110	${MKDIR} ${STAGEDIR}${DOCSDIR}
135	-d build/doctrees source build/man/man1)	111	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
136	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b man \
137	-d build/doctrees/pasture pasture/source build/man/man8)
138		112
139	.if ${PORT_OPTIONS:MDOCS}
140	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b html \
141	-d build/doctrees source build/doc/galera/html)
142	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b text \
143	-d build/doctrees source build/doc/galera/text)
144	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b html \
145	-d build/doctrees/pasture pasture/source build/doc/pasture/html)
146	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b text \
147	-d build/doctrees/pasture pasture/source build/doc/pasture/text)
148
149	. if ${PORT_OPTIONS:MEPUB}
150	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b epub \
151	-d build/doctrees source build/doc/galera/epub)
152	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b epub \
153	-d build/doctrees/pasture pasture/source build/doc/pasture/epub)
154	. endif
155
156	. if ${PORT_OPTIONS:MJSON}
157	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b json \
158	-d build/doctrees source build/doc/galera/json)
159	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b json \
160	-d build/doctrees/pasture pasture/source build/doc/pasture/json)
161	. endif
162
163	. if ${PORT_OPTIONS:MLATEX}
164	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b latex \
165	-d build/doctrees source build/doc/galera/latex)
166	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b latex \
167	-d build/doctrees/pasture pasture/source \
168	build/doc/pasture/latex)
169	. endif
170
171	. if ${PORT_OPTIONS:MPICKLE}
172	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b pickle \
173	-d build/doctrees source build/doc/galera/pickle)
174	@(cd ${BUILD_WRKSRC}/docs && sphinx-build -a -b pickle \
175	-d build/doctrees/pasture \
176	pasture/source build/doc/pasture/pickle)
177	. endif
178	.endif
179
180	@(cd ${BUILD_WRKSRC}/galerautils/doc && doxygen Doxyfile)
181	@(cd ${BUILD_WRKSRC}/gcomm/doc && doxygen Doxyfile)
182	@(cd ${BUILD_WRKSRC}/gcs/doc && doxygen Doxyfile)
183
184	do-install:	113	do-install:
185	${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/libgalera_smm.so \	114	${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/libgalera_smm.so \
186	${STAGEDIR}${PREFIX}/lib/	115	${STAGEDIR}${PREFIX}/lib/
Lines 187-211 Link Here
187	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \	116	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
188	libgalera.so)	117	libgalera.so)
189		118
190	@(cd ${WRKSRC}/docs/build/man/man1 && ${INSTALL_MAN} \
191	${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/)
192	@(cd ${WRKSRC}/docs/build/man/man3 && ${RM} _*.3 && ${INSTALL_MAN} \
193	*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/)
194	@(cd ${WRKSRC}/docs/build/man/man8 && ${INSTALL_MAN} \
195	${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/)
196
197	@cd ${STAGEDIR}${MANPREFIX} && \
198	${FIND} -H -s man/man*/ -maxdepth 1 -type f -print \| \
199	${SED} 's\|$$\|.gz\|' >> ${TMPPLIST}
200
201	post-install:
202	.if ${PORT_OPTIONS:MDOCS}
203	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR4}
204	${INSTALL_DATA} ${DOC_FILES1:S\|^\|${DOCSRCDIR1}/\|} ${STAGEDIR}${DOCSDIR}
205	(cd ${DOCSRCDIR2} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
206	${INSTALL_DATA} ${DOC_FILES3:S\|^\|${DOCSRCDIR3}/\|} ${STAGEDIR}${DOCSDIR3}
207	${INSTALL_DATA} ${DOC_FILES4:S\|^\|${DOCSRCDIR4}/\|} ${STAGEDIR}${DOCSDIR4}
208	${INSTALL_DATA} ${DOC_FILES5:S\|^\|${DOCSRCDIR5}/\|} ${STAGEDIR}${DOCSDIR5}
209	.endif
210
211	.include <bsd.port.post.mk>	119	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)files/patch-SConstruct (-9 / +9 lines)
1	--- ./SConstruct.orig 2014-08-01 16:33:09.000000000 -0400	1	--- SConstruct.orig 2016-03-12 10:07:22.000000000 +0100
2	+++ ./SConstruct 2014-08-01 16:34:45.000000000 -0400	2	+++ SConstruct 2016-03-26 22:31:19.381845557 +0100
3	@@ -153,7 +153,7 @@	3	@@ -171,7 +171,7 @@ env.Replace(CCFLAGS = os.getenv('CCFLA
		4	env.Replace(CFLAGS = os.getenv('CFLAGS', ''))
		5	env.Replace(CXXFLAGS = os.getenv('CXXFLAGS', ''))
		6	env.Replace(LINKFLAGS = os.getenv('LDFLAGS', link_arch))
		7	-env.Replace(LIBPATH = [os.getenv('LIBPATH', '')])
		8	+env.Replace(RPATH = [os.getenv('RPATH', '')])
4		9
5	# Initialize CPPFLAGS and LIBPATH from environment to get user preferences
6	env.Replace(CPPFLAGS = os.getenv('CPPFLAGS', ''))
7	-env.Replace(LIBPATH = [os.getenv('LIBPATH', '')])
8	+env.Replace(RPATH = [os.getenv('RPATH', '')])
9
10	# Set -pthread flag explicitly to make sure that pthreads are	10	# Set -pthread flag explicitly to make sure that pthreads are
11	# enabled on all platforms.	11	# enabled on all platforms.
12	@@ -165,6 +165,9 @@	12	@@ -183,6 +183,9 @@ if sysname == 'freebsd' or sysname == 's
13	env.Append(CPPFLAGS = ' -I/usr/local/include ')	13	env.Append(CPPFLAGS = ' -I/usr/local/include ')
14	if sysname == 'sunos':	14	if sysname == 'sunos':
15	env.Replace(SHLINKFLAGS = '-shared ')	15	env.Replace(SHLINKFLAGS = '-shared ')

Lines 1-47 Link Here

(-)files/patch-galerautils__src__gu_errno.h (-47 lines)
1	--- ./galerautils/src/gu_errno.h.orig 2014-07-31 17:55:31.000000000 -0400
2	+++ ./galerautils/src/gu_errno.h 2014-07-31 17:56:57.000000000 -0400
3	@@ -1,5 +1,5 @@
4	/*
5	- * Copyright (C) 2013 Codership Oy <info@codership.com>
6	+ * Copyright (C) 2014 Codership Oy <info@codership.com>
7	*/
8
9	#ifndef GU_ERRNO_H
10	@@ -8,14 +8,29 @@
11	#include <errno.h>
12
13	#if defined(__APPLE__) \|\| defined(__FreeBSD__)
14	-# define EBADFD (ELAST+1) /* the largest errno + 1 */
15	-# define EREMCHG (ELAST+2)
16	-# define ENOTUNIQ (ELAST+3)
17	-# define ERESTART (ELAST+4)
18	-# if defined(__FreeBSD__)
19	-# define ENOTRECOVERABLE (ELAST+5)
20	-# define ENODATA (ELAST+6)
21	-# endif
22	+# define GU_ELAST ELAST
23	+#else
24	+/* must be high enough to not collide with system errnos but lower than 256 */
25	+# define GU_ELAST 200
26	+#endif
27	+
28	+#ifndef EBADFD
29	+# define EBADFD (GU_ELAST+1)
30	+#endif
31	+#ifndef EREMCHG
32	+# define EREMCHG (GU_ELAST+2)
33	+#endif
34	+#ifndef ENOTUNIQ
35	+# define ENOTUNIQ (GU_ELAST+3)
36	+#endif
37	+#ifndef ERESTART
38	+# define ERESTART (GU_ELAST+4)
39	+#endif
40	+#ifndef ENOTRECOVERABLE
41	+# define ENOTRECOVERABLE (GU_ELAST+5)
42	+#endif
43	+#ifndef ENODATA
44	+# define ENODATA (GU_ELAST+6)
45	#endif
46
47	#endif /* GU_STR_H */