From 8e7fd48a294d7d6e54c6d07989807cff33ab19bd Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 28 Jul 2014 23:20:38 +0000 Subject: Rename mail/ patch-xy patches to reflect the files they modify. --- mail/cclient/files/patch-Makefile | 78 +++++++ mail/cclient/files/patch-aa | 21 -- mail/cclient/files/patch-ab | 254 ----------------------- mail/cclient/files/patch-ac | 78 ------- mail/cclient/files/patch-src_osdep_unix_Makefile | 254 +++++++++++++++++++++++ mail/cclient/files/patch-src_osdep_unix_os_bsi.h | 21 ++ 6 files changed, 353 insertions(+), 353 deletions(-) create mode 100644 mail/cclient/files/patch-Makefile delete mode 100644 mail/cclient/files/patch-aa delete mode 100644 mail/cclient/files/patch-ab delete mode 100644 mail/cclient/files/patch-ac create mode 100644 mail/cclient/files/patch-src_osdep_unix_Makefile create mode 100644 mail/cclient/files/patch-src_osdep_unix_os_bsi.h (limited to 'mail/cclient') diff --git a/mail/cclient/files/patch-Makefile b/mail/cclient/files/patch-Makefile new file mode 100644 index 000000000000..1e10918790a8 --- /dev/null +++ b/mail/cclient/files/patch-Makefile @@ -0,0 +1,78 @@ +*** Makefile.orig Wed May 9 00:50:45 2007 +--- Makefile Mon Jul 23 16:02:26 2007 +*************** +*** 294,300 **** + + # Make the IMAP Toolkit + +! all: c-client SPECIALS rebuild bundled + + c-client: + @echo Not processed yet. In a first-time build, you must specify +--- 294,300 ---- + + # Make the IMAP Toolkit + +! all: c-client SPECIALS rebuild + + c-client: + @echo Not processed yet. In a first-time build, you must specify +*************** +*** 559,567 **** + @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;; *) (make nounenc;exit 1);; esac' + + nounenc: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--- 559,564 ---- +*************** +*** 582,590 **** + @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;; *) (make nonossl;exit 1);; esac' + + nonossl: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--- 579,584 ---- +*************** +*** 659,665 **** + $(TOOLS)/$@ "$(LN)" src/tmail tmail + $(LN) $(TOOLS)/$@ . + +! build: OSTYPE rebuild rebuildclean bundled + + OSTYPE: + @$(MAKE) ip$(IP) +--- 653,659 ---- + $(TOOLS)/$@ "$(LN)" src/tmail tmail + $(LN) $(TOOLS)/$@ . + +! build: OSTYPE rebuild rebuildclean + + OSTYPE: + @$(MAKE) ip$(IP) +*************** +*** 679,686 **** + @$(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 +! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \ +! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` + + rebuildclean: + $(SH) -c '$(RM) rebuild || true' +--- 673,679 ---- + @$(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 +! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` + + rebuildclean: + $(SH) -c '$(RM) rebuild || true' diff --git a/mail/cclient/files/patch-aa b/mail/cclient/files/patch-aa deleted file mode 100644 index ade4d1289237..000000000000 --- a/mail/cclient/files/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ ---- src/osdep/unix/os_bsi.h.orig Wed Apr 11 10:53:03 2001 -+++ src/osdep/unix/os_bsi.h Wed Apr 11 10:55:32 2001 -@@ -22,7 +22,18 @@ - #include - #include - #include -+ -+/* -+ * FreeBSD v3.x and onward whines about being obsolete, so switch -+ * to POSIX semantics. -+ */ -+#if __FreeBSD__ >= 3 -+#include -+#define direct dirent -+#else - #include -+#endif -+ - #include - #include - #include diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab deleted file mode 100644 index 6695c7355072..000000000000 --- a/mail/cclient/files/patch-ab +++ /dev/null @@ -1,254 +0,0 @@ -*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007 ---- src/osdep/unix/Makefile Mon Jul 23 16:30:12 2007 -*************** -*** 28,36 **** - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox -! PASSWDTYPE=std -! SSLTYPE=nopwd -! IP=4 - - - # The optimization level here for GCC ports is set here for a reason. It's ---- 28,36 ---- - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox -! PASSWDTYPE=pam -! SSLTYPE=unix.nopwd -! IP=6 - - - # The optimization level here for GCC ports is set here for a reason. It's -*************** -*** 54,66 **** - - # Extended flags needed for SSL. You may need to modify. - -! SSLDIR=/usr/local/ssl -! SSLCERTS=$(SSLDIR)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead ---- 54,66 ---- - - # Extended flags needed for SSL. You may need to modify. - -! #SSLDIR=/usr/local/ssl -! SSLCERTS=$(PREFIX)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto -lcrypt - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead -*************** -*** 87,93 **** - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= -lpam -ldl - - - # Build parameters normally set by the individual port ---- 87,93 ---- - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= # -lpam -lcrypt - - - # Build parameters normally set by the individual port -*************** -*** 125,131 **** - # Commands possibly overriden by the individual port - - ARRC=ar rc -! CC=cc - LN=ln -s - RANLIB=ranlib - ---- 125,131 ---- - # Commands possibly overriden by the individual port - - ARRC=ar rc -! #CC=cc - LN=ln -s - RANLIB=ranlib - -*************** -*** 149,155 **** - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS=-g - - CAT=cat - MAKE=make ---- 149,155 ---- - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) - - CAT=cat - MAKE=make -*************** -*** 166,171 **** ---- 166,175 ---- - PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) - - -+ # Need this for the shared library rule to work correctly -+ .SUFFIXES: .o .so -+ SOFILES=${BINARIES:.o=.so} -+ - # Here if no make argument established - - missing: osdep.h -*************** -*** 246,258 **** - BASECFLAGS="-g -Dconst=" - - bsf: # FreeBSD -! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ - SIGTYPE=psx CRXTYPE=nfs \ - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lcrypt" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ ---- 250,263 ---- - BASECFLAGS="-g -Dconst=" - - bsf: # FreeBSD -! $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \ - SIGTYPE=psx CRXTYPE=nfs \ - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ -+ LOCKPGM=$(PREFIX)/libexec/mlock \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lpam" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -*************** -*** 840,862 **** - - # Build it! - -! build: clean once $(ARCHIVE) - -! all: $(ARCHIVE) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' - @$(CAT) ARCHIVE - @$(SH) ARCHIVE - - .c.o: -! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' - - - # Dependencies ---- 845,875 ---- - - # Build it! - -! build: clean once $(ARCHIVE) $(SHLIBNAME) - -! all: $(ARCHIVE) $(SHLIBNAME) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' - @$(CAT) ARCHIVE - @$(SH) ARCHIVE - -+ $(SHLIBNAME): $(SOFILES) -+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` -+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so -+ -+ .c.so: osdep.h -+ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@ -+ - .c.o: -! $(CC) -c `cat CFLAGS` $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' -+ sh -c '$(RM) *.so $(SHLIBNAME)' - - - # Dependencies -*************** -*** 891,897 **** - - # OS-dependent - -! osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ - 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 ip_unix.c\ - auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ ---- 904,910 ---- - - # OS-dependent - -! OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ - 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 ip_unix.c\ - auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ -*************** -*** 905,916 **** - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS - @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.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c - $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c ---- 918,936 ---- - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS -+ -+ osdep.o: $(OSDEPS) -+ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c -+ @echo ======================================================================== - @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 -! @echo ======================================================================== -! -! osdep.so: $(OSDEPS) -! $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@ - - osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c - $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-ac deleted file mode 100644 index 1e10918790a8..000000000000 --- a/mail/cclient/files/patch-ac +++ /dev/null @@ -1,78 +0,0 @@ -*** Makefile.orig Wed May 9 00:50:45 2007 ---- Makefile Mon Jul 23 16:02:26 2007 -*************** -*** 294,300 **** - - # Make the IMAP Toolkit - -! all: c-client SPECIALS rebuild bundled - - c-client: - @echo Not processed yet. In a first-time build, you must specify ---- 294,300 ---- - - # Make the IMAP Toolkit - -! all: c-client SPECIALS rebuild - - c-client: - @echo Not processed yet. In a first-time build, you must specify -*************** -*** 559,567 **** - @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;; *) (make nounenc;exit 1);; esac' - - nounenc: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ---- 559,564 ---- -*************** -*** 582,590 **** - @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;; *) (make nonossl;exit 1);; esac' - - nonossl: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ---- 579,584 ---- -*************** -*** 659,665 **** - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - -! build: OSTYPE rebuild rebuildclean bundled - - OSTYPE: - @$(MAKE) ip$(IP) ---- 653,659 ---- - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - -! build: OSTYPE rebuild rebuildclean - - OSTYPE: - @$(MAKE) ip$(IP) -*************** -*** 679,686 **** - @$(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 -! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \ -! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` - - rebuildclean: - $(SH) -c '$(RM) rebuild || true' ---- 673,679 ---- - @$(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 -! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` - - rebuildclean: - $(SH) -c '$(RM) rebuild || true' diff --git a/mail/cclient/files/patch-src_osdep_unix_Makefile b/mail/cclient/files/patch-src_osdep_unix_Makefile new file mode 100644 index 000000000000..6695c7355072 --- /dev/null +++ b/mail/cclient/files/patch-src_osdep_unix_Makefile @@ -0,0 +1,254 @@ +*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007 +--- src/osdep/unix/Makefile Mon Jul 23 16:30:12 2007 +*************** +*** 28,36 **** + + EXTRAAUTHENTICATORS= + EXTRADRIVERS=mbox +! PASSWDTYPE=std +! SSLTYPE=nopwd +! IP=4 + + + # The optimization level here for GCC ports is set here for a reason. It's +--- 28,36 ---- + + EXTRAAUTHENTICATORS= + EXTRADRIVERS=mbox +! PASSWDTYPE=pam +! SSLTYPE=unix.nopwd +! IP=6 + + + # The optimization level here for GCC ports is set here for a reason. It's +*************** +*** 54,66 **** + + # Extended flags needed for SSL. You may need to modify. + +! SSLDIR=/usr/local/ssl +! SSLCERTS=$(SSLDIR)/certs + SSLKEYS=$(SSLCERTS) + SSLINCLUDE=$(SSLDIR)/include + SSLLIB=$(SSLDIR)/lib + +! SSLCRYPTO=-lcrypto + + # Older versions of MIT Kerberos also have a libcrypto. If so, you may need + # to use this instead +--- 54,66 ---- + + # Extended flags needed for SSL. You may need to modify. + +! #SSLDIR=/usr/local/ssl +! SSLCERTS=$(PREFIX)/certs + SSLKEYS=$(SSLCERTS) + SSLINCLUDE=$(SSLDIR)/include + SSLLIB=$(SSLDIR)/lib + +! SSLCRYPTO=-lcrypto -lcrypt + + # Older versions of MIT Kerberos also have a libcrypto. If so, you may need + # to use this instead +*************** +*** 87,93 **** + # AFSLDFLAGS may also need -L/usr/ucblib -lucb + DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" + DCELDFLAGS= -ldce +! PAMLDFLAGS= -lpam -ldl + + + # Build parameters normally set by the individual port +--- 87,93 ---- + # AFSLDFLAGS may also need -L/usr/ucblib -lucb + DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" + DCELDFLAGS= -ldce +! PAMLDFLAGS= # -lpam -lcrypt + + + # Build parameters normally set by the individual port +*************** +*** 125,131 **** + # Commands possibly overriden by the individual port + + ARRC=ar rc +! CC=cc + LN=ln -s + RANLIB=ranlib + +--- 125,131 ---- + # Commands possibly overriden by the individual port + + ARRC=ar rc +! #CC=cc + LN=ln -s + RANLIB=ranlib + +*************** +*** 149,155 **** + dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ + rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ + unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o +! CFLAGS=-g + + CAT=cat + MAKE=make +--- 149,155 ---- + dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ + rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ + unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o +! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) + + CAT=cat + MAKE=make +*************** +*** 166,171 **** +--- 166,175 ---- + PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) + + ++ # Need this for the shared library rule to work correctly ++ .SUFFIXES: .o .so ++ SOFILES=${BINARIES:.o=.so} ++ + # Here if no make argument established + + missing: osdep.h +*************** +*** 246,258 **** + BASECFLAGS="-g -Dconst=" + + bsf: # FreeBSD +! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ + SIGTYPE=psx CRXTYPE=nfs \ + SPOOLDIR=/var \ + ACTIVEFILE=/usr/local/news/lib/active \ + RSHPATH=/usr/bin/rsh \ + BASECFLAGS="$(GCCCFLAGS)" \ +! BASELDFLAGS="-lcrypt" + + bsi: # BSD/i386 + $(BUILD) `$(CAT) SPECIALS` OS=$@ \ +--- 250,263 ---- + BASECFLAGS="-g -Dconst=" + + bsf: # FreeBSD +! $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \ + SIGTYPE=psx CRXTYPE=nfs \ + SPOOLDIR=/var \ + ACTIVEFILE=/usr/local/news/lib/active \ + RSHPATH=/usr/bin/rsh \ ++ LOCKPGM=$(PREFIX)/libexec/mlock \ + BASECFLAGS="$(GCCCFLAGS)" \ +! BASELDFLAGS="-lpam" + + bsi: # BSD/i386 + $(BUILD) `$(CAT) SPECIALS` OS=$@ \ +*************** +*** 840,862 **** + + # Build it! + +! build: clean once $(ARCHIVE) + +! all: $(ARCHIVE) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ARCHIVE + @$(SH) ARCHIVE + + .c.o: +! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c + + + # Cleanup + + clean: + sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' + + + # Dependencies +--- 845,875 ---- + + # Build it! + +! build: clean once $(ARCHIVE) $(SHLIBNAME) + +! all: $(ARCHIVE) $(SHLIBNAME) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ARCHIVE + @$(SH) ARCHIVE + ++ $(SHLIBNAME): $(SOFILES) ++ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` ++ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so ++ ++ .c.so: osdep.h ++ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@ ++ + .c.o: +! $(CC) -c `cat CFLAGS` $*.c + + + # Cleanup + + clean: + sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' ++ sh -c '$(RM) *.so $(SHLIBNAME)' + + + # Dependencies +*************** +*** 891,897 **** + + # OS-dependent + +! osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ + 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 ip_unix.c\ + auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ +--- 904,910 ---- + + # OS-dependent + +! OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ + 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 ip_unix.c\ + auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ +*************** +*** 905,916 **** + write.c sslstdio.c \ + strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ + OSCFLAGS + @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.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c + $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c +--- 918,936 ---- + write.c sslstdio.c \ + strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ + OSCFLAGS ++ ++ osdep.o: $(OSDEPS) ++ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== + @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 +! @echo ======================================================================== +! +! osdep.so: $(OSDEPS) +! $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@ + + osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c + $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c diff --git a/mail/cclient/files/patch-src_osdep_unix_os_bsi.h b/mail/cclient/files/patch-src_osdep_unix_os_bsi.h new file mode 100644 index 000000000000..ade4d1289237 --- /dev/null +++ b/mail/cclient/files/patch-src_osdep_unix_os_bsi.h @@ -0,0 +1,21 @@ +--- src/osdep/unix/os_bsi.h.orig Wed Apr 11 10:53:03 2001 ++++ src/osdep/unix/os_bsi.h Wed Apr 11 10:55:32 2001 +@@ -22,7 +22,18 @@ + #include + #include + #include ++ ++/* ++ * FreeBSD v3.x and onward whines about being obsolete, so switch ++ * to POSIX semantics. ++ */ ++#if __FreeBSD__ >= 3 ++#include ++#define direct dirent ++#else + #include ++#endif ++ + #include + #include + #include -- cgit v1.2.3