summaryrefslogtreecommitdiff
path: root/mail/imap-uw/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mail/imap-uw/patches')
-rw-r--r--mail/imap-uw/patches/patch-aa28
-rw-r--r--mail/imap-uw/patches/patch-ab73
-rw-r--r--mail/imap-uw/patches/patch-ac15
-rw-r--r--mail/imap-uw/patches/patch-ad15
-rw-r--r--mail/imap-uw/patches/patch-ae15
-rw-r--r--mail/imap-uw/patches/patch-af11
-rw-r--r--mail/imap-uw/patches/patch-aj34
-rw-r--r--mail/imap-uw/patches/patch-al12
-rw-r--r--mail/imap-uw/patches/patch-am14
-rw-r--r--mail/imap-uw/patches/patch-be22
-rw-r--r--mail/imap-uw/patches/patch-bf26
-rw-r--r--mail/imap-uw/patches/patch-bg22
12 files changed, 186 insertions, 101 deletions
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 7afeb974bd5..331474cf76a 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,26 +1,24 @@
-$NetBSD: patch-aa,v 1.16 2006/01/12 20:53:51 adam Exp $
+$NetBSD: patch-aa,v 1.17 2006/07/26 20:00:27 jlam Exp $
---- Makefile.orig 2005-04-30 22:50:20.000000000 +0200
+--- Makefile.orig 2005-04-30 16:50:20.000000000 -0400
+++ Makefile
-@@ -180,7 +180,7 @@ SSLTYPE=nopwd
- # 4 (default) IPv4 support only
- # 6 IPv6 and IPv4 support
-
--IP=4
-+#IP=4
-
-
- # The following extra compilation flags are defined. None of these flags are
-@@ -474,9 +474,9 @@ sslunix sslsco:
+@@ -474,9 +474,6 @@ sslunix sslsco:
@echo + In order to rectify this problem, you MUST build with:
@echo ++ SSLTYPE=$(SSLTYPE).nopwd
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- @echo
- @echo Do you want to continue this build anyway? Type y or n please:
- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
-+# @echo
-+# @echo Do you want to continue this build anyway? Type y or n please:
-+# @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
sslnone:
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@@ -489,9 +486,6 @@ sslnone:
+ @echo ++ SSLTYPE=nopwd
+ @echo + You must also have OpenSSL or equivalent installed.
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- @echo
+- @echo Do you want to continue this build anyway? Type y or n please:
+- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
+
+
+ # C compiler types
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index 0e0f825e0a6..5e5f91b27c8 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,44 +1,17 @@
-$NetBSD: patch-ab,v 1.18 2006/07/07 05:45:51 minskim Exp $
+$NetBSD: patch-ab,v 1.19 2006/07/26 20:00:27 jlam Exp $
---- src/osdep/unix/Makefile.orig 2006-07-06 22:20:44.000000000 -0700
+--- src/osdep/unix/Makefile.orig 2005-04-30 16:51:13.000000000 -0400
+++ src/osdep/unix/Makefile
-@@ -41,9 +41,6 @@ GCCOPTLEVEL= -O2
+@@ -124,7 +124,7 @@ DEFAULTDRIVERS=imap nntp pop3 mh mx mbx
- # Extended flags needed for SSL. You may need to modify.
+ # Normally no need to change any of these
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
--SSLKEYS=$(SSLCERTS)
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
-
-@@ -60,7 +57,7 @@ SSLRSA= # -lRSAglue -lrsaref
-
- SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
- -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
--SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-+SSLLDFLAGS= -lssl $(SSLCRYPTO) $(SSLRSA)
-
-
- # Extended flags needed for non-standard passwd types. You may need to modify.
-@@ -104,14 +101,14 @@ LOCKPGM=/etc/mlock
- # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
- # formats can never be empty files.
-
--CREATEPROTO=unixproto
-+#CREATEPROTO=unixproto
- EMPTYPROTO=unixproto
-
-
- # Commands possibly overriden by the individual port
-
- ARRC=ar rc
--CC=cc
-+#CC=cc
- LN=ln -s
- RANLIB=ranlib
-
-@@ -403,9 +400,9 @@ gso: os_sol.h # GCC Solaris
+-ARCHIVE=c-client.a
++ARCHIVE=libc-client.la
+ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
+ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+@@ -403,9 +403,9 @@ gso: os_sol.h # GCC Solaris
SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
ACTIVEFILE=/usr/share/news/active \
RSHPATH=/usr/bin/rsh \
@@ -50,7 +23,7 @@ $NetBSD: patch-ab,v 1.18 2006/07/07 05:45:51 minskim Exp $
gsu: # GCC SUN-OS
$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -495,9 +492,9 @@ neb: # NetBSD
+@@ -495,9 +495,9 @@ neb: # NetBSD
$(BUILD) `$(CAT) SPECIALS` OS=bsi \
CRXTYPE=nfs \
SPOOLDIR=/var \
@@ -62,7 +35,7 @@ $NetBSD: patch-ab,v 1.18 2006/07/07 05:45:51 minskim Exp $
BASELDFLAGS="-lcrypt"
nec: # NEC UX
-@@ -549,7 +546,7 @@ osx: # Mac OS X
+@@ -549,7 +549,7 @@ osx: # Mac OS X
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
CRXTYPE=nfs \
SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
@@ -71,12 +44,30 @@ $NetBSD: patch-ab,v 1.18 2006/07/07 05:45:51 minskim Exp $
ptx: # PTX
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -924,7 +921,7 @@ onceenv:
+@@ -811,7 +811,7 @@ $(ARCHIVE): $(BINARIES)
+ @$(SH) ARCHIVE
+
+ .c.o:
+- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
++ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+
+
+ # Cleanup
+@@ -869,7 +869,7 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
+ @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
+ @echo is not installed on your system. Either install OpenSSL first
+ @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
+- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
++ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+
+ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
+ $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
+@@ -924,7 +924,7 @@ onceenv:
-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
-DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+ echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`cat LDFLAGS\`" > ARCHIVE
++ echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) `$(CAT) LDFLAGS`" > ARCHIVE
echo $(OS) > OSTYPE
./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac
index 1e176aebbc7..889aa10010e 100644
--- a/mail/imap-uw/patches/patch-ac
+++ b/mail/imap-uw/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2002/12/11 12:21:23 tron Exp $
+$NetBSD: patch-ac,v 1.6 2006/07/26 20:00:27 jlam Exp $
---- src/mailutil/Makefile.orig Tue Nov 19 01:41:46 2002
-+++ src/mailutil/Makefile Wed Dec 11 12:34:19 2002
+--- src/mailutil/Makefile.orig 2002-11-18 19:41:46.000000000 -0500
++++ src/mailutil/Makefile
@@ -19,7 +19,7 @@
@@ -11,3 +11,12 @@ $NetBSD: patch-ac,v 1.5 2002/12/11 12:21:23 tron Exp $
SHELL = /bin/sh
# Get local definitions from c-client directory
+@@ -29,7 +29,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+
+ mailutil: $(CCLIENTLIB) mailutil.o
+- $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS)
+
+ mailutil.o: $C/mail.h $C/misc.h $C/osdep.h
+
diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad
index 54a27808953..79163224251 100644
--- a/mail/imap-uw/patches/patch-ad
+++ b/mail/imap-uw/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2002/12/11 12:21:24 tron Exp $
+$NetBSD: patch-ad,v 1.6 2006/07/26 20:00:27 jlam Exp $
---- src/dmail/Makefile.orig Tue Nov 19 01:43:31 2002
-+++ src/dmail/Makefile Wed Dec 11 12:34:22 2002
+--- src/dmail/Makefile.orig 2002-11-18 19:43:31.000000000 -0500
++++ src/dmail/Makefile
@@ -18,7 +18,7 @@
@@ -11,3 +11,12 @@ $NetBSD: patch-ad,v 1.5 2002/12/11 12:21:24 tron Exp $
SHELL = /bin/sh
# Get local definitions from c-client directory
+@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+
+ dmail: $(CCLIENTLIB) dmail.o
+- $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
+
+ dmail.o: $C/mail.h $C/misc.h $C/osdep.h
+
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index dea4c804fb0..c17bf1315e0 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.15 2002/12/11 12:21:24 tron Exp $
+$NetBSD: patch-ae,v 1.16 2006/07/26 20:00:27 jlam Exp $
---- src/tmail/Makefile.orig Tue Nov 19 01:45:14 2002
-+++ src/tmail/Makefile Wed Dec 11 12:34:26 2002
+--- src/tmail/Makefile.orig 2002-11-18 19:45:14.000000000 -0500
++++ src/tmail/Makefile
@@ -18,7 +18,7 @@
@@ -11,3 +11,12 @@ $NetBSD: patch-ae,v 1.15 2002/12/11 12:21:24 tron Exp $
SHELL = /bin/sh
# Get local definitions from c-client directory
+@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+
+ tmail: $(CCLIENTLIB) tmail.o
+- $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS)
+
+ tmail.o: $C/mail.h $C/misc.h $C/osdep.h
+
diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af
index 371d6bf3785..198b4cc5046 100644
--- a/mail/imap-uw/patches/patch-af
+++ b/mail/imap-uw/patches/patch-af
@@ -1,13 +1,12 @@
-$NetBSD: patch-af,v 1.5 2003/07/28 14:40:27 adam Exp $
+$NetBSD: patch-af,v 1.6 2006/07/26 20:00:27 jlam Exp $
---- src/osdep/unix/kerb_mit.c.orig 2003-03-05 06:27:21.000000000 +0100
-+++ src/osdep/unix/kerb_mit.c 2003-07-28 15:47:17.000000000 +0200
-@@ -18,9 +18,16 @@
+--- src/osdep/unix/kerb_mit.c.orig 2003-10-17 12:39:42.000000000 -0400
++++ src/osdep/unix/kerb_mit.c
+@@ -18,9 +18,15 @@
* CPYRIGHT, included with this Distribution.
*/
-+#ifdef __NetBSD__
-+/* This is really Heimdal specific, but . . . */
++#ifdef HEIMDAL_KRB5
+#include <gssapi/gssapi.h>
+#include <krb5/krb5.h>
+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
index 66179ef4477..239fb5a2aa6 100644
--- a/mail/imap-uw/patches/patch-aj
+++ b/mail/imap-uw/patches/patch-aj
@@ -1,28 +1,20 @@
-$NetBSD: patch-aj,v 1.11 2003/07/28 14:38:06 adam Exp $
+$NetBSD: patch-aj,v 1.12 2006/07/26 20:00:27 jlam Exp $
---- src/osdep/unix/Makefile.gss.orig 2003-07-28 15:34:51.000000000 +0200
-+++ src/osdep/unix/Makefile.gss 2003-07-28 15:37:26.000000000 +0200
-@@ -20,12 +20,16 @@
-
+--- src/osdep/unix/Makefile.gss.orig 2003-03-04 22:29:59.000000000 -0500
++++ src/osdep/unix/Makefile.gss
+@@ -21,11 +21,13 @@
# Extended flags needed for additional authenticators. You may need to modify.
--GSSDIR=/usr/local
+ 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
-+#GSSDIR=/usr/local
-+#GSSCFLAGS= -I$(GSSDIR)/include
-+#GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
-+#GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-+#
-+#gss: # GSSAPI Kerberos V flags
-+# echo $(GSSCFLAGS) >> OSCFLAGS
-+# sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
++GSSCFLAGS= -I$(GSSDIR)/include -I$(GSSDIR)/include/krb5
+ GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
+ GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
--gss: # GSSAPI Kerberos V flags
-- echo $(GSSCFLAGS) >> OSCFLAGS
+ gss: # GSSAPI Kerberos V flags
+ echo $(GSSCFLAGS) >> OSCFLAGS
- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
-+gss:
++ sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' > LDFLAGS.gss1
++ sh -c '(test -z "$(KRB5_CONFIG)") || $(KRB5_CONFIG) --libs gssapi' > LDFLAGS.gss2
++ sh -c '(test -z "$(KRB5_CONFIG)") && cat LDFLAGS.gss1 || cat LDFLAGS.gss2' >> LDFLAGS
echo "#include \"kerb_mit.c\"" >> auths.c
-+ echo "-I/usr/include/krb5" >> OSCFLAGS
-+ echo "-lgssapi -lkrb5 -lasn1 -lcrypto ${GSS_EXTRA_LDFLAGS} -lcom_err -lroken" >> LDFLAGS
diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al
index dfa397ab5c8..497d3cf26dd 100644
--- a/mail/imap-uw/patches/patch-al
+++ b/mail/imap-uw/patches/patch-al
@@ -1,16 +1,14 @@
-$NetBSD: patch-al,v 1.5 2004/05/13 18:14:34 adam Exp $
+$NetBSD: patch-al,v 1.6 2006/07/26 20:00:27 jlam Exp $
---- src/c-client/auth_gss.c.orig 2004-03-15 19:59:22.000000000 +0000
+--- src/c-client/auth_gss.c.orig 2005-05-03 20:24:03.000000000 -0400
+++ src/c-client/auth_gss.c
-@@ -18,6 +18,16 @@
+@@ -18,6 +18,14 @@
* CPYRIGHT, included with this Distribution.
*/
-+#ifdef __NetBSD__
-+/* This is really Heimdal specific, but . . . */
++#ifdef HEIMDAL_KRB5
+#include <gssapi/gssapi.h>
+#include <krb5/krb5.h>
-+
+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
+#else
+#include <gssapi/gssapi_generic.h>
@@ -19,7 +17,7 @@ $NetBSD: patch-al,v 1.5 2004/05/13 18:14:34 adam Exp $
long auth_gssapi_valid (void);
long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -56,15 +66,32 @@ long auth_gssapi_valid (void)
+@@ -56,15 +64,32 @@ long auth_gssapi_valid (void)
OM_uint32 smn;
gss_buffer_desc buf;
gss_name_t name;
diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am
index bd536d6ed28..14b4c35a903 100644
--- a/mail/imap-uw/patches/patch-am
+++ b/mail/imap-uw/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.4 2004/10/11 16:56:28 abs Exp $
+$NetBSD: patch-am,v 1.5 2006/07/26 20:00:27 jlam Exp $
---- src/osdep/unix/env_unix.c.orig 2004-08-22 19:54:29.000000000 +0100
+--- src/osdep/unix/env_unix.c.orig 2004-09-13 17:31:19.000000000 -0400
+++ src/osdep/unix/env_unix.c
@@ -21,6 +21,9 @@
#include <grp.h>
@@ -29,3 +29,13 @@ $NetBSD: patch-am,v 1.4 2004/10/11 16:56:28 abs Exp $
syslog (level|LOG_AUTH,"Login %s user=%.64s auth=%.64s host=%.80s",err,
user,(authuser && *authuser) ? authuser : user,tcp_clienthost ());
sleep (3); /* slow down possible cracker */
+@@ -830,7 +841,8 @@ char *sysinbox ()
+ {
+ char tmp[MAILTMPLEN];
+ if (!sysInbox) { /* initialize if first time */
+- sprintf (tmp,"%s/%s",MAILSPOOL,myusername ());
++ /* Substitute SPOOLDIR and MAILBOX appropriately for pkgsrc. */
++ sprintf (tmp,"%s/%s",@SPOOLDIR@,@MAILBOX@);
+ sysInbox = cpystr (tmp); /* system inbox is from mail spool */
+ }
+ return sysInbox;
diff --git a/mail/imap-uw/patches/patch-be b/mail/imap-uw/patches/patch-be
new file mode 100644
index 00000000000..2737608ce21
--- /dev/null
+++ b/mail/imap-uw/patches/patch-be
@@ -0,0 +1,22 @@
+$NetBSD: patch-be,v 1.1 2006/07/26 20:00:27 jlam Exp $
+
+--- src/imapd/Makefile.orig 2004-06-29 17:26:28.000000000 -0400
++++ src/imapd/Makefile
+@@ -45,7 +45,7 @@ SHELL= /bin/sh
+ # Get local definitions from c-client directory
+
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libc-client.la
+ CC = `cat $C/CCTYPE`
+ CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
+ -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
+@@ -55,7 +55,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+ all: imapd
+
+ imapd: $(CCLIENTLIB) imapd.o
+- $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+
+ imapd.o: $C/mail.h $C/misc.h $C/osdep.h
+
diff --git a/mail/imap-uw/patches/patch-bf b/mail/imap-uw/patches/patch-bf
new file mode 100644
index 00000000000..130c255d7c4
--- /dev/null
+++ b/mail/imap-uw/patches/patch-bf
@@ -0,0 +1,26 @@
+$NetBSD: patch-bf,v 1.1 2006/07/26 20:00:27 jlam Exp $
+
+--- src/ipopd/Makefile.orig 2000-10-24 19:55:07.000000000 -0400
++++ src/ipopd/Makefile
+@@ -19,7 +19,7 @@
+
+
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libc-client.la
+ SHELL = /bin/sh
+
+ # Get local definitions from c-client directory
+@@ -31,10 +31,10 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+ ipopd: ipop2d ipop3d
+
+ ipop2d: $(CCLIENTLIB) ipop2d.o
+- $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
+
+ ipop3d: $(CCLIENTLIB) ipop3d.o
+- $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
+
+ ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h
+
diff --git a/mail/imap-uw/patches/patch-bg b/mail/imap-uw/patches/patch-bg
new file mode 100644
index 00000000000..a58d65b0ab6
--- /dev/null
+++ b/mail/imap-uw/patches/patch-bg
@@ -0,0 +1,22 @@
+$NetBSD: patch-bg,v 1.1 2006/07/26 20:00:27 jlam Exp $
+
+--- src/mtest/Makefile.orig 2000-10-24 19:55:39.000000000 -0400
++++ src/mtest/Makefile
+@@ -19,7 +19,7 @@
+
+
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++CCLIENTLIB = $C/libc-client.la
+ SHELL = /bin/sh
+
+ # Get local definitions from c-client directory
+@@ -31,7 +31,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+ all: mtest
+
+ mtest: $(CCLIENTLIB) mtest.o
+- $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
++ $(LTLINK) $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
+
+ mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 04:09:04 +0000