Date: Mon, 23 Jul 2007 16:30:36 GMT From: "Pedro J. Lobo" <pjlobo@sec.upm.es> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/114833: [patch] update to version 2006j Message-ID: <200707231630.l6NGUab4026968@www.freebsd.org> Resent-Message-ID: <200707231640.l6NGe17L071036@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114833 >Category: ports >Synopsis: [patch] update to version 2006j >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 23 16:40:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Pedro J. Lobo >Release: 5.5-STABLE (as of 2007-06-05) >Organization: Universidad Politécnica de Madrid >Environment: FreeBSD antares.sec.upm.es 5.5-STABLE FreeBSD 5.5-STABLE #0: Tue Jun 5 15:29:29 CEST 2007 rootbash@antares.sec.upm.es:/usr/obj/usr/src/sys/ANTARES i386 >Description: The c-client and imap-uw are still at version 2004g. The patch I am enclosing updates c-client to version 2006j. Will submit a patch for imap-uw in another PR. >How-To-Repeat: >Fix: Apply the attached patch. Patch attached with submission follows: --- Makefile.orig Mon Jul 23 13:47:16 2007 +++ Makefile Mon Jul 23 17:10:06 2007 @@ -6,7 +6,7 @@ # PORTNAME= cclient -PORTVERSION= 2004g +PORTVERSION= 2006j PORTEPOCH= 1 CATEGORIES= mail devel ipv6 MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ @@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR= . old DISTNAME= imap-${PORTVERSION} EXTRACT_SUFX= .tar.Z +DISTVERSIONSUFFIX= 2 +DISTFILES= ${DISTNAME}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} MAINTAINER= anders@FreeBSD.org COMMENT= Mark Crispin's C-client mail access routines @@ -43,7 +45,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} SHLIBBASE= c-client4 -SHLIBMAJ= 8 +SHLIBMAJ= 9 SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ} MAKE_ENV= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} @@ -66,10 +68,11 @@ post-configure: @${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}" -HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flstring.h \ - fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h mbx.h mh.h \ - misc.h mx.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \ - rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h +HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h \ + flocksim.h flstring.h fs.h ftl.h imap4r1.h linkage.h mail.h \ + misc.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \ + rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h \ + utf8aux.h PORTREV_H= ${WRKDIR}/portrevision.h post-build: --- distinfo.orig Tue Jan 31 10:19:47 2006 +++ distinfo Mon Jul 23 15:27:48 2007 @@ -1,3 +1,3 @@ -MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020 -SHA256 (imap-2004g.tar.Z) = 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d -SIZE (imap-2004g.tar.Z) = 2246713 +MD5 (imap-2006j2.tar.Z) = d7900691c415bcc725c1bf2b15e4fb99 +SHA256 (imap-2006j2.tar.Z) = 5b2ed247fd98f81c7a2d23d0822f602d49b742c19761a9c2dad6753f5f3e806e +SIZE (imap-2006j2.tar.Z) = 2686745 --- pkg-plist.orig Wed Sep 1 13:47:42 2004 +++ pkg-plist Mon Jul 23 16:41:01 2007 @@ -3,17 +3,15 @@ include/c-client/env.h include/c-client/env_unix.h include/c-client/fdstring.h +include/c-client/flockcyg.h +include/c-client/flocksim.h include/c-client/flstring.h include/c-client/fs.h include/c-client/ftl.h include/c-client/imap4r1.h -include/c-client/linkage.c include/c-client/linkage.h include/c-client/mail.h -include/c-client/mbx.h -include/c-client/mh.h include/c-client/misc.h -include/c-client/mx.h include/c-client/netmsg.h include/c-client/newsrc.h include/c-client/nl.h @@ -27,6 +25,7 @@ include/c-client/tcp_unix.h include/c-client/unix.h include/c-client/utf8.h +include/c-client/utf8aux.h include/c-client/portrevision.h lib/%%SHLIBNAME%% lib/libc-client4.a --- files/patch-ab.orig Mon Jul 23 13:47:16 2007 +++ files/patch-ab Mon Jul 23 16:31:38 2007 @@ -1,151 +1,254 @@ ---- src/osdep/unix/Makefile.orig Sat Apr 30 22:51:13 2005 -+++ src/osdep/unix/Makefile Sun Jul 1 22:29:26 2007 -@@ -22,8 +22,8 @@ - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox --PASSWDTYPE=std --SSLTYPE=nopwd -+PASSWDTYPE=pam -+SSLTYPE=unix.nopwd - IP=4 - - -@@ -41,13 +41,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 -@@ -74,7 +74,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 -@@ -111,7 +111,7 @@ - # Commands possibly overriden by the individual port - - ARRC=ar rc --CC=cc -+#CC=cc - LN=ln -s - RANLIB=ranlib - -@@ -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 --CFLAGS=-g -+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) - - CAT=cat - MAKE=make -@@ -146,6 +146,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 -@@ -226,13 +230,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 \ -- BASECFLAGS="-g -O -pipe" \ -- BASELDFLAGS="-lcrypt" -+ LOCKPGM=$(PREFIX)/libexec/mlock \ -+ BASECFLAGS="-DNFSKLUDGE" \ -+ BASELDFLAGS="-lpam" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -@@ -801,23 +806,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) -+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` -+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so -+ -+.c.so: osdep.h -+ $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@ -+ - .c.o: -- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c -+ $(CC) -c $(CFLAGS) $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' -+ sh -c '$(RM) *.so $(SHLIBNAME)' - - - # Dependencies -@@ -850,7 +863,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 nfstest.c fsync.c \ -@@ -864,12 +877,19 @@ - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS -+ -+osdep.o: $(OSDEPS) -+ $(CC) $(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 $(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 +*** 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 --- files/patch-ac.orig Wed Nov 27 04:53:42 2002 +++ files/patch-ac Mon Jul 23 16:02:45 2007 @@ -1,50 +1,78 @@ ---- Makefile.orig Tue Nov 5 01:19:13 2002 -+++ Makefile Wed Nov 27 00:59:07 2002 -@@ -256,7 +256,7 @@ - - # Make the IMAP Toolkit - --all: SPECIALS c-client rebuild bundled -+all: SPECIALS c-client rebuild - - c-client: - @echo Not processed yet. In a first-time build, you must specify -@@ -396,9 +396,6 @@ - @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;; *) exit 1;; esac' - - sslnone: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -@@ -411,9 +408,6 @@ - @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;; *) exit 1;; esac' - - - # C compiler types -@@ -434,7 +428,7 @@ - $(TOOLS)/$@ "$(LN)" src/tmail tmail - $(LN) $(TOOLS)/$@ . - --build: OSTYPE rebuild rebuildclean bundled -+build: OSTYPE rebuild rebuildclean - - OSTYPE: - @echo Building c-client for $(BUILDTYPE)... -@@ -453,8 +447,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 -- $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \ -- CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` -+ $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS` - - rebuildclean: - $(SH) -c '$(RM) rebuild || true' +*** 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' >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707231630.l6NGUab4026968>