integrate USE_INET6 build better. uses the same set of NetBSD patches,

and switch INET6/non-INET6 build by "#ifdef INET6".

5 files changed, 31 insertions, 25 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index e80a928d3a5..a8528f3ff5f 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/07/08 17:11:56 itojun Exp $
+# $NetBSD: Makefile,v 1.16 1999/07/09 15:58:34 itojun Exp $
 #
 
 DISTNAME=		qpopper2.53
@@ -24,12 +24,6 @@ CONFIGURE_ARGS+=	--enable-servermode
 .endif
 .if defined(USE_INET6)
 CONFIGURE_ENV+=		O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
-PATCHDIR=		${WRKDIR}/.patches
-
-pre-patch:
-	${MKDIR} ${WRKDIR}/.patches
-	${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches
-	${CP} ${.CURDIR}/patches.v6/patch-* ${WRKDIR}/.patches
 .endif
 
 # popper makefile doesn't have an install target...
diff --git a/mail/qpopper/files/md5 b/mail/qpopper/files/md5
index cafa8a3eae3..12066b7da1a 100644
--- a/mail/qpopper/files/md5
+++ b/mail/qpopper/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/08/07 13:25:03 agc Exp $
+$NetBSD: md5,v 1.6 1999/07/09 15:58:34 itojun Exp $
 
 MD5 (qpopper2.53.tar.Z) = fc8ef705510369692ca514808423b723
diff --git a/mail/qpopper/files/patch-sum b/mail/qpopper/files/patch-sum
index 718e8a97147..39aa17bc1f4 100644
--- a/mail/qpopper/files/patch-sum
+++ b/mail/qpopper/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/09 15:58:34 itojun Exp $
 
 MD5 (patch-aa) = 0c73de75838fa87bdeee8ff25215aa6c
 MD5 (patch-ab) = 023d541f3737c6af4f226a736151fa4b
@@ -7,3 +7,5 @@ MD5 (patch-ad) = f159699e6d26570cbf5e2653db9a1c13
 MD5 (patch-ae) = 2c3c67441b4ba5ca70b3e84365fdbbd0
 MD5 (patch-af) = 0b6310b766f2840ed1b909adceb34b7f
 MD5 (patch-ag) = 15372d496bd7e7a4829b8ffdd9aa06a3
+MD5 (patch-ah) = 95917820ef99cd7f8f5780fa830017f7
+MD5 (patch-ai) = 723837297204949e004422ffeaa5fcc3
diff --git a/mail/qpopper/patches.v6/patch-ba b/mail/qpopper/patches/patch-ah
index 2ac1c33bca6..2c65462b940 100644
--- a/mail/qpopper/patches.v6/patch-ba
+++ b/mail/qpopper/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 1999/07/08 17:11:57 itojun Exp $
+$NetBSD: patch-ah,v 1.3 1999/07/09 15:58:34 itojun Exp $
 
---- /dev/null	Wed May 13 18:16:48 1998
-+++ sockunion.h	Wed May 13 17:57:27 1998
-@@ -0,0 +1,12 @@
+--- sockunion.h.orig	Fri Jul  9 08:18:22 1999
++++ sockunion.h	Fri Jul  9 08:20:21 1999
+@@ -0,0 +1,14 @@
 +union sockunion {
 +	struct sockinet {
 +		u_char si_len;
@@ -10,7 +10,9 @@ $NetBSD: patch-ba,v 1.1 1999/07/08 17:11:57 itojun Exp $
 +		u_short si_port;
 +	} su_si;
 +	struct sockaddr_in  su_sin;
++#ifdef INET6
 +	struct sockaddr_in6 su_sin6;
++#endif
 +};
 +#define su_len	su_si.si_len
 +#define su_family	su_si.si_family
diff --git a/mail/qpopper/patches.v6/patch-bb b/mail/qpopper/patches/patch-ai
index 67ef79f4f8e..a031cf03d06 100644
--- a/mail/qpopper/patches.v6/patch-bb
+++ b/mail/qpopper/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
+$NetBSD: patch-ai,v 1.1 1999/07/09 15:58:34 itojun Exp $
 
---- pop_init.c.orig	Thu Nov 20 06:20:38 1997
-+++ pop_init.c	Thu May 14 14:28:25 1998
+--- pop_init.c.orig	Thu Jul  9 16:44:07 1998
++++ pop_init.c	Fri Jul  9 08:20:24 1999
 @@ -44,6 +44,8 @@
  
  #include <popper.h>
@@ -11,7 +11,7 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
  /* CNS Kerberos IV */
  #ifdef KERBEROS
  AUTH_DAT kdata;
-@@ -75,9 +77,31 @@
+@@ -75,9 +77,37 @@
  }
  #endif
  
@@ -19,7 +19,11 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
 +sock_ntop(p)
 +    struct sockaddr *p;
 +{
++#ifndef INET6
 +    static char ntop_buf[INET6_ADDRSTRLEN];
++#else
++    static char ntop_buf[INET_ADDRSTRLEN];
++#endif
 +    union sockunion *su;
 +
 +    su = (union sockunion *)p;
@@ -28,10 +32,12 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
 +	inet_ntop(su->su_family, &su->su_sin.sin_addr, ntop_buf,
 +	    sizeof(ntop_buf));
 +	return ntop_buf;
++#ifdef INET6
 +    case AF_INET6:
 +	inet_ntop(su->su_family, &su->su_sin6.sin6_addr, ntop_buf,
 +	    sizeof(ntop_buf));
 +	return ntop_buf;
++#endif
 +    default:
 +	return "(unsupported AF)";
 +    }
@@ -44,7 +50,7 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
  {
  
  #ifdef KERBEROS
-@@ -87,10 +111,10 @@
+@@ -87,10 +117,10 @@
      char version[9];
      int auth;
    
@@ -57,7 +63,7 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
  			    &kdata, "", schedule, version);
  	
  	if (auth != KSUCCESS) {
-@@ -105,7 +129,7 @@
+@@ -105,7 +135,7 @@
  # ifdef DEBUG
  	if (p->debug)
  	    pop_log(p, POP_DEBUG, "%s.%s@%s (%s): ok", kdata.pname, 
@@ -66,7 +72,7 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
  # endif /* DEBUG */
  
  	strncpy(p->user, kdata.pname, sizeof(p->user));
-@@ -126,7 +150,7 @@
+@@ -126,7 +156,7 @@
  char    **      argmessage;
  {
  
@@ -75,7 +81,7 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
      struct hostent      *   ch;                 /*  Client host information */
      int                     errflag = 0;
      int                     c;
-@@ -272,13 +296,23 @@
+@@ -272,13 +302,25 @@
  
      /*  Save the dotted decimal form of the client's IP address 
          in the POP parameter block */
@@ -92,9 +98,11 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
 +    case AF_INET:
 +	ch = gethostbyaddr((char *) &cs.su_sin.sin_addr, sizeof(cs.su_sin.sin_addr), AF_INET);
 +	break;
++#ifdef INET6
 +    case AF_INET6:
 +	ch = gethostbyaddr((char *) &cs.su_sin6.sin6_addr, sizeof(cs.su_sin6.sin6_addr), AF_INET6);
 +	break;
++#endif
 +    default:
 +	ch = NULL;
 +	break;
@@ -102,15 +110,15 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
      if (ch == NULL){
          pop_log(p,POP_PRIORITY,
              "(v%s) Unable to get canonical name of client, err = %d",
-@@ -320,6 +354,7 @@
+@@ -320,6 +362,7 @@
  
  	strncpy(h_name, ch->h_name, sizeof(h_name));
  
-+#if 0
++#ifndef INET6
          /*  See if the name obtained for the client's IP 
              address returns an address */
          if ((ch_again = gethostbyname(h_name)) == NULL) {
-@@ -336,7 +371,7 @@
+@@ -336,7 +379,7 @@
              /*  Look for the client's IP address in the list returned 
                  for its name */
              for (addrp=ch_again->h_addr_list; *addrp; ++addrp)
@@ -119,7 +127,7 @@ $NetBSD: patch-bb,v 1.1 1999/07/08 17:11:57 itojun Exp $
  
              if (!*addrp) {
                  pop_log (p,POP_PRIORITY,
-@@ -345,6 +380,54 @@
+@@ -345,6 +388,54 @@
                  p->client = p->ipaddr;
              }
          }