update of net/spread and net/spread-j to version 3.17.2

PR:		69095
Submitted by:	Joshua Goodall <joshua@roughtrade.net> (maintainer)

15 files changed, 75 insertions, 73 deletions

diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index 7e38271fec76..70522dc848a8 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -5,34 +5,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=	spread-j
-PORTVERSION=	3.17.1
+PORTNAME=	spread
+PORTVERSION=	3.17.2
 CATEGORIES=	net java
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
-DISTNAME=	spread-src-${PORTVERSION}
+PKGNAMESUFFIX=	-j
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	joshua@roughtrade.net
 COMMENT=	Java client library for the Spread Group Communication System
 
 BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
-USE_JAVA=	1.2+
-JAVALIBDIR=	${PREFIX}/share/java/classes
+USE_JAVA=	YES
+JAVA_VERSION=	1.2+
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
 ANT?=		${LOCALBASE}/bin/ant
 .if defined(NOPORTDOCS)
-PLIST_SUB+=	JAVALIB_DOCS='@comment '
 ANT_TARGET=	jar
 .else
-PLIST_SUB+=	JAVALIB_DOCS=''
 ANT_TARGET=	javadocs jar
-PORTDOCS+=	html readme.txt
+PORTDOCS+=	java
 .endif
-ANT_PARAMS+=	-Dlib.dir=${JAVALIBDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
+ANT_PARAMS+=	-Dlib.dir=${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/java
-PLIST_SUB+=	JAVALIBDIR=share/java/classes
+WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}/java
+PLIST_SUB+=	PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
 
 do-build:
 	@cd ${WRKSRC} && \
@@ -41,19 +40,19 @@ do-build:
 do-install:
 	@cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/recThread.java ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/User.java ${EXAMPLESDIR}
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html/spread
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html/spread/class-use
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${DOCSDIR}/html/spread
-	${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${DOCSDIR}/html/spread/class-use
+	${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/recThread.java ${EXAMPLESDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${EXAMPLESDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/User.java ${EXAMPLESDIR}/java
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/java
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html/spread
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html/spread/class-use
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/java/html
+	${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${DOCSDIR}/java/html
+	${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${DOCSDIR}/java/html/spread
+	${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${DOCSDIR}/java/html/spread/class-use
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net/spread-j/distinfo b/net/spread-j/distinfo
index 5c0534733595..091600afbf48 100644
--- a/net/spread-j/distinfo
+++ b/net/spread-j/distinfo
@@ -1,2 +1,2 @@
-MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4
-SIZE (spread-src-3.17.1.tar.gz) = 290861
+MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1
+SIZE (spread-src-3.17.2.tar.gz) = 289180
diff --git a/net/spread-j/pkg-plist b/net/spread-j/pkg-plist
index 0ede388ef94b..a45877cac486 100644
--- a/net/spread-j/pkg-plist
+++ b/net/spread-j/pkg-plist
@@ -1,5 +1,6 @@
-%%JAVALIBDIR%%/spread-3.17.1.jar
-%%PORTDOCS%%%%EXAMPLESDIR%%/Flooder.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/recThread.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/User.java
-%%PORTDOCS%%@dirrm share/examples/spread-j
+%%JAVAJARDIR%%/%%PORTNAME%%-%%PORTVERSION%%.jar
+%%PORTDOCS%%%%EXAMPLESDIR%%/java/Flooder.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/java/recThread.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/java/User.java
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java
+%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
diff --git a/net/spread/Makefile b/net/spread/Makefile
index b3528f4ae269..be453e5bf938 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spread
-PORTVERSION=	3.17.1
+PORTVERSION=	3.17.2
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	joshua@roughtrade.net
 COMMENT=	The Spread Group Communication System, a network toolkit
 
+WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 5c0534733595..091600afbf48 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1,2 +1,2 @@
-MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4
-SIZE (spread-src-3.17.1.tar.gz) = 290861
+MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1
+SIZE (spread-src-3.17.2.tar.gz) = 289180
diff --git a/net/spread/files/patch-Makefile.in b/net/spread/files/patch-Makefile.in
index 32dd8494442e..91e69fceaf9e 100644
--- a/net/spread/files/patch-Makefile.in
+++ b/net/spread/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in	Wed Jun 18 05:00:10 2003
-+++ Makefile.in	Tue Aug  5 21:26:23 2003
+--- Makefile.in	Thu Nov 13 08:42:54 2003
++++ Makefile.in	Thu Jul 15 21:42:27 2004
 @@ -26,7 +26,7 @@
  #Rules: major  -- inc for incompatible change
  #     : minor  -- inc for bugfix or forward compatible change
@@ -91,7 +91,7 @@
  	rm -f config.cache config.log docs/*.out core
  	rm -rf autom4te.cache
  
-@@ -247,11 +255,6 @@
+@@ -248,11 +256,6 @@
  	done
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  		$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
diff --git a/net/spread/files/patch-auth-ip.c b/net/spread/files/patch-auth-ip.c
index 278edc27a50c..6a28acdab04a 100644
--- a/net/spread/files/patch-auth-ip.c
+++ b/net/spread/files/patch-auth-ip.c
@@ -1,17 +1,17 @@
---- auth-ip.c	Sun Sep 22 12:56:52 2002
-+++ auth-ip.c	Tue Aug  5 21:27:40 2003
+--- auth-ip.c	Fri Mar  5 11:32:46 2004
++++ auth-ip.c	Thu Jul 15 21:38:09 2004
 @@ -90,12 +90,9 @@
      /* load spread.access_ip file */
      if (NULL != (fp = fopen(file_name,"r")) )
-         Alarm( PRINT, "ip_init: using file: %s\n", file_name);
+         Alarmp( SPLOG_INFO, ACM, "ip_init: using file: %s\n", file_name);
 -    if (fp == NULL) 
 -        if (NULL != (fp = fopen("./spread.access_ip", "r")) )
--            Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n");
+-            Alarmp( SPLOG_INFO, ACM, "ip_init: using file: ./spread.access_ip\n");
      if (fp == NULL)
 -        if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) )
--            Alarm( PRINT, "ip_init: using file: /etc/spread.access_ip\n");
+-            Alarmp( SPLOG_INFO, ACM, "ip_init: using file: /etc/spread.access_ip\n");
 +        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_ip", "r")) )
-+            Alarm( PRINT, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
++            Alarmp( SPLOG_INFO, ACM, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
      if (fp == NULL)
      {
-         Alarm( PRINT, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
+         Alarmp( SPLOG_ERROR, ACM, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
diff --git a/net/spread/files/patch-auth-pword.c b/net/spread/files/patch-auth-pword.c
index c0bae4a7b0cf..3ff9f6426920 100644
--- a/net/spread/files/patch-auth-pword.c
+++ b/net/spread/files/patch-auth-pword.c
@@ -1,17 +1,17 @@
---- auth-pword.c	Sun Sep 22 12:56:52 2002
-+++ auth-pword.c	Tue Aug  5 21:28:50 2003
+--- auth-pword.c	Fri Mar  5 11:32:46 2004
++++ auth-pword.c	Thu Jul 15 21:40:16 2004
 @@ -118,12 +118,9 @@
      /* load spread.access_ip file */
      if (NULL != (fp = fopen(file_name,"r")) )
-         Alarm( PRINT, "pword_init: using file: %s\n", file_name);
+         Alarmp( SPLOG_INFO, ACM, "pword_init: using file: %s\n", file_name);
 -    if (fp == NULL) 
 -        if (NULL != (fp = fopen("./spread.access_pword", "r")) )
--            Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n");
+-            Alarmp( SPLOG_INFO,ACM, "pword_init: using file: ./spread.access_pword\n");
      if (fp == NULL)
 -        if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) )
--            Alarm( PRINT, "pword_init: using file: /etc/spread.access_pword\n");
+-            Alarmp( SPLOG_INFO, ACM, "pword_init: using file: /etc/spread.access_pword\n");
 +        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) )
-+            Alarm( PRINT, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
++            Alarmp( SPLOG_INFO, ACM, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
      if (fp == NULL)
-         Alarm( EXIT, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
+         Alarmp( SPLOG_FATAL, ACM, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
  
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index ace659ce5f7d..85ffe55a99df 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -23,4 +23,4 @@ sbin/spread
 %%PORTDOCS%%%%EXAMPLESDIR%%/test.pl
 @unexec rmdir /var/run/spread 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
diff --git a/net/spread4/Makefile b/net/spread4/Makefile
index b3528f4ae269..be453e5bf938 100644
--- a/net/spread4/Makefile
+++ b/net/spread4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spread
-PORTVERSION=	3.17.1
+PORTVERSION=	3.17.2
 CATEGORIES=	net perl5
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	joshua@roughtrade.net
 COMMENT=	The Spread Group Communication System, a network toolkit
 
+WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/spread4/distinfo b/net/spread4/distinfo
index 5c0534733595..091600afbf48 100644
--- a/net/spread4/distinfo
+++ b/net/spread4/distinfo
@@ -1,2 +1,2 @@
-MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4
-SIZE (spread-src-3.17.1.tar.gz) = 290861
+MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1
+SIZE (spread-src-3.17.2.tar.gz) = 289180
diff --git a/net/spread4/files/patch-Makefile.in b/net/spread4/files/patch-Makefile.in
index 32dd8494442e..91e69fceaf9e 100644
--- a/net/spread4/files/patch-Makefile.in
+++ b/net/spread4/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in	Wed Jun 18 05:00:10 2003
-+++ Makefile.in	Tue Aug  5 21:26:23 2003
+--- Makefile.in	Thu Nov 13 08:42:54 2003
++++ Makefile.in	Thu Jul 15 21:42:27 2004
 @@ -26,7 +26,7 @@
  #Rules: major  -- inc for incompatible change
  #     : minor  -- inc for bugfix or forward compatible change
@@ -91,7 +91,7 @@
  	rm -f config.cache config.log docs/*.out core
  	rm -rf autom4te.cache
  
-@@ -247,11 +255,6 @@
+@@ -248,11 +256,6 @@
  	done
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  		$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
diff --git a/net/spread4/files/patch-auth-ip.c b/net/spread4/files/patch-auth-ip.c
index 278edc27a50c..6a28acdab04a 100644
--- a/net/spread4/files/patch-auth-ip.c
+++ b/net/spread4/files/patch-auth-ip.c
@@ -1,17 +1,17 @@
---- auth-ip.c	Sun Sep 22 12:56:52 2002
-+++ auth-ip.c	Tue Aug  5 21:27:40 2003
+--- auth-ip.c	Fri Mar  5 11:32:46 2004
++++ auth-ip.c	Thu Jul 15 21:38:09 2004
 @@ -90,12 +90,9 @@
      /* load spread.access_ip file */
      if (NULL != (fp = fopen(file_name,"r")) )
-         Alarm( PRINT, "ip_init: using file: %s\n", file_name);
+         Alarmp( SPLOG_INFO, ACM, "ip_init: using file: %s\n", file_name);
 -    if (fp == NULL) 
 -        if (NULL != (fp = fopen("./spread.access_ip", "r")) )
--            Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n");
+-            Alarmp( SPLOG_INFO, ACM, "ip_init: using file: ./spread.access_ip\n");
      if (fp == NULL)
 -        if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) )
--            Alarm( PRINT, "ip_init: using file: /etc/spread.access_ip\n");
+-            Alarmp( SPLOG_INFO, ACM, "ip_init: using file: /etc/spread.access_ip\n");
 +        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_ip", "r")) )
-+            Alarm( PRINT, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
++            Alarmp( SPLOG_INFO, ACM, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
      if (fp == NULL)
      {
-         Alarm( PRINT, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
+         Alarmp( SPLOG_ERROR, ACM, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
diff --git a/net/spread4/files/patch-auth-pword.c b/net/spread4/files/patch-auth-pword.c
index c0bae4a7b0cf..3ff9f6426920 100644
--- a/net/spread4/files/patch-auth-pword.c
+++ b/net/spread4/files/patch-auth-pword.c
@@ -1,17 +1,17 @@
---- auth-pword.c	Sun Sep 22 12:56:52 2002
-+++ auth-pword.c	Tue Aug  5 21:28:50 2003
+--- auth-pword.c	Fri Mar  5 11:32:46 2004
++++ auth-pword.c	Thu Jul 15 21:40:16 2004
 @@ -118,12 +118,9 @@
      /* load spread.access_ip file */
      if (NULL != (fp = fopen(file_name,"r")) )
-         Alarm( PRINT, "pword_init: using file: %s\n", file_name);
+         Alarmp( SPLOG_INFO, ACM, "pword_init: using file: %s\n", file_name);
 -    if (fp == NULL) 
 -        if (NULL != (fp = fopen("./spread.access_pword", "r")) )
--            Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n");
+-            Alarmp( SPLOG_INFO,ACM, "pword_init: using file: ./spread.access_pword\n");
      if (fp == NULL)
 -        if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) )
--            Alarm( PRINT, "pword_init: using file: /etc/spread.access_pword\n");
+-            Alarmp( SPLOG_INFO, ACM, "pword_init: using file: /etc/spread.access_pword\n");
 +        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) )
-+            Alarm( PRINT, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
++            Alarmp( SPLOG_INFO, ACM, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
      if (fp == NULL)
-         Alarm( EXIT, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
+         Alarmp( SPLOG_FATAL, ACM, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
  
diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist
index ace659ce5f7d..85ffe55a99df 100644
--- a/net/spread4/pkg-plist
+++ b/net/spread4/pkg-plist
@@ -23,4 +23,4 @@ sbin/spread
 %%PORTDOCS%%%%EXAMPLESDIR%%/test.pl
 @unexec rmdir /var/run/spread 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true