svn commit: r406941 - in head/sysutils/bacula-server: . files

[Dan Langille]

Author: dvl
Date: Fri Jan 22 20:34:51 2016
New Revision: 406941
URL: https://svnweb.freebsd.org/changeset/ports/406941

Log:
  * use shebang instead of patching make_catalog_backup.pl
  * install the query.sql as query.sql.sample so we don't overwrite location
    edits

Deleted:
  head/sysutils/bacula-server/files/patch-src_cats_make__catalog__backup.pl.in
Modified:
  head/sysutils/bacula-server/Makefile
  head/sysutils/bacula-server/pkg-plist

Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile	Fri Jan 22 19:21:17 2016	(r406940)
+++ head/sysutils/bacula-server/Makefile	Fri Jan 22 20:34:51 2016	(r406941)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	7.4.0
+PORTREVISION=   1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -12,7 +13,7 @@ MAINTAINER=	dvl at FreeBSD.org
 COMMENT?=	Network backup solution (server)
 
 USES+=		libtool readline shebangfix
-SHEBANG_FILES=	scripts/dvd-handler.in
+SHEBANG_FILES=	scripts/dvd-handler.in src/cats/make_catalog_backup.pl.in
 python_OLD_CMD=	@PYTHON@
 USE_OPENSSL=	yes
 
@@ -190,6 +191,7 @@ post-install:
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
+	${MV} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
 	#the following are installed by the -CLIENT port, and I (ler at lerctr.org)
 	#don't know how to remove them from being built for the -SERVER port.
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so

Modified: head/sysutils/bacula-server/pkg-plist
==============================================================================
--- head/sysutils/bacula-server/pkg-plist	Fri Jan 22 19:21:17 2016	(r406940)
+++ head/sysutils/bacula-server/pkg-plist	Fri Jan 22 20:34:51 2016	(r406941)
@@ -49,7 +49,7 @@ sbin/dbcheck
 %%DATADIR%%/make_%%DBTYPE%%_tables
 %%DATADIR%%/mtx-changer
 %%DATADIR%%/mtx-changer.conf
-%%DATADIR%%/query.sql
+%%DATADIR%%/query.sql.sample
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables
 @owner