Date: Sun, 6 Jan 2013 19:20:01 GMT From: Corey Halpin <chalpin@cs.wisc.edu> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/174873: [PATCH] mail/fetchmail: update to 6.3.24 Message-ID: <201301061920.r06JK1Rr018415@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174873; it has been noted by GNATS.
From: Corey Halpin <chalpin@cs.wisc.edu>
To: bug-followup@FreeBSD.ORG
Cc:
Subject: Re: ports/174873: [PATCH] mail/fetchmail: update to 6.3.24
Date: Sun, 6 Jan 2013 13:14:13 -0600
--Yylu36WmvOXNoKYn
Content-Type: multipart/mixed; boundary="Dxnq1zWXvFF0Q93v"
Content-Disposition: inline
--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In addition to the suggested changes, the MASTER_SITES should be updated =
as=20
in the attached patch.
With that modification, it looks good to me.
~crh
--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fetchmail-6.3.24_crh1.patch"
Content-Transfer-Encoding: quoted-printable
diff -ruN /usr/ports/mail/fetchmail/Makefile fetchmail/Makefile
--- /usr/ports/mail/fetchmail/Makefile 2012-11-16 23:59:03.000000000 -0600
+++ fetchmail/Makefile 2013-01-06 13:03:18.000000000 -0600
@@ -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 svne=
xp Exp $
#
# NOTE: The fetchmailconf program (an interactive program for
@@ -11,12 +8,10 @@
# want fetchmailconf to work, define the X11 option.
=20
PORTNAME=3D fetchmail
-PORTVERSION=3D 6.3.22
+PORTVERSION=3D 6.3.24
CATEGORIES=3D mail ipv6
-MASTER_SITES=3D BERLIOS/${PORTNAME}/ \
- SF/${PORTNAME}/branch_6.3/ \
- http://mandree.home.pages.de/${PORTNAME}/ \
- SUNSITE/system/mail/pop/${PORTNAME}/
+MASTER_SITES=3D SF/${PORTNAME}/branch_6.3/ \
+ http://mandree.home.pages.de/${PORTNAME}/
=20
MAINTAINER=3D chalpin@cs.wisc.edu
COMMENT=3D Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR
@@ -24,61 +19,58 @@
RUN_DEPENDS=3D ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/securi=
ty/ca_root_nss
=20
# Note USERS can only contain a single word as parts below rely on that.
-USERS=3D ${PORTNAME}
-GROUPS=3D ${USERS}
+USERS=3D ${PORTNAME}
+GROUPS=3D ${USERS}
=20
USE_RC_SUBR=3D fetchmail
FETCHMAILRC=3D ${PREFIX}/etc/fetchmailrc
SUB_FILES=3D pkg-message
-PATCH_STRIP=3D -p1
=20
-USE_XZ=3D yes
+USE_XZ=3D yes
USE_GMAKE=3D yes
MAKE_JOBS_SAFE=3D yes
GNU_CONFIGURE=3D yes
USE_OPENSSL=3D yes
CONFIGURE_ARGS=3D --enable-opie --enable-RPA --enable-SDPS \
- --with-hesiod=3Dno --enable-fallback=3Dno PYTHON=3D:
-# bsd.openssl.mk will add the LDFLAGS to CONFIGURE_ENV:
+ --without-hesiod --enable-fallback=3Dno \
+ --with-ssl=3D${OPENSSLBASE}
+
LDFLAGS+=3D -L${LOCALBASE}/lib
-MAKE_ENV+=3D ${CONFIGURE_ENV}
-MAN1=3D fetchmail.1
-MLINKS=3D fetchmail.1 fetchmailconf.1
-
-OPTIONS=3D 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=3D fetchmail.1
+MLINKS=3D fetchmail.1 fetchmailconf.1
=20
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=3D X11 NLS NTLM GSSAPI
+OPTIONS_DEFAULT=3D GSSAPI
+X11_DESC=3D Python/Tkinter dependencies for ``fetchmailconf''
+NTLM_DESC=3D Build in support for NTLM/MSN authentication
+GSSAPI_DESC=3D Build GSSAPI/Kerberos 5 support
=20
-.if defined(WITH_X11)
-USE_PYTHON=3D yes
-RUN_DEPENDS+=3D ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.=
so:${PORTSDIR}/x11-toolkits/py-tkinter
-.endif
+PORTDOCS=3D FAQ FEATURES NEWS NOTES README README.SSL \
+ design-notes.html fetchmail-FAQ.html fetchmail-features.html \
+ esrs-design-notes.html
=20
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
=20
# Pop2 is obsolete
.if defined(WITH_POP2)
-CONFIGURE_ARGS+=3D--enable-POP2
+CONFIGURE_ARGS+=3D --enable-POP2
.endif
=20
-CONFIGURE_ARGS+=3D --with-ssl=3D${OPENSSLBASE}
-
-DOCS=3D 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=3D yes
+RUN_DEPENDS+=3D ${PYTHON_PKGNAMEPREFIX}tkinter>=3D0:${PORTSDIR}/x11-toolki=
ts/py-tkinter
+.endif
=20
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=3D --enable-nls
-PLIST_SUB+=3D NLS=3D""
-USE_GETTEXT=3D yes
+PLIST_SUB+=3D NLS=3D""
+USE_GETTEXT=3D yes
.else
CONFIGURE_ARGS+=3D --disable-nls
-PLIST_SUB+=3D NLS=3D"@comment "
+PLIST_SUB+=3D NLS=3D"@comment "
.endif
=20
+.if ${PORT_OPTIONS:MGSSAPI}
.if !defined(KRB5_HOME)
.if exists(${LOCALBASE}/lib/libkrb5.a)
KRB5_HOME=3D ${LOCALBASE}
@@ -88,21 +80,17 @@
.endif
=20
.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a)
-BROKEN=3D KRB5_HOME is set but doesn't provide lib/libkrb5.a
+BROKEN=3D KRB5_HOME is set but doesn\'t provide lib/libkrb5.a
.endif
=20
-.if defined(WITH_GSSAPI)
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
-CONFIGURE_ARGS +=3D --with-gssapi=3D${KRB5_HOME}
+CONFIGURE_ARGS+=3D --with-gssapi=3D${KRB5_HOME}
.endif
.endif
=20
-.if defined(WITH_NTLM)
-CONFIGURE_ARGS +=3D --enable-NTLM
-DOCS+=3D README.NTLM
-PLIST_SUB+=3D NTLMDOCS=3D"%%PORTDOCS%%"
-.else
-PLIST_SUB+=3D NTLMDOCS=3D"%%PORTDOCS%%@comment "
+.if ${PORT_OPTIONS:MNTLM}
+CONFIGURE_ARGS+=3D --enable-NTLM
+PORTDOCS+=3D README.NTLM
.endif
=20
pre-patch:
@@ -113,12 +101,12 @@
${WRKDIR}/fetchmailconf
=20
post-build:
- @cd ${WRKSRC} && ${MAKE} check
+ @${MAKE} -C ${WRKSRC} check
=20
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
=20
${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
@@ -136,4 +124,4 @@
@${CAT} ${PKGMESSAGE}
@${ECHO_CMD} ""
=20
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/mail/fetchmail/distinfo fetchmail/distinfo
--- /usr/ports/mail/fetchmail/distinfo 2012-08-30 01:24:48.000000000 -0500
+++ fetchmail/distinfo 2013-01-06 13:00:53.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (fetchmail-6.3.22.tar.xz) =3D 9ab51a851f79e16258f068e791c39e3e378a9=
9927f70c9635132f4295d70b1a4
-SIZE (fetchmail-6.3.22.tar.xz) =3D 1260296
+SHA256 (fetchmail-6.3.24.tar.xz) =3D f6882f00f0d69bbabaa4fbdaccb9231c7c441=
781fcb95ff763f75589f2328daf
+SIZE (fetchmail-6.3.24.tar.xz) =3D 1263156
diff -ruN /usr/ports/mail/fetchmail/pkg-plist fetchmail/pkg-plist
--- /usr/ports/mail/fetchmail/pkg-plist 2012-11-16 23:59:03.000000000 -0600
+++ fetchmail/pkg-plist 2013-01-06 13:00:53.000000000 -0600
@@ -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
\ No newline at end of file
--Dxnq1zWXvFF0Q93v--
--Yylu36WmvOXNoKYn
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
iF4EAREIAAYFAlDpzQQACgkQR8PgTIRJoTVD9QEAqs2/0r2ThSh6HSoSPzFQsEHK
2PIYLhNNwpnLDk8Tga4BAJiZ+DA8gjBA+EMMgccGGkFNLzqIXW7/o6m5Nrv0ZOUO
=pNXi
-----END PGP SIGNATURE-----
--Yylu36WmvOXNoKYn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301061920.r06JK1Rr018415>