View | Details | Raw Unified | Return to bug 174873 | Differences between
and this patch

Collapse All | Expand All

(-)fetchmail/Makefile (-57 / +48 lines)
Lines 1-7 Link Here
1
# New ports collection makefile for:	fetchmail
1
# Created by: Ville Eerola <ve@sci.fi>
2
# Date created:		25 Feb 2000
3
# Whom:			Ville Eerola <ve@sci.fi>
4
#
5
# $FreeBSD: head/mail/fetchmail/Makefile 303362 2012-08-30 06:24:48Z mandree $
2
# $FreeBSD: head/mail/fetchmail/Makefile 303362 2012-08-30 06:24:48Z mandree $
6
#
3
#
7
# NOTE:  The fetchmailconf program (an interactive program for
4
# NOTE:  The fetchmailconf program (an interactive program for
Lines 11-22 Link Here
11
# want fetchmailconf to work, define the X11 option.
8
# want fetchmailconf to work, define the X11 option.
12
9
13
PORTNAME=	fetchmail
10
PORTNAME=	fetchmail
14
PORTVERSION=	6.3.22
11
PORTVERSION=	6.3.24
15
CATEGORIES=	mail ipv6
12
CATEGORIES=	mail ipv6
16
MASTER_SITES=	BERLIOS/${PORTNAME}/ \
13
MASTER_SITES=	SF/${PORTNAME}/branch_6.3/ \
17
		SF/${PORTNAME}/branch_6.3/ \
14
		http://mandree.home.pages.de/${PORTNAME}/
18
		http://mandree.home.pages.de/${PORTNAME}/ \
19
		SUNSITE/system/mail/pop/${PORTNAME}/
20
15
21
MAINTAINER=	chalpin@cs.wisc.edu
16
MAINTAINER=	chalpin@cs.wisc.edu
22
COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
17
COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
Lines 24-84 Link Here
24
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
19
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
25
20
26
# Note USERS can only contain a single word as parts below rely on that.
21
# Note USERS can only contain a single word as parts below rely on that.
27
USERS=		${PORTNAME}
22
USERS=	${PORTNAME}
28
GROUPS=		${USERS}
23
GROUPS=	${USERS}
29
24
30
USE_RC_SUBR=	fetchmail
25
USE_RC_SUBR=	fetchmail
31
FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
26
FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
32
SUB_FILES=	pkg-message
27
SUB_FILES=	pkg-message
33
PATCH_STRIP=	-p1
34
28
35
USE_XZ=		yes
29
USE_XZ=	yes
36
USE_GMAKE=	yes
30
USE_GMAKE=	yes
37
MAKE_JOBS_SAFE=	yes
31
MAKE_JOBS_SAFE=	yes
38
GNU_CONFIGURE=	yes
32
GNU_CONFIGURE=	yes
39
USE_OPENSSL=	yes
33
USE_OPENSSL=	yes
40
CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
34
CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
41
		--with-hesiod=no --enable-fallback=no PYTHON=:
35
		--without-hesiod --enable-fallback=no \
42
# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
36
		--with-ssl=${OPENSSLBASE}
37
43
LDFLAGS+=	-L${LOCALBASE}/lib
38
LDFLAGS+=	-L${LOCALBASE}/lib
44
MAKE_ENV+=	${CONFIGURE_ENV}
39
MAN1=	fetchmail.1
45
MAN1=		fetchmail.1
40
MLINKS=	fetchmail.1 fetchmailconf.1
46
MLINKS=		fetchmail.1 fetchmailconf.1
47
48
OPTIONS=	X11	"Python/Tkinter dependencies for fetchmailconf" off \
49
		NLS	"National language support (NLS)."		on \
50
		NTLM	"Build in support for NTLM/MSN authentication." off \
51
		GSSAPI	"Build GSSAPI/Kerberos 5 support" 		on
52
41
53
.include <bsd.port.options.mk>
42
OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI
43
OPTIONS_DEFAULT=	GSSAPI
44
X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
45
NTLM_DESC=	Build in support for NTLM/MSN authentication
46
GSSAPI_DESC=	Build GSSAPI/Kerberos 5 support
54
47
55
.if defined(WITH_X11)
48
PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
56
USE_PYTHON=	yes
49
		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
57
RUN_DEPENDS+=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
50
		esrs-design-notes.html
58
.endif
59
51
60
.include <bsd.port.pre.mk>
52
.include <bsd.port.options.mk>
61
53
62
# Pop2 is obsolete
54
# Pop2 is obsolete
63
.if defined(WITH_POP2)
55
.if defined(WITH_POP2)
64
CONFIGURE_ARGS+=--enable-POP2
56
CONFIGURE_ARGS+=	--enable-POP2
65
.endif
57
.endif
66
58
67
CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
59
.if ${PORT_OPTIONS:MX11}
68
60
USE_PYTHON_RUN=	yes
69
DOCS=		FAQ FEATURES NEWS NOTES README README.SSL \
61
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
70
		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
62
PLIST_SUB+=	X11="" NOX11="@comment "
71
		esrs-design-notes.html
63
.else
64
CONFIGURE_ARGS+=	PYTHON=:
65
SUB_FILES+=	fetchmailconf
66
PLIST_SUB+=	X11="@comment " NOX11=""
67
.endif
72
68
73
.if !defined(WITHOUT_NLS)
69
.if ${PORT_OPTIONS:MNLS}
74
CONFIGURE_ARGS+=	--enable-nls
70
CONFIGURE_ARGS+=	--enable-nls
75
PLIST_SUB+=		NLS=""
71
PLIST_SUB+=	NLS=""
76
USE_GETTEXT=		yes
72
USE_GETTEXT=	yes
77
.else
73
.else
78
CONFIGURE_ARGS+=	--disable-nls
74
CONFIGURE_ARGS+=	--disable-nls
79
PLIST_SUB+=		NLS="@comment "
75
PLIST_SUB+=	NLS="@comment "
80
.endif
76
.endif
81
77
78
.if ${PORT_OPTIONS:MGSSAPI}
82
.if !defined(KRB5_HOME)
79
.if !defined(KRB5_HOME)
83
.if exists(${LOCALBASE}/lib/libkrb5.a)
80
.if exists(${LOCALBASE}/lib/libkrb5.a)
84
KRB5_HOME=	${LOCALBASE}
81
KRB5_HOME=	${LOCALBASE}
Lines 88-129 Link Here
88
.endif
85
.endif
89
86
90
.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
87
.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
91
BROKEN=		KRB5_HOME is set but doesn't provide lib/libkrb5.a
88
BROKEN=	KRB5_HOME is set but doesn\'t provide lib/libkrb5.a
92
.endif
89
.endif
93
90
94
.if defined(WITH_GSSAPI)
95
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
91
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
96
CONFIGURE_ARGS += --with-gssapi=${KRB5_HOME}
92
CONFIGURE_ARGS+=	--with-gssapi=${KRB5_HOME}
97
.endif
93
.endif
98
.endif
94
.endif
99
95
100
.if defined(WITH_NTLM)
96
.if ${PORT_OPTIONS:MNTLM}
101
CONFIGURE_ARGS += --enable-NTLM
97
CONFIGURE_ARGS+=	--enable-NTLM
102
DOCS+=		README.NTLM
98
PORTDOCS+=	README.NTLM
103
PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%"
104
.else
105
PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%@comment "
106
.endif
99
.endif
107
100
108
pre-patch:
101
pre-patch:
109
	@${REINPLACE_CMD} -e "s,^#!/usr/bin/env python,#!${LOCALBASE}/bin/python,g" \
102
	@${REINPLACE_CMD} -e "s,^#!/usr/bin/env python,#!${LOCALBASE}/bin/python,g" \
110
		${WRKSRC}/fetchmailconf.py
103
		${WRKSRC}/fetchmailconf.py
111
	@${CP} ${FILESDIR}/fetchmailconf ${WRKDIR}/fetchmailconf
112
	@${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE},g" \
113
		 ${WRKDIR}/fetchmailconf
114
104
115
post-build:
105
post-build:
116
	@cd ${WRKSRC} && ${MAKE} check
106
	@${MAKE} -C ${WRKSRC} check
117
107
118
post-install:
108
post-install:
119
.if !defined(NOPORTDOCS)
109
.if ${PORT_OPTIONS:MDOCS}
120
	${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}
110
	${MKDIR} ${DOCSDIR}
121
	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
111
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
122
.endif
112
.endif
123
113
114
.if empty(PORT_OPTIONS:MX11)
124
	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
115
	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
125
	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/libexec
116
	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/libexec
126
117
.endif
127
	${MKDIR} -m 0755 "/var/run/${PORTNAME}"
118
	${MKDIR} -m 0755 "/var/run/${PORTNAME}"
128
	${CHOWN} "${USERS}:${GROUPS}" "/var/run/${PORTNAME}"
119
	${CHOWN} "${USERS}:${GROUPS}" "/var/run/${PORTNAME}"
129
	${INSTALL} -m 644 -o ${USERS} -g ${GROUPS} ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
120
	${INSTALL} -m 644 -o ${USERS} -g ${GROUPS} ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
Lines 136-139 Link Here
136
	@${CAT} ${PKGMESSAGE}
127
	@${CAT} ${PKGMESSAGE}
137
	@${ECHO_CMD} ""
128
	@${ECHO_CMD} ""
138
129
139
.include <bsd.port.post.mk>
130
.include <bsd.port.mk>
(-)fetchmail/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (fetchmail-6.3.22.tar.xz) = 9ab51a851f79e16258f068e791c39e3e378a99927f70c9635132f4295d70b1a4
1
SHA256 (fetchmail-6.3.24.tar.xz) = f6882f00f0d69bbabaa4fbdaccb9231c7c441781fcb95ff763f75589f2328daf
2
SIZE (fetchmail-6.3.22.tar.xz) = 1260296
2
SIZE (fetchmail-6.3.24.tar.xz) = 1263156
(-)fetchmail/files/fetchmailconf (-22 lines)
Lines 1-22 Link Here
1
#!/bin/sh
2
#
3
# Wrapper for the real fetchmailconf.  Checks whether Python and Tkinter are
4
# installed, and runs the real fetchmailconf or alerts the user, as appropriate.
5
#
6
# $FreeBSD: head/mail/fetchmail/files/fetchmailconf 300896 2012-07-14 13:54:48Z beat $
7
8
LOCALBASE=@LOCALBASE@
9
10
if [ -x $LOCALBASE/bin/python ] ; then
11
	PYTHON_VERSION=python$(${LOCALBASE}/bin/python -c 'import sys; print sys.version[:3]' 2>/dev/null)
12
	if [ -e ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so ]; then
13
		exec ${LOCALBASE}/libexec/fetchmailconf.py "$@"
14
	fi
15
fi
16
cat <<EOF
17
The fetchmailconf program requires Python with Tkinter, which does
18
not appear to be installed on this system.  Python can be found in
19
the FreeBSD Ports Collection in lang/python, and Tkinter for Python
20
can be found in x11-toolkits/py-tkinter.
21
EOF
22
exit 1
(-)fetchmail/files/fetchmailconf.in (+22 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# Wrapper for the real fetchmailconf.  Checks whether Python and Tkinter are
4
# installed, and runs the real fetchmailconf or alerts the user, as appropriate.
5
#
6
# $FreeBSD: head/mail/fetchmail/files/fetchmailconf 300896 2012-07-14 13:54:48Z beat $
7
8
LOCALBASE=%%LOCALBASE%%
9
10
if [ -x $LOCALBASE/bin/python ] ; then
11
	PYTHON_VERSION=python$(${LOCALBASE}/bin/python -c 'import sys; print sys.version[:3]' 2>/dev/null)
12
	if [ -e ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so ]; then
13
		exec ${LOCALBASE}/libexec/fetchmailconf.py "$@"
14
	fi
15
fi
16
cat <<EOF
17
The fetchmailconf program requires Python with Tkinter, which does
18
not appear to be installed on this system.  Python can be found in
19
the FreeBSD Ports Collection in lang/python, and Tkinter for Python
20
can be found in x11-toolkits/py-tkinter.
21
EOF
22
exit 1
(-)fetchmail/pkg-plist (-15 / +7 lines)
Lines 1-19 Link Here
1
@comment $FreeBSD: head/mail/fetchmail/pkg-plist 303362 2012-08-30 06:24:48Z mandree $
1
@comment $FreeBSD: head/mail/fetchmail/pkg-plist 303362 2012-08-30 06:24:48Z mandree $
2
bin/fetchmail
2
bin/fetchmail
3
bin/fetchmailconf
3
bin/fetchmailconf
4
libexec/fetchmailconf.py
4
%%NOX11%%libexec/fetchmailconf.py
5
%%PORTDOCS%%%%DOCSDIR%%/FAQ
6
%%PORTDOCS%%%%DOCSDIR%%/FEATURES
7
%%PORTDOCS%%%%DOCSDIR%%/NEWS
8
%%PORTDOCS%%%%DOCSDIR%%/NOTES
9
%%PORTDOCS%%%%DOCSDIR%%/README
10
%%PORTDOCS%%%%NTLMDOCS%%%%DOCSDIR%%/README.NTLM
11
%%PORTDOCS%%%%DOCSDIR%%/README.SSL
12
%%PORTDOCS%%%%DOCSDIR%%/design-notes.html
13
%%PORTDOCS%%%%DOCSDIR%%/esrs-design-notes.html
14
%%PORTDOCS%%%%DOCSDIR%%/fetchmail-FAQ.html
15
%%PORTDOCS%%%%DOCSDIR%%/fetchmail-features.html
16
%%PORTDOCS%%@dirrm %%DOCSDIR%%
17
%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
5
%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
18
%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
6
%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
19
%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
7
%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
Lines 37-45 Link Here
37
%%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo
25
%%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo
38
%%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo
26
%%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo
39
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
27
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
28
%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py
29
%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
30
%%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo
40
@exec /usr/bin/install -d -m 755 -o fetchmail -g fetchmail /var/run/fetchmail
31
@exec /usr/bin/install -d -m 755 -o fetchmail -g fetchmail /var/run/fetchmail
41
@unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi
32
@unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi
42
etc/fetchmailrc.sample
33
etc/fetchmailrc.sample
43
@exec if [ ! -f %D/etc/fetchmailrc ] ; then cp -p %D/%F %B/fetchmailrc; fi
34
@exec if [ ! -f %D/etc/fetchmailrc ] ; then cp -p %D/%F %B/fetchmailrc; fi
44
@unexec rm -f /var/run/fetchmail/fetchmail.pid 2>/dev/null || true
35
@cwd /var/run
45
@unexec rmdir /var/run/fetchmail 2>/dev/null || true
36
@unexec rm -f %D/fetchmail/fetchmail.pid 2>/dev/null || true
37
@dirrmtry fetchmail

Return to bug 174873