[MAINTAINER UPDATE] New versions of spread, spread-j and py-spreadmodule

* Use more bsd.port.mk convenience switches.
* Use rc.subr properly for spread daemon.
* Write a logfile rather than spewing to stdio.
* Move rendezvous socket to /var/run.
* Make Makefile.PL behave properly with PREFIX.

PR:             ports/60053
Submitted by:	Joshua Goodall <joshua@roughtrade.net>

1 files changed, 32 insertions, 10 deletions

diff --git a/net/spread4/Makefile b/net/spread4/Makefile
index fada5f96f318..b3528f4ae269 100644
--- a/net/spread4/Makefile
+++ b/net/spread4/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:    spread
+# New ports collection makefile for:	spread
 # Date created:		11 June 2001
 # Whom:			Anders Nordby <anders@fix.no>
 #
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	spread
-PORTVERSION=	3.17.0
-PORTREVISION=	1
+PORTVERSION=	3.17.1
 CATEGORIES=	net perl5
-MASTER_SITES=	http://www.roughtrade.net/distfiles/
+MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	joshua@roughtrade.net
 COMMENT=	The Spread Group Communication System, a network toolkit
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=	spflooder.1 spmonitor.1 spread.1 sptuser.1 spuser.1
@@ -24,35 +24,57 @@ MAN3=	libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.3 \
 	SP_scat_multicast.3 SP_scat_receive.3
 
 USE_PERL5=	yes
+USE_RC_SUBR=	yes
 INSTALLS_SHLIB=	yes
 PKGMESSAGE=	${WRKSRC}/license.txt
 
 MAKE_ARGS+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
+.if !defined(NOPORTDOCS)
+PORTDOCS+=	Readme.txt LICENSE
+.endif
+
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
 .include <bsd.port.pre.mk>
 
+# bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together.
+
+PERL_CONFIGURE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
+		INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
+
+_MANPAGES+=	${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/docs/spread.1 ${WRKSRC}/docs/spmonitor.1
+
 post-build:
-	(cd ${WRKSRC}/perl/Spread; ${PERL} Makefile.PL; ${MAKE})
+	@cd ${WRKSRC}/perl/Spread && \
+		${SETENV} ${CONFIGURE_ENV} ${PERL5} ./Makefile.PL ${PERL_CONFIGURE_ARGS}
+	@cd ${WRKSRC}/perl/Spread && \
+		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+	@cd ${WRKSRC}/perl/Spread && ${MAKE}
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/spread.sh > ${WRKDIR}/spread.sh
 
 pre-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh.sample
+	${INSTALL_SCRIPT} ${WRKDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh
 	${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/sp_func.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/sp_events.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.conf ${PREFIX}/etc/spread.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip ${PREFIX}/etc/spread.access_ip.sample
 	(cd ${WRKSRC}/perl/Spread && ${MAKE} install)
-	${GZIP_CMD} ${GZIP} ${LOCALBASE}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
+	${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/perl
-	${INSTALL_DATA} ${WRKSRC}/perl/Spread/README ${DOCSDIR}/perl
-	${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${DOCSDIR}/perl
+	${INSTALL_SCRIPT} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL