[Midnightbsd-cvs] mports [20588] trunk/mail/cclient: imap 2007f - cclient port
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 31 14:18:58 EDT 2015
Revision: 20588
http://svnweb.midnightbsd.org/mports/?rev=20588
Author: laffer1
Date: 2015-10-31 14:18:58 -0400 (Sat, 31 Oct 2015)
Log Message:
-----------
imap 2007f - cclient port
Modified Paths:
--------------
trunk/mail/cclient/Makefile
trunk/mail/cclient/distinfo
trunk/mail/cclient/pkg-descr
trunk/mail/cclient/pkg-plist
Added Paths:
-----------
trunk/mail/cclient/files/patch-Makefile
trunk/mail/cclient/files/patch-src_osdep_unix_Makefile
trunk/mail/cclient/files/patch-src_osdep_unix_os_bsi.h
trunk/mail/cclient/pkg-message-ssl
Removed Paths:
-------------
trunk/mail/cclient/files/patch-aa
trunk/mail/cclient/files/patch-ab
trunk/mail/cclient/files/patch-ac
Modified: trunk/mail/cclient/Makefile
===================================================================
--- trunk/mail/cclient/Makefile 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/Makefile 2015-10-31 18:18:58 UTC (rev 20588)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= cclient
-PORTVERSION= 2007e
+PORTVERSION= 2007f
PORTEPOCH= 1
CATEGORIES= mail devel ipv6
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
Modified: trunk/mail/cclient/distinfo
===================================================================
--- trunk/mail/cclient/distinfo 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/distinfo 2015-10-31 18:18:58 UTC (rev 20588)
@@ -1,3 +1,2 @@
-SHA256 (imap-2007e.tar.gz) = 4b1137b87249782496ec3eeacaf83bbf09312a7d2ae3aead262179041b55565f
-RMD160 (imap-2007e.tar.gz) = 6a392f3ebf5b72686a0a232333a5670c76c173d6
-SIZE (imap-2007e.tar.gz) = 1991389
+SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28
+SIZE (imap-2007f.tar.gz) = 1990304
Copied: trunk/mail/cclient/files/patch-Makefile (from rev 20583, trunk/mail/cclient/files/patch-ac)
===================================================================
--- trunk/mail/cclient/files/patch-Makefile (rev 0)
+++ trunk/mail/cclient/files/patch-Makefile 2015-10-31 18:18:58 UTC (rev 20588)
@@ -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'
Deleted: trunk/mail/cclient/files/patch-aa
===================================================================
--- trunk/mail/cclient/files/patch-aa 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/files/patch-aa 2015-10-31 18:18:58 UTC (rev 20588)
@@ -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 <unistd.h>
- #include <string.h>
- #include <sys/types.h>
-+
-+/*
-+ * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch
-+ * to POSIX semantics.
-+ */
-+#if __FreeBSD__ >= 3
-+#include <dirent.h>
-+#define direct dirent
-+#else
- #include <sys/dir.h>
-+#endif
-+
- #include <fcntl.h>
- #include <syslog.h>
- #include <sys/file.h>
Deleted: trunk/mail/cclient/files/patch-ab
===================================================================
--- trunk/mail/cclient/files/patch-ab 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/files/patch-ab 2015-10-31 18:18:58 UTC (rev 20588)
@@ -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
Deleted: trunk/mail/cclient/files/patch-ac
===================================================================
--- trunk/mail/cclient/files/patch-ac 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/files/patch-ac 2015-10-31 18:18:58 UTC (rev 20588)
@@ -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'
Copied: trunk/mail/cclient/files/patch-src_osdep_unix_Makefile (from rev 20583, trunk/mail/cclient/files/patch-ab)
===================================================================
--- trunk/mail/cclient/files/patch-src_osdep_unix_Makefile (rev 0)
+++ trunk/mail/cclient/files/patch-src_osdep_unix_Makefile 2015-10-31 18:18:58 UTC (rev 20588)
@@ -0,0 +1,152 @@
+--- src/osdep/unix/Makefile.orig 2011-07-23 00:20:10.000000000 +0000
++++ src/osdep/unix/Makefile 2014-11-24 10:19:06.579841371 +0000
+@@ -28,9 +28,9 @@
+
+ EXTRAAUTHENTICATORS=
+ EXTRADRIVERS=mbox
+-PASSWDTYPE=std
+-SSLTYPE=nopwd
+-IP=4
++PASSWDTYPE=pam
++SSLTYPE=unix.nopwd
++IP=6
+
+
+ # The optimization level here for GCC ports is set here for a reason. It's
+@@ -54,13 +54,13 @@
+
+ # Extended flags needed for SSL. You may need to modify.
+
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
++#SSLDIR=/usr/local/ssl
++SSLCERTS=$(PREFIX)/certs
+ SSLKEYS=$(SSLCERTS)
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+
+-SSLCRYPTO=-lcrypto
++SSLCRYPTO=-lcrypto -lcrypt
+
+ # Older versions of MIT Kerberos also have a libcrypto. If so, you may need
+ # to use this instead
+@@ -87,7 +87,7 @@
+ # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+ DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+ DCELDFLAGS= -ldce
+-PAMLDFLAGS= -lpam -ldl
++PAMLDFLAGS= # -lpam -lcrypt
+
+
+ # Build parameters normally set by the individual port
+@@ -130,7 +130,7 @@
+ # Commands possibly overriden by the individual port
+
+ ARRC=ar rc
+-CC=cc
++#CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+
+@@ -154,7 +154,7 @@
+ 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
++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+
+ CAT=cat
+ MAKE=make
+@@ -171,6 +171,10 @@
+ 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
+@@ -259,13 +263,14 @@
+ BASECFLAGS="-g -Dconst="
+
+ bsf: # FreeBSD
+- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
++ $(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="-lcrypt"
++ BASELDFLAGS="-lpam"
+
+ bsi: # BSD/i386
+ $(BUILD) `$(CAT) SPECIALS` OS=$@ \
+@@ -853,23 +858,31 @@
+
+ # Build it!
+
+-build: clean once $(ARCHIVE)
++build: clean once $(ARCHIVE) $(SHLIBNAME)
+
+-all: $(ARCHIVE)
++all: $(ARCHIVE) $(SHLIBNAME)
+
+ $(ARCHIVE): $(BINARIES)
+ sh -c '$(RM) $(ARCHIVE) || true'
+ @$(CAT) ARCHIVE
+ @$(SH) ARCHIVE
+
++$(SHLIBNAME): $(SOFILES)
++ $(CC) -shared -Wl,-soname=$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
++ $(LN) $(SHLIBNAME) lib$(SHLIBBASE).so
++
++.c.so: osdep.h
++ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@
++
+ .c.o:
+- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
++ $(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
+@@ -904,7 +917,7 @@
+
+ # OS-dependent
+
+-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
++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 \
+@@ -918,12 +931,19 @@
+ 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
+- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
++ @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
Copied: trunk/mail/cclient/files/patch-src_osdep_unix_os_bsi.h (from rev 20583, trunk/mail/cclient/files/patch-aa)
===================================================================
--- trunk/mail/cclient/files/patch-src_osdep_unix_os_bsi.h (rev 0)
+++ trunk/mail/cclient/files/patch-src_osdep_unix_os_bsi.h 2015-10-31 18:18:58 UTC (rev 20588)
@@ -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 <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>
++
++/*
++ * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch
++ * to POSIX semantics.
++ */
++#if __FreeBSD__ >= 3
++#include <dirent.h>
++#define direct dirent
++#else
+ #include <sys/dir.h>
++#endif
++
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <sys/file.h>
Modified: trunk/mail/cclient/pkg-descr
===================================================================
--- trunk/mail/cclient/pkg-descr 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/pkg-descr 2015-10-31 18:18:58 UTC (rev 20588)
@@ -5,5 +5,3 @@
For more information, please see the UW IMAP homepage:
WWW: http://www.washington.edu/imap/
-
-- Anders Nordby <anders at fix.no>
Added: trunk/mail/cclient/pkg-message-ssl
===================================================================
--- trunk/mail/cclient/pkg-message-ssl (rev 0)
+++ trunk/mail/cclient/pkg-message-ssl 2015-10-31 18:18:58 UTC (rev 20588)
@@ -0,0 +1,5 @@
+================================================================================
+Warning: You have chosen to include SSL support. Applications/ports that use
+the cclient library but do not support SSL may stop working or have problems
+linking. Linking them explicitly with ssl (-lssl -lcrypto) may or may not help.
+================================================================================
Property changes on: trunk/mail/cclient/pkg-message-ssl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/cclient/pkg-plist
===================================================================
--- trunk/mail/cclient/pkg-plist 2015-10-31 18:12:02 UTC (rev 20587)
+++ trunk/mail/cclient/pkg-plist 2015-10-31 18:18:58 UTC (rev 20588)
@@ -34,4 +34,3 @@
lib/%%SHLIBNAME%%
lib/libc-client4.a
lib/libc-client4.so
- at dirrm include/c-client
More information about the Midnightbsd-cvs
mailing list