- update to 2006k (reminded by robert@)

- indent clean-up

ok robert@ (whom I suspect to own a time machine)
This commit is contained in:
ajacoutot 2007-11-13 14:11:17 +00:00
parent 43dc6891f3
commit f453b02611
6 changed files with 37 additions and 35 deletions

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.56 2007/10/31 13:53:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.57 2007/11/13 14:11:17 ajacoutot Exp $
COMMENT-server= University of Washington IMAP4rev1/POP2/POP3 mail servers
COMMENT-mailutil=University of Washington IMAP4rev1/POP2/POP3 mail utility
COMMENT-c-client=University of Washington's c-client mail access routines
BASEVER= 2006j
VERSION= ${BASEVER}2
DISTNAME= imap-${VERSION}
V= 2006k
DISTNAME= imap-${V}
PKGNAME-server= imap-uw-${VERSION}p0
PKGNAME-mailutil= mailutil-uw-${VERSION}p0
PKGNAME-c-client= c-client-${VERSION}p0
PKGNAME-server= imap-uw-${V}
PKGNAME-mailutil=mailutil-uw-${V}
PKGNAME-c-client=c-client-${V}
CATEGORIES= mail
CATEGORIES-c-client=mail devel
@ -37,7 +36,6 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= asn1 c com_err crypto des gssapi kafs krb5 ssl
WANTLIB-c-client=
WRKDIST= ${WRKDIR}/imap-${BASEVER}
ALL_TARGET= bso
SHLIB= libc-client.so.${LIBc-client_VERSION}
MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" EXTRAAUTHENTICATORS="gss" IP=6 \

View File

@ -1,5 +1,5 @@
MD5 (imap-2006j2.tar.Z) = 15AGkcQVvMclwb8rFeT7mQ==
RMD160 (imap-2006j2.tar.Z) = kZJyClJ+iXfvbj62vPjzsmaA5Pw=
SHA1 (imap-2006j2.tar.Z) = Qfw/jPEfGTGpwEYkC8BM658UFsA=
SHA256 (imap-2006j2.tar.Z) = Wy7SR/2Y+Bx6LSPQgi9gLUm3QsGXYanC2tZ1P18+gG4=
SIZE (imap-2006j2.tar.Z) = 2686745
MD5 (imap-2006k.tar.Z) = OpgGaHD7gHXHRAeTCeN5yA==
RMD160 (imap-2006k.tar.Z) = S+bEYDXyi8XytxDOe2x355KdKF8=
SHA1 (imap-2006k.tar.Z) = S2TnTVkohXocgCumyatXUgWzQs4=
SHA256 (imap-2006k.tar.Z) = 4pSmKdlI3voJ37fugMgKATkOiWoaNhinCQGfF6DldDE=
SIZE (imap-2006k.tar.Z) = 2723757

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile,v 1.10 2007/10/30 10:12:41 ajacoutot Exp $
--- Makefile.orig Wed Oct 24 23:55:15 2007
+++ Makefile Wed Oct 24 23:57:45 2007
@@ -333,7 +333,7 @@ bsf: an
$OpenBSD: patch-Makefile,v 1.11 2007/11/13 14:11:17 ajacoutot Exp $
--- Makefile.orig Thu Nov 8 00:16:50 2007
+++ Makefile Tue Nov 13 14:57:51 2007
@@ -334,7 +334,7 @@ bsf: an
bso: an
$(TOUCH) ip6
$(BUILD) BUILDTYPE=$@ IP=$(IP6) \
- SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/ssl SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib LOCKPGM=/usr/sbin/mlock"
+ 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 \
@@ -560,8 +560,8 @@ sslunix sslsco:
# Info from Joel Reicher about NetBSD SSL paths. I assume it has PAM because pam is in NetBSD sources...
@@ -575,8 +575,8 @@ sslunix sslsco:
@echo ++ SSLTYPE=$(SSLTYPE).nopwd
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.8 2007/10/30 10:12:41 ajacoutot Exp $
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.9 2007/11/13 14:11:17 ajacoutot Exp $
--- src/osdep/unix/env_unix.c.orig Tue May 29 22:29:52 2007
+++ src/osdep/unix/env_unix.c Thu Oct 25 00:13:05 2007
@@ -935,15 +935,12 @@ char *myhomedir ()
--- src/osdep/unix/env_unix.c.orig Fri Sep 14 18:05:57 2007
+++ src/osdep/unix/env_unix.c Tue Nov 13 14:57:52 2007
@@ -936,15 +936,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tmail_tmail_c,v 1.2 2006/12/01 14:40:00 jakob Exp $
--- 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[])
$OpenBSD: patch-tmail_tmail_c,v 1.3 2007/11/13 14:11:17 ajacoutot Exp $
--- src/tmail/tmail.c.orig Mon Sep 17 22:58:56 2007
+++ src/tmail/tmail.c Tue Nov 13 14:57:52 2007
@@ -227,7 +227,6 @@ int main (int argc,char *argv[])
while ((c = getchar ()) != EOF) putc (c,f);
}
else {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.3 2007/10/31 13:53:56 ajacoutot Exp $
@comment $OpenBSD: PLIST-server,v 1.4 2007/11/13 14:11:17 ajacoutot Exp $
@conflict courier-imap-*
@conflict courier-pop3-*
@pkgpath ${BASE_PKGPATH}
@ -78,3 +78,7 @@ share/doc/imap-uw/rfc/rfc4616.txt
share/doc/imap-uw/rfc/rfc4731.txt
share/doc/imap-uw/rfc/rfc4752.txt
share/doc/imap-uw/rfc/rfc4790.txt
share/doc/imap-uw/rfc/rfc4959.txt
share/doc/imap-uw/rfc/rfc4978.txt
share/doc/imap-uw/rfc/rfc5032.txt
share/doc/imap-uw/rfc/rfc5051.txt