From owner-svn-ports-head@freebsd.org Sun Nov 13 23:09:07 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 DEFFEC40388; Sun, 13 Nov 2016 23:09:07 +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 88CE71FBC; Sun, 13 Nov 2016 23:09:07 +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 uADN96ge049132; Sun, 13 Nov 2016 23:09:06 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uADN96Io049129; Sun, 13 Nov 2016 23:09:06 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201611132309.uADN96Io049129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Sun, 13 Nov 2016 23:09:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426074 - head/sysutils/bacula-server 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.23 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: Sun, 13 Nov 2016 23:09:08 -0000 Author: dvl Date: Sun Nov 13 23:09:06 2016 New Revision: 426074 URL: https://svnweb.freebsd.org/changeset/ports/426074 Log: install correct query.sql{,.sample} Bump PORTREVISION Submitted by: Larry Rosenman PR: 214489 Modified: head/sysutils/bacula-server/Makefile head/sysutils/bacula-server/pkg-plist head/sysutils/bacula-server/pkg-plist.client Modified: head/sysutils/bacula-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Sun Nov 13 23:05:23 2016 (r426073) +++ head/sysutils/bacula-server/Makefile Sun Nov 13 23:09:06 2016 (r426074) @@ -3,7 +3,7 @@ PORTNAME= bacula DISTVERSION= 7.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -188,10 +188,13 @@ post-patch: post-install: .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 .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 + # bacula-dir attempts to install query.sql as bpart of bacula-server, but that should only installed by bacula-client. + ${RM} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql + #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 Sun Nov 13 23:05:23 2016 (r426073) +++ head/sysutils/bacula-server/pkg-plist Sun Nov 13 23:09:06 2016 (r426074) @@ -49,7 +49,6 @@ sbin/dbcheck %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/mtx-changer %%DATADIR%%/mtx-changer.conf -@sample(,bacula,640) %%DATADIR%%/query.sql.sample %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables @owner Modified: head/sysutils/bacula-server/pkg-plist.client ============================================================================== --- head/sysutils/bacula-server/pkg-plist.client Sun Nov 13 23:05:23 2016 (r426073) +++ head/sysutils/bacula-server/pkg-plist.client Sun Nov 13 23:09:06 2016 (r426074) @@ -15,3 +15,4 @@ sbin/bacula-fd @dir(bacula,bacula,) %%BACULA_DIR%% @dir share/bacula @dir(,bacula,) %%ETCDIR%% +@sample(,bacula,644) share/bacula/query.sql.sample