diff options
| author | acm <acm@FreeBSD.org> | 2015-08-15 00:33:39 +0800 |
|---|---|---|
| committer | acm <acm@FreeBSD.org> | 2015-08-15 00:33:39 +0800 |
| commit | e7df14e665943ce677b5c0036188ecc84287ef93 (patch) | |
| tree | 5603911f6467e36b6ca3f7bb145d3eee72bc7d41 | |
| parent | 0f253d3c0257e0bf6c403b35c421ebc50716b247 (diff) | |
| download | freebsd-ports-gnome-e7df14e665943ce677b5c0036188ecc84287ef93.tar.gz freebsd-ports-gnome-e7df14e665943ce677b5c0036188ecc84287ef93.tar.zst freebsd-ports-gnome-e7df14e665943ce677b5c0036188ecc84287ef93.zip | |
- /var/log/bareos and /var/run/bareos are created by bareos-client now. It
fixed a problem when bareos-client is started
PR: 202291
Reported by: timp87 _ at _ gmail.com
| -rw-r--r-- | sysutils/bareos-client/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/bareos-server/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/bareos-server/pkg-plist | 2 | ||||
| -rw-r--r-- | sysutils/bareos-server/pkg-plist.client | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index 044af1bb77f5..401ef24bba9e 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index d946616c4dde..d879dbeda80e 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= bareos DISTVERSION= 15.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server @@ -162,15 +162,13 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: -# This port does not install docs. See bacula-docs for that +# This port does not install docs. See bareos-docs for that ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in # Default bconsole.conf is in ${ETCDIR} @${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in @${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in .if defined(WITH_CLIENT_ONLY) -# In client port only install startup script out of script dir (see below post-install) -# Dont mkdir ${PREFIX}/share/bacula cause it's empty @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in .else diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index 0cbd86e2e6ab..05e2e214e6df 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -93,5 +93,3 @@ sbin/btraceback sbin/bwild sbin/chio-bareos @dir(bareos,bareos,) %%BAREOS_DIR%% -@dir(bareos,bareos,) /var/log/bareos -@dir(bareos,bareos,) /var/run/bareos diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client index 70e8dc6aace9..4b077500a144 100644 --- a/sysutils/bareos-server/pkg-plist.client +++ b/sysutils/bareos-server/pkg-plist.client @@ -30,5 +30,5 @@ bin/bconsole @dir(,bareos,) %%ETCDIR%% @dir lib/bareos/plugins @dir lib/bareos/scripts -@dir /var/log/bareos - +@dir(bareos,bareos,) /var/log/bareos +@dir(bareos,bareos,) /var/run/bareos |