please test.
jakob
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/imap-uw/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 7 Oct 2005 12:22:07 -0000 1.47
+++ Makefile 22 Nov 2006 11:17:12 -0000
@@ -3,8 +3,8 @@
COMMENT= "University of Washington IMAP4rev1/POP2/POP3 mail
servers"
COMMENT-mailutil= "University of Washington IMAP4rev1/POP2/POP3
mail utility"
-VERSION= 2004g
-DISTNAME= imap-2004g
+VERSION= 2006c1
+DISTNAME= imap-2006c1
PKGNAME= imap-uw-${VERSION}
PKGNAME-mailutil= mailutil-uw-${VERSION}
@@ -45,6 +45,9 @@
DOCDIR= share/doc/imap-uw
DOCFILES= FAQ.txt FAQ.html commndmt.txt drivers.txt formats.txt \
imaprc.txt md5.txt naming.txt RELNOTES
+
+post-configure:
+ touch ${WRKSRC}/ip6
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/imap-uw/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo 7 Oct 2005 12:22:07 -0000 1.21
+++ distinfo 22 Nov 2006 11:17:12 -0000
@@ -1,4 +1,4 @@
-MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020
-RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687
-SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066
-SIZE (imap-2004g.tar.Z) = 2246713
+MD5 (imap-2006c1.tar.Z) = 35a9976cc0c57e0423cd49fb0f967d5e
+RMD160 (imap-2006c1.tar.Z) = 58cc0e09cc61a390c9c88f463fd0d8aa6e5ef766
+SHA1 (imap-2006c1.tar.Z) = b59e66ede620257f1bc5f6e6e66ca91b7bef15c7
+SIZE (imap-2006c1.tar.Z) = 2708011
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Makefile
--- patches/patch-Makefile 29 Jul 2005 17:30:11 -0000 1.6
+++ patches/patch-Makefile 22 Nov 2006 11:17:12 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-Makefile,v 1.6 2005/07/29 17:30:11 jakob Exp $
---- Makefile.orig Sat Apr 30 22:50:20 2005
-+++ Makefile Fri Jul 29 09:26:33 2005
-@@ -311,7 +311,7 @@ aos art asv aux bsd cvx dpx dyn isc pyr
+--- Makefile.orig Fri Sep 15 20:10:32 2006
++++ Makefile Wed Nov 22 11:56:03 2006
+@@ -320,8 +320,7 @@ aos art asv aux bsd cvx dpx dyn isc pyr
bsf bso: an
$(BUILD) BUILDTYPE=$@ \
-- SPECIALS="GSSDIR=/usr SSLDIR=/usr SSLINCLUDE=/usr/include/openssl
SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private LOCKPGM=/usr/sbin/
mlock"
-+ SPECIALS="GSSDIR=/usr SSLDIR=/usr SSLINCLUDE=/usr/include/openssl
SSLCERTS=/etc/ssl SSLKEYS=/etc/ssl/private LOCKPGM=/usr/sbin/mlock"
+- PASSWDTYPE=pam \
+- SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib
SSLCERTS=/etc/ssl/certs SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/
include GSSLIB=/usr/lib LOCKPGM=/usr/sbin/mlock PAMLDFLAGS=-lpam"
++ SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib
SSLCERTS=/etc/ssl SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include/
kerberosV GSSLIB=/usr/lib LOCKPGM=/usr/sbin/mlock"
cyg: an
$(BUILD) BUILDTYPE=cyg \
-@@ -475,8 +475,6 @@ sslunix sslsco:
+@@ -486,8 +485,6 @@ sslunix sslsco:
@echo ++ SSLTYPE=$(SSLTYPE).nopwd
@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+++++
@echo
Index: patches/patch-imapd.8
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-imapd.8,v
retrieving revision 1.2
diff -u -r1.2 patch-imapd.8
--- patches/patch-imapd.8 29 Jul 2005 17:30:11 -0000 1.2
+++ patches/patch-imapd.8 22 Nov 2006 11:17:12 -0000
@@ -1,11 +1,8 @@
$OpenBSD: patch-imapd.8,v 1.2 2005/07/29 17:30:11 jakob Exp $
---- src/imapd/imapd.8.orig Tue May 18 19:46:54 2004
-+++ src/imapd/imapd.8 Fri Jul 29 09:17:44 2005
-@@ -1,9 +1,9 @@
--.TH IMAPD 8 "May 18, 2004"
-+.TH IMAPD 8 "October 12, 1998"
- .UC 5
+--- src/imapd/imapd.8.orig Thu Aug 31 02:11:24 2006
++++ src/imapd/imapd.8 Wed Nov 22 11:58:04 2006
+@@ -16,7 +16,7 @@
.SH NAME
IMAPd \- Internet Message Access Protocol server
.SH SYNOPSIS
Index: patches/patch-ipopd.8
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-ipopd.8,v
retrieving revision 1.2
diff -u -r1.2 patch-ipopd.8
--- patches/patch-ipopd.8 29 Jul 2005 17:30:11 -0000 1.2
+++ patches/patch-ipopd.8 22 Nov 2006 11:17:12 -0000
@@ -1,11 +1,8 @@
$OpenBSD: patch-ipopd.8,v 1.2 2005/07/29 17:30:11 jakob Exp $
---- src/ipopd/ipopd.8.orig Tue May 18 19:50:05 2004
-+++ src/ipopd/ipopd.8 Fri Jul 29 09:17:44 2005
-@@ -1,11 +1,11 @@
--.TH IPOPD 8 "May 18, 2004"
-+.TH IPOPD 8 "January 16, 1992"
- .UC 5
+--- src/ipopd/ipopd.8.orig Thu Aug 31 02:18:43 2006
++++ src/ipopd/ipopd.8 Wed Nov 22 11:58:04 2006
+@@ -16,9 +16,9 @@
.SH NAME
IPOPd \- Post Office Protocol server
.SH SYNOPSIS
Index: patches/patch-src_osdep_unix_Makefile
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-
src_osdep_unix_Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-src_osdep_unix_Makefile
--- patches/patch-src_osdep_unix_Makefile 29 Jul 2005 17:30:11 -0000
1.6
+++ patches/patch-src_osdep_unix_Makefile 22 Nov 2006 11:17:12 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_osdep_unix_Makefile,v 1.6 2005/07/29 17:30:11
jakob Exp $
---- src/osdep/unix/Makefile.orig Sat Apr 30 22:51:13 2005
-+++ src/osdep/unix/Makefile Fri Jul 29 19:27:10 2005
-@@ -36,14 +36,14 @@ IP=4
+--- src/osdep/unix/Makefile.orig Mon Oct 23 23:35:38 2006
++++ src/osdep/unix/Makefile Wed Nov 22 11:56:23 2006
+@@ -42,7 +42,7 @@ IP=4
# -O3 seems to be safe, but empirical observation from our local
expert
# indicates that in some (many?) cases -O3 code runs slower than -O2.
@@ -10,14 +10,4 @@
+GCCOPTLEVEL=
- # Extended flags needed for SSL. You may need to modify.
-
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
--SSLKEYS=$(SSLCERTS)
-+SSLDIR=/usr
-+SSLCERTS=/etc/ssl
-+SSLKEYS=$(SSLCERTS)/private
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
-
+ # Try to have some consistency in GCC builds. We want
optimization, but we
Index: patches/patch-src_osdep_unix_Makefile.gss
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-
src_osdep_unix_Makefile.gss,v
retrieving revision 1.5
diff -u -r1.5 patch-src_osdep_unix_Makefile.gss
--- patches/patch-src_osdep_unix_Makefile.gss 25 Jun 2003 21:28:08
-0000 1.5
+++ patches/patch-src_osdep_unix_Makefile.gss 22 Nov 2006 11:17:12 -0000
@@ -1,19 +1,19 @@
$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.5 2003/06/25
21:28:08 jakob Exp $
---- src/osdep/unix/Makefile.gss.orig Wed Mar 5 06:26:40 2003
-+++ src/osdep/unix/Makefile.gss Thu Apr 17 09:14:06 2003
-@@ -21,11 +21,10 @@
- # Extended flags needed for additional authenticators. You may
need to modify.
-
+--- src/osdep/unix/Makefile.gss.orig Thu Aug 31 03:32:16 2006
++++ src/osdep/unix/Makefile.gss Wed Nov 22 12:08:43 2006
+@@ -29,11 +29,10 @@
GSSDIR=/usr/local
--GSSCFLAGS= -I$(GSSDIR)/include -
DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
--GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
--GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -
lcom_err
-+GSSCFLAGS= -I/usr/include/kerberosV -DHEIMDAL
-+GSSLDFLAGS= -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -ldes -lcrypto
+ GSSINCLUDE=$(GSSDIR)/include
+ GSSLIB=$(GSSDIR)/lib
+-GSSCFLAGS= -I$(GSSINCLUDE) -
DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
+-GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
+-GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
++GSSCFLAGS= -I$(GSSINCLUDE) -DHEIMDAL
++GSSLDFLAGS= -L$(GSSLIB) -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -
ldes -lcrypto
gss: # GSSAPI Kerberos V flags
echo $(GSSCFLAGS) >> OSCFLAGS
-- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $
(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
+- sh -c '(test -f $(GSSLIB)/libk5crypto.a) && echo $(GSSNEWLDFLAGS)
|| echo $(GSSOLDLDFLAGS)' >> LDFLAGS
+ echo $(GSSLDFLAGS) >> LDFLAGS
echo "#include \"kerb_mit.c\"" >> auths.c
Index: patches/patch-src_osdep_unix_env_unix.c
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-
src_osdep_unix_env_unix.c,v
retrieving revision 1.6
diff -u -r1.6 patch-src_osdep_unix_env_unix.c
--- patches/patch-src_osdep_unix_env_unix.c 29 Jul 2005 17:30:11
-0000 1.6
+++ patches/patch-src_osdep_unix_env_unix.c 22 Nov 2006 11:17:12 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.6 2005/07/29 17:30:11
jakob Exp $
---- src/osdep/unix/env_unix.c.orig Mon Sep 13 23:31:19 2004
-+++ src/osdep/unix/env_unix.c Fri Jul 29 09:17:44 2005
-@@ -809,15 +809,12 @@ char *myhomedir ()
+--- src/osdep/unix/env_unix.c.orig Fri Sep 15 19:00:55 2006
++++ src/osdep/unix/env_unix.c Wed Nov 22 11:50:47 2006
+@@ -888,15 +888,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();
Index: patches/patch-src_osdep_unix_kerb_mit_c
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-
src_osdep_unix_kerb_mit_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_osdep_unix_kerb_mit_c
--- patches/patch-src_osdep_unix_kerb_mit_c 17 Apr 2003 08:06:30
-0000 1.1
+++ patches/patch-src_osdep_unix_kerb_mit_c 22 Nov 2006 11:17:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_osdep_unix_kerb_mit_c,v 1.1 2003/04/17 08:06:30
jakob Exp $
---- src/osdep/unix/kerb_mit.c.orig Thu Apr 17 09:29:01 2003
-+++ src/osdep/unix/kerb_mit.c Thu Apr 17 09:29:19 2003
-@@ -19,8 +19,13 @@
+--- src/osdep/unix/kerb_mit.c.orig Thu Aug 31 03:40:15 2006
++++ src/osdep/unix/kerb_mit.c Wed Nov 22 11:50:47 2006
+@@ -27,8 +27,13 @@
*/
#define PROTOTYPE(x) x
Index: patches/patch-tmail_tmail_c
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-tmail_tmail_c,v
retrieving revision 1.1
diff -u -r1.1 patch-tmail_tmail_c
--- patches/patch-tmail_tmail_c 18 Sep 2002 08:19:06 -0000 1.1
+++ patches/patch-tmail_tmail_c 22 Nov 2006 11:17:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tmail_tmail_c,v 1.1 2002/09/18 08:19:06 jakob Exp $
---- src/tmail/tmail.c.orig Mon Jul 15 00:49:28 2002
-+++ src/tmail/tmail.c Sun Sep 8 20:51:54 2002
-@@ -189,7 +189,6 @@ int main (int argc,char *argv[])
+--- src/tmail/tmail.c.orig Thu Oct 12 19:33:37 2006
++++ src/tmail/tmail.c Wed Nov 22 11:50:47 2006
+@@ -197,7 +197,6 @@ int main (int argc,char *argv[])
while ((c = getchar ()) != EOF) putc (c,f);
}
else {
