aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/mu/Makefile6
-rw-r--r--mail/mu/distinfo6
-rw-r--r--mail/mu/pkg-plist1
-rw-r--r--mail/mu4e/Makefile3
-rw-r--r--mail/mu4e/distinfo6
-rw-r--r--mail/mu4e/files/patch-configure.ac13
6 files changed, 21 insertions, 14 deletions
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index e35c7e55100d..87bddff6d550 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= mu
-PORTVERSION= 0.9.18
+PORTVERSION= 1.0
+DISTVERSIONPREFIX= v
CATEGORIES= mail
MAINTAINER= hrs@FreeBSD.org
@@ -14,10 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxapian.so:databases/xapian-core \
libgmime-2.6.so:mail/gmime26
+USES= autoreconf gettext-runtime gmake libtool makeinfo pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= djcb
-
-USES= autoreconf gettext-runtime gmake libtool makeinfo pkgconfig
USE_GNOME= glib20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk --disable-mu4e
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index f09a73075221..2c87e6124866 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497793932
-SHA256 (djcb-mu-0.9.18_GH0.tar.gz) = 8dd35ab52774c4595077570e730989a2ef329204cd677ad1085f43cc1b89dc3d
-SIZE (djcb-mu-0.9.18_GH0.tar.gz) = 2250319
+TIMESTAMP = 1519797729
+SHA256 (djcb-mu-v1.0_GH0.tar.gz) = 533149abab967e2809f72e9fe62c6deb71d45b6ad2a5846247733a1dd2de69a0
+SIZE (djcb-mu-v1.0_GH0.tar.gz) = 2273670
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index ff18a076a9bf..d2dfd8566d46 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -20,6 +20,7 @@ man/man1/mu-view.1.gz
man/man1/mu.1.gz
man/man1/mug.1.gz
man/man5/mu-bookmarks.5.gz
+man/man7/mu-query.7.gz
%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
%%GUILE%%share/guile/site/2.0/mu.scm
%%GUILE%%share/guile/site/2.0/mu/plot.scm
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
index f068f0fdaf15..79d10b4832be 100644
--- a/mail/mu4e/Makefile
+++ b/mail/mu4e/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= mu4e
-PORTVERSION= 0.9.18
+PORTVERSION= 1.0
+DISTVERSIONPREFIX= v
CATEGORIES= mail
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo
index 14472da60afa..09fe4dfdbbe1 100644
--- a/mail/mu4e/distinfo
+++ b/mail/mu4e/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519794720
-SHA256 (djcb-mu-0.9.18_GH0.tar.gz) = 8dd35ab52774c4595077570e730989a2ef329204cd677ad1085f43cc1b89dc3d
-SIZE (djcb-mu-0.9.18_GH0.tar.gz) = 2250319
+TIMESTAMP = 1519797815
+SHA256 (djcb-mu-v1.0_GH0.tar.gz) = 533149abab967e2809f72e9fe62c6deb71d45b6ad2a5846247733a1dd2de69a0
+SIZE (djcb-mu-v1.0_GH0.tar.gz) = 2273670
diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac
index cc7ddb173c05..6be3082de51f 100644
--- a/mail/mu4e/files/patch-configure.ac
+++ b/mail/mu4e/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2016-12-04 19:18:18 UTC
+--- configure.ac.orig 2018-02-03 12:02:45 UTC
+++ configure.ac
-@@ -30,25 +30,25 @@ AC_SUBST(prefix)
+@@ -37,12 +37,12 @@ AC_SUBST(prefix)
# AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
# when a c++ compiler is not found. Weird, huh?
@@ -16,6 +16,10 @@
-AC_HEADER_STDC
+#AC_HEADER_STDC
+ AX_CXX_COMPILE_STDCXX_14
+ m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes])])
+@@ -50,16 +50,16 @@ AX_VALGRIND_CHECK
+
# for now, use AM_PROG_LIBTOOL, as we don't want to require
# a too new setup for autotools/libtool
-AM_PROG_LIBTOOL
@@ -34,7 +38,7 @@
# check for makeinfo
AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no)
-@@ -124,36 +124,36 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
+@@ -135,36 +135,36 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
# glib2?
# we pick some late-2012 version
@@ -92,7 +96,7 @@
AC_SUBST(XAPIAN_CXXFLAGS)
AC_SUBST(XAPIAN_LIBS)
-@@ -249,37 +249,20 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/do
+@@ -260,38 +260,20 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/do
###############################################################################
# check for pmccabe
@@ -118,6 +122,7 @@
-mu/tests/Makefile
-lib/Makefile
-lib/doxyfile
+-lib/parser/Makefile
-lib/tests/Makefile
mu4e/Makefile
mu4e/mu4e-meta.el