Index: head/mail/mailest/Makefile =================================================================== --- head/mail/mailest/Makefile (revision 425349) +++ head/mail/mailest/Makefile (revision 425350) @@ -1,51 +1,50 @@ # $FreeBSD$ PORTNAME= mailest -PORTVERSION= 0.9.20 +PORTVERSION= 0.9.22 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 CATEGORIES= mail MAINTAINER= hrs@FreeBSD.org COMMENT= Hyper Estraier backend for Mew LICENSE= BSD2CLAUSE BSD3CLAUSE ISCL LGPL21 LICENSE_COMB= multi .for L in ${LICENSE} LICENSE_FILE_${L}= ${WRKSRC}/LICENSE.${L} .endfor LIB_DEPENDS= libevent.so:devel/libevent2 \ libqdbm.so:databases/qdbm \ libestraier.so:textproc/hyperestraier RUN_DEPENDS= mewl:mail/mew USES= iconv fakeroot USE_EMACS= yes USE_GITHUB= yes GH_ACCOUNT= yasuoka MAKE_ENV= USE_BSDMAKE=true WITH_INSTALL_AS_USER=true LICENSE_BSD2CLAUSE_SRC= bytebuf.c replace/sys/tree.h LICENSE_BSD3CLAUSE_SRC= replace/sys/queue.h LICENSE_ISCL_SRC= mailestctl.c parser.c parser.h \ replace/open_memstream.c \ replace/reallocarray.c \ replace/replace.h \ replace/strlcat.c \ replace/strtonum.c LICENSE_LGPL21_SRC= estdraft.c LICENSE_BSD2CLAUSE_REGEX="/ \* [Cc]opyright/,/ \*\//!d;s,^ \*,,;s,^/,," LICENSE_BSD3CLAUSE_REGEX=${LICENSE_BSD2CLAUSE_REGEX} LICENSE_ISCL_REGEX= ${LICENSE_BSD2CLAUSE_REGEX} LICENSE_LGPL21_REGEX= "/^\/\*\*/,/\*\*\//!d;s,^ \*,,;s,^/,," post-extract: .for L in ${LICENSE} .for F in ${LICENSE_${L}_SRC} cd ${WRKSRC} && ${SED} -e ${LICENSE_${L}_REGEX} ${F} \ >> ${LICENSE_FILE_${L}} .endfor .endfor .include Index: head/mail/mailest/distinfo =================================================================== --- head/mail/mailest/distinfo (revision 425349) +++ head/mail/mailest/distinfo (revision 425350) @@ -1,2 +1,3 @@ -SHA256 (yasuoka-mailest-mailest-0.9.20_GH0.tar.gz) = f51cde2047422c993425eee8102e5f7a914094b60a1a039a0b84502e5d22c5f8 -SIZE (yasuoka-mailest-mailest-0.9.20_GH0.tar.gz) = 171958 +TIMESTAMP = 1473036362 +SHA256 (yasuoka-mailest-mailest-0.9.22_GH0.tar.gz) = 38979dd2ed5dee6e03c392721e113233959a4a2c558702340a326c632e6bdd70 +SIZE (yasuoka-mailest-mailest-0.9.22_GH0.tar.gz) = 172305 Index: head/mail/mailest/files/patch-mailestd.c =================================================================== --- head/mail/mailest/files/patch-mailestd.c (revision 425349) +++ head/mail/mailest/files/patch-mailestd.c (nonexistent) @@ -1,47 +0,0 @@ ---- mailestd.c.orig 2015-06-06 10:45:32 UTC -+++ mailestd.c -@@ -809,8 +809,6 @@ mailestd_gather(struct mailestd *_this, - - RB_INIT(&folders); - ctx = mailestd_get_gather(_this, task->gather_id); -- mailestd_log(LOG_DEBUG, "Gathering %s ...", mailestd_folder_name( -- _this, folder, buf, sizeof(buf))); - if (folder[0] == '/') - strlcpy(rdir, folder, sizeof(rdir)); - else { -@@ -818,6 +816,8 @@ mailestd_gather(struct mailestd *_this, - strlcat(rdir, "/", sizeof(rdir)); - strlcat(rdir, folder, sizeof(rdir)); - } -+ mailestd_log(LOG_DEBUG, "Gathering %s ...", mailestd_folder_name( -+ _this, rdir, buf, sizeof(buf))); - paths[0] = rdir; - paths[1] = NULL; - lrdir = strlen(rdir); -@@ -853,7 +853,7 @@ mailestd_gather(struct mailestd *_this, - } - - mailestd_log(LOG_DEBUG, "Gathered %s (Total: %d Remove: %d Update: %d)", -- mailestd_folder_name(_this, folder, buf, sizeof(buf)), -+ mailestd_folder_name(_this, rdir, buf, sizeof(buf)), - total, delete, update); - out: - if (ctx != NULL) { -@@ -2647,6 +2647,7 @@ static void - mailestd_monitor_folder(struct mailestd *_this, const char *dirpath) - { - int fd = -1; -+ char buf[PATH_MAX]; - struct folder *fld, fld0; - - MAILESTD_ASSERT(_thread_self() == _this->monitorworker.thread); -@@ -2668,7 +2669,8 @@ mailestd_monitor_folder(struct mailestd - fld->fd = fd; - fld->path = xstrdup(dirpath); - RB_INSERT(folder_tree, &_this->monitors, fld); -- mailestd_log(LOG_DEBUG, "Start monitoring %s", dirpath); -+ mailestd_log(LOG_DEBUG, "Start monitoring %s", -+ mailestd_folder_name(_this, dirpath, buf, sizeof(buf))); - } - - static void Property changes on: head/mail/mailest/files/patch-mailestd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mailest/files/patch-mailestd-Makefile =================================================================== --- head/mail/mailest/files/patch-mailestd-Makefile (revision 425349) +++ head/mail/mailest/files/patch-mailestd-Makefile (revision 425350) @@ -1,29 +1,30 @@ ---- mailestd/Makefile.orig 2015-06-06 10:45:32 UTC -+++ mailestd/Makefile -@@ -2,9 +2,9 @@ MAILESTD_MT= # +--- mailestd/Makefile.orig 2016-09-02 20:16:03.000000000 +0900 ++++ mailestd/Makefile 2016-09-05 13:12:14.868757000 +0900 +@@ -1,10 +1,8 @@ + MAILESTD_MT= # +-.include +- PROG= mailestd SRCS= bytebuf.c mailestd.c mailestctl.c parse.y parser.c -LINKS= ${BINDIR}/mailestd ${LOCALBASE}/bin/mailestctl -+LINKS= ${BINDIR}/${PROG} ${BINDIR}/mailestctl ++LINKS= ${BINDIR}/mailestd ${BINDIR}/mailestctl CFLAGS+= -DHAVE_LIBESTDRAFT -DMONITOR_KQUEUE --LIBESTDRAFTOBJ!=cd ${.CURDIR}/../libestdraft; ${MAKE} _whereobj -+LIBESTDRAFTOBJ!=cd ${.CURDIR}/../libestdraft; ${MAKE} -V.OBJDIR - LDFLAGS= -L${LOCALBASE}/lib - LDADD= -lestraier -levent -lqdbm - DPADD= ${LIBESTRAIER} ${LIBEVENT} ${LIBQDBM} -@@ -21,13 +21,7 @@ LDADD+= -lpthread + .if defined(__objdir) && exists(${.CURDIR}/../libestdraft/${__objdir}) + LIBESTDRAFTOBJ= ${.CURDIR}/../libestdraft/${__objdir} +@@ -27,13 +25,14 @@ DPADD+= ${LIBPTHREAD} .endif -beforeinstall: -- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ -- ${.CURDIR}/../mew-mailest.sh ${PREFIX}/bin/mew-mailest -- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ -- ${.CURDIR}/../cmew-mailest.sh ${PREFIX}/bin/cmew-mailest -- ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ -- ${.CURDIR}/../smew-mailest.sh ${PREFIX}/bin/smew-mailest ++X-beforeinstall: + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.CURDIR}/../mew-mailest.sh ${PREFIX}/bin/mew-mailest + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.CURDIR}/../cmew-mailest.sh ${PREFIX}/bin/cmew-mailest + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.CURDIR}/../smew-mailest.sh ${PREFIX}/bin/smew-mailest +SCRIPTS= mew-mailest.sh cmew-mailest.sh smew-mailest.sh LDFLAGS+= -L${LIBESTDRAFTOBJ} LDADD+= -lestdraft