Attachment #117322 for bug #159399




#

PORTNAME=	boxbackup
PORTVERSION=	0.11.1
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	SF
PKGNAMESUFFIX=	${CLIENT_OR_SERVER}
EXTRACT_SUFX=	.tgz

MAINTAINER=	james@netinertia.co.uk

USE_AUTOTOOLS=	autoconf aclocal autoheader
ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4

# Box now defaults to /etc for configuration. Linux devs make me sad.
# Override this.
CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc

PKGMESSAGE=	${WRKDIR}/pkg-message

OPTIONS=	CLIENT "Install the bbackupd client" On \
		SERVER "Install the bbstored server" On \
		GNUREADLINE "Enable the use of GNU readline" Off
		TESTS  "Allows use of a 'test' target to run tests" Off

.include <bsd.port.pre.mk>

TARGETOS!=	${ECHO_CMD} `${UNAME} -s``${UNAME} -r | ${SED} -e 's/[-(].*//'` | ${TR} A-Z a-z

.if defined(WITH_GNUREADLINE)
CONFIGURE_ARGS+=--enable-gnu-readline
.endif

		Please 'make config' again
.endif

MANCOMPRESSED=	yes
.if defined(WITH_CLIENT)
USE_RC_SUBR+=	bbackupd
USE_RC_SUBR+=	bbackupd.sh
PLIST_SUB+=	CLIENT=""
ALL_TARGET+=	build-backup-client
INSTALL_TARGET+=install-backup-client
MAN5+=		bbackupd.conf.5
MAN8+=		bbackupd.8 bbackupctl.8 bbackupd-config.8 bbackupquery.8
SUB_FILES+=	999.boxbackup
.else
PLIST_SUB+=	CLIENT="@comment "
.endif

.if defined(WITH_SERVER)
USE_RC_SUBR+=	bbstored
USERS+=		_bbstored
GROUPS+=	_bbstored
PLIST_SUB+=	SERVER=""
ALL_TARGET+=	build-backup-server
INSTALL_TARGET+=install-backup-server
MAN5+=		bbstored.conf.5 raidfile.conf.5
MAN8+=		bbstored.8 bbstoreaccounts.8 bbstored-certs.8 bbstored-config.8 raidfile-config.8
.else
PLIST_SUB+=	SERVER="@comment "
.endif

CONFLICTS=	boxbackup-server-[0-9]* boxbackup-client-[0-9]*
.if defined(WITHOUT_CLIENT)
CONFLICTS=	boxbackup-client-[0-9]*
CLIENT_OR_SERVER=-server
.elif defined(WITHOUT_SERVER)
CONFLICTS=	boxbackup-server-[0-9]*
CLIENT_OR_SERVER=-client
.endif

post-patch:
# Replace hard-coded /etc/box with $PREFIX/etc/box
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
		${WRKSRC}/lib/common/BoxPortsAndFiles.h
# Fix path to perl
	@${FIND} ${WRKSRC} -name "*.pl" -exec \
		${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' {} \;
	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' \
		${WRKSRC}/bin/bbackupd/bbackupd-config \
		${WRKSRC}/bin/bbstored/bbstored-certs \
		${WRKSRC}/bin/bbstored/bbstored-config \
		${WRKSRC}/lib/raidfile/raidfile-config
	@${FIND} ${WRKSRC} -name "Makefile.extra" -exec \
		${REINPLACE_CMD} -e 's,perl,${PERL},g' {} \;
	@${REINPLACE_CMD} -e 's,perl ,${PERL} ,g' \
		${WRKSRC}/test/bbackupd/testfiles/bbackupd.conf \
		${WRKSRC}/infrastructure/makebuildenv.pl
	@${REINPLACE_CMD} -e 's,"perl ,PERL_EXECUTABLE " ,g' \
		${WRKSRC}/test/backupstorefix/testbackupstorefix.cpp
# Fix hard-coded g++
	@${REINPLACE_CMD} -e 's,g++,${CXX},' \
		 ${WRKSRC}/infrastructure/makebuildenv.pl
.if !defined(WITHOUT_CLIENT)
	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}
.endif

	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}
.endif

do-install:
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
.if !defined(WITHOUT_CLIENT)
	@${MKDIR} ${PREFIX}/etc/periodic/monthly; \
	 ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly
.endif

post-install:

.endif
	@${CAT} ${PKGMESSAGE}

.if defined(WITH_TESTS)
test:
	 @${ECHO_CMD} "===> Running tests"
	 @${MAKE} -C ${WRKSRC} test
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (boxbackup-0.10.tgz) = 09e88f4ee26b76b3d6e6a0cf3fc374e55d79dd84e9884dfc6a7635593862d361	1	SHA256 (boxbackup-0.11.1.tgz) = 1328b010477259c4767276dbfebab6580e883336cc9d25696c39991b09cc6d32
2	SIZE (boxbackup-0.10.tgz) = 842450	2	SIZE (boxbackup-0.11.1.tgz) = 1863270




#! /bin/sh
#
# ex:ts=4

ask() {
	local question default answer

	question=$1
	default=$2
	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
		read -p "${question} [${default}]? " answer
	fi
	echo ${answer:-${default}}
}

yesno() {
	local question default answer

	question=$1
	default=$2
	while :; do
		answer=$(ask "${question}" "${default}")
		case "${answer}" in
		[Yy]*)	return 0;;
		[Nn]*)	return 1;;
		esac
		echo "Please answer yes or no."
	done
}

delete_account() {
	local u pw

	u=$1
	pw=`pw usershow ${u} >/dev/null 2>&1`
	if [ $? -eq 0 ]; then
		if yesno "Do you want me to remove user \"${u}\"" n; then
			pw userdel -n ${u}
			echo "Done."
		fi
	fi
}

case $2 in

DEINSTALL)
	if ps -axc | grep -qw bbstored; then
		if yesno "bbstored is still running. Shall I stop it?" y; then
			killall bbstored
			sleep 2
		else
			echo "OK ... I hope you know what you are doing."
		fi
	fi

	if ps -axc | grep -qw bbackupd; then
		if yesno "bbackupd is still running. Shall I stop it?" y; then
			killall bbackupd
			sleep 2
		else
			echo "OK ... I hope you know what you are doing."
		fi
	fi

	delete_account _bbstored

	;;

esac

Lines 10-13 Link Here

(-)pkg-descr (-1 / +1 lines)
10	Once set up, there should be no need for user or administrative	10	Once set up, there should be no need for user or administrative
11	intervention, apart from usual system maintenance.	11	intervention, apart from usual system maintenance.
12		12
13	WWW: http://www.fluffy.co.uk/boxbackup/	13	WWW: http://www.boxbackup.org/




#!/bin/sh

# $FreeBSD: ports/sysutils/boxbackup/pkg-install,v 1.3 2006/03/24 19:31:14 mnag Exp $

case $2 in
PRE-INSTALL)
	USER=_bbstored
	GROUP=${USER}
	UID=505
	GID=${UID}

	if pw group show "${GROUP}" 2>/dev/null; then
		echo "You already have a group \"${GROUP}\", so I will use it."
	else
		if pw groupadd ${GROUP} -g ${GID}; then
                        echo "Added group \"${GROUP}\"."
                else
                        echo "Adding group \"${GROUP}\" failed..."
                        exit 1
                fi
        fi

	if pw user show "${USER}" 2>/dev/null; then
		echo "You already have a user \"${USER}\", so I will use it."
	else
		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
			-d /nonexistent -c "Box Backup Store Daemon"
		then
			echo "Added user \"${USER}\"."
		else
			echo "Adding user \"${USER}\" failed..."
			exit 1
		fi
	fi
	;;
esac




%%CLIENT%%sbin/bbackupctl
%%CLIENT%%sbin/bbackupd
%%CLIENT%%sbin/bbackupd-config
%%CLIENT%%sbin/bbackupquery
%%SERVER%%sbin/bbstoreaccounts
%%SERVER%%sbin/bbstored
%%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




#!/bin/sh
#
# $FreeBSD$
#
# Box Backup monthly store compare
#
# Add the following to /etc/periodic.conf to enable the monthly compare:
#  monthly_boxbackup_compare_enable="YES"
#
# By default the script will run "compare -aq". If you want to change this to
# run a full compare, add the following to periodic.conf:
#  monthly_boxbackup_compare_args="-a"
#
# NOTE: This script will cause the monthly periodic(8) run to take much longer
# than usual, depending on the size of your backup store.
#
# If you wish to run this independently of the monthly job, you can create a
# new periodic entry as follows:
#
#  # mkdir /usr/local/etc/periodic/boxbackup
#  # mv /usr/local/etc/periodic/monthly/999.boxbackup \
#       /usr/local/etc/periodic/boxbackup/100.compare
#
# Then add the following to /etc/crontab:
# 30      5       1       *       *       root    periodic boxbackup
#
# (adjust the timings as necessary)
#
# You may also wish to add boxbackup_output="root" to periodic.conf so that
# mail comes from periodic rather than cron.

monthly_boxbackup_compare_enable="NO"
monthly_boxbackup_compare_args="-aq"

if [ -r /etc/defaults/periodic.conf ]
then
	. /etc/defaults/periodic.conf
	source_periodic_confs
fi

rc=0

case "$monthly_boxbackup_compare_enable" in
	[Yy][Ee][Ss])
		echo
		echo "Running Box Backup store compare:"
		%%PREFIX%%/sbin/bbackupquery -q "compare -c $monthly_boxbackup_compare_args" quit

		# Return codes:
		#  1    Comparison was exact
		#  2    Differences were found
		#  3    An error occured
		if [ $? -eq 2 ]; then
			echo
			echo "Differences were found. Please check the output."
			rc=3
		elif [ $? -eq 3 ]; then
			echo
			echo "An error occurred. Please check the output."
			rc=3
		fi

		;;
esac

exit $rc




#!/bin/sh
#
# $FreeBSD: ports/sysutils/boxbackup/files/bbackupd.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
#
# PROVIDE: bbackupd
# REQUIRE: NETWORKING
# KEYWORD: shutdown

#
# Add the following line to /etc/rc.conf to enable bbackupd:
#
#bbackupd_enable="YES"
#

: ${bbackupd_enable:="NO"}
: ${bbackupd_flags:="%%PREFIX%%/etc/box/bbackupd.conf"}
: ${bbackupd_pidfile:="/var/run/bbackupd.pid"}

. /etc/rc.subr

name="bbackupd"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/bbackupd"
extra_commands="reload"

load_rc_config $name
run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD: ports/sysutils/boxbackup/files/bbackupd.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
#
# PROVIDE: bbackupd
# REQUIRE: NETWORKING
# KEYWORD: shutdown

#
# Add the following line to /etc/rc.conf to enable bbackupd:
#
#bbackupd_enable="YES"
#

: ${bbackupd_enable:="NO"}
: ${bbackupd_flags:="%%PREFIX%%/etc/box/bbackupd.conf"}
: ${bbackupd_pidfile:="/var/run/bbackupd.pid"}

. /etc/rc.subr

name="bbackupd"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/bbackupd"
extra_commands="reload"

load_rc_config $name
run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD: ports/sysutils/boxbackup/files/bbstored.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
#
# PROVIDE: bbstored
# REQUIRE: NETWORKING
# KEYWORD: shutdown

#
# Add the following line to /etc/rc.conf to enable bbstored:
#
#bbstored_enable="YES"
#

: ${bbstored_enable:="NO"}
: ${bbstored_flags:="%%PREFIX%%/etc/box/bbstored.conf"}
: ${bbstored_pidfile:="/var/run/bbstored.pid"}

. /etc/rc.subr

name="bbstored"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/bbstored"
extra_commands="reload"

load_rc_config $name
run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD: ports/sysutils/boxbackup/files/bbstored.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
#
# PROVIDE: bbstored
# REQUIRE: NETWORKING
# KEYWORD: shutdown

#
# Add the following line to /etc/rc.conf to enable bbstored:
#
#bbstored_enable="YES"
#

: ${bbstored_enable:="NO"}
: ${bbstored_flags:="%%PREFIX%%/etc/box/bbstored.conf"}
: ${bbstored_pidfile:="/var/run/bbstored.pid"}

. /etc/rc.subr

name="bbstored"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/bbstored"
extra_commands="reload"

load_rc_config $name
run_rc_command "$1"




--- configure.ac.orig	Thu Mar 16 22:26:39 2006
+++ configure.ac	Thu Mar 16 22:28:31 2006
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk])
+AC_INIT([Box Backup], 0.10, [box@fluffy.co.uk])
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
 
@@ -26,6 +26,12 @@
   # Use -rdynamic if we have gcc. This is needed for backtrace
   AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
 fi
+AC_PATH_PROG([PERL], [perl], [no])
+if test "x$PERL" != "xno"; then
+  AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
+else
+  AC_MSG_ERROR([[perl executable was not found]])
+fi
 
 
 ### Checks for libraries.
@@ -208,8 +214,8 @@
 
 # Configure the Box build system
 echo
-perl ./infrastructure/makebuildenv.pl &&
-  perl ./infrastructure/makeparcels.pl
+$PERL ./infrastructure/makebuildenv.pl &&
+  $PERL ./infrastructure/makeparcels.pl
 
 # Write summary of important info
 cat <<EOC




--- lib/common/BoxPortsAndFiles.h.orig	Thu Mar 16 19:28:09 2006
+++ lib/common/BoxPortsAndFiles.h	Thu Mar 16 19:28:38 2006
@@ -53,7 +53,7 @@
 
 // Backup store daemon
 #define BOX_PORT_BBSTORED					(BOX_PORT_BASE+1)
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG	"/etc/box/bbstored.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG	"%%PREFIX%%/etc/box/bbstored.conf"
 // directory within the RAIDFILE root for the backup store daemon
 #define BOX_RAIDFILE_ROOT_BBSTORED			"backup"
 
@@ -61,11 +61,11 @@
 #ifdef WIN32
 #define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"C:\\Program Files\\Box Backup\\bbackupd.conf"
 #else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"/etc/box/bbackupd.conf"
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG	"%%PREFIX%%/etc/box/bbackupd.conf"
 #endif
 
 // RaidFile conf location default
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG	"/etc/box/raidfile.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG	"%%PREFIX%%/etc/box/raidfile.conf"
 
 // Default name of the named pipe
 #define BOX_NAMED_PIPE_NAME L"\\\\.\\pipe\\boxbackup"

Lines 1-4 Link Here

(-)files/pkg-message.client (-2 / +2 lines)
1		1
2	To run bbackupd at startup, add bbackupd_enable="YES" to /etc/rc.conf	2	To run bbackupd at startup, add bbackupd_enable="YES" to /etc/rc.conf
3	Please see http://www.fluffy.co.uk/boxbackup/client.html for client	3	Please see http://www.boxbackup.org/client.html for client configuration
4	configuration options	4	options

Lines 1-4 Link Here

(-)files/pkg-message.server (-2 / +2 lines)
1		1
2	To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf	2	To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf
3	Please see http://www.fluffy.co.uk/boxbackup/server.html for server	3	Please see http://www.boxbackup.org/server.html for server configuration
4	configuration options	4	options

Return to bug 159399

Lines 6-15 Link Here

(-)Makefile (-45 / +32 lines)
6	#	6	#
7		7
8	PORTNAME= boxbackup	8	PORTNAME= boxbackup
9	PORTVERSION= 0.10	9	PORTVERSION= 0.11.1
10	PORTREVISION= 2
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= SF	11	MASTER_SITES= SF
		12	PKGNAMESUFFIX= ${CLIENT_OR_SERVER}
13	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
14		14
15	MAINTAINER= james@netinertia.co.uk	15	MAINTAINER= james@netinertia.co.uk
Lines 21-37 Link Here
21	USE_AUTOTOOLS= autoconf aclocal autoheader	21	USE_AUTOTOOLS= autoconf aclocal autoheader
22	ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4	22	ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
23		23
		24	# Box now defaults to /etc for configuration. Linux devs make me sad.
		25	# Override this.
		26	CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
		27
24	PKGMESSAGE= ${WRKDIR}/pkg-message	28	PKGMESSAGE= ${WRKDIR}/pkg-message
25		29
26	OPTIONS= CLIENT "Install the bbackupd client" On \	30	OPTIONS= CLIENT "Install the bbackupd client" On \
27	SERVER "Install the bbstored server" On \	31	SERVER "Install the bbstored server" On \
28	GNUREADLINE "Enable the use of GNU readline" Off \	32	GNUREADLINE "Enable the use of GNU readline" Off
29	TESTS "Allows use of a 'test' target to run tests" Off
30		33
31	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
32		35
33	TARGETOS!= ${ECHO_CMD} `${UNAME} -s``${UNAME} -r \| ${SED} -e 's/[-(].*//'` \| ${TR} A-Z a-z
34
35	.if defined(WITH_GNUREADLINE)	36	.if defined(WITH_GNUREADLINE)
36	CONFIGURE_ARGS+=--enable-gnu-readline	37	CONFIGURE_ARGS+=--enable-gnu-readline
37	.endif	38	.endif
Lines 41-95 Link Here
41	Please 'make config' again	42	Please 'make config' again
42	.endif	43	.endif
43		44
44	.if defined(WITHOUT_CLIENT)	45	MANCOMPRESSED= yes
45	PLIST_SUB+= CLIENT="@comment "	46	.if defined(WITH_CLIENT)
46	.else	47	USE_RC_SUBR+= bbackupd
47	USE_RC_SUBR+= bbackupd.sh
48	PLIST_SUB+= CLIENT=""	48	PLIST_SUB+= CLIENT=""
49	ALL_TARGET+= parcels/${DISTNAME}-backup-client-${TARGETOS}.tgz	49	ALL_TARGET+= build-backup-client
50	INSTALL_TARGET+=install-backup-client	50	INSTALL_TARGET+=install-backup-client
		51	MAN5+= bbackupd.conf.5
		52	MAN8+= bbackupd.8 bbackupctl.8 bbackupd-config.8 bbackupquery.8
		53	SUB_FILES+= 999.boxbackup
		54	.else
		55	PLIST_SUB+= CLIENT="@comment "
51	.endif	56	.endif
52		57
53	.if defined(WITHOUT_SERVER)	58	.if defined(WITH_SERVER)
54	PLIST_SUB+= SERVER="@comment "	59	USE_RC_SUBR+= bbstored
55	.else	60	USERS+= _bbstored
56	USE_RC_SUBR+= bbstored.sh	61	GROUPS+= _bbstored
57	PLIST_SUB+= SERVER=""	62	PLIST_SUB+= SERVER=""
58	ALL_TARGET+= parcels/${DISTNAME}-backup-server-${TARGETOS}.tgz	63	ALL_TARGET+= build-backup-server
59	INSTALL_TARGET+=install-backup-server	64	INSTALL_TARGET+=install-backup-server
		65	MAN5+= bbstored.conf.5 raidfile.conf.5
		66	MAN8+= bbstored.8 bbstoreaccounts.8 bbstored-certs.8 bbstored-config.8 raidfile-config.8
		67	.else
		68	PLIST_SUB+= SERVER="@comment "
60	.endif	69	.endif
61		70
62	CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]*	71	CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]*
63	.if defined(WITHOUT_CLIENT)	72	.if defined(WITHOUT_CLIENT)
64	CONFLICTS= boxbackup-client-[0-9]*	73	CONFLICTS= boxbackup-client-[0-9]*
65	PKGNAMESUFFIX= -server	74	CLIENT_OR_SERVER=-server
66	.elif defined(WITHOUT_SERVER)	75	.elif defined(WITHOUT_SERVER)
67	CONFLICTS= boxbackup-server-[0-9]*	76	CONFLICTS= boxbackup-server-[0-9]*
68	PKGNAMESUFFIX= -client	77	CLIENT_OR_SERVER=-client
69	.endif	78	.endif
70		79
71	post-patch:	80	post-patch:
72	# Replace hard-coded /etc/box with $PREFIX/etc/box
73	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
74	${WRKSRC}/lib/common/BoxPortsAndFiles.h
75	# Fix path to perl
76	@${FIND} ${WRKSRC} -name "*.pl" -exec \
77	${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' {} \;
78	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' \
79	${WRKSRC}/bin/bbackupd/bbackupd-config \
80	${WRKSRC}/bin/bbstored/bbstored-certs \
81	${WRKSRC}/bin/bbstored/bbstored-config \
82	${WRKSRC}/lib/raidfile/raidfile-config
83	@${FIND} ${WRKSRC} -name "Makefile.extra" -exec \
84	${REINPLACE_CMD} -e 's,perl,${PERL},g' {} \;
85	@${REINPLACE_CMD} -e 's,perl ,${PERL} ,g' \
86	${WRKSRC}/test/bbackupd/testfiles/bbackupd.conf \
87	${WRKSRC}/infrastructure/makebuildenv.pl
88	@${REINPLACE_CMD} -e 's,"perl ,PERL_EXECUTABLE " ,g' \
89	${WRKSRC}/test/backupstorefix/testbackupstorefix.cpp
90	# Fix hard-coded g++
91	@${REINPLACE_CMD} -e 's,g++,${CXX},' \
92	${WRKSRC}/infrastructure/makebuildenv.pl
93	.if !defined(WITHOUT_CLIENT)	81	.if !defined(WITHOUT_CLIENT)
94	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}	82	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}
95	.endif	83	.endif
Lines 97-106 Link Here
97	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}	85	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}
98	.endif	86	.endif
99		87
100	.if !defined(WITHOUT_SERVER)	88	do-install:
101	pre-install:	89	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
102	@${SETENV} PKG_PREFIX=${PREFIX} \	90	.if !defined(WITHOUT_CLIENT)
103	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	91	@${MKDIR} ${PREFIX}/etc/periodic/monthly; \
		92	${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly
104	.endif	93	.endif
105		94
106	post-install:	95	post-install:
Lines 112-121 Link Here
112	.endif	101	.endif
113	@${CAT} ${PKGMESSAGE}	102	@${CAT} ${PKGMESSAGE}
114		103
115	.if defined(WITH_TESTS)
116	test:	104	test:
117	@${ECHO_CMD} "===> Running tests"	105	@${ECHO_CMD} "===> Running tests"
118	@${MAKE} -C ${WRKSRC} test	106	@${MAKE} -C ${WRKSRC} test
119	.endif
120		107
121	.include <bsd.port.post.mk>	108	.include <bsd.port.post.mk>

Removed Link Here

(-)pkg-deinstall (-69 lines)
1	#! /bin/sh
2	#
3	# ex:ts=4
4
5	ask() {
6	local question default answer
7
8	question=$1
9	default=$2
10	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
11	read -p "${question} [${default}]? " answer
12	fi
13	echo ${answer:-${default}}
14	}
15
16	yesno() {
17	local question default answer
18
19	question=$1
20	default=$2
21	while :; do
22	answer=$(ask "${question}" "${default}")
23	case "${answer}" in
24	[Yy]*) return 0;;
25	[Nn]*) return 1;;
26	esac
27	echo "Please answer yes or no."
28	done
29	}
30
31	delete_account() {
32	local u pw
33
34	u=$1
35	pw=`pw usershow ${u} >/dev/null 2>&1`
36	if [ $? -eq 0 ]; then
37	if yesno "Do you want me to remove user \"${u}\"" n; then
38	pw userdel -n ${u}
39	echo "Done."
40	fi
41	fi
42	}
43
44	case $2 in
45
46	DEINSTALL)
47	if ps -axc \| grep -qw bbstored; then
48	if yesno "bbstored is still running. Shall I stop it?" y; then
49	killall bbstored
50	sleep 2
51	else
52	echo "OK ... I hope you know what you are doing."
53	fi
54	fi
55
56	if ps -axc \| grep -qw bbackupd; then
57	if yesno "bbackupd is still running. Shall I stop it?" y; then
58	killall bbackupd
59	sleep 2
60	else
61	echo "OK ... I hope you know what you are doing."
62	fi
63	fi
64
65	delete_account _bbstored
66
67	;;
68
69	esac

Removed Link Here

(-)pkg-install (-36 lines)
1	#!/bin/sh
2
3	# $FreeBSD: ports/sysutils/boxbackup/pkg-install,v 1.3 2006/03/24 19:31:14 mnag Exp $
4
5	case $2 in
6	PRE-INSTALL)
7	USER=_bbstored
8	GROUP=${USER}
9	UID=505
10	GID=${UID}
11
12	if pw group show "${GROUP}" 2>/dev/null; then
13	echo "You already have a group \"${GROUP}\", so I will use it."
14	else
15	if pw groupadd ${GROUP} -g ${GID}; then
16	echo "Added group \"${GROUP}\"."
17	else
18	echo "Adding group \"${GROUP}\" failed..."
19	exit 1
20	fi
21	fi
22
23	if pw user show "${USER}" 2>/dev/null; then
24	echo "You already have a user \"${USER}\", so I will use it."
25	else
26	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
27	-d /nonexistent -c "Box Backup Store Daemon"
28	then
29	echo "Added user \"${USER}\"."
30	else
31	echo "Adding user \"${USER}\" failed..."
32	exit 1
33	fi
34	fi
35	;;
36	esac

Lines 1-12 Link Here

(-)pkg-plist (-9 / +9 lines)
1	%%CLIENT%%bin/bbackupctl	1	%%CLIENT%%sbin/bbackupctl
2	%%CLIENT%%bin/bbackupd	2	%%CLIENT%%sbin/bbackupd
3	%%CLIENT%%bin/bbackupd-config	3	%%CLIENT%%sbin/bbackupd-config
4	%%CLIENT%%bin/bbackupquery	4	%%CLIENT%%sbin/bbackupquery
5	%%SERVER%%bin/bbstoreaccounts	5	%%SERVER%%sbin/bbstoreaccounts
6	%%SERVER%%bin/bbstored	6	%%SERVER%%sbin/bbstored
7	%%SERVER%%bin/bbstored-certs	7	%%SERVER%%sbin/bbstored-certs
8	%%SERVER%%bin/bbstored-config	8	%%SERVER%%sbin/bbstored-config
9	%%SERVER%%bin/raidfile-config	9	%%SERVER%%sbin/raidfile-config
10	%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd	10	%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd
11	%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored	11	%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored
12	%%CLIENT%%@dirrmtry etc/box/bbackupd	12	%%CLIENT%%@dirrmtry etc/box/bbackupd

Added Link Here

(-)files/999.boxbackup.in (+66 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# Box Backup monthly store compare
6	#
7	# Add the following to /etc/periodic.conf to enable the monthly compare:
8	# monthly_boxbackup_compare_enable="YES"
9	#
10	# By default the script will run "compare -aq". If you want to change this to
11	# run a full compare, add the following to periodic.conf:
12	# monthly_boxbackup_compare_args="-a"
13	#
14	# NOTE: This script will cause the monthly periodic(8) run to take much longer
15	# than usual, depending on the size of your backup store.
16	#
17	# If you wish to run this independently of the monthly job, you can create a
18	# new periodic entry as follows:
19	#
20	# # mkdir /usr/local/etc/periodic/boxbackup
21	# # mv /usr/local/etc/periodic/monthly/999.boxbackup \
22	# /usr/local/etc/periodic/boxbackup/100.compare
23	#
24	# Then add the following to /etc/crontab:
25	# 30 5 1 * * root periodic boxbackup
26	#
27	# (adjust the timings as necessary)
28	#
29	# You may also wish to add boxbackup_output="root" to periodic.conf so that
30	# mail comes from periodic rather than cron.
31
32	monthly_boxbackup_compare_enable="NO"
33	monthly_boxbackup_compare_args="-aq"
34
35	if [ -r /etc/defaults/periodic.conf ]
36	then
37	. /etc/defaults/periodic.conf
38	source_periodic_confs
39	fi
40
41	rc=0
42
43	case "$monthly_boxbackup_compare_enable" in
44	[Yy][Ee][Ss])
45	echo
46	echo "Running Box Backup store compare:"
47	%%PREFIX%%/sbin/bbackupquery -q "compare -c $monthly_boxbackup_compare_args" quit
48
49	# Return codes:
50	# 1 Comparison was exact
51	# 2 Differences were found
52	# 3 An error occured
53	if [ $? -eq 2 ]; then
54	echo
55	echo "Differences were found. Please check the output."
56	rc=3
57	elif [ $? -eq 3 ]; then
58	echo
59	echo "An error occurred. Please check the output."
60	rc=3
61	fi
62
63	;;
64	esac
65
66	exit $rc

Added Link Here

(-)files/bbackupd.in (+27 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/sysutils/boxbackup/files/bbackupd.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
4	#
5	# PROVIDE: bbackupd
6	# REQUIRE: NETWORKING
7	# KEYWORD: shutdown
8
9	#
10	# Add the following line to /etc/rc.conf to enable bbackupd:
11	#
12	#bbackupd_enable="YES"
13	#
14
15	: ${bbackupd_enable:="NO"}
16	: ${bbackupd_flags:="%%PREFIX%%/etc/box/bbackupd.conf"}
17	: ${bbackupd_pidfile:="/var/run/bbackupd.pid"}
18
19	. /etc/rc.subr
20
21	name="bbackupd"
22	rcvar=`set_rcvar`
23	command="%%PREFIX%%/bin/bbackupd"
24	extra_commands="reload"
25
26	load_rc_config $name
27	run_rc_command "$1"

Removed Link Here

(-)files/bbackupd.sh.in (-27 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/sysutils/boxbackup/files/bbackupd.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
4	#
5	# PROVIDE: bbackupd
6	# REQUIRE: NETWORKING
7	# KEYWORD: shutdown
8
9	#
10	# Add the following line to /etc/rc.conf to enable bbackupd:
11	#
12	#bbackupd_enable="YES"
13	#
14
15	: ${bbackupd_enable:="NO"}
16	: ${bbackupd_flags:="%%PREFIX%%/etc/box/bbackupd.conf"}
17	: ${bbackupd_pidfile:="/var/run/bbackupd.pid"}
18
19	. /etc/rc.subr
20
21	name="bbackupd"
22	rcvar=`set_rcvar`
23	command="%%PREFIX%%/bin/bbackupd"
24	extra_commands="reload"
25
26	load_rc_config $name
27	run_rc_command "$1"

Added Link Here

(-)files/bbstored.in (+27 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/sysutils/boxbackup/files/bbstored.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
4	#
5	# PROVIDE: bbstored
6	# REQUIRE: NETWORKING
7	# KEYWORD: shutdown
8
9	#
10	# Add the following line to /etc/rc.conf to enable bbstored:
11	#
12	#bbstored_enable="YES"
13	#
14
15	: ${bbstored_enable:="NO"}
16	: ${bbstored_flags:="%%PREFIX%%/etc/box/bbstored.conf"}
17	: ${bbstored_pidfile:="/var/run/bbstored.pid"}
18
19	. /etc/rc.subr
20
21	name="bbstored"
22	rcvar=`set_rcvar`
23	command="%%PREFIX%%/bin/bbstored"
24	extra_commands="reload"
25
26	load_rc_config $name
27	run_rc_command "$1"

Removed Link Here

(-)files/bbstored.sh.in (-27 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/sysutils/boxbackup/files/bbstored.sh.in,v 1.3 2010/03/27 00:14:53 dougb Exp $
4	#
5	# PROVIDE: bbstored
6	# REQUIRE: NETWORKING
7	# KEYWORD: shutdown
8
9	#
10	# Add the following line to /etc/rc.conf to enable bbstored:
11	#
12	#bbstored_enable="YES"
13	#
14
15	: ${bbstored_enable:="NO"}
16	: ${bbstored_flags:="%%PREFIX%%/etc/box/bbstored.conf"}
17	: ${bbstored_pidfile:="/var/run/bbstored.pid"}
18
19	. /etc/rc.subr
20
21	name="bbstored"
22	rcvar=`set_rcvar`
23	command="%%PREFIX%%/bin/bbstored"
24	extra_commands="reload"
25
26	load_rc_config $name
27	run_rc_command "$1"

Removed Link Here

(-)files/patch-configure.ac (-35 lines)
1	--- configure.ac.orig Thu Mar 16 22:26:39 2006
2	+++ configure.ac Thu Mar 16 22:28:31 2006
3	@@ -2,7 +2,7 @@
4	# Process this file with autoconf to produce a configure script.
5
6	AC_PREREQ(2.59)
7	-AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk])
8	+AC_INIT([Box Backup], 0.10, [box@fluffy.co.uk])
9	AC_CONFIG_SRCDIR([lib/common/Box.h])
10	AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
11
12	@@ -26,6 +26,12 @@
13	# Use -rdynamic if we have gcc. This is needed for backtrace
14	AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
15	fi
16	+AC_PATH_PROG([PERL], [perl], [no])
17	+if test "x$PERL" != "xno"; then
18	+ AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
19	+else
20	+ AC_MSG_ERROR([[perl executable was not found]])
21	+fi
22
23
24	### Checks for libraries.
25	@@ -208,8 +214,8 @@
26
27	# Configure the Box build system
28	echo
29	-perl ./infrastructure/makebuildenv.pl &&
30	- perl ./infrastructure/makeparcels.pl
31	+$PERL ./infrastructure/makebuildenv.pl &&
32	+ $PERL ./infrastructure/makeparcels.pl
33
34	# Write summary of important info
35	cat <<EOC

Removed Link Here

(-)files/patch-lib-common-BoxPortsAndFiles.h (-25 lines)
1	--- lib/common/BoxPortsAndFiles.h.orig Thu Mar 16 19:28:09 2006
2	+++ lib/common/BoxPortsAndFiles.h Thu Mar 16 19:28:38 2006
3	@@ -53,7 +53,7 @@
4
5	// Backup store daemon
6	#define BOX_PORT_BBSTORED (BOX_PORT_BASE+1)
7	-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/box/bbstored.conf"
8	+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "%%PREFIX%%/etc/box/bbstored.conf"
9	// directory within the RAIDFILE root for the backup store daemon
10	#define BOX_RAIDFILE_ROOT_BBSTORED "backup"
11
12	@@ -61,11 +61,11 @@
13	#ifdef WIN32
14	#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "C:\\Program Files\\Box Backup\\bbackupd.conf"
15	#else
16	-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/box/bbackupd.conf"
17	+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "%%PREFIX%%/etc/box/bbackupd.conf"
18	#endif
19
20	// RaidFile conf location default
21	-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/box/raidfile.conf"
22	+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "%%PREFIX%%/etc/box/raidfile.conf"
23
24	// Default name of the named pipe
25	#define BOX_NAMED_PIPE_NAME L"\\\\.\\pipe\\boxbackup"