View | Details | Raw Unified | Return to bug 136774
Collapse All | Expand All

(-)fetchmail/Makefile (-6 / +7 lines)
Lines 10-19 Link Here
10
# want fetchmailconf to work, define WITH_X11
10
# want fetchmailconf to work, define WITH_X11
11
11
12
PORTNAME=	fetchmail
12
PORTNAME=	fetchmail
13
PORTVERSION=	6.3.9
13
PORTVERSION=	6.3.10
14
CATEGORIES=	mail ipv6
14
CATEGORIES=	mail ipv6
15
MASTER_SITES=	${MASTER_SITE_BERLIOS} \
15
MASTER_SITES=	${MASTER_SITE_BERLIOS} \
16
		http://homepages.uni-paderborn.de/mandree/fetchmail/:ma \
16
		http://homepages.uni-paderborn.de/mandree/fetchmail/:ma \
17
		http://mandree.home.pages.de/fetchmail/:ma \
17
		${MASTER_SITE_SUNSITE:S/$/:sunsite/}
18
		${MASTER_SITE_SUNSITE:S/$/:sunsite/}
18
MASTER_SITE_SUBDIR=	fetchmail/:DEFAULT \
19
MASTER_SITE_SUBDIR=	fetchmail/:DEFAULT \
19
			system/mail/pop/fetchmail/:sunsite \
20
			system/mail/pop/fetchmail/:sunsite \
Lines 37-44 Link Here
37
		--with-hesiod=no --enable-fallback=no PYTHON=:
38
		--with-hesiod=no --enable-fallback=no PYTHON=:
38
# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
39
# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
39
LDFLAGS=	-L${LOCALBASE}/lib
40
LDFLAGS=	-L${LOCALBASE}/lib
40
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
41
#CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
41
		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
42
#		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
42
MAKE_ENV+=	${CONFIGURE_ENV}
43
MAKE_ENV+=	${CONFIGURE_ENV}
43
MAN1=		fetchmail.1
44
MAN1=		fetchmail.1
44
MLINKS=		fetchmail.1 fetchmailconf.1
45
MLINKS=		fetchmail.1 fetchmailconf.1
Lines 49-62 Link Here
49
		POP2	"Build pop2 support (obsolete)." off \
50
		POP2	"Build pop2 support (obsolete)." off \
50
		GSSAPI	"Build GSSAPI support (requires KRB5_HOME to be set)" off
51
		GSSAPI	"Build GSSAPI support (requires KRB5_HOME to be set)" off
51
52
52
.include <bsd.port.pre.mk>
53
54
.if defined(WITH_X11)
53
.if defined(WITH_X11)
55
USE_PYTHON=	yes
54
USE_PYTHON=	yes
56
.include "${PORTSDIR}/Mk/bsd.python.mk"
55
.include "${PORTSDIR}/Mk/bsd.python.mk"
57
RUN_DEPENDS+=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
56
RUN_DEPENDS+=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
58
.endif
57
.endif
59
58
59
.include <bsd.port.pre.mk>
60
60
# Pop2 is obsolete
61
# Pop2 is obsolete
61
.if defined(WITH_POP2)
62
.if defined(WITH_POP2)
62
CONFIGURE_ARGS+=--enable-POP2
63
CONFIGURE_ARGS+=--enable-POP2
Lines 128-134 Link Here
128
	@${ECHO_CMD} "Unable to detect Kerberos in your system. Disabling GSSAPI support."
129
	@${ECHO_CMD} "Unable to detect Kerberos in your system. Disabling GSSAPI support."
129
.endif
130
.endif
130
.else
131
.else
131
	@${ECHO_CMD} "GSSAPI requires Kerberos which is not enabled in your current configuration."
132
	@${ECHO_CMD} "GSSAPI requires Kerberos, but Kerberos is disabled."
132
.endif
133
.endif
133
.endif
134
.endif
134
135
(-)fetchmail/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (fetchmail-6.3.9.tar.bz2) = 72c20ad2b9629f1a109668b05a84d823
1
MD5 (fetchmail-6.3.10.tar.bz2) = 50f6c7d2c400c6521dec3da459ae30c4
2
SHA256 (fetchmail-6.3.9.tar.bz2) = 3dfd3b04aa552331f91f96bdf5f5afe489c31a600ae7973f5814bde5555813dc
2
SHA256 (fetchmail-6.3.10.tar.bz2) = d3a22d81990908f7df4bfd25f12b9e41303e956b3e70d7447356cf92ad7f6607
3
SIZE (fetchmail-6.3.9.tar.bz2) = 1538134
3
SIZE (fetchmail-6.3.10.tar.bz2) = 1608066
(-)fetchmail/files/patch-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	Thu Dec  1 00:33:52 2005
2
+++ Makefile.in	Sun Dec 11 21:58:15 2005
3
@@ -29,7 +29,7 @@
4
 INSTALL = @INSTALL@
5
 install_sh_DATA = $(install_sh) -c -m 644
6
 install_sh_PROGRAM = $(install_sh) -c
7
-install_sh_SCRIPT = $(install_sh) -c
8
+install_sh_SCRIPT = $(install_sh) -c -m 555
9
 INSTALL_HEADER = $(INSTALL_DATA)
10
 transform = $(program_transform_name)
11
 NORMAL_INSTALL = :
(-)fetchmail/files/patch-fetchlimit-exitstatus (-18 lines)
Lines 1-18 Link Here
1
Index: driver.c
2
===================================================================
3
--- driver.c	(Revision 5254)
4
+++ driver.c	(Revision 5255)
5
@@ -1435,9 +1435,11 @@
6
 		/* end-of-mailbox processing before we repoll or switch to another one */
7
 		if (ctl->server.base_protocol->end_mailbox_poll)
8
 		{
9
-		    err = (ctl->server.base_protocol->end_mailbox_poll)(mailserver_socket, ctl);
10
-		    if (err)
11
+		    tmperr = (ctl->server.base_protocol->end_mailbox_poll)(mailserver_socket, ctl);
12
+		    if (tmperr) {
13
+			err = tmperr;
14
 			goto cleanUp;
15
+		    }
16
 		}
17
 		/* Return now if we have reached the fetchlimit */
18
 		if (maxfetch && maxfetch <= fetches)

Return to bug 136774