Attachment 44676 Details for Bug 69095 – file.diff

[patch] file.diff

file.diff (text/plain), 7.97 KB, created by Joshua Goodall on 2004-07-15 13:10:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joshua Goodall

Created: 2004-07-15 13:10:25 UTC

Size: 7.97 KB

patch

obsolete

>Index: net/spread/Makefile
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread/Makefile,v
>retrieving revision 1.13
>diff -u -r1.13 Makefile
>--- net/spread/Makefile	29 Dec 2003 06:21:19 -0000	1.13
>+++ net/spread/Makefile	15 Jul 2004 11:51:07 -0000
>@@ -6,14 +6,16 @@
> #
> 
> PORTNAME=	spread
>-PORTVERSION=	3.17.1
>+PORTVERSION=	3.17.2
> CATEGORIES=	net perl5
>-MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
>+MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/ \
>+		http://www.roughtrade.net/distfiles/
> 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
> 
>Index: net/spread/distinfo
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- net/spread/distinfo	31 Mar 2004 03:10:16 -0000	1.6
>+++ net/spread/distinfo	15 Jul 2004 11:33:18 -0000
>@@ -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
>Index: net/spread/files/patch-Makefile.in
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread/files/patch-Makefile.in,v
>retrieving revision 1.2
>diff -u -r1.2 patch-Makefile.in
>--- net/spread/files/patch-Makefile.in	29 Dec 2003 06:21:20 -0000	1.2
>+++ net/spread/files/patch-Makefile.in	15 Jul 2004 11:42:41 -0000
>@@ -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); \
>Index: net/spread/files/patch-auth-ip.c
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread/files/patch-auth-ip.c,v
>retrieving revision 1.2
>diff -u -r1.2 patch-auth-ip.c
>--- net/spread/files/patch-auth-ip.c	29 Dec 2003 06:21:20 -0000	1.2
>+++ net/spread/files/patch-auth-ip.c	15 Jul 2004 11:38:58 -0000
>@@ -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");
>Index: net/spread/files/patch-auth-pword.c
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread/files/patch-auth-pword.c,v
>retrieving revision 1.2
>diff -u -r1.2 patch-auth-pword.c
>--- net/spread/files/patch-auth-pword.c	29 Dec 2003 06:21:20 -0000	1.2
>+++ net/spread/files/patch-auth-pword.c	15 Jul 2004 11:40:34 -0000
>@@ -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);
>  
>Index: net/spread-j/Makefile
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread-j/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- net/spread-j/Makefile	13 May 2004 22:54:07 -0000	1.5
>+++ net/spread-j/Makefile	15 Jul 2004 11:58:21 -0000
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	spread-j
>-PORTVERSION=	3.17.1
>+PORTVERSION=	3.17.2
> CATEGORIES=	net java
>-MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
>+MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/ \
>+		http://www.roughtrade.net/distfiles/
> DISTNAME=	spread-src-${PORTVERSION}
> 
> MAINTAINER=	joshua@roughtrade.net
>@@ -31,7 +32,7 @@
> .endif
> ANT_PARAMS+=	-Dlib.dir=${JAVALIBDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
> 
>-WRKSRC=		${WRKDIR}/${DISTNAME}/java
>+WRKSRC=		${WRKDIR}/spread_src-${PORTVERSION}/java
> PLIST_SUB+=	JAVALIBDIR=share/java/classes
> 
> do-build:
>Index: net/spread-j/distinfo
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread-j/distinfo,v
>retrieving revision 1.3
>diff -u -r1.3 distinfo
>--- net/spread-j/distinfo	31 Mar 2004 03:10:16 -0000	1.3
>+++ net/spread-j/distinfo	15 Jul 2004 11:53:21 -0000
>@@ -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
>Index: net/spread-j/pkg-plist
>===================================================================
>RCS file: /usr/cvsup/freebsd/ports/net/spread-j/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- net/spread-j/pkg-plist	29 Dec 2003 06:21:22 -0000	1.2
>+++ net/spread-j/pkg-plist	15 Jul 2004 11:55:39 -0000
>@@ -1,4 +1,4 @@
>-%%JAVALIBDIR%%/spread-3.17.1.jar
>+%%JAVALIBDIR%%/spread-3.17.2.jar
> %%PORTDOCS%%%%EXAMPLESDIR%%/Flooder.java
> %%PORTDOCS%%%%EXAMPLESDIR%%/recThread.java
> %%PORTDOCS%%%%EXAMPLESDIR%%/User.java

Actions: View | Diff

Attachments on bug 69095: 44676