diff options
| author | Dan Langille <dvl@FreeBSD.org> | 2016-11-13 23:09:06 +0000 |
|---|---|---|
| committer | Dan Langille <dvl@FreeBSD.org> | 2016-11-13 23:09:06 +0000 |
| commit | 73b3ebdd6f5982c97458d677fe6bfa27b7d76319 (patch) | |
| tree | f42ed4116d6581e757d6009ab90eaf312593f164 | |
| parent | d3e9d456037f0c79a681c78b9a12478c97410855 (diff) | |
| download | freebsd-ports-73b3ebdd6f5982c97458d677fe6bfa27b7d76319.zip | |
install correct query.sql{,.sample}
Bump PORTREVISION
Submitted by: Larry Rosenman
PR: 214489
| -rw-r--r-- | sysutils/bacula-server/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/bacula-server/pkg-plist | 1 | ||||
| -rw-r--r-- | sysutils/bacula-server/pkg-plist.client | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index c279ddd20c53..c2bc4dcb5fa4 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -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 diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist index 6da493f29228..85ea2a2140bf 100644 --- a/sysutils/bacula-server/pkg-plist +++ b/sysutils/bacula-server/pkg-plist @@ -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 diff --git a/sysutils/bacula-server/pkg-plist.client b/sysutils/bacula-server/pkg-plist.client index 395b9fc579c9..58839819e591 100644 --- a/sysutils/bacula-server/pkg-plist.client +++ b/sysutils/bacula-server/pkg-plist.client @@ -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 |