Index: head/mail/mu/Makefile =================================================================== --- head/mail/mu/Makefile (revision 463178) +++ head/mail/mu/Makefile (revision 463179) @@ -1,42 +1,42 @@ # Created by: rea@FreeBSD.org # $FreeBSD$ PORTNAME= mu -PORTVERSION= 0.9.18 +PORTVERSION= 1.0 +DISTVERSIONPREFIX= v CATEGORIES= mail MAINTAINER= hrs@FreeBSD.org COMMENT= Mail searching frontend for Xapian LICENSE= GPLv3+ 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 INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS GUILE OPTIONS_SUB= yes GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 GUILE_USE= ldconfig=yes GUILE_CONFIGURE_ENABLE= guile GUILE_INFO= mu-guile post-install: cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \ ${STAGEDIR}${PREFIX}/bin post-install-GUILE-on: ${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \ ${XARGS} ${STRIP_CMD} .include Index: head/mail/mu/distinfo =================================================================== --- head/mail/mu/distinfo (revision 463178) +++ head/mail/mu/distinfo (revision 463179) @@ -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 Index: head/mail/mu/pkg-plist =================================================================== --- head/mail/mu/pkg-plist (revision 463178) +++ head/mail/mu/pkg-plist (revision 463179) @@ -1,34 +1,35 @@ bin/mu bin/mu-ask %%GUILE%%lib/libguile-mu.a %%GUILE%%lib/libguile-mu.so %%GUILE%%lib/libguile-mu.so.0 %%GUILE%%lib/libguile-mu.so.0.0.0 man/man1/mu-add.1.gz man/man1/mu-cfind.1.gz man/man1/mu-easy.1.gz man/man1/mu-extract.1.gz man/man1/mu-find.1.gz man/man1/mu-help.1.gz man/man1/mu-index.1.gz man/man1/mu-mkdir.1.gz man/man1/mu-remove.1.gz man/man1/mu-script.1.gz man/man1/mu-server.1.gz man/man1/mu-verify.1.gz 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 %%GUILE%%share/guile/site/2.0/mu/script.scm %%GUILE%%share/guile/site/2.0/mu/stats.scm %%GUILE%%%%DATADIR%%/scripts/find-dups.scm %%GUILE%%%%DATADIR%%/scripts/msgs-count.scm %%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm %%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm %%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm %%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm %%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm Index: head/mail/mu4e/Makefile =================================================================== --- head/mail/mu4e/Makefile (revision 463178) +++ head/mail/mu4e/Makefile (revision 463179) @@ -1,40 +1,41 @@ # $FreeBSD$ PORTNAME= mu4e -PORTVERSION= 0.9.18 +PORTVERSION= 1.0 +DISTVERSIONPREFIX= v CATEGORIES= mail PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= hrs@FreeBSD.org COMMENT= Emacs frontend for Mu LICENSE= GPLv3 RUN_DEPENDS= mu:mail/mu USES= autoreconf emacs gmake makeinfo pkgconfig USE_GITHUB= yes GH_PROJECT= mu GH_ACCOUNT= djcb GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk \ --disable-webkit \ --disable-guile \ --docdir="${DOCSDIR}" \ --enable-mu4e INFO= mu4e BUILD_WRKSRC= ${WRKSRC}/mu4e INSTALL_WRKSRC= ${WRKSRC}/mu4e INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes post-install: cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \ ${GZIP_CMD} *.el .include Index: head/mail/mu4e/distinfo =================================================================== --- head/mail/mu4e/distinfo (revision 463178) +++ head/mail/mu4e/distinfo (revision 463179) @@ -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 Index: head/mail/mu4e/files/patch-configure.ac =================================================================== --- head/mail/mu4e/files/patch-configure.ac (revision 463178) +++ head/mail/mu4e/files/patch-configure.ac (revision 463179) @@ -1,139 +1,144 @@ ---- 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? -AC_PROG_CXX -AC_PROG_CC -AC_PROG_CC_STDC -AC_PROG_CC_C99 +#AC_PROG_CXX +#AC_PROG_CC +#AC_PROG_CC_STDC +#AC_PROG_CC_C99 AC_PROG_INSTALL -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 +#AM_PROG_LIBTOOL #LT_INIT([disable-shared]) AC_PROG_AWK AC_CHECK_PROG(SORT,sort,sort) -AC_CHECK_HEADERS([wordexp.h]) +#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) -@@ -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 -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`" # 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) AC_SUBST(GMIME_CFLAGS) AC_SUBST(GMIME_LIBS) -gmime_version="`$PKG_CONFIG --modversion gmime-2.6`" +#gmime_version="`$PKG_CONFIG --modversion gmime-2.6`" # xapian checking - we need 1.2.x 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"],[ - 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_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"],[ +# 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_CXXFLAGS="`$XAPIAN_CONFIG --cxxflags`" +#XAPIAN_LIBS="`$XAPIAN_CONFIG --libs`" +#have_xapian="yes" 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 -AC_PATH_PROG([PMCCABE],[pmccabe],[no]) -AS_IF([test "x$PMCCABE" = "xno"],[ - have_pmccabe="no" - AC_MSG_WARN([ - *** Developers: you do not seem to have the pmccabe tool installed. - *** Please install it if you want to run the automated code checks]) -],[have_pmccabe="yes"]) +#AC_PATH_PROG([PMCCABE],[pmccabe],[no]) +#AS_IF([test "x$PMCCABE" = "xno"],[ +# have_pmccabe="no" +# AC_MSG_WARN([ +# *** Developers: you do not seem to have the pmccabe tool installed. +# *** Please install it if you want to run the automated code checks]) +#],[have_pmccabe="yes"]) ############################################################################### AC_CONFIG_FILES([ Makefile -mu/Makefile -mu/tests/Makefile -lib/Makefile -lib/doxyfile +-lib/parser/Makefile -lib/tests/Makefile mu4e/Makefile mu4e/mu4e-meta.el mu4e/texi.texi -guile/Makefile -guile/texi.texi -guile/mu/Makefile -guile/examples/Makefile -guile/tests/Makefile -guile/scripts/Makefile -toys/Makefile -toys/mug/Makefile -toys/msg2pdf/Makefile -man/Makefile -m4/Makefile -contrib/Makefile ]) AC_OUTPUT