Index: head/sysutils/boxbackup/Makefile
===================================================================
--- head/sysutils/boxbackup/Makefile	(revision 473496)
+++ head/sysutils/boxbackup/Makefile	(revision 473497)
@@ -1,109 +1,109 @@
 # Created by: James O'Gorman <james@netinertia.co.uk>
 # $FreeBSD$
 
 PORTNAME=	boxbackup
 PORTVERSION=	0.11.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	${CLIENT_OR_SERVER}
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Open source, completely automatic on-line backup system for Unix
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE-DUAL.txt
 
 USES=		autoreconf perl5 ssl tar:tgz
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${OPENSSLINC}
+CFLAGS+=	-I${OPENSSLINC} -std=c++98
 LDFLAGS+=	-L${OPENSSLLIB} -lexecinfo
 
 MAKE_JOBS_UNSAFE=yes
 
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	READLINE
 
 OPTIONS_MULTI=	FLAVOUR
 OPTIONS_MULTI_FLAVOUR=	CLIENT SERVER
 
 CLIENT_DESC=	Install the bbackupd client
 SERVER_DESC=	Install the bbstored server
 
 OPTIONS_DEFAULT=CLIENT SERVER
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
 CONFIGURE_ARGS+=--enable-gnu-readline
 .endif
 
 MANCOMPRESSED=	yes
 .if ${PORT_OPTIONS:MCLIENT}
 USE_RC_SUBR+=	bbackupd
 PLIST_SUB+=	CLIENT=""
 SUB_LIST+=	CLIENT=""
 ALL_TARGET+=	build-backup-client
 INSTALL_TARGET+=install-backup-client
 SUB_FILES+=	999.boxbackup
 .else
 PLIST_SUB+=	CLIENT="@comment "
 SUB_LIST+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
 USE_RC_SUBR+=	bbstored
 USERS+=		_bbstored
 GROUPS+=	_bbstored
 PLIST_SUB+=	SERVER=""
 SUB_LIST+=	SERVER=""
 ALL_TARGET+=	build-backup-server
 INSTALL_TARGET+=install-backup-server
 .else
 PLIST_SUB+=	SERVER="@comment "
 SUB_LIST+=	SERVER="@comment "
 .endif
 
 .if ! ${PORT_OPTIONS:MCLIENT}
 # if this is a server-only install, CONFLICT with an install of the CLIENT or both
 CONFLICTS=	boxbackup-client-[0-9]* boxbackup-[0-9]*
 CLIENT_OR_SERVER=-server
 .elif ! ${PORT_OPTIONS:MSERVER}
 # if this is a client-only install, CONFLICT with an install of the SERVER or both
 CONFLICTS=	boxbackup-server-[0-9]* boxbackup-[0-9]*
 CLIENT_OR_SERVER=-client
 .else
 # if we install boxbackup-[0-9]*, we should CONFLICT with a CLIENT or SERVER only install
 # PKGNAMESUFFIX is empty at this point
 CONFLICTS=	boxbackup-server-[0-9]* boxbackup-client-[0-9]*
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/html/d' ${WRKSRC}/parcels.txt
 
 post-configure:
 	@${REINPLACE_CMD} -e '/share.doc.boxbackup/d' \
 		${WRKSRC}/parcels/scripts/install-backup-*
 
 post-install:
 .for f in bbstoreaccounts bbackupctl bbstored bbackupd bbackupquery
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${f}
 .endfor
 .if ${PORT_OPTIONS:MCLIENT}
 	@${MKDIR} -m 0700 ${STAGEDIR}/${PREFIX}/etc/boxbackup/bbackupd
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/periodic/monthly
 	${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${STAGEDIR}/${PREFIX}/etc/periodic/monthly
 .endif
 .if ${PORT_OPTIONS:MSERVER}
 	@${MKDIR} -m 0700 ${STAGEDIR}/${PREFIX}/etc/boxbackup/bbstored
 .endif
 
 test:
 	 @${ECHO_CMD} "===> Running tests"
 	 @${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.mk>
Index: head/sysutils/boxbackup/files/patch-bbackupd-config
===================================================================
--- head/sysutils/boxbackup/files/patch-bbackupd-config	(revision 473496)
+++ head/sysutils/boxbackup/files/patch-bbackupd-config	(revision 473497)
@@ -1,11 +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
+--- bin/bbackupd/bbackupd-config.in.orig	2013-01-25 13:17:39 UTC
++++ bin/bbackupd/bbackupd-config.in
 @@ -445,7 +445,7 @@
  
  Server
  {
 -	PidFile = $working_dir/bbackupd.pid
 +	PidFile = /var/run/bbackupd.pid
  }