svn commit: r377333 - in head: . net net/fspd

Rene Ladan rene at FreeBSD.org
Sun Jan 18 15:14:20 UTC 2015 

Author: rene
Date: Sun Jan 18 15:14:17 2015
New Revision: 377333
URL: https://svnweb.freebsd.org/changeset/ports/377333
QAT: https://qat.redports.org/buildarchive/r377333/

Log:
  net/fspd: revive
  - stage
  - add a static pkg-plist
  - add DOCS knob
  - do not build SGML documentation (jade fails)
  - only install man pages for client commands if CLIENTS option is set
  
  Changes from me:
  - flip NOCLIENTS option into a CLIENTS option
  - drop MLINKS files
  - use @sample
  - other minor Makefile changes
  
  PR:		193393
  Submitted by:	Radim Kolar

Added:
  head/net/fspd/
     - copied from r366684, head/net/fspd/
  head/net/fspd/pkg-plist   (contents, props changed)
Modified:
  head/MOVED
  head/net/Makefile
  head/net/fspd/Makefile
  head/net/fspd/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Jan 18 14:52:27 2015	(r377332)
+++ head/MOVED	Sun Jan 18 15:14:17 2015	(r377333)
@@ -6774,7 +6774,6 @@ net/ct||2014-09-01|Not staged
 net/entitymib||2014-09-01|Not staged
 net/freedbd||2014-09-01|Not staged
 net/frickin||2014-09-01|Not staged
-net/fspd||2014-09-01|Not staged
 net/hawknl-devel||2014-09-01|Not staged
 net/hawknl||2014-09-01|Not staged
 net/heybuddy||2014-09-01|Not staged

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Sun Jan 18 14:52:27 2015	(r377332)
+++ head/net/Makefile	Sun Jan 18 15:14:17 2015	(r377333)
@@ -133,6 +133,7 @@
     SUBDIR += freerdp
     SUBDIR += freevrrpd
     SUBDIR += fspclient
+    SUBDIR += fspd
     SUBDIR += fsplib
     SUBDIR += g2ipmsg
     SUBDIR += geoclue

Modified: head/net/fspd/Makefile
==============================================================================
--- head/net/fspd/Makefile	Sat Aug 30 21:49:21 2014	(r366684)
+++ head/net/fspd/Makefile	Sun Jan 18 15:14:17 2015	(r377333)
@@ -7,81 +7,78 @@ CATEGORIES=	net
 MASTER_SITES=	SF/fsp/fsp/2.8.1b26
 DISTNAME=	fsp-2.8.1b26
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	hsn at sendmail.cz
 COMMENT=	FSP daemon, clients, and scanner
 
-BUILD_DEPENDS=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 CLIENTS=	fcatcmd fcdcmd fducmd ffindcmd fgetcmd fgrabcmd fhostcmd \
 		flscmd fmkdir fprocmd fput frmcmd frmdircmd fver fspmerge \
 		fstatcmd fmvcmd fbye fsetupcmd
-DOCDIR=		share/doc/${PORTNAME}
-PORTDOCS=	BETA.README COPYRIGHT ChangeLog FILES INFO INSTALL MACHINES \
-		TODO PROTOCOL HISTORY faq.html fsp-faq.html
-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
+FSPDOCS=	BETA.README COPYRIGHT ChangeLog FILES INFO INSTALL MACHINES \
+		TODO PROTOCOL HISTORY faq.html
+MAN1CLIENT=	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 fver.1 fstatcmd.1 fmvcmd.1 fsetupcmd.1
+MAN1SERVER=	fspscan.1 fspd.1
+MAN5CLIENT=	fsp_prof.5 fspsites.5
+MAN7CLIENT=	fsp_env.7
 
 USES=		scons tar:bzip2
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-OPTIONS_DEFINE=	NOCLIENTS INFINITE
-NOCLIENTS_DESC=	Omit client commands
+OPTIONS_DEFINE=	CLIENTS INFINITE DOCS
+CLIENTS_DESC=	Install client commands
 INFINITE_DESC=	Infinite retry in client commands
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MINFINITE}
-MAKE_ARGS+=	disable-timeout=yes
+SCONS_ARGS+=	disable-timeout=yes
 .endif
 
-.if ! ${PORT_OPTIONS:MNOCLIENTS}
-.for command in ${CLIENTS}
-PLIST_FILES+=	bin/${command}
-.endfor
-.else
+.if ! ${PORT_OPTIONS:MCLIENTS}
 SCONS_ARGS+=	without-clients=yes
 .endif
 
-PLIST_FILES+=	etc/fspd.conf.sample bin/fspscan bin/fspd
-
 post-extract:
 	@${CP} ${WRKSRC}/doc/PROTOCOL ${WRKSRC}
 	@${CP} ${WRKSRC}/doc/HISTORY ${WRKSRC}
+	: > ${WRKSRC}/doc/SConscript
 
 post-build:
 	@${CP} ${WRKSRC}/doc/*.html ${WRKSRC}
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in ${FSPDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-.if ! ${PORT_OPTIONS:MNOCLIENTS}
+.if ${PORT_OPTIONS:MCLIENTS}
 .for command in ${CLIENTS}
-	${INSTALL_PROGRAM} ${WRKSRC}/clients/${command} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/clients/${command} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/fspscan ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/server/fspd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/fspd.conf ${PREFIX}/etc/fspd.conf.sample
-.for page in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/${page} ${PREFIX}/man/man1
+.for page in ${MAN1CLIENT}
+	${INSTALL_MAN} ${WRKSRC}/man/${page} ${STAGEDIR}${PREFIX}/man/man1
+.endfor
+.for page in ${MAN5CLIENT}
+	${INSTALL_MAN} ${WRKSRC}/man/${page} ${STAGEDIR}${PREFIX}/man/man5
 .endfor
-.for page in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC}/man/${page} ${PREFIX}/man/man5
+.for page in ${MAN7CLIENT}
+	${INSTALL_MAN} ${WRKSRC}/man/${page} ${STAGEDIR}${PREFIX}/man/man7
+.endfor
+.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/contrib/fspscan ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/server/fspd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/fspd.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fspd.conf.sample
+.for page in ${MAN1SERVER}
+	${INSTALL_MAN} ${WRKSRC}/man/${page} ${STAGEDIR}${PREFIX}/man/man1
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN7} ${PREFIX}/man/man7
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net/fspd/pkg-descr
==============================================================================
--- head/net/fspd/pkg-descr	Sat Aug 30 21:49:21 2014	(r366684)
+++ head/net/fspd/pkg-descr	Sun Jan 18 15:14:17 2015	(r377333)
@@ -12,4 +12,4 @@ To use fspd, you must copy the fspd.conf
 
 You can run fspd from inetd or stand-alone.
 
-WWW:  http://fsp.sourceforge.net/
+WWW: http://fsp.sourceforge.net/

Added: head/net/fspd/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/fspd/pkg-plist	Sun Jan 18 15:14:17 2015	(r377333)
@@ -0,0 +1,55 @@
+bin/fspd
+bin/fspscan
+ at sample etc/fspd.conf.sample
+man/man1/fspd.1.gz
+man/man1/fspscan.1.gz
+%%CLIENTS%%bin/fbye
+%%CLIENTS%%bin/fcatcmd
+%%CLIENTS%%bin/fcdcmd
+%%CLIENTS%%bin/fducmd
+%%CLIENTS%%bin/ffindcmd
+%%CLIENTS%%bin/fgetcmd
+%%CLIENTS%%bin/fgrabcmd
+%%CLIENTS%%bin/fhostcmd
+%%CLIENTS%%bin/flscmd
+%%CLIENTS%%bin/fmkdir
+%%CLIENTS%%bin/fmvcmd
+%%CLIENTS%%bin/fprocmd
+%%CLIENTS%%bin/fput
+%%CLIENTS%%bin/frmcmd
+%%CLIENTS%%bin/frmdircmd
+%%CLIENTS%%bin/fsetupcmd
+%%CLIENTS%%bin/fspmerge
+%%CLIENTS%%bin/fstatcmd
+%%CLIENTS%%bin/fver
+%%CLIENTS%%man/man1/fcatcmd.1.gz
+%%CLIENTS%%man/man1/fcdcmd.1.gz
+%%CLIENTS%%man/man1/fducmd.1.gz
+%%CLIENTS%%man/man1/ffindcmd.1.gz
+%%CLIENTS%%man/man1/fgetcmd.1.gz
+%%CLIENTS%%man/man1/fgrabcmd.1.gz
+%%CLIENTS%%man/man1/fhostcmd.1.gz
+%%CLIENTS%%man/man1/flscmd.1.gz
+%%CLIENTS%%man/man1/fmkdir.1.gz
+%%CLIENTS%%man/man1/fmvcmd.1.gz
+%%CLIENTS%%man/man1/fprocmd.1.gz
+%%CLIENTS%%man/man1/fput.1.gz
+%%CLIENTS%%man/man1/frmcmd.1.gz
+%%CLIENTS%%man/man1/frmdircmd.1.gz
+%%CLIENTS%%man/man1/fsetupcmd.1.gz
+%%CLIENTS%%man/man1/fstatcmd.1.gz
+%%CLIENTS%%man/man1/fver.1.gz
+%%CLIENTS%%man/man5/fsp_prof.5.gz
+%%CLIENTS%%man/man5/fspsites.5.gz
+%%CLIENTS%%man/man7/fsp_env.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/BETA.README
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FILES
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/INFO
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/MACHINES
+%%PORTDOCS%%%%DOCSDIR%%/PROTOCOL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/faq.html

More information about the svn-ports-all mailing list