From owner-svn-ports-head@freebsd.org Fri Jan 22 20:34:52 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8D3CA8DC78; Fri, 22 Jan 2016 20:34:52 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C90313D1; Fri, 22 Jan 2016 20:34:52 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MKYpR6014310; Fri, 22 Jan 2016 20:34:51 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MKYp7Y014308; Fri, 22 Jan 2016 20:34:51 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201601222034.u0MKYp7Y014308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Fri, 22 Jan 2016 20:34:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406941 - in head/sysutils/bacula-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2016 20:34:52 -0000 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@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@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