From 33a0c621430a420fd8431941a04445f02c2ad221 Mon Sep 17 00:00:00 2001
From: Florent Thoumie <flz@FreeBSD.org>
Date: Tue, 12 Apr 2005 12:22:13 +0000
Subject: [PATCH] - Update to 2.8.1.24.

PR:		ports/78083
Submitted by:	Radim Kolar <hsn@netmag.cz>
Approved by:	maintainer timeout (1.5 month)
---
 net/fspd/Makefile | 41 +++++++++++++++++++++++++++++------------
 net/fspd/distinfo |  4 ++--
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index 65cd23305ab9..6ff7f5aab00d 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -6,34 +6,45 @@
 #
 
 PORTNAME=	fspd
-PORTVERSION=	2.8.1.19
+PORTVERSION=	2.8.1.24
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fsp
-DISTNAME=	fsp-2.8.1b19
+DISTNAME=	fsp-2.8.1b24
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	FSP daemon, clients and scanner
 
 CLIENTS=	fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \
 		flscmd fmkdir fprocmd fput frmcmd frmdircmd fver fspmerge \
-		fstatcmd
+		fstatcmd fmvcmd fbye fsetupcmd
 DOCDIR=		share/doc/${PORTNAME}
-PORTDOCS=	BETA.README COPYRIGHT ChangeLog FILES INFO INSTALL MACHINES TODO
-MAN1=		fcat.1 fcatcmd.1 fcd.1 fcdcmd.1 fdu.1 fducmd.1 ffind.1 \
-		ffindcmd.1 fget.1 fgetcmd.1 fgrab.1 fgrabcmd.1 fhost.1 \
-		fhostcmd.1 fls.1 flscmd.1 fmkdir.1 fpro.1 fprocmd.1 fput.1 \
-		frm.1 frmcmd.1 frmdir.1 frmdircmd.1 fspd.1 fspscan.1 fver.1 \
-		fstatcmd.1
-MAN5=		fsp_prof.5
+PORTDOCS=	BETA.README COPYRIGHT ChangeLog FILES INFO INSTALL MACHINES \
+		TODO PROTOCOL
+MAN1=		fcatcmd.1 fcdcmd.1 fducmd.1 ffindcmd.1 fgetcmd.1 fgrabcmd.1 \
+		fhostcmd.1 flscmd.1 fmkdir.1 fprocmd.1 fput.1 \
+		frmcmd.1 frmdircmd.1 fspd.1 fspscan.1 fver.1 \
+		fstatcmd.1 fmvcmd.1 fsetupcmd.1
+MAN5=		fsp_prof.5 fspsites.5
+MAN7=		fsp_env.7
+MLINKS=		fcatcmd.1 fcat.1 fcdcmd.1 fcd.1 fducmd.1 fdu.1 \
+		ffindcmd.1 ffind.1 fgetcmd.1 fget.1 fgrabcmd.1 fgrab.1 \
+		fhostcmd.1 fhost.1 flscmd.1 fls.1 fprocmd.1 fpro.1 \
+		frmdircmd.1 frmdir.1 fstatcmd.1 fstat.1 fmvcmd.1 fmv.1 \
+		fsetupcmd.1 fsetup.1
 PLIST_FILES=	bin/fspd bin/fspscan etc/fspd.conf.sample
-OPTIONS=	NOCLIENTS "Omit client commands" off
+OPTIONS=	NOCLIENTS "Omit client commands" off \
+		INFINITE  "Infinite retry in client commands" off
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_INFINITE)
+CONFIGURE_ARGS+=	--disable-timeout
+.endif
+
 .if ${OSVERSION} < 500000 || ${ARCH} != "i386"
 BROKEN=		"Does not compile on 4.x or on !i386"
 .endif
@@ -44,6 +55,9 @@ PLIST_FILES+=	bin/${command}
 .endfor
 .endif
 
+post-extract:
+	${CP} ${WRKSRC}/doc/PROTOCOL ${WRKSRC}
+
 do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -62,6 +76,9 @@ do-install:
 .for page in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}/man/${page} ${PREFIX}/man/man1
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN5} ${PREFIX}/man/man5
+.for page in ${MAN5}
+	${INSTALL_MAN} ${WRKSRC}/man/${page} ${PREFIX}/man/man5
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/${MAN7} ${PREFIX}/man/man7
 
 .include <bsd.port.post.mk>
diff --git a/net/fspd/distinfo b/net/fspd/distinfo
index 9a164dd2365a..97ded849315b 100644
--- a/net/fspd/distinfo
+++ b/net/fspd/distinfo
@@ -1,2 +1,2 @@
-MD5 (fsp-2.8.1b19.tar.bz2) = 0219f935d25d363a633ff588000e378b
-SIZE (fsp-2.8.1b19.tar.bz2) = 238743
+MD5 (fsp-2.8.1b24.tar.bz2) = 19a80b22e43717175facfc26e25d902b
+SIZE (fsp-2.8.1b24.tar.bz2) = 264521