Rename some #define's so they don't conflict with some definitions from arpa.h

4 files changed, 55 insertions, 5 deletions

diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile
index 21ad7d4af09..2b865182812 100644
--- a/net/yale-tftpd/Makefile
+++ b/net/yale-tftpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:52:06 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/21 09:15:30 jmc Exp $
 # FreeBSD Id: ports/ftp/yale-tftpd/Makefile,v 1.14 2000/04/12 05:31:29 mharo Exp
 
 DISTNAME=	yale-tftpd-3.0
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/net/yale-tftpd/
diff --git a/net/yale-tftpd/distinfo b/net/yale-tftpd/distinfo
index 56f6059792b..ec2250b8f25 100644
--- a/net/yale-tftpd/distinfo
+++ b/net/yale-tftpd/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.3 2002/04/23 15:27:15 seb Exp $
+$NetBSD: distinfo,v 1.4 2003/09/21 09:15:30 jmc Exp $
 
 SHA1 (yale-tftpd-3.0.tar.gz) = 5f87e3d37feb5c5c8b7f2db34a0c87ee537727af
 Size (yale-tftpd-3.0.tar.gz) = 33469 bytes
 SHA1 (patch-aa) = e6e9b368db8f70bdb4fbb2a1b032bd4ce66206f2
 SHA1 (patch-ab) = e6eb66ed95139b47ee1df07014a636803e89ad47
 SHA1 (patch-ac) = 3c550bc492079cdf01be93a12d1692452fd07282
-SHA1 (patch-ad) = 1743282699af3a17e4e95c825ad4989688349cd6
+SHA1 (patch-ad) = fba4253b24ad9950508736288c52bee421d95189
 SHA1 (patch-ae) = 0b431f5a4f769dbc560fc55231ea2cf478616987
 SHA1 (patch-af) = c6815c58d6ce91dbe0478cbb4fcf0c01126b3c4a
 SHA1 (patch-ag) = 7e14bea74c2d94222cc5f13b03b7735fbe442487
 SHA1 (patch-ah) = 623a09bbb11ae354007cd90e55a98dea3555ec68
 SHA1 (patch-ai) = c183d7b8530322566710000ee7885a6fd8db3480
+SHA1 (patch-aj) = f57139380e8b7e48b9e40f9ef9864eb1b56720f0
diff --git a/net/yale-tftpd/patches/patch-ad b/net/yale-tftpd/patches/patch-ad
index 4838dc5f6bf..2862f1864b0 100644
--- a/net/yale-tftpd/patches/patch-ad
+++ b/net/yale-tftpd/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
+$NetBSD: patch-ad,v 1.2 2003/09/21 09:15:31 jmc Exp $
 
 --- tftpd.c.orig	Mon Mar 20 21:14:39 1995
 +++ tftpd.c
@@ -11,6 +11,19 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
  #define	TIMEOUT		5
  
  extern	int errno;
+@@ -66,9 +68,9 @@
+ int	rexmtval = TIMEOUT;
+ int	maxtimeout = 5*TIMEOUT;
+ 
+-#define	PKTSIZE	SEGSIZE+4
+-char	buf[PKTSIZE];
+-char	ackbuf[PKTSIZE];
++#define	BUF_PKTSIZE	SEGSIZE+4
++char	buf[BUF_PKTSIZE];
++char	ackbuf[BUF_PKTSIZE];
+ struct	sockaddr_in from;
+ int	fromlen;
+ 
 @@ -105,6 +107,8 @@
  
  	if (argc > 1 && strcmp (argv[1], "-d") == 0) {
@@ -196,3 +209,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
  	struct formats *pf;
  {
  	struct tftphdr *dp, *w_init();
+@@ -739,7 +739,7 @@
+ 		write_behind(file, pf->f_convert);
+ 		for ( ; ; ) {
+ 			alarm(rexmtval);
+-			n = recv(peer, dp, PKTSIZE, 0);
++			n = recv(peer, dp, BUF_PKTSIZE, 0);
+ 			alarm(0);
+ 			if (n < 0) {            /* really? */
+ 				syslog(LOG_ERR, "tftpd: read: %m\n");
diff --git a/net/yale-tftpd/patches/patch-aj b/net/yale-tftpd/patches/patch-aj
new file mode 100644
index 00000000000..c84c5b105da
--- /dev/null
+++ b/net/yale-tftpd/patches/patch-aj
@@ -0,0 +1,27 @@
+$NetBSD: patch-aj,v 1.1 2003/09/21 09:15:31 jmc Exp $
+
+--- tftpsubs.c.orig	2003-09-21 04:09:09.000000000 +0000
++++ tftpsubs.c	2003-09-21 04:10:08.000000000 +0000
+@@ -39,11 +39,11 @@
+ #include <arpa/tftp.h>
+ #include <stdio.h>
+ 
+-#define PKTSIZE SEGSIZE+4       /* should be moved to tftp.h */
++#define BUF_PKTSIZE SEGSIZE+4       /* should be moved to tftp.h */
+ 
+ struct bf {
+ 	int counter;            /* size of data in buffer, or flag */
+-	char buf[PKTSIZE];      /* room for data packet */
++	char buf[BUF_PKTSIZE];      /* room for data packet */
+ } bfs[2];
+ 
+ 				/* Values for bf.counter  */
+@@ -233,7 +233,7 @@
+ int	f;		/* socket to flush */
+ {
+ 	int i, j = 0;
+-	char rbuf[PKTSIZE];
++	char rbuf[BUF_PKTSIZE];
+ 	struct sockaddr_in from;
+ 	int fromlen;
+