diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-01-12 16:10:38 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-01-12 16:10:38 +0000 |
commit | 6e9a3838624d09df97cb2b461c19609231a16f02 (patch) | |
tree | 65c365d283e187bd44287673fa9863a2badae8a0 /mail/imap-uw/files | |
parent | fa6c47916cb8b282ef940226745348caf1e9b4cf (diff) | |
download | ports-6e9a3838624d09df97cb2b461c19609231a16f02.tar.gz ports-6e9a3838624d09df97cb2b461c19609231a16f02.zip |
Notes
Diffstat (limited to 'mail/imap-uw/files')
-rw-r--r-- | mail/imap-uw/files/patch-aa | 38 | ||||
-rw-r--r-- | mail/imap-uw/files/patch-ab | 130 | ||||
-rw-r--r-- | mail/imap-uw/files/patch-ac | 76 |
3 files changed, 206 insertions, 38 deletions
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) |