diff options
| -rw-r--r-- | mail/cclient/Makefile | 7 | ||||
| -rw-r--r-- | mail/cclient/distinfo | 4 | ||||
| -rw-r--r-- | mail/cclient/files/patch-ab | 31 |
3 files changed, 23 insertions, 19 deletions
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile index 93512abf153a..e46489f1b663 100644 --- a/mail/cclient/Makefile +++ b/mail/cclient/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cclient -PORTVERSION= 2004c1 -PORTREVISION= 1 +PORTVERSION= 2004d PORTEPOCH= 1 CATEGORIES= mail devel ipv6 MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ @@ -55,6 +54,10 @@ post-patch: .endfor @${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \ s:/etc/ssl/private:${PREFIX}/certs:g" ${WRKSRC}/Makefile +.if !defined(WITHOUT_IPV6) + @${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \ + ${WRKSRC}/src/osdep/unix/Makefile +.endif post-configure: @${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}" diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo index 9ea10db8bc3f..cd5114221fea 100644 --- a/mail/cclient/distinfo +++ b/mail/cclient/distinfo @@ -1,2 +1,2 @@ -MD5 (imap-2004c1.tar.Z) = f0a1a2abfa4b1ed8074ce023724416f3 -SIZE (imap-2004c1.tar.Z) = 2227092 +MD5 (imap-2004d.tar.Z) = 9bee45a210138d4a924ab95539f5ef35 +SIZE (imap-2004d.tar.Z) = 2223019 diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab index 2897ba09bf01..d1c72f6fe8cc 100644 --- a/mail/cclient/files/patch-ab +++ b/mail/cclient/files/patch-ab @@ -1,17 +1,18 @@ ---- src/osdep/unix/Makefile.orig Fri Apr 30 02:08:48 2004 -+++ src/osdep/unix/Makefile Fri Jun 4 07:00:12 2004 -@@ -22,20 +22,20 @@ +--- src/osdep/unix/Makefile.orig Thu Apr 21 00:48:34 2005 ++++ src/osdep/unix/Makefile Mon May 30 19:08:25 2005 +@@ -22,8 +22,8 @@ EXTRAAUTHENTICATORS= EXTRADRIVERS=mbox -PASSWDTYPE=std -SSLTYPE=nopwd --IP=4 +PASSWDTYPE=pam +SSLTYPE=unix.nopwd -+IP=6 + IP=4 +@@ -41,13 +41,13 @@ + # Extended flags needed for SSL. You may need to modify. -SSLDIR=/usr/local/ssl @@ -29,7 +30,7 @@ # Older versions of MIT Kerberos also have a libcrypto. If so, you may need # to use this instead -@@ -62,7 +62,7 @@ +@@ -74,7 +74,7 @@ # AFSLDFLAGS may also need -L/usr/ucblib -lucb DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" DCELDFLAGS= -ldce @@ -38,7 +39,7 @@ # Build parameters normally set by the individual port -@@ -99,7 +99,7 @@ +@@ -111,7 +111,7 @@ # Commands possibly overriden by the individual port ARRC=ar rc @@ -47,7 +48,7 @@ LN=ln -s RANLIB=ranlib -@@ -117,7 +117,7 @@ +@@ -129,7 +129,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 @@ -56,8 +57,8 @@ CAT=cat MAKE=make -@@ -134,6 +134,10 @@ - PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) +@@ -146,6 +146,10 @@ + PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) +# Need this for the shared library rule to work correctly @@ -67,7 +68,7 @@ # Here if no make argument established missing: osdep.h -@@ -214,13 +218,14 @@ +@@ -226,13 +230,14 @@ BASECFLAGS="-g -Dconst=" bsf: # FreeBSD @@ -85,7 +86,7 @@ bsi: # BSD/i386 $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -@@ -786,23 +791,35 @@ +@@ -801,23 +806,35 @@ # Build it! @@ -124,7 +125,7 @@ # Dependencies -@@ -835,7 +852,7 @@ +@@ -850,7 +867,7 @@ # OS-dependent @@ -132,8 +133,8 @@ +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 flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \ -@@ -848,12 +865,19 @@ + auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c nfstest.c fsync.c \ +@@ -864,12 +881,19 @@ write.c sslstdio.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS |