Attachment 139339 Details for Bug 185572 – mail__fetchmail.diff

[patch] mail__fetchmail.diff

mail__fetchmail.diff (text/x-patch), 6.31 KB, created by Rene Ladan on 2014-04-06 12:52:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rene Ladan

Created: 2014-04-06 12:52:09 UTC

Size: 6.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 350348)
>+++ Makefile	(working copy)
>@@ -10,18 +10,23 @@
> MAINTAINER=	chalpin@cs.wisc.edu
> COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
> 
>+LICENSE=	GPLv2 LGPL21
>+LICENSE_COMB=	dual
>+
> 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}
> 
>+USES=		gmake shebangfix tar:xz
>+SHEBANG_FILES=	fetchmailconf.py
>+python_OLD_CMD=	/usr/bin/env python
>+
> USE_RC_SUBR=	fetchmail
>-FETCHMAILRC=	${PREFIX}/etc/fetchmailrc
>-SUB_FILES=	pkg-message
>+SUB_FILES=	pkg-message pkg-install pkg-deinstall
>+SUB_LIST+=	USERS=${USERS} GROUPS=${GROUPS} PORTNAME=${PORTNAME}
> 
>-USE_XZ=	yes
>-USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
> CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
>@@ -29,24 +34,26 @@
> 		--with-ssl=${OPENSSLBASE}
> 
> LDFLAGS+=	-L${LOCALBASE}/lib
>-MAN1=	fetchmail.1
>-MLINKS=	fetchmail.1 fetchmailconf.1
> 
>-OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI
>+OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI POP2
> OPTIONS_DEFAULT=	GSSAPI
>+OPTIONS_SUB=	yes
> X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
>-NTLM_DESC=	Build in support for NTLM/MSN authentication
>-GSSAPI_DESC=	Build GSSAPI/Kerberos 5 support
>+POP2_DESC=	POP2 Protocol support[obsolete]
> 
>+NLS_USES=	gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+NLS_CONFIGURE_ON=	--enable-nls
>+NLS_CONFIGURE_OFF=	--disable-nls
>+
> PORTDOCS=	FAQ FEATURES NEWS NOTES README README.SSL \
> 		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
> 		esrs-design-notes.html
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> # Pop2 is obsolete
>-.if defined(WITH_POP2)
>+.if ${PORT_OPTIONS:MPOP2}
> CONFIGURE_ARGS+=	--enable-POP2
> .endif
> 
>@@ -53,22 +60,13 @@
> .if ${PORT_OPTIONS:MX11}
> USE_PYTHON_RUN=	yes
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
>-PLIST_SUB+=	X11="" NOX11="@comment "
>+PLIST_SUB+=	NOX11="@comment "
> .else
> CONFIGURE_ARGS+=	PYTHON=:
> SUB_FILES+=	fetchmailconf
>-PLIST_SUB+=	X11="@comment " NOX11=""
>+PLIST_SUB+=	NOX11=""
> .endif
> 
>-.if ${PORT_OPTIONS:MNLS}
>-CONFIGURE_ARGS+=	--enable-nls
>-PLIST_SUB+=	NLS=""
>-USES+=		gettext
>-.else
>-CONFIGURE_ARGS+=	--disable-nls
>-PLIST_SUB+=	NLS="@comment "
>-.endif
>-
> .if ${PORT_OPTIONS:MGSSAPI}
> .if !defined(KRB5_HOME)
> .if exists(${LOCALBASE}/lib/libkrb5.a)
>@@ -92,33 +90,20 @@
> PORTDOCS+=	README.NTLM
> .endif
> 
>-pre-patch:
>-	@${REINPLACE_CMD} -e "s,^#!/usr/bin/env python,#!${LOCALBASE}/bin/python,g" \
>-		${WRKSRC}/fetchmailconf.py
>-
> post-build:
> 	@${MAKE} -C ${WRKSRC} check
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 
> .if empty(PORT_OPTIONS:MX11)
>-	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
>-	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/libexec
>+	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec
> .endif
>-	${MKDIR} -m 0755 "/var/run/${PORTNAME}"
>-	${CHOWN} "${USERS}:${GROUPS}" "/var/run/${PORTNAME}"
>-	${INSTALL} -m 644 -o ${USERS} -g ${GROUPS} ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
>-	if [ ! -f ${PREFIX}/etc/fetchmailrc ]; then \
>-		${CP} -p ${PREFIX}/etc/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc ; \
>-		${CHMOD} 600 ${PREFIX}/etc/fetchmailrc ; \
>-	fi
>+	${INSTALL} ${FILESDIR}/fetchmailrc.sample \
>+		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
> 
>-	@${ECHO_CMD} ""
>-	@${CAT} ${PKGMESSAGE}
>-	@${ECHO_CMD} ""
>-
> .include <bsd.port.mk>
>Index: files/pkg-deinstall.in
>===================================================================
>--- files/pkg-deinstall.in	(revision 0)
>+++ files/pkg-deinstall.in	(working copy)
>@@ -0,0 +1,13 @@
>+#!/bin/sh
>+
>+if [ x$2 != xPOST-DEINSTALL ]; then
>+  exit
>+fi
>+
>+if [ -f /var/run/%%PORTNAME%%/fetchmail.pid ] ; then
>+  /bin/rm -f /var/run/%%PORTNAME%%/fetchmail.pid
>+fi
>+
>+/bin/rmdir /var/run/%%PORTNAME%%
>+
>+exit
>
>Property changes on: files/pkg-deinstall.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/pkg-install.in
>===================================================================
>--- files/pkg-install.in	(revision 0)
>+++ files/pkg-install.in	(working copy)
>@@ -0,0 +1,13 @@
>+#!/bin/sh
>+
>+if [ x$2 != xPOST-INSTALL ]; then
>+  exit
>+fi
>+
>+/bin/mkdir -m 0755 -p /var/run/%%PORTNAME%%
>+/usr/sbin/chown "%%USERS%%:%%GROUPS%%" /var/run/%%PORTNAME%%
>+/usr/sbin/chown "%%USERS%%:%%GROUPS%%" %%PREFIX%%/etc/fetchmailrc*
>+/usr/sbin/chmod 0600 %%PREFXI%%/etc/fetchmailrc
>+/usr/sbin/chmod 0644 %%PREFXI%%/etc/fetchmailrc.sample
>+
>+exit
>
>Property changes on: files/pkg-install.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 350348)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,8 @@
>+@comment $FreeBSD: mail/fetchmail/pkg-plist 315268 2013-03-26 08:56:28Z mandree $
> bin/fetchmail
> bin/fetchmailconf
>+man/man1/fetchmail.1.gz
>+man/man1/fetchmailconf.1.gz
> %%NOX11%%libexec/fetchmailconf.py
> %%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
>@@ -28,10 +31,6 @@
> %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py
> %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc
> %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo
>-@exec /usr/bin/install -d -m 755 -o fetchmail -g fetchmail /var/run/fetchmail
> @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
>-@cwd /var/run
>-@unexec rm -f %D/fetchmail/fetchmail.pid 2>/dev/null || true
>-@dirrmtry fetchmail

Actions: View | Diff

Attachments on bug 185572: 139338 | 139339