diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2002-11-26 12:05:13 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2002-11-26 12:05:13 +0000 |
| commit | 5ccd0436d2153ad0ce45663451cd4efa3a15137a (patch) | |
| tree | 6bb07bcfc97bc4c886c0e8ed4dcbeecb139e35a8 /mail/cclient/files | |
| parent | Fix build by improving GNU auto* tools disabling patch (diff) | |
anders assigned me a PR to update pine, so he must have meant me to update
this too. :)
* Mostly a simple version update, although I tweaked a few things
* Make some Makefile variables more... variable
* SSLTYPE update to match new c-client makefile
* Remove a spurious variable from the port Makefile
* Tab'ify a couple places in patches that had to be regenerated anyway
Notes
Notes:
svn path=/head/; revision=71113
Diffstat (limited to 'mail/cclient/files')
| -rw-r--r-- | mail/cclient/files/patch-ab | 18 | ||||
| -rw-r--r-- | mail/cclient/files/patch-ac | 12 |
2 files changed, 18 insertions, 12 deletions
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab index 8d3f7449372e..6562900dbdd8 100644 --- a/mail/cclient/files/patch-ab +++ b/mail/cclient/files/patch-ab @@ -1,12 +1,13 @@ ---- src/osdep/unix/Makefile.orig Tue Jul 3 08:02:10 2001 -+++ src/osdep/unix/Makefile Mon Oct 1 10:13:43 2001 +--- src/osdep/unix/Makefile.orig Mon Oct 14 15:45:24 2002 ++++ src/osdep/unix/Makefile Tue Nov 26 01:44:27 2002 @@ -22,18 +22,18 @@ EXTRAAUTHENTICATORS= EXTRADRIVERS=mbox -PASSWDTYPE=std +-SSLTYPE=nopwd +PASSWDTYPE=pam - SSLTYPE=none ++SSLTYPE=nopwd.nopwd # Extended flags needed for SSL. You may need to modify. @@ -129,14 +130,19 @@ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \ -@@ -824,7 +841,12 @@ +@@ -824,12 +841,17 @@ write.c sslstdio.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS -- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c + +osdep.o: $(OSDEPS) -+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c ++ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c + @echo Building OS-dependent module + @echo If you get No such file error messages for files x509.h, ssl.h, + @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 + +osdep.so: $(OSDEPS) + $(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@ diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-ac index 8dd24c954196..ae5ba9170a10 100644 --- a/mail/cclient/files/patch-ac +++ b/mail/cclient/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.orig Tue Oct 23 06:46:33 2001 -+++ Makefile Fri Dec 7 00:37:08 2001 -@@ -253,7 +253,7 @@ +--- Makefile.orig Mon Nov 4 16:19:13 2002 ++++ Makefile Tue Nov 26 01:18:50 2002 +@@ -256,7 +256,7 @@ # Make the IMAP Toolkit @@ -9,8 +9,8 @@ c-client: @echo Not processed yet. In a first-time build, you must specify -@@ -374,7 +374,7 @@ - $(TOOLS)/$@ "$(LN)" src/imapd imapd +@@ -434,7 +434,7 @@ + $(TOOLS)/$@ "$(LN)" src/tmail tmail $(LN) $(TOOLS)/$@ . -build: OSTYPE rebuild rebuildclean bundled @@ -18,7 +18,7 @@ OSTYPE: @echo Building c-client for $(BUILDTYPE)... -@@ -393,8 +393,7 @@ +@@ -453,8 +453,7 @@ @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)' @echo Rebuilding c-client for `$(CAT) OSTYPE`... @$(TOUCH) SPECIALS |