svn commit: r448638 - head/sysutils/bacula-server

[Dan Langille]

Author: dvl
Date: Wed Aug 23 21:32:40 2017
New Revision: 448638
URL: https://svnweb.freebsd.org/changeset/ports/448638

Log:
  Do a better job with options with respect to DBTYPE.
  
  Submitted by:	des

Modified:
  head/sysutils/bacula-server/Makefile
  head/sysutils/bacula-server/pkg-plist

Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile	Wed Aug 23 20:37:16 2017	(r448637)
+++ head/sysutils/bacula-server/Makefile	Wed Aug 23 21:32:40 2017	(r448638)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bacula
 PORTVERSION=	7.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -31,10 +31,17 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS IPV6
-OPTIONS_DEFAULT?=	PGSQL
+OPTIONS_DEFINE?=	MTX PYTHON NLS IPV6
 MTX_DESC=		Install mtx for control of autochanger devices
 
+.if ${PKGNAMESUFFIX} == "-server"
+OPTIONS_MULTI=		BACKEND
+OPTIONS_MULTI_BACKEND=	SQLITE3 MYSQL PGSQL
+OPTIONS_DEFAULT+=	PGSQL
+.endif
+
+OPTIONS_SUB=		yes
+
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 
 PYTHON_USES=		python
@@ -110,28 +117,15 @@ CONFFILES=		sd dir
 # Server default database
 
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
-MYSQL_USE=		MYSQL=yes
+MYSQL_USES=		mysql
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+SQLITE3_USES=		sqlite:3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
-PGSQL_USE=		USES+=pgsql
+PGSQL_USES=		pgsql
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-DBTYPE=			mysql
-SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
-.elif ${PORT_OPTIONS:MSQLITE3}
-DBTYPE=			sqlite3
-.else
-DBTYPE=			postgresql
-SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
-USES+=  pgsql
 .endif
-PLIST_SUB+=		DBTYPE=${DBTYPE}
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -190,6 +184,9 @@ post-patch:
 
 .if !target(post-install)
 post-install:
+.if ! ${PORT_OPTIONS:MPYTHON}
+	${RM} ${STAGEDIR}${DATADIR}/dvd-handler
+.endif
 .if defined(WITH_CLIENT_ONLY)
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample

Modified: head/sysutils/bacula-server/pkg-plist
==============================================================================
--- head/sysutils/bacula-server/pkg-plist	Wed Aug 23 20:37:16 2017	(r448637)
+++ head/sysutils/bacula-server/pkg-plist	Wed Aug 23 21:32:40 2017	(r448638)
@@ -3,8 +3,12 @@
 @sample(,bacula,) %%ETCDIR%%/bacula-sd.conf.sample
 lib/libbaccats-%%LIB_VERSION%%.so
 lib/libbaccats.so
-lib/libbaccats-%%DBTYPE%%-%%LIB_VERSION%%.so
-lib/libbaccats-%%DBTYPE%%.so
+%%MYSQL%%lib/libbaccats-mysql-%%LIB_VERSION%%.so
+%%PGSQL%%lib/libbaccats-postgresql-%%LIB_VERSION%%.so
+%%SQLITE3%%lib/libbaccats-sqlite3-%%LIB_VERSION%%.so
+%%MYSQL%%lib/libbaccats-mysql.so
+%%PGSQL%%lib/libbaccats-postgresql.so
+%%SQLITE3%%lib/libbaccats-sqlite3.so
 lib/libbacsql-%%LIB_VERSION%%.so
 lib/libbacsql.so
 sbin/bacula
@@ -33,24 +37,36 @@ sbin/dbcheck
 %%DATADIR%%/btraceback.gdb
 %%DATADIR%%/btraceback.mdb
 %%DATADIR%%/create_bacula_database
-%%DATADIR%%/create_%%DBTYPE%%_database
+%%MYSQL%%%%DATADIR%%/create_mysql_database
+%%PGSQL%%%%DATADIR%%/create_postgresql_database
+%%SQLITE3%%%%DATADIR%%/create_sqlite3_database
 %%DATADIR%%/delete_catalog_backup
 %%DATADIR%%/disk-changer
 %%DATADIR%%/drop_bacula_database
 %%DATADIR%%/drop_bacula_tables
-%%DATADIR%%/drop_%%DBTYPE%%_database
-%%DATADIR%%/drop_%%DBTYPE%%_tables
-%%DATADIR%%/dvd-handler
+%%MYSQL%%%%DATADIR%%/drop_mysql_database
+%%PGSQL%%%%DATADIR%%/drop_postgresql_database
+%%SQLITE3%%%%DATADIR%%/drop_sqlite3_database
+%%MYSQL%%%%DATADIR%%/drop_mysql_tables
+%%PGSQL%%%%DATADIR%%/drop_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/drop_sqlite3_tables
+%%PYTHON%%%%DATADIR%%/dvd-handler
 %%DATADIR%%/grant_bacula_privileges
-%%DATADIR%%/grant_%%DBTYPE%%_privileges
+%%MYSQL%%%%DATADIR%%/grant_mysql_privileges
+%%PGSQL%%%%DATADIR%%/grant_postgresql_privileges
+%%SQLITE3%%%%DATADIR%%/grant_sqlite3_privileges
 %%DATADIR%%/make_bacula_tables
 %%DATADIR%%/make_catalog_backup
 %%DATADIR%%/make_catalog_backup.pl
-%%DATADIR%%/make_%%DBTYPE%%_tables
+%%MYSQL%%%%DATADIR%%/make_mysql_tables
+%%PGSQL%%%%DATADIR%%/make_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/make_sqlite3_tables
 %%DATADIR%%/mtx-changer
 %%DATADIR%%/mtx-changer.conf
 %%DATADIR%%/update_bacula_tables
-%%DATADIR%%/update_%%DBTYPE%%_tables
+%%MYSQL%%%%DATADIR%%/update_mysql_tables
+%%PGSQL%%%%DATADIR%%/update_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/update_sqlite3_tables
 @owner
 @group
 man/man1/bsmtp.1.gz