Attachment 130862 Details for Bug 174873 – fetchmail-6.3.24.patch

[patch] fetchmail-6.3.24.patch

fetchmail-6.3.24.patch (text/plain), 6.27 KB, created by Po-Chien Lin on 2013-01-01 00:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chien Lin

Created: 2013-01-01 00:10:00 UTC

Size: 6.27 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/Makefile ./Makefile
>--- /usr/ports/mail/fetchmail/Makefile	2012-11-17 13:59:03.000000000 +0800
>+++ ./Makefile	2013-01-01 07:54:23.000000000 +0800
>@@ -1,7 +1,4 @@
>-# New ports collection makefile for:	fetchmail
>-# Date created:		25 Feb 2000
>-# Whom:			Ville Eerola <ve@sci.fi>
>-#
>+# Created by: Ville Eerola <ve@sci.fi>
> # $FreeBSD: ports/mail/fetchmail/Makefile,v 1.224 2012/11/17 05:59:03 svnexp Exp $
> #
> # NOTE:  The fetchmailconf program (an interactive program for
>@@ -11,7 +8,7 @@
> # want fetchmailconf to work, define the X11 option.
> 
> PORTNAME=	fetchmail
>-PORTVERSION=	6.3.22
>+PORTVERSION=	6.3.24
> CATEGORIES=	mail ipv6
> MASTER_SITES=	BERLIOS/${PORTNAME}/ \
> 		SF/${PORTNAME}/branch_6.3/ \
>@@ -24,61 +21,58 @@
> RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
> 
> # Note USERS can only contain a single word as parts below rely on that.
>-USERS=		${PORTNAME}
>-GROUPS=		${USERS}
>+USERS=	${PORTNAME}
>+GROUPS=	${USERS}
> 
> USE_RC_SUBR=	fetchmail
> FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
> SUB_FILES=	pkg-message
>-PATCH_STRIP=	-p1
> 
>-USE_XZ=		yes
>+USE_XZ=	yes
> USE_GMAKE=	yes
> MAKE_JOBS_SAFE=	yes
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
> CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
>-		--with-hesiod=no --enable-fallback=no PYTHON=:
>-# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
>+		--without-hesiod --enable-fallback=no \
>+		--with-ssl=${OPENSSLBASE}
>+
> LDFLAGS+=	-L${LOCALBASE}/lib
>-MAKE_ENV+=	${CONFIGURE_ENV}
>-MAN1=		fetchmail.1
>-MLINKS=		fetchmail.1 fetchmailconf.1
>-
>-OPTIONS=	X11	"Python/Tkinter dependencies for fetchmailconf" off \
>-		NLS	"National language support (NLS)."		on \
>-		NTLM	"Build in support for NTLM/MSN authentication." off \
>-		GSSAPI	"Build GSSAPI/Kerberos 5 support" 		on
>+MAN1=	fetchmail.1
>+MLINKS=	fetchmail.1 fetchmailconf.1
> 
>-.include <bsd.port.options.mk>
>+OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI
>+OPTIONS_DEFAULT=	GSSAPI
>+X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
>+NTLM_DESC=	Build in support for NTLM/MSN authentication
>+GSSAPI_DESC=	Build GSSAPI/Kerberos 5 support
> 
>-.if defined(WITH_X11)
>-USE_PYTHON=	yes
>-RUN_DEPENDS+=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
>-.endif
>+PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
>+		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
>+		esrs-design-notes.html
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> # Pop2 is obsolete
> .if defined(WITH_POP2)
>-CONFIGURE_ARGS+=--enable-POP2
>+CONFIGURE_ARGS+=	--enable-POP2
> .endif
> 
>-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
>-
>-DOCS=		FAQ FEATURES NEWS NOTES README README.SSL \
>-		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
>-		esrs-design-notes.html
>+.if ${PORT_OPTIONS:MX11}
>+USE_PYTHON=	yes
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
>+.endif
> 
>-.if !defined(WITHOUT_NLS)
>+.if ${PORT_OPTIONS:MNLS}
> CONFIGURE_ARGS+=	--enable-nls
>-PLIST_SUB+=		NLS=""
>-USE_GETTEXT=		yes
>+PLIST_SUB+=	NLS=""
>+USE_GETTEXT=	yes
> .else
> CONFIGURE_ARGS+=	--disable-nls
>-PLIST_SUB+=		NLS="@comment "
>+PLIST_SUB+=	NLS="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MGSSAPI}
> .if !defined(KRB5_HOME)
> .if exists(${LOCALBASE}/lib/libkrb5.a)
> KRB5_HOME=	${LOCALBASE}
>@@ -88,21 +82,17 @@
> .endif
> 
> .if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
>-BROKEN=		KRB5_HOME is set but doesn't provide lib/libkrb5.a
>+BROKEN=	KRB5_HOME is set but doesn\'t provide lib/libkrb5.a
> .endif
> 
>-.if defined(WITH_GSSAPI)
> .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
>-CONFIGURE_ARGS += --with-gssapi=${KRB5_HOME}
>+CONFIGURE_ARGS+=	--with-gssapi=${KRB5_HOME}
> .endif
> .endif
> 
>-.if defined(WITH_NTLM)
>-CONFIGURE_ARGS += --enable-NTLM
>-DOCS+=		README.NTLM
>-PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%"
>-.else
>-PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%@comment "
>+.if ${PORT_OPTIONS:MNTLM}
>+CONFIGURE_ARGS+=	--enable-NTLM
>+PORTDOCS+=	README.NTLM
> .endif
> 
> pre-patch:
>@@ -113,12 +103,12 @@
> 		 ${WRKDIR}/fetchmailconf
> 
> post-build:
>-	@cd ${WRKSRC} && ${MAKE} check
>+	@${MAKE} -C ${WRKSRC} check
> 
> post-install:
>-.if !defined(NOPORTDOCS)
>-	${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
>+.if ${PORT_OPTIONS:MDOCS}
>+	${MKDIR} ${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
> .endif
> 
> 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
>@@ -136,4 +126,4 @@
> 	@${CAT} ${PKGMESSAGE}
> 	@${ECHO_CMD} ""
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/distinfo ./distinfo
>--- /usr/ports/mail/fetchmail/distinfo	2012-08-30 14:24:48.000000000 +0800
>+++ ./distinfo	2013-01-01 05:04:23.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (fetchmail-6.3.22.tar.xz) = 9ab51a851f79e16258f068e791c39e3e378a99927f70c9635132f4295d70b1a4
>-SIZE (fetchmail-6.3.22.tar.xz) = 1260296
>+SHA256 (fetchmail-6.3.24.tar.xz) = f6882f00f0d69bbabaa4fbdaccb9231c7c441781fcb95ff763f75589f2328daf
>+SIZE (fetchmail-6.3.24.tar.xz) = 1263156
>diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/pkg-plist ./pkg-plist
>--- /usr/ports/mail/fetchmail/pkg-plist	2012-11-17 13:59:03.000000000 +0800
>+++ ./pkg-plist	2013-01-01 07:19:15.000000000 +0800
>@@ -2,18 +2,6 @@
> bin/fetchmail
> bin/fetchmailconf
> libexec/fetchmailconf.py
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/NOTES
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%NTLMDOCS%%%%DOCSDIR%%/README.NTLM
>-%%PORTDOCS%%%%DOCSDIR%%/README.SSL
>-%%PORTDOCS%%%%DOCSDIR%%/design-notes.html
>-%%PORTDOCS%%%%DOCSDIR%%/esrs-design-notes.html
>-%%PORTDOCS%%%%DOCSDIR%%/fetchmail-FAQ.html
>-%%PORTDOCS%%%%DOCSDIR%%/fetchmail-features.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
> %%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
> %%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
>@@ -41,5 +29,6 @@
> @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
>-@unexec rm -f /var/run/fetchmail/fetchmail.pid 2>/dev/null || true
>-@unexec rmdir /var/run/fetchmail 2>/dev/null || true
>+@cwd /var/run
>+@unexec rm -f %D/fetchmail/fetchmail.pid 2>/dev/null || true
>+@dirrmtry fetchmail

Actions: View | Diff

Attachments on bug 174873: 130862 | 130863