Attachment #174279 for bug #212282




PORTNAME=	bareos
DISTVERSIONPREFIX=	Release/
DISTVERSION=	15.2.2
PORTREVISION?=	4
CATEGORIES?=	sysutils
PKGNAMEPREFIX?=	#
PKGNAMESUFFIX?=	-server

CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO
OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
OPTIONS_SUB=		yes
MTX_DESC=		Install mtx for control of autochanger devices
NDMP_DESC=		Enable build of NDMP support
SCSICRYPTO_DESC=	Build LTO AME crypto plugin

.if ${PKGNAMESUFFIX} == "-server"
OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL

NDMP_CONFIGURE_OFF=     --enable-ndmp=no
.endif

SCSICRYPTO_CONFIGURE_ON=	--enable-scsi-crypto=yes
SCSICRYPTO_CONFIGURE_OFF=	--enable-scsi-crypto=no

OPENSSL_USE=	OPENSSL=yes
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
OPENSSL_CONFIGURE_OFF=	--with-openssl="no"

#	In server port don't install filed
	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|\.\./\.\./lib/libbareos|$$(LOCALBASE)/lib/libbareos|g' \
		${WRKSRC}/src/plugins/dird/Makefile.in \
		${WRKSRC}/src/plugins/filed/Makefile.in \
		${WRKSRC}/src/plugins/stored/Makefile.in
	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
	@${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' \

Lines 11-16 Link Here

(-)sysutils/bareos-server/files/bareos-dir.in (-1 / +16 lines)
11	#	11	#
12	# bareos_dir_enable (bool): Set to NO by default.	12	# bareos_dir_enable (bool): Set to NO by default.
13	# Set it to YES to enable bareos_dir.	13	# Set it to YES to enable bareos_dir.
		14	# bareos_dir_configfile (foo/bar/file.conf): absolute path to bareos-dir
		15	# configuration file
14	# bareos_dir_flags (params): Set params used to start bareos_dir.	16	# bareos_dir_flags (params): Set params used to start bareos_dir.
15	#	17	#
16		18
Lines 19-31 Link Here
19	name="bareos_dir"	21	name="bareos_dir"
20	rcvar=${name}_enable	22	rcvar=${name}_enable
21	command=%%PREFIX%%/sbin/bareos-dir	23	command=%%PREFIX%%/sbin/bareos-dir
		24	bareos_dir_user="bareos"
		25	bareos_dir_group="bareos"
		26	bareos_dir_configfile="%%PREFIX%%/etc/bareos/bareos-dir.conf"
		27	start_precmd=${name}_prestart
22		28
23	load_rc_config $name	29	load_rc_config $name
24		30
25	: ${bareos_dir_enable="NO"}	31	: ${bareos_dir_enable="NO"}
26	: ${bareos_dir_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-dir.conf"}	32	: ${bareos_dir_flags=" -u ${bareos_dir_user} -g ${bareos_dir_group} -v -c ${bareos_dir_configfile}"}
27	: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}	33	: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
28		34
29	pidfile="${bareos_dir_pidfile}"	35	pidfile="${bareos_dir_pidfile}"
30		36
		37	required_files=${bareos_dir_configfile}
		38	required_dirs=${pidfile%/*}
		39
		40	bareos_dir_prestart()
		41	{
		42	[ -d "${pidfile%/}" ] \|\| install -d -o ${bareos_dir_user} -g ${bareos_dir_group} ${pidfile%/}
		43	}
		44
		45
31	run_rc_command "$1"	46	run_rc_command "$1"

Lines 11-16 Link Here

(-)sysutils/bareos-server/files/bareos-fd.in (-1 / +17 lines)
11	#	11	#
12	# bareos_fd_enable (bool): Set to NO by default.	12	# bareos_fd_enable (bool): Set to NO by default.
13	# Set it to YES to enable bareos_fd.	13	# Set it to YES to enable bareos_fd.
		14	# bareos_sd_configfile (foo/bar/file.conf): absolute path to bareos-fd
		15	# configuration file
14	# bareos_fd_flags (params): Set params used to start bareos_fd.	16	# bareos_fd_flags (params): Set params used to start bareos_fd.
15	#	17	#
16		18
Lines 19-31 Link Here
19	name="bareos_fd"	21	name="bareos_fd"
20	rcvar=${name}_enable	22	rcvar=${name}_enable
21	command=%%PREFIX%%/sbin/bareos-fd	23	command=%%PREFIX%%/sbin/bareos-fd
		24	bareos_fd_user="root"
		25	bareos_fd_group="wheel"
		26	bareos_user="bareos"
		27	bareos_group="bareos"
		28	bareos_fd_configfile="%%PREFIX%%/etc/bareos/bareos-fd.conf"
		29	start_precmd=${name}_prestart
22		30
23	load_rc_config $name	31	load_rc_config $name
24		32
25	: ${bareos_fd_enable="NO"}	33	: ${bareos_fd_enable="NO"}
26	: ${bareos_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bareos/bareos-fd.conf"}	34	: ${bareos_fd_flags=" -u ${bareos_fd_user} -g ${bareos_fd_group} -v -c ${bareos_fd_configfile}"}
27	: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}	35	: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
28		36
29	pidfile="${bareos_fd_pidfile}"	37	pidfile="${bareos_fd_pidfile}"
30		38
		39	required_files=${bareos_fd_configfile}
		40	required_dirs=${pidfile%/*}
		41
		42	bareos_fd_prestart()
		43	{
		44	[ -d "${pidfile%/}" ] \|\| install -d -o ${bareos_user} -g {bareos_group} ${pidfile%/}
		45	}
		46
31	run_rc_command "$1"	47	run_rc_command "$1"

Lines 11-16 Link Here

(-)sysutils/bareos-server/files/bareos-sd.in (-2 / +16 lines)
11	#	11	#
12	# bareos_sd_enable (bool): Set to NO by default.	12	# bareos_sd_enable (bool): Set to NO by default.
13	# Set it to YES to enable bareos_sd.	13	# Set it to YES to enable bareos_sd.
		14	# bareos_sd_configfile (foo/bar/file.conf): absolute path to bareos-sd
		15	# configuration file
14	# bareos_sd_flags (params): Set params used to start bareos_sd.	16	# bareos_sd_flags (params): Set params used to start bareos_sd.
15	#	17	#
16		18
Lines 19-31 Link Here
19	name="bareos_sd"	21	name="bareos_sd"
20	rcvar=${name}_enable	22	rcvar=${name}_enable
21	command=%%PREFIX%%/sbin/bareos-sd	23	command=%%PREFIX%%/sbin/bareos-sd
		24	bareos_sd_user="bareos"
		25	bareos_sd_group="bareos"
		26	bareos_sd_configfile="%%PREFIX%%/etc/bareos/bareos-sd.conf"
		27	start_precmd=${name}_prestart
22		28
23	load_rc_config $name	29	load_rc_config $name
24		30
25	: ${bareos_sd_enable="NO"}	31	: ${bareos_sd_enable="NO"}
26	: ${bareos_sd_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-sd.conf"}	32	: ${bareos_sd_flags=" -u ${bareos_sd_user} -g ${bareos_sd_group} -v -c ${bareos_sd_configfile}"}
27	: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}	33	: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
28		34
29	pidfile="${bacula_sd_pidfile}"	35	pidfile="${bareos_sd_pidfile}"
		36
		37	required_files=${bareos_sd_configfile}
		38	required_dirs=${pidfile%/*}
		39
		40	bareos_sd_prestart()
		41	{
		42	[ -d "${pidfile%/}" ] \|\| install -d -o ${bareos_sd_user} -g ${bareos_sd_group} ${pidfile%/}
		43	}
30		44
31	run_rc_command "$1"	45	run_rc_command "$1"

Lines 18-23 Link Here

(-)sysutils/bareos-server/pkg-plist (+1 lines)
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 212282

Lines 4-10 Link Here

(-)sysutils/bareos-server/Makefile (-2 / +10 lines)
4	PORTNAME= bareos	4	PORTNAME= bareos
5	DISTVERSIONPREFIX= Release/	5	DISTVERSIONPREFIX= Release/
6	DISTVERSION= 15.2.2	6	DISTVERSION= 15.2.2
7	PORTREVISION?= 3	7	PORTREVISION?= 4
8	CATEGORIES?= sysutils	8	CATEGORIES?= sysutils
9	PKGNAMEPREFIX?= #	9	PKGNAMEPREFIX?= #
10	PKGNAMESUFFIX?= -server	10	PKGNAMESUFFIX?= -server
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' \