From a2835fe3cbdf191e73510014dd8aab2a626ac511 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Wed, 25 Dec 2019 22:00:03 +0000 Subject: [PATCH] Update to 1.2. --- mail/mu/Makefile | 10 ++-- mail/mu/distinfo | 6 +- mail/mu4e/Makefile | 4 +- mail/mu4e/distinfo | 6 +- mail/mu4e/files/patch-configure.ac | 94 +++++++++++++++--------------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/mail/mu/Makefile b/mail/mu/Makefile index 7dab2048e605..c5061233795e 100644 --- a/mail/mu/Makefile +++ b/mail/mu/Makefile @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= mu -PORTVERSION= 1.0 -DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTVERSION= 1.2 CATEGORIES= mail MAINTAINER= hrs@FreeBSD.org @@ -14,8 +12,10 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxapian.so:databases/xapian-core \ - libgmime-2.6.so:mail/gmime26 - + libgmime-3.0.so:mail/gmime30 \ + libgc-threaded.so:devel/boehm-gc-threaded \ + libjson-glib-1.0.so:devel/json-glib + USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \ libtool makeinfo pkgconfig USE_GITHUB= yes diff --git a/mail/mu/distinfo b/mail/mu/distinfo index 2c87e6124866..8d8e7b80380a 100644 --- a/mail/mu/distinfo +++ b/mail/mu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519797729 -SHA256 (djcb-mu-v1.0_GH0.tar.gz) = 533149abab967e2809f72e9fe62c6deb71d45b6ad2a5846247733a1dd2de69a0 -SIZE (djcb-mu-v1.0_GH0.tar.gz) = 2273670 +TIMESTAMP = 1577309838 +SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a +SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571 diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile index e0b0abbf018e..3967885d8596 100644 --- a/mail/mu4e/Makefile +++ b/mail/mu4e/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= mu4e -PORTVERSION= 1.0 -DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTVERSION= 1.2 CATEGORIES= mail PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo index 09fe4dfdbbe1..421a22dfe269 100644 --- a/mail/mu4e/distinfo +++ b/mail/mu4e/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519797815 -SHA256 (djcb-mu-v1.0_GH0.tar.gz) = 533149abab967e2809f72e9fe62c6deb71d45b6ad2a5846247733a1dd2de69a0 -SIZE (djcb-mu-v1.0_GH0.tar.gz) = 2273670 +TIMESTAMP = 1577310090 +SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a +SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571 diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac index c67cc22823d9..bc2637476e97 100644 --- a/mail/mu4e/files/patch-configure.ac +++ b/mail/mu4e/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2018-02-03 12:02:45 UTC +--- configure.ac.orig 2019-04-07 07:54:18 UTC +++ configure.ac -@@ -37,29 +37,29 @@ AC_SUBST(prefix) +@@ -37,31 +37,31 @@ 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,11 +16,16 @@ -AC_HEADER_STDC +#AC_HEADER_STDC + extra_flags="-Wformat-security \ + -Wstack-protector \ + -Wstack-protector-all \ + -Wno-cast-function-type" + -AX_CXX_COMPILE_STDCXX_14 --m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes])]) +-m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})]) -AX_VALGRIND_CHECK +#AX_CXX_COMPILE_STDCXX_14 -+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes])]) ++#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})]) +#AX_VALGRIND_CHECK # for now, use AM_PROG_LIBTOOL, as we don't want to require @@ -36,32 +41,34 @@ +#AC_CHECK_HEADERS([wordexp.h]) # use the 64-bit versions --AC_SYS_LARGEFILE -+#AC_SYS_LARGEFILE - - # check for makeinfo - AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no) -@@ -135,36 +135,36 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[ + AC_SYS_LARGEFILE +@@ -150,19 +150,19 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[ # glib2? # we pick some late-2012 version -PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0) -+#PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0) ++# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) --glib_version="`$PKG_CONFIG --modversion glib-2.0`" -+#glib_version="`$PKG_CONFIG --modversion glib-2.0`" + glib_version="`$PKG_CONFIG --modversion glib-2.0`" - # gmime, some late-2012 version --PKG_CHECK_MODULES(GMIME,gmime-2.6 >= 2.6.7) -+#PKG_CHECK_MODULES(GMIME,gmime-2.6 >= 2.6.7) + # gmime, version 3.0 or higher +-PKG_CHECK_MODULES(GMIME,gmime-3.0) ++# PKG_CHECK_MODULES(GMIME,gmime-3.0) AC_SUBST(GMIME_CFLAGS) AC_SUBST(GMIME_LIBS) --gmime_version="`$PKG_CONFIG --modversion gmime-2.6`" -+#gmime_version="`$PKG_CONFIG --modversion gmime-2.6`" + gmime_version="`$PKG_CONFIG --modversion gmime-3.0`" + # gmime, version 3.0 or higher +-PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no]) ++# PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no]) + AS_IF([test "x$have_json_glib" = "xyes"],[ + AC_SUBST(JSON_GLIB_CFLAGS) + AC_SUBST(JSON_GLIB_LIBS) +@@ -172,21 +172,21 @@ AS_IF([test "x$have_json_glib" = "xyes"],[ + AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"]) - # xapian checking - we need 1.2.x at least + # xapian checking - we need 1.4 at least -AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) -AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno") -AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ @@ -71,35 +78,31 @@ - *** If you compiled it yourself, you should ensure that xapian-config - *** is in your PATH.])], - [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) --AS_CASE([$xapian_version], -- [1.[[2-9]].[[0-9]]*], [], -- [AC_MSG_ERROR([*** xapian version >= 1.2 needed, -- but version $xapian_version found.])]) - --XAPIAN_CXXFLAGS="`$XAPIAN_CONFIG --cxxflags`" --XAPIAN_LIBS="`$XAPIAN_CONFIG --libs`" --have_xapian="yes" -+#AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) -+#AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno") -+#AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ +-AS_CASE([$xapian_version], +- [1.[[4-9]].[[0-9]]*], +- [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])], +- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])]) +- ++# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) ++# AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno") ++# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[ +# AC_MSG_ERROR([ -+# *** xapian could not be found; please install it -+# *** e.g., in debian/ubuntu the package would be 'libxapian-dev' -+# *** If you compiled it yourself, you should ensure that xapian-config -+# *** is in your PATH.])], -+# [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) -+#AS_CASE([$xapian_version], -+# [1.[[2-9]].[[0-9]]*], [], -+# [AC_MSG_ERROR([*** xapian version >= 1.2 needed, -+# but version $xapian_version found.])]) ++# *** xapian could not be found; please install it ++# *** e.g., in debian/ubuntu the package would be 'libxapian-dev' ++# *** If you compiled it yourself, you should ensure that xapian-config ++# *** is in your PATH.])], ++# [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')]) +# -+#XAPIAN_CXXFLAGS="`$XAPIAN_CONFIG --cxxflags`" -+#XAPIAN_LIBS="`$XAPIAN_CONFIG --libs`" -+#have_xapian="yes" - - AC_SUBST(XAPIAN_CXXFLAGS) - AC_SUBST(XAPIAN_LIBS) -@@ -260,38 +260,20 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/do ++#AS_CASE([$xapian_version], ++# [1.[[4-9]].[[0-9]]*], ++# [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])], ++# [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])]) ++# + XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)" + XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)" + have_xapian="yes" +@@ -261,37 +261,19 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu") ############################################################################### # check for pmccabe @@ -129,7 +132,6 @@ -lib/tests/Makefile mu4e/Makefile mu4e/mu4e-meta.el - mu4e/texi.texi -guile/Makefile -guile/texi.texi -guile/mu/Makefile