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

Collapse All | Expand All

(-)./Makefile (-49 / +39 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: ports/mail/fetchmail/Makefile,v 1.224 2012/11/17 05:59:03 svnexp Exp $
2
# $FreeBSD: ports/mail/fetchmail/Makefile,v 1.224 2012/11/17 05:59:03 svnexp Exp $
6
#
3
#
7
# NOTE:  The fetchmailconf program (an interactive program for
4
# NOTE:  The fetchmailconf program (an interactive program for
Lines 11-17 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=	BERLIOS/${PORTNAME}/ \
17
		SF/${PORTNAME}/branch_6.3/ \
14
		SF/${PORTNAME}/branch_6.3/ \
Lines 24-84 Link Here
24
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
21
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
25
22
26
# Note USERS can only contain a single word as parts below rely on that.
23
# Note USERS can only contain a single word as parts below rely on that.
27
USERS=		${PORTNAME}
24
USERS=	${PORTNAME}
28
GROUPS=		${USERS}
25
GROUPS=	${USERS}
29
26
30
USE_RC_SUBR=	fetchmail
27
USE_RC_SUBR=	fetchmail
31
FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
28
FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
32
SUB_FILES=	pkg-message
29
SUB_FILES=	pkg-message
33
PATCH_STRIP=	-p1
34
30
35
USE_XZ=		yes
31
USE_XZ=	yes
36
USE_GMAKE=	yes
32
USE_GMAKE=	yes
37
MAKE_JOBS_SAFE=	yes
33
MAKE_JOBS_SAFE=	yes
38
GNU_CONFIGURE=	yes
34
GNU_CONFIGURE=	yes
39
USE_OPENSSL=	yes
35
USE_OPENSSL=	yes
40
CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
36
CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
41
		--with-hesiod=no --enable-fallback=no PYTHON=:
37
		--without-hesiod --enable-fallback=no \
42
# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
38
		--with-ssl=${OPENSSLBASE}
39
43
LDFLAGS+=	-L${LOCALBASE}/lib
40
LDFLAGS+=	-L${LOCALBASE}/lib
44
MAKE_ENV+=	${CONFIGURE_ENV}
41
MAN1=	fetchmail.1
45
MAN1=		fetchmail.1
42
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
43
53
.include <bsd.port.options.mk>
44
OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI
45
OPTIONS_DEFAULT=	GSSAPI
46
X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
47
NTLM_DESC=	Build in support for NTLM/MSN authentication
48
GSSAPI_DESC=	Build GSSAPI/Kerberos 5 support
54
49
55
.if defined(WITH_X11)
50
PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
56
USE_PYTHON=	yes
51
		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
52
		esrs-design-notes.html
58
.endif
59
53
60
.include <bsd.port.pre.mk>
54
.include <bsd.port.options.mk>
61
55
62
# Pop2 is obsolete
56
# Pop2 is obsolete
63
.if defined(WITH_POP2)
57
.if defined(WITH_POP2)
64
CONFIGURE_ARGS+=--enable-POP2
58
CONFIGURE_ARGS+=	--enable-POP2
65
.endif
59
.endif
66
60
67
CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
61
.if ${PORT_OPTIONS:MX11}
68
62
USE_PYTHON=	yes
69
DOCS=		FAQ FEATURES NEWS NOTES README README.SSL \
63
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
70
		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
64
.endif
71
		esrs-design-notes.html
72
65
73
.if !defined(WITHOUT_NLS)
66
.if ${PORT_OPTIONS:MNLS}
74
CONFIGURE_ARGS+=	--enable-nls
67
CONFIGURE_ARGS+=	--enable-nls
75
PLIST_SUB+=		NLS=""
68
PLIST_SUB+=	NLS=""
76
USE_GETTEXT=		yes
69
USE_GETTEXT=	yes
77
.else
70
.else
78
CONFIGURE_ARGS+=	--disable-nls
71
CONFIGURE_ARGS+=	--disable-nls
79
PLIST_SUB+=		NLS="@comment "
72
PLIST_SUB+=	NLS="@comment "
80
.endif
73
.endif
81
74
75
.if ${PORT_OPTIONS:MGSSAPI}
82
.if !defined(KRB5_HOME)
76
.if !defined(KRB5_HOME)
83
.if exists(${LOCALBASE}/lib/libkrb5.a)
77
.if exists(${LOCALBASE}/lib/libkrb5.a)
84
KRB5_HOME=	${LOCALBASE}
78
KRB5_HOME=	${LOCALBASE}
Lines 88-108 Link Here
88
.endif
82
.endif
89
83
90
.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
84
.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
91
BROKEN=		KRB5_HOME is set but doesn't provide lib/libkrb5.a
85
BROKEN=	KRB5_HOME is set but doesn\'t provide lib/libkrb5.a
92
.endif
86
.endif
93
87
94
.if defined(WITH_GSSAPI)
95
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
88
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
96
CONFIGURE_ARGS += --with-gssapi=${KRB5_HOME}
89
CONFIGURE_ARGS+=	--with-gssapi=${KRB5_HOME}
97
.endif
90
.endif
98
.endif
91
.endif
99
92
100
.if defined(WITH_NTLM)
93
.if ${PORT_OPTIONS:MNTLM}
101
CONFIGURE_ARGS += --enable-NTLM
94
CONFIGURE_ARGS+=	--enable-NTLM
102
DOCS+=		README.NTLM
95
PORTDOCS+=	README.NTLM
103
PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%"
104
.else
105
PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%@comment "
106
.endif
96
.endif
107
97
108
pre-patch:
98
pre-patch:
Lines 113-124 Link Here
113
		 ${WRKDIR}/fetchmailconf
103
		 ${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
124
	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
114
	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
Lines 136-139 Link Here
136
	@${CAT} ${PKGMESSAGE}
126
	@${CAT} ${PKGMESSAGE}
137
	@${ECHO_CMD} ""
127
	@${ECHO_CMD} ""
138
128
139
.include <bsd.port.post.mk>
129
.include <bsd.port.mk>
(-)./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
(-)./pkg-plist (-14 / +3 lines)
Lines 2-19 Link Here
2
bin/fetchmail
2
bin/fetchmail
3
bin/fetchmailconf
3
bin/fetchmailconf
4
libexec/fetchmailconf.py
4
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 41-45 Link Here
41
@unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi
29
@unexec if cmp -s %D/etc/fetchmailrc.sample %D/etc/fetchmailrc; then rm -f %D/etc/fetchmailrc; fi
42
etc/fetchmailrc.sample
30
etc/fetchmailrc.sample
43
@exec if [ ! -f %D/etc/fetchmailrc ] ; then cp -p %D/%F %B/fetchmailrc; fi
31
@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
32
@cwd /var/run
45
@unexec rmdir /var/run/fetchmail 2>/dev/null || true
33
@unexec rm -f %D/fetchmail/fetchmail.pid 2>/dev/null || true
34
@dirrmtry fetchmail

Return to bug 174873