From james@netinertia.co.uk  Fri Dec  9 23:57:56 2005
Return-Path: <james@netinertia.co.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AFBB216A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Dec 2005 23:57:56 +0000 (GMT)
	(envelope-from james@netinertia.co.uk)
Received: from harvey.towers.jogbert.com (harvey.towers.jogbert.com [82.69.247.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7DA5743D5C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Dec 2005 23:57:55 +0000 (GMT)
	(envelope-from james@netinertia.co.uk)
Received: from james by harvey.towers.jogbert.com with local (Exim 4.52 (FreeBSD))
	id 1Eks7c-0009M9-53
	for FreeBSD-gnats-submit@freebsd.org; Fri, 09 Dec 2005 23:57:52 +0000
Message-Id: <E1Eks7c-0009M9-53@harvey.towers.jogbert.com>
Date: Fri, 09 Dec 2005 23:57:52 +0000
From: James O'Gorman <james@netinertia.co.uk>
Reply-To: James O'Gorman <james@netinertia.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: sysutils/boxbackup - General cleanup of port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90166
>Category:       ports
>Synopsis:       Update port: sysutils/boxbackup - General cleanup of port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lawrance
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 10 00:00:17 GMT 2005
>Closed-Date:    Wed Dec 14 13:40:50 GMT 2005
>Last-Modified:  Wed Dec 14 13:40:50 GMT 2005
>Originator:     James O'Gorman
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD starbug.netinertia.co.uk 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Mon Nov 7 23:03:59 GMT 2005 root@starbug.netinertia.co.uk:/usr/obj/usr/src/sys/STARBUG i386


>Description:
	General cleanup of the port:
	- Fix USE_RC_SUBR to use bb{ackup,store}d.sh.in
	- Rename files/bb{ackup,store}d.sh as above to .sh.in
	- Remove unncessary CONFLICTS (people can install client/server
	  separately if they really want to...)
	- Add SHA256
	- OPTIONSify
	- Cleanup of whitespace
	- Bump PORTREVISION
>How-To-Repeat:
>Fix:

Apply following patch:

diff -urN boxbackup.orig/Makefile boxbackup/Makefile
--- boxbackup.orig/Makefile	Sun Mar 13 17:19:14 2005
+++ boxbackup/Makefile	Fri Dec  9 23:31:14 2005
@@ -1,120 +1,91 @@
-# vim: ts=4
 # New ports collection makefile for: boxbackup
 # Date created:		19 December 2004
-# Whom:				James O'Gorman <james@netinertia.co.uk>
+# Whom:			James O'Gorman <james@netinertia.co.uk>
 #
 # $FreeBSD: ports/sysutils/boxbackup/Makefile,v 1.4 2005/03/13 17:19:14 barner Exp $
 #
 
-PORTNAME=		boxbackup
+PORTNAME=	boxbackup
 PORTVERSION=	0.09
-CATEGORIES=		sysutils
+PORTREVISION=	1
+CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-.if defined(CLIENT_ONLY) && !defined(SERVER_ONLY)
-PKGNAMESUFFIX=	-client
-.elif defined(SERVER_ONLY) && !defined(CLIENT_ONLY)
-PKGNAMESUFFIX=	-server
-.endif
+PKGNAMESUFFIX=	${CLIENT_OR_SERVER}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		james@netinertia.co.uk
-COMMENT=		An open source, completely automatic on-line backup system for UNIX
+MAINTAINER=	james@netinertia.co.uk
+COMMENT=	An open source, completely automatic on-line backup system for UNIX
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	openssl:${OPENSSLBASE}
 USE_REINPLACE=	yes
-USE_RC_SUBR=	yes
-USE_PERL5=		yes
+USE_PERL5=	yes
 
-PKGMESSAGE=		${WRKDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if defined(CLIENT_ONLY) && !defined(SERVER_ONLY)
-CONFLICTS=	boxbackup-[0-9]* boxbackup-server-[0-9]*
-PLIST_SUB+=	CLIENT=""
-PLIST_SUB+=	SERVER="@comment "
-ALL_TARGET=	parcels/${DISTNAME}-backup-client-FreeBSD.tgz
-INSTALL_TARGET=	install-backup-client
-.elif defined(SERVER_ONLY) && !defined(CLIENT_ONLY)
-CONFLICTS=	boxbackup-[0-9]* boxbackup-client-[0-9]*
-PLIST_SUB+=	SERVER=""
+OPTIONS=	CLIENT "Install the bbackupd client" On \
+		SERVER "Install the bbstored server" On \
+		TESTS  "Allows use of a 'check' target to run tests" Off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER)
+IGNORE=		requires at least CLIENT or SERVER to be defined.\
+		Please \`make config\` again
+.endif
+.if defined(WITHOUT_CLIENT)
 PLIST_SUB+=	CLIENT="@comment "
-ALL_TARGET=	parcels/${DISTNAME}-backup-server-FreeBSD.tgz
-INSTALL_TARGET=	install-backup-server
 .else
+USE_RC_SUBR+=	bbackupd.sh
 PLIST_SUB+=	CLIENT=""
-PLIST_SUB+=	SERVER=""
-INSTALL_TARGET=	install-backup-server install-backup-client
+ALL_TARGET+=	parcels/${DISTNAME}-backup-client-FreeBSD.tgz
+INSTALL_TARGET+=install-backup-client
+.if defined(WITHOUT_SERVER)
+CLIENT_OR_SERVER=-client
 .endif
-
-# These will be used at some point in the future when I get around to
-# automating the final configuration.
-#WITH_BACKUPSTORE?=	/var/bbstored
-#WITH_WORKINGDIR?=	/var/bbackupd
-#WITH_BACKUPMODE?=	lazy
-
-.if ${.CURDIR} == ${MASTERDIR}
-pre-everything::
-	@${ECHO} "${PORTNAME} has the following options:"
-	@${ECHO} ""
-.if !defined(CLIENT_ONLY)
-	@${ECHO} "  CLIENT_ONLY		Only install client suite"
-.endif
-.if !defined(SERVER_ONLY)
-	@${ECHO} "  SERVER_ONLY		Only install server suite"
-.endif
-.if !defined(WITH_TESTS)
-	@${ECHO} "  WITH_TESTS		Allows use of a \"check\" target"
-	@${ECHO} "			to run tests"
-.endif
-	@${ECHO} ""
-.if defined(SERVER_ONLY) && defined(CLIENT_ONLY)
-	@${ECHO} "SERVER_ONLY and CLIENT_ONLY are mutually exclusive."
-	@${ECHO} "Please choose one or the other."
-	@exit 1
+.endif
+.if defined(WITHOUT_SERVER)
+PLIST_SUB+=	SERVER="@comment "
+.else
+USE_RC_SUBR+=	bbstored.sh
+PLIST_SUB+=	SERVER=""
+ALL_TARGET+=	parcels/${DISTNAME}-backup-server-FreeBSD.tgz
+INSTALL_TARGET+=install-backup-server
+.if defined(WITHOUT_CLIENT)
+CLIENT_OR_SERVER=-server
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/infrastructure/BoxPlatform.pm
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/lib/common/BoxPortsAndFiles.h
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' <${FILESDIR}/bbstored.sh >\
-		${WRKSRC}/bbstored.sh
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' <${FILESDIR}/bbackupd.sh >\
-		${WRKSRC}/bbackupd.sh
 	@${FIND} ${WRKSRC} -name "*.pl" -exec \
 		${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' {} \;
 	@${REINPLACE_CMD} -e 's, perl , ${PERL} ,' \
 		${WRKSRC}/infrastructure/makebuildenv.pl
-.if defined(CLIENT_ONLY) || !defined(SERVER_ONLY)
+.if !defined(WITHOUT_CLIENT)
 	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}
 .endif
-.if defined(SERVER_ONLY) || !defined(CLIENT_ONLY)
+.if !defined(WITHOUT_SERVER)
 	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}
 .endif
 
-.if defined(SERVER_ONLY) || !defined(CLIENT_ONLY)
+.if !defined(WITHOUT_SERVER)
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 			${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .endif
 
 post-install:
-	@${ECHO_CMD} "===> Installing startup scripts"
-.if defined(CLIENT_ONLY) || !defined(SERVER_ONLY)
-	@${INSTALL_SCRIPT} -m 751 ${WRKSRC}/bbackupd.sh ${PREFIX}/etc/rc.d/bbackupd.sh
+.if !defined(WITHOUT_CLIENT)
 	@${MKDIR} -m 0700 ${PREFIX}/etc/box/bbackupd
 .endif
-.if defined(SERVER_ONLY) || !defined(CLIENT_ONLY)
-	@${INSTALL_SCRIPT} -m 751 ${WRKSRC}/bbstored.sh ${PREFIX}/etc/rc.d/bbstored.sh
+.if !defined(WITHOUT_SERVER)
 	@${MKDIR} -m 0700 ${PREFIX}/etc/box/bbstored
 .endif
 	@${CAT} ${PKGMESSAGE}
-# At some point we might want to automate final configuration...
-#.if !defined(BATCH) && exists(${PREFIX}/bin/bbackupd-config)
-#	@${PREFIX}/bin/bbackupd-config ${PREFIX}/etc/box ${WITH_BACKUPMODE} ${ACCOUNT} ${BACKUP_SERVER} ${WITH_WORKDIR} ${BACKUPDIRS}
-#.endif
 
 .if defined(WITH_TESTS)
 check:
@@ -122,4 +93,4 @@
 	 @${MAKE} -C ${WRKSRC} test
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN boxbackup.orig/distinfo boxbackup/distinfo
--- boxbackup.orig/distinfo	Fri Feb 25 09:09:51 2005
+++ boxbackup/distinfo	Fri Dec  9 16:10:17 2005
@@ -1,2 +1,3 @@
 MD5 (boxbackup-0.09.tgz) = b4fced539ed72855383f25609de9e6da
+SHA256 (boxbackup-0.09.tgz) = e77ecb2514c976a8e59e7588bb9bf3d09a4d1b612748b1b63ef532f1c43f1e86
 SIZE (boxbackup-0.09.tgz) = 505088
diff -urN boxbackup.orig/files/bbackupd.sh boxbackup/files/bbackupd.sh
--- boxbackup.orig/files/bbackupd.sh	Fri Feb 25 09:09:51 2005
+++ boxbackup/files/bbackupd.sh	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-#
-# PROVIDE: bbackupd
-# REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable bbackupd:
-#
-#bbackupd_enable="YES"
-#
-
-bbackupd_enable=${bbackupd_enable-"NO"}
-bbackupd_flags=${bbackupd_flags-"/usr/local/etc/box/bbackupd.conf"}
-bbackupd_pidfile=${bbackupd_pidfile-"/var/run/bbackupd.pid"}
-
-. /etc/rc.subr
-
-name="bbackupd"
-rcvar=`set_rcvar`
-command="/usr/local/bin/bbackupd"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff -urN boxbackup.orig/files/bbackupd.sh.in boxbackup/files/bbackupd.sh.in
--- boxbackup.orig/files/bbackupd.sh.in	Thu Jan  1 01:00:00 1970
+++ boxbackup/files/bbackupd.sh.in	Fri Dec  9 16:10:17 2005
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: bbackupd
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD 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"}
+
+. %%RC_SUBR%%
+
+name="bbackupd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/bbackupd"
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff -urN boxbackup.orig/files/bbstored.sh boxbackup/files/bbstored.sh
--- boxbackup.orig/files/bbstored.sh	Fri Feb 25 09:09:51 2005
+++ boxbackup/files/bbstored.sh	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-#
-# PROVIDE: bbstored
-# REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable bbstored:
-#
-#bbstored_enable="YES"
-#
-
-bbstored_enable=${bbstored_enable-"NO"}
-bbstored_flags=${bbstored_flags-"/usr/local/etc/box/bbstored.conf"}
-bbstored_pidfile=${bbstored_pidfile-"/var/run/bbstored.pid"}
-
-. /etc/rc.subr
-
-name="bbstored"
-rcvar=`set_rcvar`
-command="/usr/local/bin/bbstored"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff -urN boxbackup.orig/files/bbstored.sh.in boxbackup/files/bbstored.sh.in
--- boxbackup.orig/files/bbstored.sh.in	Thu Jan  1 01:00:00 1970
+++ boxbackup/files/bbstored.sh.in	Fri Dec  9 16:10:17 2005
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: bbstored
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD 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"}
+
+. %%RC_SUBR%%
+
+name="bbstored"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/bbstored"
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff -urN boxbackup.orig/pkg-plist boxbackup/pkg-plist
--- boxbackup.orig/pkg-plist	Fri Feb 25 09:09:51 2005
+++ boxbackup/pkg-plist	Fri Dec  9 23:35:15 2005
@@ -7,8 +7,8 @@
 %%SERVER%%bin/bbstored-certs
 %%SERVER%%bin/bbstored-config
 %%SERVER%%bin/raidfile-config
-%%CLIENT%%etc/rc.d/bbackupd.sh
-%%SERVER%%etc/rc.d/bbstored.sh
+%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd
+%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored
 %%CLIENT%%@dirrm etc/box/bbackupd
 %%SERVER%%@dirrm etc/box/bbstored
 @dirrm etc/box

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lawrance 
Responsible-Changed-By: lawrance 
Responsible-Changed-When: Mon Dec 12 00:20:48 UTC 2005 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90166 
State-Changed-From-To: open->feedback 
State-Changed-By: lawrance 
State-Changed-When: Mon Dec 12 00:57:24 UTC 2005 
State-Changed-Why:  
Wouldn't the default package (boxbackup-server), which installs 
the client and the server, still conflict with boxbackup-client? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90166 

From: James O'Gorman <james@netinertia.co.uk>
To: Sam Lawrance <lawrance@FreeBSD.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/90166: Update port: sysutils/boxbackup - General cleanup
 of port
Date: Tue, 13 Dec 2005 19:07:21 +0000

 This is a multi-part message in MIME format.
 --------------010705010504080106000807
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Sorry - forgot to make clean before I generated the diff!
 
 Many apologies.
 
 On 13/12/05 04:06, Sam Lawrance wrote:
 > On 13/12/2005, at 4:51 AM, James O'Gorman wrote:
 >> Do you think I should put the CONFLICTS back anyway?
 > 
 > Yes, I think it would be a good idea.
 
 
 --------------010705010504080106000807
 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
  name="boxbackup.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="boxbackup.diff"
 
 diff -urN boxbackup.orig/Makefile boxbackup/Makefile
 --- boxbackup.orig/Makefile	Sun Mar 13 17:19:14 2005
 +++ boxbackup/Makefile	Tue Dec 13 18:37:30 2005
 @@ -1,120 +1,96 @@
 -# vim: ts=4
  # New ports collection makefile for: boxbackup
  # Date created:		19 December 2004
 -# Whom:				James O'Gorman <james@netinertia.co.uk>
 +# Whom:			James O'Gorman <james@netinertia.co.uk>
  #
  # $FreeBSD: ports/sysutils/boxbackup/Makefile,v 1.4 2005/03/13 17:19:14 barner Exp $
  #
  
 -PORTNAME=		boxbackup
 +PORTNAME=	boxbackup
  PORTVERSION=	0.09
 -CATEGORIES=		sysutils
 +PORTREVISION=	1
 +CATEGORIES=	sysutils
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 -.if defined(CLIENT_ONLY) && !defined(SERVER_ONLY)
 -PKGNAMESUFFIX=	-client
 -.elif defined(SERVER_ONLY) && !defined(CLIENT_ONLY)
 -PKGNAMESUFFIX=	-server
 -.endif
 +PKGNAMESUFFIX=	${CLIENT_OR_SERVER}
  EXTRACT_SUFX=	.tgz
  
 -MAINTAINER=		james@netinertia.co.uk
 -COMMENT=		An open source, completely automatic on-line backup system for UNIX
 +MAINTAINER=	james@netinertia.co.uk
 +COMMENT=	An open source, completely automatic on-line backup system for UNIX
  
  USE_OPENSSL=	yes
  HAS_CONFIGURE=	yes
  CONFIGURE_ARGS=	openssl:${OPENSSLBASE}
  USE_REINPLACE=	yes
 -USE_RC_SUBR=	yes
 -USE_PERL5=		yes
 +USE_PERL5=	yes
  
 -PKGMESSAGE=		${WRKDIR}/pkg-message
 +PKGMESSAGE=	${WRKDIR}/pkg-message
  
 -.if defined(CLIENT_ONLY) && !defined(SERVER_ONLY)
 -CONFLICTS=	boxbackup-[0-9]* boxbackup-server-[0-9]*
 -PLIST_SUB+=	CLIENT=""
 -PLIST_SUB+=	SERVER="@comment "
 -ALL_TARGET=	parcels/${DISTNAME}-backup-client-FreeBSD.tgz
 -INSTALL_TARGET=	install-backup-client
 -.elif defined(SERVER_ONLY) && !defined(CLIENT_ONLY)
 -CONFLICTS=	boxbackup-[0-9]* boxbackup-client-[0-9]*
 -PLIST_SUB+=	SERVER=""
 +OPTIONS=	CLIENT "Install the bbackupd client" On \
 +		SERVER "Install the bbstored server" On \
 +		TESTS  "Allows use of a 'check' target to run tests" Off
 +
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER)
 +IGNORE=		requires at least CLIENT or SERVER to be defined.\
 +		Please \`make config\` again
 +.endif
 +.if defined(WITHOUT_CLIENT)
  PLIST_SUB+=	CLIENT="@comment "
 -ALL_TARGET=	parcels/${DISTNAME}-backup-server-FreeBSD.tgz
 -INSTALL_TARGET=	install-backup-server
  .else
 +USE_RC_SUBR+=	bbackupd.sh
  PLIST_SUB+=	CLIENT=""
 +ALL_TARGET+=	parcels/${DISTNAME}-backup-client-FreeBSD.tgz
 +INSTALL_TARGET+=install-backup-client
 +.if defined(WITHOUT_SERVER)
 +CLIENT_OR_SERVER=-client
 +CONFLICTS=	boxbackup-[0-9]* boxbackup-server-[0-9]*
 +.endif
 +.endif
 +.if defined(WITHOUT_SERVER)
 +PLIST_SUB+=	SERVER="@comment "
 +.else
 +USE_RC_SUBR+=	bbstored.sh
  PLIST_SUB+=	SERVER=""
 -INSTALL_TARGET=	install-backup-server install-backup-client
 +ALL_TARGET+=	parcels/${DISTNAME}-backup-server-FreeBSD.tgz
 +INSTALL_TARGET+=install-backup-server
 +CONFLICTS=	boxbackup-[0-9]* boxbackup-client-[0-9]*
 +.if defined(WITHOUT_CLIENT)
 +CLIENT_OR_SERVER=-server
  .endif
 -
 -# These will be used at some point in the future when I get around to
 -# automating the final configuration.
 -#WITH_BACKUPSTORE?=	/var/bbstored
 -#WITH_WORKINGDIR?=	/var/bbackupd
 -#WITH_BACKUPMODE?=	lazy
 -
 -.if ${.CURDIR} == ${MASTERDIR}
 -pre-everything::
 -	@${ECHO} "${PORTNAME} has the following options:"
 -	@${ECHO} ""
 -.if !defined(CLIENT_ONLY)
 -	@${ECHO} "  CLIENT_ONLY		Only install client suite"
 -.endif
 -.if !defined(SERVER_ONLY)
 -	@${ECHO} "  SERVER_ONLY		Only install server suite"
 -.endif
 -.if !defined(WITH_TESTS)
 -	@${ECHO} "  WITH_TESTS		Allows use of a \"check\" target"
 -	@${ECHO} "			to run tests"
 -.endif
 -	@${ECHO} ""
 -.if defined(SERVER_ONLY) && defined(CLIENT_ONLY)
 -	@${ECHO} "SERVER_ONLY and CLIENT_ONLY are mutually exclusive."
 -	@${ECHO} "Please choose one or the other."
 -	@exit 1
  .endif
 +.if !defined(WITHOUT_CLIENT) && !defined(WITHOUT_SERVER)
 +CONFLICTS=	boxbackup-server-[0-9]* boxbackup-client-[0-9]*
  .endif
  
  post-patch:
  	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/infrastructure/BoxPlatform.pm
  	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/lib/common/BoxPortsAndFiles.h
 -	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' <${FILESDIR}/bbstored.sh >\
 -		${WRKSRC}/bbstored.sh
 -	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' <${FILESDIR}/bbackupd.sh >\
 -		${WRKSRC}/bbackupd.sh
  	@${FIND} ${WRKSRC} -name "*.pl" -exec \
  		${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' {} \;
  	@${REINPLACE_CMD} -e 's, perl , ${PERL} ,' \
  		${WRKSRC}/infrastructure/makebuildenv.pl
 -.if defined(CLIENT_ONLY) || !defined(SERVER_ONLY)
 +.if !defined(WITHOUT_CLIENT)
  	@${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE}
  .endif
 -.if defined(SERVER_ONLY) || !defined(CLIENT_ONLY)
 +.if !defined(WITHOUT_SERVER)
  	@${CAT} ${FILESDIR}/pkg-message.server >> ${PKGMESSAGE}
  .endif
  
 -.if defined(SERVER_ONLY) || !defined(CLIENT_ONLY)
 +.if !defined(WITHOUT_SERVER)
  pre-install:
  	@${SETENV} PKG_PREFIX=${PREFIX} \
  			${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
  .endif
  
  post-install:
 -	@${ECHO_CMD} "===> Installing startup scripts"
 -.if defined(CLIENT_ONLY) || !defined(SERVER_ONLY)
 -	@${INSTALL_SCRIPT} -m 751 ${WRKSRC}/bbackupd.sh ${PREFIX}/etc/rc.d/bbackupd.sh
 +.if !defined(WITHOUT_CLIENT)
  	@${MKDIR} -m 0700 ${PREFIX}/etc/box/bbackupd
  .endif
 -.if defined(SERVER_ONLY) || !defined(CLIENT_ONLY)
 -	@${INSTALL_SCRIPT} -m 751 ${WRKSRC}/bbstored.sh ${PREFIX}/etc/rc.d/bbstored.sh
 +.if !defined(WITHOUT_SERVER)
  	@${MKDIR} -m 0700 ${PREFIX}/etc/box/bbstored
  .endif
  	@${CAT} ${PKGMESSAGE}
 -# At some point we might want to automate final configuration...
 -#.if !defined(BATCH) && exists(${PREFIX}/bin/bbackupd-config)
 -#	@${PREFIX}/bin/bbackupd-config ${PREFIX}/etc/box ${WITH_BACKUPMODE} ${ACCOUNT} ${BACKUP_SERVER} ${WITH_WORKDIR} ${BACKUPDIRS}
 -#.endif
  
  .if defined(WITH_TESTS)
  check:
 @@ -122,4 +98,4 @@
  	 @${MAKE} -C ${WRKSRC} test
  .endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN boxbackup.orig/distinfo boxbackup/distinfo
 --- boxbackup.orig/distinfo	Fri Feb 25 09:09:51 2005
 +++ boxbackup/distinfo	Fri Dec  9 16:10:17 2005
 @@ -1,2 +1,3 @@
  MD5 (boxbackup-0.09.tgz) = b4fced539ed72855383f25609de9e6da
 +SHA256 (boxbackup-0.09.tgz) = e77ecb2514c976a8e59e7588bb9bf3d09a4d1b612748b1b63ef532f1c43f1e86
  SIZE (boxbackup-0.09.tgz) = 505088
 diff -urN boxbackup.orig/files/bbackupd.sh boxbackup/files/bbackupd.sh
 --- boxbackup.orig/files/bbackupd.sh	Fri Feb 25 09:09:51 2005
 +++ boxbackup/files/bbackupd.sh	Thu Jan  1 01:00:00 1970
 @@ -1,26 +0,0 @@
 -#!/bin/sh
 -#
 -#
 -# PROVIDE: bbackupd
 -# REQUIRE: NETWORKING
 -# KEYWORD: FreeBSD shutdown
 -
 -#
 -# Add the following line to /etc/rc.conf to enable bbackupd:
 -#
 -#bbackupd_enable="YES"
 -#
 -
 -bbackupd_enable=${bbackupd_enable-"NO"}
 -bbackupd_flags=${bbackupd_flags-"/usr/local/etc/box/bbackupd.conf"}
 -bbackupd_pidfile=${bbackupd_pidfile-"/var/run/bbackupd.pid"}
 -
 -. /etc/rc.subr
 -
 -name="bbackupd"
 -rcvar=`set_rcvar`
 -command="/usr/local/bin/bbackupd"
 -extra_commands="reload"
 -
 -load_rc_config $name
 -run_rc_command "$1"
 diff -urN boxbackup.orig/files/bbackupd.sh.in boxbackup/files/bbackupd.sh.in
 --- boxbackup.orig/files/bbackupd.sh.in	Thu Jan  1 01:00:00 1970
 +++ boxbackup/files/bbackupd.sh.in	Fri Dec  9 16:10:17 2005
 @@ -0,0 +1,27 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +# PROVIDE: bbackupd
 +# REQUIRE: NETWORKING
 +# KEYWORD: FreeBSD 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"}
 +
 +. %%RC_SUBR%%
 +
 +name="bbackupd"
 +rcvar=`set_rcvar`
 +command="%%PREFIX%%/bin/bbackupd"
 +extra_commands="reload"
 +
 +load_rc_config $name
 +run_rc_command "$1"
 diff -urN boxbackup.orig/files/bbstored.sh boxbackup/files/bbstored.sh
 --- boxbackup.orig/files/bbstored.sh	Fri Feb 25 09:09:51 2005
 +++ boxbackup/files/bbstored.sh	Thu Jan  1 01:00:00 1970
 @@ -1,26 +0,0 @@
 -#!/bin/sh
 -#
 -#
 -# PROVIDE: bbstored
 -# REQUIRE: NETWORKING
 -# KEYWORD: FreeBSD shutdown
 -
 -#
 -# Add the following line to /etc/rc.conf to enable bbstored:
 -#
 -#bbstored_enable="YES"
 -#
 -
 -bbstored_enable=${bbstored_enable-"NO"}
 -bbstored_flags=${bbstored_flags-"/usr/local/etc/box/bbstored.conf"}
 -bbstored_pidfile=${bbstored_pidfile-"/var/run/bbstored.pid"}
 -
 -. /etc/rc.subr
 -
 -name="bbstored"
 -rcvar=`set_rcvar`
 -command="/usr/local/bin/bbstored"
 -extra_commands="reload"
 -
 -load_rc_config $name
 -run_rc_command "$1"
 diff -urN boxbackup.orig/files/bbstored.sh.in boxbackup/files/bbstored.sh.in
 --- boxbackup.orig/files/bbstored.sh.in	Thu Jan  1 01:00:00 1970
 +++ boxbackup/files/bbstored.sh.in	Fri Dec  9 16:10:17 2005
 @@ -0,0 +1,27 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +# PROVIDE: bbstored
 +# REQUIRE: NETWORKING
 +# KEYWORD: FreeBSD 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"}
 +
 +. %%RC_SUBR%%
 +
 +name="bbstored"
 +rcvar=`set_rcvar`
 +command="%%PREFIX%%/bin/bbstored"
 +extra_commands="reload"
 +
 +load_rc_config $name
 +run_rc_command "$1"
 diff -urN boxbackup.orig/pkg-plist boxbackup/pkg-plist
 --- boxbackup.orig/pkg-plist	Fri Feb 25 09:09:51 2005
 +++ boxbackup/pkg-plist	Fri Dec  9 23:35:15 2005
 @@ -7,8 +7,8 @@
  %%SERVER%%bin/bbstored-certs
  %%SERVER%%bin/bbstored-config
  %%SERVER%%bin/raidfile-config
 -%%CLIENT%%etc/rc.d/bbackupd.sh
 -%%SERVER%%etc/rc.d/bbstored.sh
 +%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd
 +%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored
  %%CLIENT%%@dirrm etc/box/bbackupd
  %%SERVER%%@dirrm etc/box/bbstored
  @dirrm etc/box
 
 --------------010705010504080106000807--

From: linimon@lonesome.com (Mark Linimon)
To: bug-followup@FreeBSD.org
Cc: james@netinertia.co.uk, lawrance@FreeBSD.org
Subject: Re: ports/90166: Update port: sysutils/boxbackup - General cleanup of port
Date: Tue, 13 Dec 2005 15:14:12 -0600

 To submitter: please resend your patch and exclude the work/ directory.
 By including it, it added several tens of thousands of lines to the diff,
 which spamassassin rejected.
 
 Also, please do not use Content-Transfer-Encoding: quoted-printable; it
 renders diff completely useless.

From: James O'Gorman <james@netinertia.co.uk>
To: Mark Linimon <linimon@lonesome.com>
Cc: bug-followup@FreeBSD.org,  lawrance@FreeBSD.org
Subject: Re: ports/90166: Update port: sysutils/boxbackup - General cleanup
 of port
Date: Tue, 13 Dec 2005 21:19:12 +0000

 Hi Mark,
 
 On 13/12/05 21:14, Mark Linimon wrote:
 > To submitter: please resend your patch and exclude the work/ directory.
 > By including it, it added several tens of thousands of lines to the diff,
 > which spamassassin rejected.
 > 
 > Also, please do not use Content-Transfer-Encoding: quoted-printable; it
 > renders diff completely useless.
 
 Sorry about that, I was in a bit of a hurry. I've already resubmitted 
 the patch.
 
 Thanks,
 
 James
State-Changed-From-To: feedback->closed 
State-Changed-By: lawrance 
State-Changed-When: Wed Dec 14 13:40:27 UTC 2005 
State-Changed-Why:  
Committed with some minor changes.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90166 
>Unformatted:
