View | Details | Raw Unified | Return to bug 210177 | Differences between
and this patch

Collapse All | Expand All

(-)bareos-client/Makefile (-1 / +2 lines)
Lines 13-20 Link Here
13
PLIST=		${PKGDIR}/pkg-plist.client
13
PLIST=		${PKGDIR}/pkg-plist.client
14
MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
14
MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
15
15
16
OPTIONS_DEFINE=	NLS PYTHON LMDB
16
OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
17
OPTIONS_DEFAULT=#
17
OPTIONS_DEFAULT=#
18
LMDB_DESC=	Enable build of LMDB support
18
LMDB_DESC=	Enable build of LMDB support
19
SCSICRYPTO_DESC= Build LTO AME crypto plugin
19
20
20
.include "${MASTERDIR}/Makefile"
21
.include "${MASTERDIR}/Makefile"
(-)bareos-server/Makefile (-1 / +9 lines)
Lines 32-42 Link Here
32
CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
32
CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
33
LDFLAGS+=	-L${LOCALBASE}/lib
33
LDFLAGS+=	-L${LOCALBASE}/lib
34
34
35
OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL
35
OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO
36
OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
36
OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
37
OPTIONS_SUB=		yes
37
OPTIONS_SUB=		yes
38
MTX_DESC=		Install mtx for control of autochanger devices
38
MTX_DESC=		Install mtx for control of autochanger devices
39
NDMP_DESC=		Enable build of NDMP support
39
NDMP_DESC=		Enable build of NDMP support
40
SCSICRYPTO_DESC=	Build LTO AME crypto plugin
40
41
41
.if ${PKGNAMESUFFIX} == "-server"
42
.if ${PKGNAMESUFFIX} == "-server"
42
OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
43
OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
Lines 47-52 Link Here
47
NDMP_CONFIGURE_OFF=     --enable-ndmp=no
48
NDMP_CONFIGURE_OFF=     --enable-ndmp=no
48
.endif
49
.endif
49
50
51
SCSICRYPTO_CONFIGURE_ON=	--enable-scsi-crypto=yes
52
SCSICRYPTO_CONFIGURE_OFF=	--enable-scsi-crypto=no
53
50
OPENSSL_USE=	OPENSSL=yes
54
OPENSSL_USE=	OPENSSL=yes
51
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
55
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
52
OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
56
OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
Lines 184-189 Link Here
184
#	In server port don't install filed
188
#	In server port don't install filed
185
	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
189
	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
186
		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
190
		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
191
	@${REINPLACE_CMD} -e 's|\.\./\.\./lib/libbareos|$$(LOCALBASE)/lib/libbareos|g' \
192
		${WRKSRC}/src/plugins/dird/Makefile.in \
193
		${WRKSRC}/src/plugins/filed/Makefile.in \
194
		${WRKSRC}/src/plugins/stored/Makefile.in
187
	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
195
	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
188
		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
196
		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
189
	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
197
	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
(-)bareos-server/files/patch-src-plugins-stored-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- src/plugins/stored/Makefile.in	2015-07-23 18:04:28.275396000 -0500
2
+++ src/plugins/stored/Makefile.in	2015-07-23 18:05:09.508399000 -0500
3
@@ -39,7 +39,7 @@
4
 
5
 autoxflate-sd.la: Makefile \
6
 		  autoxflate-sd$(DEFAULT_OBJECT_TYPE) \
7
-		  ../../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
8
+		  $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
9
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared autoxflate-sd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version -L../../lib -lbareos
10
 
11
 example-plugin-sd.la: Makefile example-plugin-sd$(DEFAULT_OBJECT_TYPE)
(-)bareos-server/pkg-plist (+1 lines)
Lines 18-23 Link Here
18
lib/bareos/plugins/bareos-sd.py.template
18
lib/bareos/plugins/bareos-sd.py.template
19
lib/bareos/plugins/bareos_dir_consts.py
19
lib/bareos/plugins/bareos_dir_consts.py
20
lib/bareos/plugins/bareos_sd_consts.py
20
lib/bareos/plugins/bareos_sd_consts.py
21
lib/bareos/plugins/scsicrypto-sd.so
21
lib/bareos/scripts/bareos
22
lib/bareos/scripts/bareos
22
lib/bareos/scripts/bareos-config
23
lib/bareos/scripts/bareos-config
23
lib/bareos/scripts/bareos-config-lib.sh
24
lib/bareos/scripts/bareos-config-lib.sh

Return to bug 210177