diff options
author | obache <obache@pkgsrc.org> | 2013-10-03 11:12:43 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2013-10-03 11:12:43 +0000 |
commit | 61f32fd0534b3cc0bea0f7f6aefc9a6068f839a1 (patch) | |
tree | 9eb1331336e46c252c9e3f2b9fd46fc21187f181 /mail/fdm | |
parent | a2b32c956068735343bc4d40b8dfae91e4d499d1 (diff) | |
download | pkgsrc-61f32fd0534b3cc0bea0f7f6aefc9a6068f839a1.tar.gz |
Update fdm to 1.7.
Based on PR pkg/48254 by Leonardo Taccari.
pkgsrc changes:
* add options.mk: now fdm supports "debug" and "pcre" options (previously the
PCRE support was always included).
Changes:
* Add mbox tags for messages fetched from a mbox
* Detect GMail's XYZZY capability for IMAP and use it to try and workaround
some of their broken behaviour (incorrectly reported message sizes).
* Print a warning on missing maildirs when fetching from them rather than
crashing or giving an error. Reported by Frank Terbeck.
* Introduce a configure script and tidy up build infrastructure.
* GMail IMAP doesn't correctly set the \Seen flag after UID FETCH BODY[], so
explicitly set it with STORE when mail is kept. Reported by Patrice Clement.
* Properly count mails when polling multiple folders on a single IMAP server,
reported by Claudio M. Alessi.
* Support user and pass on NNTP, requested by Michael Hamann.
* Escape . properly when delivering to SMTP.
* Don't be as strict about format at the end of messages when using IMAP -
accept additional information as well as FLAGS. Reported by rivo nurges.
Diffstat (limited to 'mail/fdm')
-rw-r--r-- | mail/fdm/Makefile | 24 | ||||
-rw-r--r-- | mail/fdm/PLIST | 3 | ||||
-rw-r--r-- | mail/fdm/distinfo | 12 | ||||
-rw-r--r-- | mail/fdm/options.mk | 22 | ||||
-rw-r--r-- | mail/fdm/patches/patch-aa | 59 | ||||
-rw-r--r-- | mail/fdm/patches/patch-fdm.h | 9 |
6 files changed, 73 insertions, 56 deletions
diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile index fbf5238c549..aaa098798ec 100644 --- a/mail/fdm/Makefile +++ b/mail/fdm/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2013/02/06 23:22:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2013/10/03 11:12:43 obache Exp $ -DISTNAME= fdm-1.6 -PKGREVISION= 1 +DISTNAME= fdm-1.7 CATEGORIES= mail -PKG_REVISION= 1 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/} MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,20 +9,19 @@ HOMEPAGE= http://fdm.sourceforge.net/ COMMENT= Fetch or receive mail and deliver it in various ways LICENSE= modified-bsd +HAS_CONFIGURE= yes + INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} EGDIR= ${PREFIX}/share/examples/fdm DOCDIR= ${PREFIX}/share/doc/fdm -USE_TOOLS+= pax -MAKE_ENV+= PCRE=1 +USE_TOOLS+= yacc pax + +.include "options.mk" -SUBST_CLASSES+= files -SUBST_STAGE.files= post-patch -SUBST_FILES.files= Makefile -SUBST_SED.files= -e "s|@INSTALL_PROGRAM_DIR@|${INSTALL_PROGRAM_DIR}|" -SUBST_SED.files+= -e "s|@INSTALL_PROGRAM@|${INSTALL_PROGRAM}|" -SUBST_SED.files+= -e "s|@INSTALL_MAN@|${INSTALL_MAN}|" -SUBST_MESSAGE.files= Fixing install invocation in Makefile +post-build: + ${RUN}cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ + -f tools/dist.mk manual post-install: cd ${WRKSRC}/examples && pax -rwpam . ${DESTDIR}${EGDIR} @@ -32,6 +29,5 @@ post-install: .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" .include "../../databases/tdb/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/fdm/PLIST b/mail/fdm/PLIST index 3b9cb7a1d1b..eb1f86efd2f 100644 --- a/mail/fdm/PLIST +++ b/mail/fdm/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2012/08/17 17:45:40 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/10/03 11:12:43 obache Exp $ bin/fdm man/man1/fdm.1 man/man5/fdm.conf.5 share/doc/fdm/MANUAL share/examples/fdm/f-terbeck.conf share/examples/fdm/g-lando.conf -share/examples/fdm/n-marriott-old.conf share/examples/fdm/n-marriott.conf share/examples/fdm/t-ulmer.conf share/examples/fdm/w-maier.conf diff --git a/mail/fdm/distinfo b/mail/fdm/distinfo index b1f8910b289..85553fe2a04 100644 --- a/mail/fdm/distinfo +++ b/mail/fdm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2012/08/23 18:04:12 marino Exp $ +$NetBSD: distinfo,v 1.3 2013/10/03 11:12:43 obache Exp $ -SHA1 (fdm-1.6.tar.gz) = fb8042f2355062848ff142c9604069b6657e6a82 -RMD160 (fdm-1.6.tar.gz) = 7e2c846b97dce20e123b8453732e107f88e0de8f -Size (fdm-1.6.tar.gz) = 192159 bytes -SHA1 (patch-aa) = 4284d7fc2e88fc9d42fc861e19a890dd526354d6 -SHA1 (patch-fdm.h) = 03ad0167120e06e76f4f1ef086c918c6a0cccf55 +SHA1 (fdm-1.7.tar.gz) = 5534d1ec1831794e092e0821db70f36b7e1ee961 +RMD160 (fdm-1.7.tar.gz) = 942f0989501645aa7e04bd428510daa309e8fca6 +Size (fdm-1.7.tar.gz) = 199808 bytes +SHA1 (patch-aa) = 1bd7ccac945d0cb2cd23f992a58c740b9372455f +SHA1 (patch-fdm.h) = aa13bc8507c9918fb56ff65e64a83b3b5d29ce14 diff --git a/mail/fdm/options.mk b/mail/fdm/options.mk new file mode 100644 index 00000000000..80c6c9a57a7 --- /dev/null +++ b/mail/fdm/options.mk @@ -0,0 +1,22 @@ +# $NetBSD: options.mk,v 1.1 2013/10/03 11:12:43 obache Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.fdm +PKG_SUPPORTED_OPTIONS= debug pcre +PKG_SUGGESTED_OPTIONS= pcre + +.include "../../mk/bsd.options.mk" + +# +# Debug +# +.if !empty(PKG_OPTIONS:Mdebug) + MAKE_ENV+= FDEBUG=1 +.endif + +# +# PCRE support +# +.if !empty(PKG_OPTIONS:Mpcre) + MAKE_ENV+= PCRE=1 +. include "../../devel/pcre/buildlink3.mk" +.endif diff --git a/mail/fdm/patches/patch-aa b/mail/fdm/patches/patch-aa index 03fd2b530f0..57961f3b940 100644 --- a/mail/fdm/patches/patch-aa +++ b/mail/fdm/patches/patch-aa @@ -1,38 +1,35 @@ -$NetBSD: patch-aa,v 1.2 2012/08/23 18:04:12 marino Exp $ +$NetBSD: patch-aa,v 1.3 2013/10/03 11:12:43 obache Exp $ -cleanup cpp args dans adjust/fix Darwin build +* disable DEBUG knob, it will be controlled with option. +* fixes manpath and installation command for unprivileged build. ---- Makefile.orig 2008-12-22 16:20:05.000000000 +0000 +--- Makefile.orig 2009-06-26 15:58:00.000000000 +0000 +++ Makefile -@@ -37,7 +37,7 @@ HDRS= fdm.h array.h fetch.h match.h deli - YACC= yacc -d +@@ -5,7 +5,7 @@ - CC?= cc --INCDIRS+= -I. -I- -I/usr/local/include -+INCDIRS+= -I. - .ifdef PROFILE - # Don't use ccache - CC= /usr/bin/gcc -@@ -70,7 +70,8 @@ LIBS+= -lpcre - .if ${OS} == "Darwin" - SRCS+= compat/strtonum.c - INCDIRS+= -Icompat -I/usr/local/include/openssl --CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE -+CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE -DNO_QUEUE_H -DNO_TREE_H -+LIBS+= -lresolv - .endif + VERSION= 1.7 + +-FDEBUG= 1 ++#FDEBUG= 1 - # NetBSD -@@ -93,9 +94,9 @@ CFLAGS+= -DNO_STRTONUM - .endif + CC?= cc + YACC= yacc -d +@@ -76,12 +76,12 @@ regress: fdm + cd regress && ${MAKE} - PREFIX?= /usr/local --INSTALLDIR= install -d --INSTALLBIN= install -g bin -o root -m 555 --INSTALLMAN= install -g bin -o root -m 444 -+INSTALLDIR= @INSTALL_PROGRAM_DIR@ -+INSTALLBIN= @INSTALL_PROGRAM@ -+INSTALLMAN= @INSTALL_MAN@ + install: all +- ${INSTALLDIR} ${DESTDIR}${PREFIX}/bin +- ${INSTALLBIN} fdm ${DESTDIR}${PREFIX}/bin/ +- ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1 +- ${INSTALLMAN} fdm.1 ${DESTDIR}${PREFIX}/man/man1/ +- ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man5 +- ${INSTALLMAN} fdm.conf.5 ${DESTDIR}${PREFIX}/man/man5/ ++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} fdm ${DESTDIR}${PREFIX}/bin/ ++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ++ ${BSD_INSTALL_MAN} fdm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ ++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 ++ ${BSD_INSTALL_MAN} fdm.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ - LDFLAGS+= -L/usr/local/lib - .ifdef PROFILE + uninstall: + rm -f ${DESTDIR}${PREFIX}/bin/fdm diff --git a/mail/fdm/patches/patch-fdm.h b/mail/fdm/patches/patch-fdm.h index efa2a10edf0..0b989bddb28 100644 --- a/mail/fdm/patches/patch-fdm.h +++ b/mail/fdm/patches/patch-fdm.h @@ -1,8 +1,11 @@ -$NetBSD: patch-fdm.h,v 1.1 2012/08/23 18:04:12 marino Exp $ +$NetBSD: patch-fdm.h,v 1.2 2013/10/03 11:12:43 obache Exp $ ---- fdm.h.orig 2012-08-23 17:13:57.000000000 +0000 +MAXNAMLEN is not POSIX. For systems that does not define it use NAME_MAX +macro instead. + +--- fdm.h.orig 2011-10-10 13:36:29.000000000 +0000 +++ fdm.h -@@ -71,6 +71,10 @@ +@@ -76,6 +76,10 @@ extern char *__progname; |