diff --git a/UPDATING b/UPDATING index a66ff4931f73..12f84488f730 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130206: + AFFECTS: users of sysutils/boxbackup + AUTHOR: bdrewery@FreeBSD.org + + The default location of the configuration files changed from + /usr/local/etc/box to /usr/local/etc/boxbackup. Move your + configuration after upgrading: + + mv /usr/local/etc/box /usr/local/etc/boxbackup + 20130206: AFFECTS: users of x11/wbar AUTHOR: nivit@FreeBSD.org diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile index 0d9797f5b339..e3baf66bec54 100644 --- a/sysutils/boxbackup/Makefile +++ b/sysutils/boxbackup/Makefile @@ -3,7 +3,7 @@ PORTNAME= boxbackup PORTVERSION= 0.11.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMESUFFIX= ${CLIENT_OR_SERVER} @@ -89,7 +89,8 @@ post-patch: @${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE} .endif .if !defined(WITHOUT_SERVER) - @${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE} + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ + ${FILESDIR}/pkg-message.server.in >> ${PKGMESSAGE} .endif post-configure: @@ -97,12 +98,12 @@ post-configure: post-install: .if !defined(WITHOUT_CLIENT) - @${MKDIR} -m 0700 ${PREFIX}/etc/box/bbackupd + @${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbackupd @${MKDIR} ${PREFIX}/etc/periodic/monthly ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly .endif .if !defined(WITHOUT_SERVER) - @${MKDIR} -m 0700 ${PREFIX}/etc/box/bbstored + @${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbstored .endif @${CAT} ${PKGMESSAGE} diff --git a/sysutils/boxbackup/files/patch-bbackupd-config b/sysutils/boxbackup/files/patch-bbackupd-config new file mode 100644 index 000000000000..81a15385159d --- /dev/null +++ b/sysutils/boxbackup/files/patch-bbackupd-config @@ -0,0 +1,11 @@ +--- bin/bbackupd/bbackupd-config.in.orig 2013-01-25 13:17:39.942303010 +1300 ++++ bin/bbackupd/bbackupd-config.in 2013-01-25 13:18:04.021348906 +1300 +@@ -445,7 +445,7 @@ + + Server + { +- PidFile = $working_dir/bbackupd.pid ++ PidFile = /var/run/bbackupd.pid + } + + diff --git a/sysutils/boxbackup/files/pkg-message.server b/sysutils/boxbackup/files/pkg-message.server deleted file mode 100644 index 872c82bf5ed8..000000000000 --- a/sysutils/boxbackup/files/pkg-message.server +++ /dev/null @@ -1,4 +0,0 @@ - -To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf -Please see http://www.boxbackup.org/server.html for server configuration -options diff --git a/sysutils/boxbackup/files/pkg-message.server.in b/sysutils/boxbackup/files/pkg-message.server.in new file mode 100644 index 000000000000..94a1c35f64fe --- /dev/null +++ b/sysutils/boxbackup/files/pkg-message.server.in @@ -0,0 +1,8 @@ + +To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf +Please see http://www.boxbackup.org/server.html for server configuration +options + +The default location of configuration files changed from %%PREFIX%%/etc/box to +%%PREFIX%%/etc/boxbackup, if you are upgrading then run + mv %%PREFIX%%/etc/box %%PREFIX%%/etc/boxbackup diff --git a/sysutils/boxbackup/pkg-plist b/sysutils/boxbackup/pkg-plist index 94e5d889b6cc..983bcbaa529d 100644 --- a/sysutils/boxbackup/pkg-plist +++ b/sysutils/boxbackup/pkg-plist @@ -7,11 +7,11 @@ %%SERVER%%sbin/bbstored-certs %%SERVER%%sbin/bbstored-config %%SERVER%%sbin/raidfile-config -%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd -%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored -%%CLIENT%%@dirrmtry etc/box/bbackupd -%%SERVER%%@dirrmtry etc/box/bbstored +%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/boxbackup/bbackupd +%%SERVER%%@exec mkdir -p -m 0700 %D/etc/boxbackup/bbstored +%%CLIENT%%@dirrmtry etc/boxbackup/bbackupd +%%SERVER%%@dirrmtry etc/boxbackup/bbstored etc/periodic/monthly/999.boxbackup @dirrmtry etc/periodic/monthly @dirrmtry etc/periodic -@dirrmtry etc/box +@dirrmtry etc/boxbackup