Attachment 97953 Details for Bug 136774 – file.diff

[patch] file.diff

file.diff (text/plain), 4.03 KB, created by Corey Halpin on 2009-07-15 05:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Halpin

Created: 2009-07-15 05:30:00 UTC

Size: 4.03 KB

patch

obsolete

>diff -urN /usr/ports/mail/fetchmail/Makefile fetchmail/Makefile
>--- /usr/ports/mail/fetchmail/Makefile	2009-05-04 18:09:15.000000000 -0500
>+++ fetchmail/Makefile	2009-07-14 21:38:25.000000000 -0500
>@@ -10,10 +10,11 @@
> # want fetchmailconf to work, define WITH_X11
> 
> PORTNAME=	fetchmail
>-PORTVERSION=	6.3.9
>+PORTVERSION=	6.3.10
> CATEGORIES=	mail ipv6
> MASTER_SITES=	${MASTER_SITE_BERLIOS} \
> 		http://homepages.uni-paderborn.de/mandree/fetchmail/:ma \
>+		http://mandree.home.pages.de/fetchmail/:ma \
> 		${MASTER_SITE_SUNSITE:S/$/:sunsite/}
> MASTER_SITE_SUBDIR=	fetchmail/:DEFAULT \
> 			system/mail/pop/fetchmail/:sunsite \
>@@ -37,8 +38,8 @@
> 		--with-hesiod=no --enable-fallback=no PYTHON=:
> # bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
> LDFLAGS=	-L${LOCALBASE}/lib
>-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
>+#CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
>+#		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
> MAKE_ENV+=	${CONFIGURE_ENV}
> MAN1=		fetchmail.1
> MLINKS=		fetchmail.1 fetchmailconf.1
>@@ -49,14 +50,14 @@
> 		POP2	"Build pop2 support (obsolete)." off \
> 		GSSAPI	"Build GSSAPI support (requires KRB5_HOME to be set)" off
> 
>-.include <bsd.port.pre.mk>
>-
> .if defined(WITH_X11)
> USE_PYTHON=	yes
> .include "${PORTSDIR}/Mk/bsd.python.mk"
> RUN_DEPENDS+=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
> # Pop2 is obsolete
> .if defined(WITH_POP2)
> CONFIGURE_ARGS+=--enable-POP2
>@@ -128,7 +129,7 @@
> 	@${ECHO_CMD} "Unable to detect Kerberos in your system. Disabling GSSAPI support."
> .endif
> .else
>-	@${ECHO_CMD} "GSSAPI requires Kerberos which is not enabled in your current configuration."
>+	@${ECHO_CMD} "GSSAPI requires Kerberos, but Kerberos is disabled."
> .endif
> .endif
> 
>diff -urN /usr/ports/mail/fetchmail/distinfo fetchmail/distinfo
>--- /usr/ports/mail/fetchmail/distinfo	2009-01-08 06:12:43.000000000 -0600
>+++ fetchmail/distinfo	2009-07-14 21:26:54.000000000 -0500
>@@ -1,3 +1,3 @@
>-MD5 (fetchmail-6.3.9.tar.bz2) = 72c20ad2b9629f1a109668b05a84d823
>-SHA256 (fetchmail-6.3.9.tar.bz2) = 3dfd3b04aa552331f91f96bdf5f5afe489c31a600ae7973f5814bde5555813dc
>-SIZE (fetchmail-6.3.9.tar.bz2) = 1538134
>+MD5 (fetchmail-6.3.10.tar.bz2) = 50f6c7d2c400c6521dec3da459ae30c4
>+SHA256 (fetchmail-6.3.10.tar.bz2) = d3a22d81990908f7df4bfd25f12b9e41303e956b3e70d7447356cf92ad7f6607
>+SIZE (fetchmail-6.3.10.tar.bz2) = 1608066
>diff -urN /usr/ports/mail/fetchmail/files/patch-Makefile.in fetchmail/files/patch-Makefile.in
>--- /usr/ports/mail/fetchmail/files/patch-Makefile.in	2009-01-08 06:12:44.000000000 -0600
>+++ fetchmail/files/patch-Makefile.in	1969-12-31 18:00:00.000000000 -0600
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	Thu Dec  1 00:33:52 2005
>-+++ Makefile.in	Sun Dec 11 21:58:15 2005
>-@@ -29,7 +29,7 @@
>- INSTALL = @INSTALL@
>- install_sh_DATA = $(install_sh) -c -m 644
>- install_sh_PROGRAM = $(install_sh) -c
>--install_sh_SCRIPT = $(install_sh) -c
>-+install_sh_SCRIPT = $(install_sh) -c -m 555
>- INSTALL_HEADER = $(INSTALL_DATA)
>- transform = $(program_transform_name)
>- NORMAL_INSTALL = :
>diff -urN /usr/ports/mail/fetchmail/files/patch-fetchlimit-exitstatus fetchmail/files/patch-fetchlimit-exitstatus
>--- /usr/ports/mail/fetchmail/files/patch-fetchlimit-exitstatus	2009-01-08 06:12:44.000000000 -0600
>+++ fetchmail/files/patch-fetchlimit-exitstatus	1969-12-31 18:00:00.000000000 -0600
>@@ -1,18 +0,0 @@
>-Index: driver.c
>-===================================================================
>---- driver.c	(Revision 5254)
>-+++ driver.c	(Revision 5255)
>-@@ -1435,9 +1435,11 @@
>- 		/* end-of-mailbox processing before we repoll or switch to another one */
>- 		if (ctl->server.base_protocol->end_mailbox_poll)
>- 		{
>--		    err = (ctl->server.base_protocol->end_mailbox_poll)(mailserver_socket, ctl);
>--		    if (err)
>-+		    tmperr = (ctl->server.base_protocol->end_mailbox_poll)(mailserver_socket, ctl);
>-+		    if (tmperr) {
>-+			err = tmperr;
>- 			goto cleanUp;
>-+		    }
>- 		}
>- 		/* Return now if we have reached the fetchlimit */
>- 		if (maxfetch && maxfetch <= fetches)

Actions: View | Diff

Attachments on bug 136774: 97953