diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/Makefile /usr/home/mandree/ports/mail/fetchmail/Makefile --- /usr/ports/mail/fetchmail/Makefile 2009-09-08 17:12:21.000000000 +0200 +++ /usr/home/mandree/ports/mail/fetchmail/Makefile 2009-10-30 10:47:57.250170616 +0100 @@ -10,8 +10,7 @@ # want fetchmailconf to work, define WITH_X11 PORTNAME= fetchmail -PORTVERSION= 6.3.11 -PORTREVISION= 1 +PORTVERSION= 6.3.13 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://homepages.uni-paderborn.de/mandree/fetchmail/:ma \ @@ -33,6 +32,7 @@ USE_BZIP2= yes USE_GMAKE= yes +MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes USE_OPENSSL= yes CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ @@ -46,8 +46,7 @@ OPTIONS= X11 "Python/Tkinter dependencies for fetchmailconf" off \ NLS "National language support (NLS)." on \ NTLM "Build in support for NTLM/MSN authentication." off \ - POP2 "Build pop2 support (obsolete)." off \ - GSSAPI "Build GSSAPI support (requires KRB5_HOME to be set)" off + GSSAPI "Build GSSAPI/Kerberos 5 support" off .include @@ -78,20 +77,22 @@ PLIST_SUB+= NLS="@comment " .endif -.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a) -CONFIGURE_ARGS += --with-kerberos5=${KRB5_HOME} - -.if defined(WITH_GSSAPI) -CONFIGURE_ARGS+=--with-gssapi=${KRB5_HOME} +.if !defined(KRB5_HOME) +.if exists(${LOCALBASE}/lib/libkrb5.a) +KRB5_HOME= ${LOCALBASE} +.elif exists(/usr/lib/libkrb5.a) +KRB5_HOME= /usr +.endif .endif -.elif exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) -CONFIGURE_ARGS += --with-kerberos=/usr +.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a) +BROKEN= KRB5_HOME is set but doesn't provide lib/libkrb5.a +.endif .if defined(WITH_GSSAPI) -CONFIGURE_ARGS+=--with-gssapi=/usr +.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a) +CONFIGURE_ARGS += --with-gssapi=${KRB5_HOME} .endif - .endif .if defined(WITH_NTLM) @@ -109,32 +110,6 @@ @${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE},g" \ ${WRKDIR}/fetchmailconf -pre-configure: - - @${ECHO_CMD} "" - -.if defined(KRB5_HOME) - @${ECHO_CMD} "Using Kerberos V support in ${KRB5_HOME}." -.else - @${ECHO_CMD} "Use KRB5_HOME= to enable Kerberos V support in (usually /usr)." -.endif - -.if defined(WITH_GSSAPI) -.if defined(KRB5_HOME) - @${ECHO_CMD} "Enabling GSSAPI support in ${KRB5_HOME}." -.elif defined(MAKE_KERBEROS4) -.if exists(/usr/lib/libkrb.a) - @${ECHO_CMD} "Enabling GSSAPI support in /usr." -.else - @${ECHO_CMD} "Unable to detect Kerberos in your system. Disabling GSSAPI support." -.endif -.else - @${ECHO_CMD} "GSSAPI requires Kerberos, but Kerberos is disabled." -.endif -.endif - - @${ECHO_CMD} "" - pre-su-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/distinfo /usr/home/mandree/ports/mail/fetchmail/distinfo --- /usr/ports/mail/fetchmail/distinfo 2009-08-11 17:27:11.000000000 +0200 +++ /usr/home/mandree/ports/mail/fetchmail/distinfo 2009-10-30 10:31:57.464662402 +0100 @@ -1,3 +1,3 @@ -MD5 (fetchmail-6.3.11.tar.bz2) = 43b28f296cc0024d3c727319eacae324 -SHA256 (fetchmail-6.3.11.tar.bz2) = ba679cef82b9520bc5dbe9e2e54381e488b5712faf885deb7612393b5ab80c6f -SIZE (fetchmail-6.3.11.tar.bz2) = 1608923 +MD5 (fetchmail-6.3.13.tar.bz2) = db792fb311bc358e95ed0437389269ac +SHA256 (fetchmail-6.3.13.tar.bz2) = 206a299f7ced9d7359621cc8e590a22f9cfc9c713696474e2119a1340c2e98ee +SIZE (fetchmail-6.3.13.tar.bz2) = 1614718 diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/files/patch-configure /usr/home/mandree/ports/mail/fetchmail/files/patch-configure --- /usr/ports/mail/fetchmail/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/mandree/ports/mail/fetchmail/files/patch-configure 2009-10-30 10:40:55.373307495 +0100 @@ -0,0 +1,11 @@ +--- configure.orig 2009-10-30 10:40:08.971594149 +0100 ++++ configure 2009-10-30 10:40:19.438656862 +0100 +@@ -14747,7 +14747,7 @@ + _ACEOF + + if test "$with_gssapi" != yes ; then +- CPPFLAGS="$CPPFLAGS-I$with_gssapi/include" ++ CPPFLAGS="$CPPFLAGS -I$with_gssapi/include" + fi + + diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/files/patch-socket.c /usr/home/mandree/ports/mail/fetchmail/files/patch-socket.c --- /usr/ports/mail/fetchmail/files/patch-socket.c 2009-09-08 17:12:21.000000000 +0200 +++ /usr/home/mandree/ports/mail/fetchmail/files/patch-socket.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- socket.c.org 2009-08-08 16:01:49.000000000 +0200 -+++ socket.c 2009-08-08 16:03:17.000000000 +0200 -@@ -628,9 +628,10 @@ - report(stdout, GT_("Unknown Issuer CommonName\n")); - } - if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) { -- if (outlevel >= O_VERBOSE) -+ if (outlevel >= O_VERBOSE) { - report(stdout, GT_("Server CommonName: %s\n"), (tt = sdump(buf, i))); -- xfree(tt); -+ xfree(tt); -+ } - if ((size_t)i >= sizeof(buf) - 1) { - /* Possible truncation. In this case, this is a DNS name, so this - * is really bad. We do not tolerate this even in the non-strict case. */ diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/files/pkg-message.in /usr/home/mandree/ports/mail/fetchmail/files/pkg-message.in --- /usr/ports/mail/fetchmail/files/pkg-message.in 2007-05-31 22:09:30.000000000 +0200 +++ /usr/home/mandree/ports/mail/fetchmail/files/pkg-message.in 2009-10-30 10:51:32.714059462 +0100 @@ -1,4 +1,4 @@ -********************************************************************* -*** For pointers how to configure fetchmail in daemon mode *** -*** please consult %%PREFIX%%/etc/rc.d/fetchmail. *** -********************************************************************* +****************************************************** +For pointers how to configure fetchmail in daemon mode +please consult %%PREFIX%%/etc/rc.d/fetchmail. +****************************************************** diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/pkg-plist /usr/home/mandree/ports/mail/fetchmail/pkg-plist --- /usr/ports/mail/fetchmail/pkg-plist 2009-07-16 01:02:51.000000000 +0200 +++ /usr/home/mandree/ports/mail/fetchmail/pkg-plist 2009-10-30 10:49:57.642400913 +0100 @@ -39,6 +39,5 @@ @unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi etc/fetchmailrc.sample @exec if [ ! -f %D/etc/fetchmailrc ] ; then cp -p %D/%F %B/fetchmailrc; fi -@cwd / @unexec rm -f /var/run/fetchmail/fetchmail.pid 2>/dev/null || true -@dirrm /var/run/fetchmail +@unexec rmdir /var/run/fetchmail 2>/dev/null || true