use separate c-client library

mail/imap-uw/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2001/02/18 15:26:43 jakob Exp $
+# $OpenBSD: Makefile,v 1.17 2001/02/18 15:27:57 jakob Exp $
 
 DISTNAME=	imap-2000c
 
@@ -19,6 +19,8 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		ftp://ftp.cac.washington.edu/imap/old/
 EXTRACT_SUFX=	.tar.Z
 
+LIB_DEPENDS=	c-client.2.1::mail/c-client
+
 ALL_TARGET=	bso
 MAKE_FLAGS=	SPECIALAUTHENTICATORS=ssl
 

mail/imap-uw/patches/patch-Makefile

@@ -0,0 +1,24 @@
+--- Makefile.orig	Wed Jan 24 00:50:36 2001
++++ Makefile	Sun Feb 18 13:50:08 2001
+@@ -431,20 +431,10 @@
+ 	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+ 	$(LN) $(TOOLS)/$@ .
+ 
+-build:	OSTYPE rebuild rebuildclean bundled
++build:	OSTYPE bundled
+ 
+ OSTYPE:
+-	@echo Building c-client for $(OS)...
+-	echo $(SPECIALS) $(EXTRASPECIALS) > c-client/SPECIALS
+-	$(CD) c-client;$(MAKE) $(OS) EXTRACFLAGS='$(EXTRACFLAGS)'\
+-	 EXTRALDFLAGS='$(EXTRALDFLAGS)'\
+-	 EXTRADRIVERS='$(EXTRADRIVERS)'\
+-	 EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\
+-	 SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'\
+-	 PASSWDTYPE=$(PASSWDTYPE)\
+-	 $(SPECIALS) $(EXTRASPECIALS)
+ 	echo $(OS) > OSTYPE
+-	$(TOUCH) rebuild
+ 
+ rebuild:
+ 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...

mail/imap-uw/patches/patch-src_imapd_Makefile

@@ -0,0 +1,31 @@
+--- src/imapd/Makefile.orig	Sun Feb 18 13:08:48 2001
++++ src/imapd/Makefile	Sun Feb 18 13:28:34 2001
+@@ -36,24 +36,16 @@
+ #EXTRACFLAGS= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\"
+ 
+ 
+-# Get local definitions from c-client directory
+-
+-C = ../c-client
+-CCLIENTLIB = $C/c-client.a
+-CC = `cat $C/CCTYPE`
+-CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
++CFLAGS = -I$(PREFIX)/include/c-client $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+ 	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++LDFLAGS = -L$(PREFIX)/lib -lc-client -lssl -lcrypto
+ 
+ all:	imapd
+ 
+-imapd: $(CCLIENTLIB) imapd.o
++imapd: imapd.o
+ 	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+ 
+-imapd.o: $C/mail.h $C/misc.h $C/osdep.h
+-
+-$(CCLIENTLIB):
+-	cd $C;make
++imapd.o:
+ 
+ clean:
+ 	rm -f *.o imapd || true

mail/imap-uw/patches/patch-src_ipopd_Makefile

@@ -0,0 +1,39 @@
+--- src/ipopd//Makefile.orig	Sun Feb 18 13:13:23 2001
++++ src/ipopd//Makefile	Sun Feb 18 13:28:30 2001
+@@ -18,30 +18,22 @@
+ # CPYRIGHT, included with this Distribution.
+ 
+ 
+-C = ../c-client
+-CCLIENTLIB = $C/c-client.a
+ SHELL = /bin/sh
+ 
+-# Get local definitions from c-client directory
+-
+-CC = `cat $C/CCTYPE`
+-CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++CFLAGS = -I$(PREFIX)/include/c-client
++LDFLAGS = -L$(PREFIX)/lib -lc-client -lssl -lcrypto
+ 
+ ipopd: ipop2d ipop3d
+ 
+-ipop2d: $(CCLIENTLIB) ipop2d.o
++ipop2d: ipop2d.o
+ 	$(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
+ 
+-ipop3d: $(CCLIENTLIB) ipop3d.o
++ipop3d: ipop3d.o
+ 	$(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
+ 
+-ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h
+-
+-ipop3d.o: $C/mail.h $C/misc.h $C/osdep.h
++ipop2d.o:
+ 
+-$(CCLIENTLIB):
+-	cd $C;make
++ipop3d.o:
+ 
+ clean:
+ 	rm -f *.o ipop2d ipop3d || true

mail/imap-uw/patches/patch-src_mtest_Makefile

@@ -0,0 +1,32 @@
+--- src/mtest///Makefile.orig	Sun Feb 18 13:14:24 2001
++++ src/mtest///Makefile	Sun Feb 18 13:28:40 2001
+@@ -18,25 +18,17 @@
+ # CPYRIGHT, included with this Distribution.
+ 
+ 
+-C = ../c-client
+-CCLIENTLIB = $C/c-client.a
+ SHELL = /bin/sh
+ 
+-# Get local definitions from c-client directory
+-
+-CC = `cat $C/CCTYPE`
+-CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++CFLAGS = -I$(PREFIX)/include/c-client
++LDFLAGS = -L$(PREFIX)/lib -lc-client -lssl -lcrypto
+ 
+ all:	mtest
+ 
+-mtest: $(CCLIENTLIB) mtest.o
++mtest: mtest.o
+ 	$(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
+-
+-$(CCLIENTLIB):
+-	cd $C;make
++mtest.o:
+ 
+ clean:
+ 	rm -f *.o mtest || true