Date: Thu, 7 Feb 2013 00:22:55 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311807 - in head: . sysutils/boxbackup sysutils/boxbackup/files Message-ID: <201302070022.r170Mtnf025670@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Feb 7 00:22:55 2013 New Revision: 311807 URL: http://svnweb.freebsd.org/changeset/ports/311807 Log: - Always use /var/run/bbackupd.pid for the server pidfile - The default configuration directory has moved from /usr/local/etc/box to /usr/local/etc/boxbackup PR: ports/175497 Submitted by: thompsa@ Approved by: James O'Gorman <james@netinertia.co.uk> (maintainer) Added: head/sysutils/boxbackup/files/patch-bbackupd-config (contents, props changed) head/sysutils/boxbackup/files/pkg-message.server.in - copied, changed from r311797, head/sysutils/boxbackup/files/pkg-message.server Deleted: head/sysutils/boxbackup/files/pkg-message.server Modified: head/UPDATING head/sysutils/boxbackup/Makefile head/sysutils/boxbackup/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Feb 6 23:40:25 2013 (r311806) +++ head/UPDATING Thu Feb 7 00:22:55 2013 (r311807) @@ -6,6 +6,16 @@ You should get into the habit of checkin 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 Modified: head/sysutils/boxbackup/Makefile ============================================================================== --- head/sysutils/boxbackup/Makefile Wed Feb 6 23:40:25 2013 (r311806) +++ head/sysutils/boxbackup/Makefile Thu Feb 7 00:22:55 2013 (r311807) @@ -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} Added: head/sysutils/boxbackup/files/patch-bbackupd-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/boxbackup/files/patch-bbackupd-config Thu Feb 7 00:22:55 2013 (r311807) @@ -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 + } + + Copied and modified: head/sysutils/boxbackup/files/pkg-message.server.in (from r311797, head/sysutils/boxbackup/files/pkg-message.server) ============================================================================== --- head/sysutils/boxbackup/files/pkg-message.server Wed Feb 6 21:34:52 2013 (r311797, copy source) +++ head/sysutils/boxbackup/files/pkg-message.server.in Thu Feb 7 00:22:55 2013 (r311807) @@ -2,3 +2,7 @@ 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 Modified: head/sysutils/boxbackup/pkg-plist ============================================================================== --- head/sysutils/boxbackup/pkg-plist Wed Feb 6 23:40:25 2013 (r311806) +++ head/sysutils/boxbackup/pkg-plist Thu Feb 7 00:22:55 2013 (r311807) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302070022.r170Mtnf025670>