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

Collapse All | Expand All

(-)bacula-client/Makefile (-1 / +5 lines)
Lines 6-12 PKGNAMESUFFIX= -client Link Here
6
6
7
MASTERDIR=	${.CURDIR}/../bacula-server
7
MASTERDIR=	${.CURDIR}/../bacula-server
8
COMMENT=	The network backup solution (client)
8
COMMENT=	The network backup solution (client)
9
PLIST=		${PKGDIR}/pkg-plist.client
9
.if defined(WITH_SFDAEMON)
10
PLIST=         ${PKGDIR}/pkg-plist.static
11
else
12
PLIST=         ${PKGDIR}/pkg-plist.client
13
.endif
10
14
11
WITH_CLIENT_ONLY=	yes
15
WITH_CLIENT_ONLY=	yes
12
USE_RC_SUBR=	bacula-fd
16
USE_RC_SUBR=	bacula-fd
(-)bacula-server/Makefile (+5 lines)
Lines 93-98 IS_INTERACTIVE= yes Link Here
93
.if defined(WITH_CLIENT_ONLY)
93
.if defined(WITH_CLIENT_ONLY)
94
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
94
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
95
OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off
95
OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off
96
OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
96
.elif defined(WITH_BAT)
97
.elif defined(WITH_BAT)
97
OPTIONS=	
98
OPTIONS=	
98
.else
99
.else
Lines 139-144 PKGINSTALL= ${PKGDIR}/pkg-install.server Link Here
139
CONFFILES=	fd
140
CONFFILES=	fd
140
# --disable-xattr is temporary to allow build with 8-current
141
# --disable-xattr is temporary to allow build with 8-current
141
CONFIGURE_ARGS+=	--enable-client-only --disable-xattr
142
CONFIGURE_ARGS+=	--enable-client-only --disable-xattr
143
.if defined(WITH_SFDAEMON)
144
CONFIGURE_ARGS+=	--enable-static-fd
142
145
143
PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.client
146
PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.client
144
PKGINSTALL=	${PKGDIR}/pkg-install.client
147
PKGINSTALL=	${PKGDIR}/pkg-install.client
Lines 151-156 PLIST_SUB+= GNOMECONS="" Link Here
151
WITHOUT_GNOME=		yes
154
WITHOUT_GNOME=		yes
152
PLIST_SUB+=		GNOMECONS="@comment "
155
PLIST_SUB+=		GNOMECONS="@comment "
153
.endif
156
.endif
157
.endif
154
# Build bwx-console
158
# Build bwx-console
155
.if defined(WITH_WXCONSOLE)
159
.if defined(WITH_WXCONSOLE)
156
USE_WX=			2.4
160
USE_WX=			2.4
Lines 219-224 pre-everything:: Link Here
219
	@${ECHO_MSG} "  WITH_GNOMECONSOLE=yes	if you only want a GNOME based GUI console."
223
	@${ECHO_MSG} "  WITH_GNOMECONSOLE=yes	if you only want a GNOME based GUI console."
220
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
224
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
221
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
225
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
226
	@${ECHO_MSG} "  WITH_SFDAEMON=yes  if you want staticly compiled file daemon (client)."
222
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
227
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
223
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
228
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
224
	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."
229
	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."
(-)bacula-server/pkg-plist.static (+8 lines)
Added Link Here
1
sbin/bacula-fd
2
sbin/bconsole
3
%%GNOMECONS%%sbin/gnome-console
4
%%WXCONS%%sbin/bwx-console
5
@unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true
6
@exec mkdir -p %%BACULA_DIR%%
7
@dirrmtry %%BACULA_DIR%%
8
@dirrm share/bacula

Return to bug 138478