Build/install/use c-client shared and normal libraries

Install mtest as mboxtest
Use INSTALL_* macros
Use ${PREFIX}/etc instead of /etc

5 files changed, 220 insertions, 47 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 1d4293bc7238..c7e11daa7b1e 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1997
 # Whom:			pst
 #
-# $Id: Makefile,v 1.1.1.1 1997/01/10 02:38:35 pst Exp $
+# $Id: Makefile,v 1.2 1997/01/10 05:18:07 asami Exp $
 #
 
 DISTNAME=	imap-4.1.BETA
@@ -18,15 +18,16 @@ ALL_TARGET=	fbd
 MAN8=		ipopd.8 imapd.8
 
 do-install:
-	${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
-		${WRKSRC}/imapd/imapd ${PREFIX}/libexec/imapd
-	${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
-		${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec/ipop2d
-	${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
-		${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec/ipop3d
-	${INSTALL} -c -m ${MANMODE} -o ${MANOWN} -g ${MANGRP} \
+	${INSTALL_DATA} ${WRKSRC}/c-client/libc-client.so.2.0 ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a ${PREFIX}/lib/libc-client.a
+	/sbin/ldconfig -m ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${PREFIX}/bin/mboxtest
+	${INSTALL_MAN} \
 		${WRKSRC}/src/imapd/imapd.8c ${PREFIX}/man/man8/imapd.8
-	${INSTALL} -c -m ${MANMODE} -o ${MANOWN} -g ${MANGRP} \
+	${INSTALL_MAN} \
 		${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
 	
 .include <bsd.port.mk>
diff --git a/mail/imap-uw/files/patch-aa b/mail/imap-uw/files/patch-aa
index db59677edcf6..aa67b253420e 100644
--- a/mail/imap-uw/files/patch-aa
+++ b/mail/imap-uw/files/patch-aa
@@ -17,41 +17,3 @@
   	$(MAKE) build OS=$@ PROCESS=an AFS=$(AFS)
   
   # If you use sv4, you may find that it works to move it to use the an process.
-*** src/osdep/unix/Makefile	Mon Jan  6 22:02:08 1997
---- src/osdep/unix/Makefile	Thu Jan  9 18:14:20 1997
-***************
-*** 39,45 ****
-  	netmsg.o rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-  	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-  CC=cc
-! CFLAGS=$(EXTRACFLAGS)
-  EXTRADRIVERS=mbox
-  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
---- 39,45 ----
-  	netmsg.o rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-  	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-  CC=cc
-! CFLAGS+=$(EXTRACFLAGS)
-  EXTRADRIVERS=mbox
-  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-***************
-*** 122,127 ****
---- 122,137 ----
-  		ACTIVEFILE=/var/news/etc/active NEWSSPOOL=/var/news/spool \
-  		RSHPATH=/usr/bin/rsh \
-  		CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)"
-+ 
-+ fbd:	# FreeBSD
-+ 	$(MAKE) $(ARCHIVE) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
-+ 		STDPROTO=bezerkproto \
-+ 		MAILSPOOL=/var/mail \
-+ 		ACTIVEFILE=/usr/local/news/lib/active \
-+ 		NEWSSPOOL=/var/news \
-+ 		RSHPATH=/usr/bin/rsh \
-+ 		CFLAGS="$(CFLAGS) -DNFSKLUDGE $(EXTRACFLAGS)" \
-+ 		LDFLAGS="-lcrypt"
-  
-  cvx:	# Convex
-  	$(MAKE) $(ARCHIVE) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
new file mode 100644
index 000000000000..4164ec583b6c
--- /dev/null
+++ b/mail/imap-uw/files/patch-ab
@@ -0,0 +1,130 @@
+*** src/osdep/unix/Makefile.orig	Tue Jan  7 09:02:08 1997
+--- src/osdep/unix/Makefile	Sun Jan 12 18:12:56 1997
+***************
+*** 32,45 ****
+  
+  
+  ARCHIVE=c-client.a
+  ARRC=ar rc
+  EXTRAAUTHENTICATORS=
+  DEFAULTAUTHENTICATORS=log
+  BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o dummy.o pseudo.o \
+  	netmsg.o rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+  	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
+  CC=cc
+! CFLAGS=$(EXTRACFLAGS)
+  EXTRADRIVERS=mbox
+  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
+  LN=ln -s
+--- 32,47 ----
+  
+  
+  ARCHIVE=c-client.a
++ SHLIB=libc-client.so.2.0
+  ARRC=ar rc
+  EXTRAAUTHENTICATORS=
+  DEFAULTAUTHENTICATORS=log
+  BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o dummy.o pseudo.o \
+  	netmsg.o rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+  	bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
++ SOFILES=      ${BINARIES:.o=.so}
+  CC=cc
+! CFLAGS+=$(EXTRACFLAGS)
+  EXTRADRIVERS=mbox
+  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
+  LN=ln -s
+***************
+*** 51,56 ****
+--- 53,61 ----
+  RSHPATH=/usr/ucb/rsh
+  SHELL=/bin/sh
+  
++ # Need this for the shared library rule to work correctly
++ .SUFFIXES: .o .so
++ 
+  missing:
+  	@echo "You must specify what type of system"
+  	@false
+***************
+*** 123,128 ****
+--- 128,143 ----
+  		RSHPATH=/usr/bin/rsh \
+  		CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)"
+  
++ fbd:	# FreeBSD
++ 	$(MAKE) $(ARCHIVE) $(SHLIB) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
++ 		STDPROTO=bezerkproto \
++ 		MAILSPOOL=/var/mail \
++ 		ACTIVEFILE=/usr/local/news/lib/active \
++ 		NEWSSPOOL=/var/news \
++ 		RSHPATH=/usr/bin/rsh \
++ 		CFLAGS="$(CFLAGS) -DNFSKLUDGE $(EXTRACFLAGS)" \
++ 		LDFLAGS="-lcrypt"
++ 
+  cvx:	# Convex
+  	$(MAKE) $(ARCHIVE) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
+  		STDPROTO=bezerkproto MAILSPOOL=/usr/spool/mail \
+***************
+*** 422,434 ****
+  # From here on down is OS-independent
+  
+  clean:
+! 	$(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
+  
+  $(ARCHIVE): $(BINARIES)
+  	$(RM) $(ARCHIVE)
+  	$(ARRC) $(ARCHIVE) $(BINARIES)
+  	$(RANLIB) $(ARCHIVE)
+  
+  # Dependencies
+  
+  bezerk.o: mail.h misc.h osdep.h bezerk.h pseudo.h dummy.h
+--- 437,455 ----
+  # From here on down is OS-independent
+  
+  clean:
+! 	$(RM) *.o *.so linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
+  
+  $(ARCHIVE): $(BINARIES)
+  	$(RM) $(ARCHIVE)
+  	$(ARRC) $(ARCHIVE) $(BINARIES)
+  	$(RANLIB) $(ARCHIVE)
+  
++ $(SHLIB):     $(SOFILES)
++ 	ld -Bshareable -x -o $(SHLIB) $(SOFILES)
++ 
++ .c.so:        osdep.h
++ 	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
++ 
+  # Dependencies
+  
+  bezerk.o: mail.h misc.h osdep.h bezerk.h pseudo.h dummy.h
+***************
+*** 475,480 ****
+--- 496,521 ----
+  	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
+  	$(EXTRAOSDEFS) -c os_$(OS).c
+  	$(MV) os_$(OS).o osdep.o
++ 
++ osdep.so: mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
++ 	osdep.h env_unix.h tcp_unix.h \
++ 	os_$(OS).c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
++ 	flock.c fsync.c gethstid.c \
++ 	gr_wait.c gr_wait4.c gr_waitp.c \
++ 	auth_krb.c auth_log.c \
++ 	log_std.c log_sv4.c \
++ 	log_a41.c log_sco.c log_sec.c log_sha.c log_ssn.c log_ult.c \
++ 	scandir.c setpgrp.c strerror.c truncate.c write.c \
++ 	memmove.c memmove2.c memset.c \
++ 	tz_bsd.c tz_nul.c tz_sv4.c \
++ 	write.c \
++ 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c
++ 	$(CC) -fpic -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \
++ 	-DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
++ 	-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
++ 	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
++ 	$(EXTRAOSDEFS) -c os_$(OS).c -o os_$(OS).so
++ 	$(MV) os_$(OS).so osdep.so
+  
+  osdep.h: os_$(OS).h linkage
+  	$(RM) CCTYPE CFLAGS LDFLAGS osdep.h
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
new file mode 100644
index 000000000000..3e6d27741a8f
--- /dev/null
+++ b/mail/imap-uw/files/patch-ac
@@ -0,0 +1,76 @@
+*** src/imapd/Makefile.bak	Fri Mar 15 00:16:22 1996
+--- src/imapd/Makefile	Sun Jan 12 18:25:27 1997
+***************
+*** 31,38 ****
+  # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  
+  
+! ALERT=/etc/imapd.alert
+! ANO=/etc/anonymous.newsgroups
+  C = ../c-client
+  CCLIENTLIB = $C/c-client.a
+  SHELL= /bin/sh
+--- 31,38 ----
+  # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  
+  
+! ALERT=$(PREFIX)/etc/imapd.alert
+! ANO=$(PREFIX)/etc/anonymous.newsgroups
+  C = ../c-client
+  CCLIENTLIB = $C/c-client.a
+  SHELL= /bin/sh
+***************
+*** 41,47 ****
+  
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\"
+! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+  
+  imapd: $(CCLIENTLIB) imapd.o
+  	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+--- 41,47 ----
+  
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\"
+! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+  
+  imapd: $(CCLIENTLIB) imapd.o
+  	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+*** src/ipopd/Makefile.bak	Fri Mar 15 00:18:17 1996
+--- src/ipopd/Makefile	Sun Jan 12 18:24:06 1997
+***************
+*** 39,45 ****
+  
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+  
+  ipopd: ipop2d ipop3d
+  
+--- 39,45 ----
+  
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+  
+  ipopd: ipop2d ipop3d
+  
+*** src/mtest/Makefile.bak	Fri Mar 15 00:18:42 1996
+--- src/mtest/Makefile	Sun Jan 12 18:26:14 1997
+***************
+*** 39,45 ****
+  
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+  
+  mtest: $(CCLIENTLIB) mtest.o
+  	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
+--- 39,45 ----
+  
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+  
+  mtest: $(CCLIENTLIB) mtest.o
+  	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
diff --git a/mail/imap-uw/pkg-plist b/mail/imap-uw/pkg-plist
index 3360e841a459..4d851622f939 100644
--- a/mail/imap-uw/pkg-plist
+++ b/mail/imap-uw/pkg-plist
@@ -1,5 +1,9 @@
+lib/libc-client.so.2.0
+lib/libc-client.a
+@exec /sbin/ldconfig -m %B
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
+bin/mboxtest
 man/man8/imapd.8.gz
 man/man8/ipopd.8.gz