Attachment #223722 for bug #250588




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20210330:
  AFFECTS: Users of mail/mu with default locations
  AUTHOR: dereks@lifeofadishwasher.com

  mu now defaults to the [XDG Base Directory Specification][1] for the
  default locations for various files. E.g. on Unix the mu database
  now lives under `~/.cache/mu/' rather than `~/.mu'. You can still
  use the old location by passing `--muhome=~/.mu' to various `mu'
  commands.

  [1] https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html

20210328:
  AFFECTS: users of www/caddy
  AUTHOR: adamw@FreeBSD.org




# $FreeBSD$

PORTNAME=	mu
PORTVERSION=	1.4.15
CATEGORIES=	mail

MAINTAINER=	hrs@FreeBSD.org

		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 readline
USE_GITHUB=	yes
GH_ACCOUNT=	djcb
USE_GNOME=	glib20

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-gtk --disable-mu4e
INSTALL_TARGET=	install-strip
TEST_TARGET=	test

OPTIONS_DEFINE=		DOCS GUILE
OPTIONS_SUB=		yes

GUILE_CONFIGURE_ENABLE=	guile
GUILE_INFO=		mu-guile

post-patch:
	@${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \
	    ${WRKSRC}/configure.ac

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 <bsd.port.mk>

Lines 1-3 Link Here

(-)b/mail/mu/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577309838	1	TIMESTAMP = 1617162498
2	SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a	2	SHA256 (djcb-mu-1.4.15_GH0.tar.gz) = e19900a68b6d26d2e01bf002b8ffaa97916239eca4d7104b7bc57db0add406b2
3	SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571	3	SIZE (djcb-mu-1.4.15_GH0.tar.gz) = 2309695




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-find.1.gz
man/man1/mu-help.1.gz
man/man1/mu-index.1.gz
man/man1/mu-info.1.gz
man/man1/mu-init.1.gz
man/man1/mu-mkdir.1.gz
man/man1/mu-remove.1.gz
man/man1/mu-script.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.2/mu.scm
%%GUILE%%share/guile/site/2.2/mu/plot.scm
%%GUILE%%share/guile/site/2.2/mu/script.scm
%%GUILE%%share/guile/site/2.2/mu/stats.scm
%%GUILE%%%%DATADIR%%/scripts/find-dups.scm
%%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm

Lines 1-8 Link Here

(-)b/mail/mu4e/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= mu4e	3	PORTNAME= mu4e
4	PORTVERSION= 1.2	4	PORTVERSION= 1.4.15
5	PORTREVISION= 4
6	CATEGORIES= mail	5	CATEGORIES= mail
7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
8		7

Lines 1-3 Link Here

(-)b/mail/mu4e/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577310090	1	TIMESTAMP = 1603332752
2	SHA256 (djcb-mu-1.2_GH0.tar.gz) = 75ac379ddbaa35ab54035b057bf729537afbef09c71505c2f7209826265e049a	2	SHA256 (djcb-mu-1.4.13_GH0.tar.gz) = 8856465501dccd9101eda1a29bedada010e6ff828c9d922f1abe86b152a2741b
3	SIZE (djcb-mu-1.2_GH0.tar.gz) = 2297571	3	SIZE (djcb-mu-1.4.13_GH0.tar.gz) = 2309545




--- configure.ac.orig	2020-10-24 23:20:38 UTC
+++ configure.ac
@@ -37,21 +37,21 @@ 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_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],${extra_flags})])

+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
+#AX_VALGRIND_CHECK
 
 LT_INIT
 # a too new setup for autotools/libtool
-AM_PROG_LIBTOOL
+#AM_PROG_LIBTOOL
 #LT_INIT([disable-shared])
 
@@ -138,15 +138,15 @@ AS_IF([test -z "$PKG_CONFIG"],
 )
 
-AC_CHECK_HEADERS([wordexp.h])
+#AC_CHECK_HEADERS([wordexp.h])
 
 # use the 64-bit versions
 AC_SYS_LARGEFILE
@@ -150,19 +150,19 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
 
 # glib2?
-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
+#PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
 glib_version="$($PKG_CONFIG --modversion glib-2.0)"
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 glib_version="`$PKG_CONFIG --modversion glib-2.0`"
 
 # gmime, version 3.0 or higher
-PKG_CHECK_MODULES(GMIME,gmime-3.0)
+#PKG_CHECK_MODULES(GMIME,gmime-3.0)
 gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
 AC_SUBST(GMIME_LIBS)
 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"],[
   json_glib_version="$($PKG_CONFIG --modversion json-glib-1.0)"
   AC_DEFINE(HAVE_JSON_GLIB,[1], [Do we support json-glib?])
@@ -154,35 +154,35 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
 AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
 
 # xapian checking - we need 1.4 at least
-PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
-  have_xapian=yes
-  xapian_version=$($PKG_CONFIG xapian-core --modversion)
-  AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
-],[
-  # fall back to the xapian-config script. Not sure if there are cases where the
-  # pkgconfig does not work, but xapian-config does, so keep this for now.
-  AC_MSG_NOTICE([falling back to xapian-config])
-  AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
-  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.[[4-9]].[[0-9]]*],
-        [AC_MSG_NOTICE([xapian $xapian_version found.])],
-        [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"
-	[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
-
-  AC_SUBST(XAPIAN_CXXFLAGS)
-  AC_SUBST(XAPIAN_LIBS)
-])
+#PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
+#  have_xapian=yes
+#  xapian_version=$($PKG_CONFIG xapian-core --modversion)
+#  AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
+#],[
+#  # fall back to the xapian-config script. Not sure if there are cases where the
+#  # pkgconfig does not work, but xapian-config does, so keep this for now.
+#  AC_MSG_NOTICE([falling back to xapian-config])
+#  AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
+#  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.[[4-9]].[[0-9]]*],
+#        [AC_MSG_NOTICE([xapian $xapian_version found.])],
+#        [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"
+#
+#  AC_SUBST(XAPIAN_CXXFLAGS)
+#  AC_SUBST(XAPIAN_LIBS)
+#])
-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"])
 ###############################################################################
 # we set the set the version of the MuStore (Xapian database) layout
 # here; it will become part of the db name, so we can automatically
@@ -258,27 +258,8 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
 
 AC_CONFIG_FILES([
 Makefile
-mu/Makefile
-mu/mu-memcheck
-lib/Makefile
-lib/doxyfile
-lib/utils/Makefile
-lib/query/Makefile
 mu4e/Makefile
 mu4e/mu4e-meta.el
-guile/Makefile

-guile/scripts/Makefile
-toys/Makefile
-toys/mug/Makefile
-toys/msg2pdf/Makefile
-man/Makefile
-m4/Makefile
-contrib/Makefile
-],[
- [chmod +x mu/mu-memcheck]
 ])
 AC_OUTPUT
 

Return to bug 250588

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+12 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20210330:
		9	AFFECTS: Users of mail/mu with default locations
		10	AUTHOR: dereks@lifeofadishwasher.com
		11
		12	mu now defaults to the [XDG Base Directory Specification][1] for the
		13	default locations for various files. E.g. on Unix the mu database
		14	now lives under `~/.cache/mu/' rather than `~/.mu'. You can still
		15	use the old location by passing `--muhome=~/.mu' to various `mu'
		16	commands.
		17
		18	[1] https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
		19
8	20210328:	20	20210328:
9	AFFECTS: users of www/caddy	21	AFFECTS: users of www/caddy
10	AUTHOR: adamw@FreeBSD.org	22	AUTHOR: adamw@FreeBSD.org

Lines 2-8 Link Here

(-)b/mail/mu/Makefile (-11 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mu	4	PORTNAME= mu
5	PORTVERSION= 1.2	5	PORTVERSION= 1.4.15
6	CATEGORIES= mail	6	CATEGORIES= mail
7		7
8	MAINTAINER= hrs@FreeBSD.org	8	MAINTAINER= hrs@FreeBSD.org
Lines 15-23 LIB_DEPENDS= libxapian.so:databases/xapian-core \ Link Here
15	libgmime-3.0.so:mail/gmime30 \	15	libgmime-3.0.so:mail/gmime30 \
16	libgc-threaded.so:devel/boehm-gc-threaded \	16	libgc-threaded.so:devel/boehm-gc-threaded \
17	libjson-glib-1.0.so:devel/json-glib	17	libjson-glib-1.0.so:devel/json-glib
18		18
19	USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \	19	USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
20	libtool makeinfo pkgconfig	20	libtool makeinfo pkgconfig readline
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	GH_ACCOUNT= djcb	22	GH_ACCOUNT= djcb
23	USE_GNOME= glib20	23	USE_GNOME= glib20
Lines 25-30 USE_GNOME= glib20 Link Here
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --disable-gtk --disable-mu4e	26	CONFIGURE_ARGS= --disable-gtk --disable-mu4e
27	INSTALL_TARGET= install-strip	27	INSTALL_TARGET= install-strip
		28	TEST_TARGET= test
28		29
29	OPTIONS_DEFINE= DOCS GUILE	30	OPTIONS_DEFINE= DOCS GUILE
30	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
Lines 34-49 GUILE_USE= ldconfig=yes Link Here
34	GUILE_CONFIGURE_ENABLE= guile	35	GUILE_CONFIGURE_ENABLE= guile
35	GUILE_INFO= mu-guile	36	GUILE_INFO= mu-guile
36		37
37	post-patch:
38	@${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \
39	${WRKSRC}/configure.ac
40
41	post-install:	38	post-install:
42	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \	39	cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \
43	${STAGEDIR}${PREFIX}/bin	40	${STAGEDIR}${PREFIX}/bin
44		41
45	post-install-GUILE-on:
46	${FIND} ${STAGEDIR}${PREFIX}/lib -name ".so." -type f \| \
47	${XARGS} ${STRIP_CMD}
48
49	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)b/mail/mu/pkg-plist (-6 / +6 lines)
1	bin/mu	1	bin/mu
2	bin/mu-ask	2	bin/mu-ask
3	%%GUILE%%lib/libguile-mu.a
4	%%GUILE%%lib/libguile-mu.so	3	%%GUILE%%lib/libguile-mu.so
5	%%GUILE%%lib/libguile-mu.so.0	4	%%GUILE%%lib/libguile-mu.so.0
6	%%GUILE%%lib/libguile-mu.so.0.0.0	5	%%GUILE%%lib/libguile-mu.so.0.0.0
Lines 11-16 man/man1/mu-extract.1.gz Link Here
11	man/man1/mu-find.1.gz	10	man/man1/mu-find.1.gz
12	man/man1/mu-help.1.gz	11	man/man1/mu-help.1.gz
13	man/man1/mu-index.1.gz	12	man/man1/mu-index.1.gz
		13	man/man1/mu-info.1.gz
		14	man/man1/mu-init.1.gz
14	man/man1/mu-mkdir.1.gz	15	man/man1/mu-mkdir.1.gz
15	man/man1/mu-remove.1.gz	16	man/man1/mu-remove.1.gz
16	man/man1/mu-script.1.gz	17	man/man1/mu-script.1.gz
Lines 18-31 man/man1/mu-server.1.gz Link Here
18	man/man1/mu-verify.1.gz	19	man/man1/mu-verify.1.gz
19	man/man1/mu-view.1.gz	20	man/man1/mu-view.1.gz
20	man/man1/mu.1.gz	21	man/man1/mu.1.gz
21	man/man1/mug.1.gz
22	man/man5/mu-bookmarks.5.gz	22	man/man5/mu-bookmarks.5.gz
23	man/man7/mu-query.7.gz	23	man/man7/mu-query.7.gz
24	%%PORTDOCS%%%%DOCSDIR%%/NEWS.org	24	%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
25	%%GUILE%%share/guile/site/2.0/mu.scm	25	%%GUILE%%share/guile/site/2.2/mu.scm
26	%%GUILE%%share/guile/site/2.0/mu/plot.scm	26	%%GUILE%%share/guile/site/2.2/mu/plot.scm
27	%%GUILE%%share/guile/site/2.0/mu/script.scm	27	%%GUILE%%share/guile/site/2.2/mu/script.scm
28	%%GUILE%%share/guile/site/2.0/mu/stats.scm	28	%%GUILE%%share/guile/site/2.2/mu/stats.scm
29	%%GUILE%%%%DATADIR%%/scripts/find-dups.scm	29	%%GUILE%%%%DATADIR%%/scripts/find-dups.scm
30	%%GUILE%%%%DATADIR%%/scripts/msgs-count.scm	30	%%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
31	%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm	31	%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm

Lines 1-6 Link Here

(-)b/mail/mu4e/files/patch-configure.ac (-85 / +80 lines)
1	--- configure.ac.orig 2019-04-07 07:54:18 UTC	1	--- configure.ac.orig 2020-10-24 23:20:38 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -37,31 +37,31 @@ AC_SUBST(prefix)	3	@@ -37,21 +37,21 @@ AC_SUBST(prefix)
4		4
5	# AC_PROG_CXX before AC_PROG_CC, otherwise configure won't error out	5	# AC_PROG_CXX before AC_PROG_CC, otherwise configure won't error out
6	# when a c++ compiler is not found. Weird, huh?	6	# when a c++ compiler is not found. Weird, huh?
Lines 16-25 Link Here
16	-AC_HEADER_STDC	16	-AC_HEADER_STDC
17	+#AC_HEADER_STDC	17	+#AC_HEADER_STDC
18		18
19	extra_flags="-Wformat-security \	19	extra_flags="-Wformat-security \
20	-Wstack-protector \	20	-Wstack-protector \
21	-Wstack-protector-all \	21	-Wstack-protector-all \
22	-Wno-cast-function-type"	22	-Wno-cast-function-type"
23		23
24	-AX_CXX_COMPILE_STDCXX_14	24	-AX_CXX_COMPILE_STDCXX_14
25	-m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])	25	-m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
Lines 28-135 Link Here
28	+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])	28	+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
29	+#AX_VALGRIND_CHECK	29	+#AX_VALGRIND_CHECK
30		30
31	# for now, use AM_PROG_LIBTOOL, as we don't want to require	31	LT_INIT
32	# a too new setup for autotools/libtool
33	-AM_PROG_LIBTOOL
34	+#AM_PROG_LIBTOOL
35	#LT_INIT([disable-shared])
36		32
37	AC_PROG_AWK	33	@@ -138,15 +138,15 @@ AS_IF([test -z "$PKG_CONFIG"],
38	AC_CHECK_PROG(SORT,sort,sort)	34	)
39
40	-AC_CHECK_HEADERS([wordexp.h])
41	+#AC_CHECK_HEADERS([wordexp.h])
42
43	# use the 64-bit versions
44	AC_SYS_LARGEFILE
45	@@ -150,19 +150,19 @@ AS_IF([test "x$PKG_CONFIG" = "xno"],[
46		35
47	# glib2?	36	# glib2?
48	# we pick some late-2012 version	37	-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
49	-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)	38	+#PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.38 gobject-2.0 gio-2.0)
50	+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)	39	glib_version="$($PKG_CONFIG --modversion glib-2.0)"
51	AC_SUBST(GLIB_CFLAGS)
52	AC_SUBST(GLIB_LIBS)
53	glib_version="`$PKG_CONFIG --modversion glib-2.0`"
54		40
55	# gmime, version 3.0 or higher	41	# gmime, version 3.0 or higher
56	-PKG_CHECK_MODULES(GMIME,gmime-3.0)	42	-PKG_CHECK_MODULES(GMIME,gmime-3.0)
57	+# PKG_CHECK_MODULES(GMIME,gmime-3.0)	43	+#PKG_CHECK_MODULES(GMIME,gmime-3.0)
58	AC_SUBST(GMIME_CFLAGS)	44	gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
59	AC_SUBST(GMIME_LIBS)
60	gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
61		45
62	# gmime, version 3.0 or higher	46	# gmime, version 3.0 or higher
63	-PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])	47	-PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
64	+# PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])	48	+#PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
65	AS_IF([test "x$have_json_glib" = "xyes"],[	49	AS_IF([test "x$have_json_glib" = "xyes"],[
66	AC_SUBST(JSON_GLIB_CFLAGS)	50	json_glib_version="$($PKG_CONFIG --modversion json-glib-1.0)"
67	AC_SUBST(JSON_GLIB_LIBS)	51	AC_DEFINE(HAVE_JSON_GLIB,[1], [Do we support json-glib?])
68	@@ -172,21 +172,21 @@ AS_IF([test "x$have_json_glib" = "xyes"],[	52	@@ -154,35 +154,35 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
69	AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])	53	AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
70		54
71	# xapian checking - we need 1.4 at least	55	# xapian checking - we need 1.4 at least
72	-AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)	56	-PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
73	-AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")	57	- have_xapian=yes
74	-AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[	58	- xapian_version=$($PKG_CONFIG xapian-core --modversion)
75	- AC_MSG_ERROR([	59	- AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
76	- *** xapian could not be found; please install it	60	-],[
77	- *** e.g., in debian/ubuntu the package would be 'libxapian-dev'	61	- # fall back to the xapian-config script. Not sure if there are cases where the
78	- *** If you compiled it yourself, you should ensure that xapian-config	62	- # pkgconfig does not work, but xapian-config does, so keep this for now.
79	- *** is in your PATH.])],	63	- AC_MSG_NOTICE([falling back to xapian-config])
80	- [xapian_version=$($XAPIAN_CONFIG --version \| sed -e 's/.* //')])	64	- AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
		65	- AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
		66	- AC_MSG_ERROR([
		67	- *** xapian could not be found; please install it
		68	- *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
		69	- *** If you compiled it yourself, you should ensure that xapian-config
		70	- *** is in your PATH.])],
		71	- [xapian_version=$($XAPIAN_CONFIG --version \| sed -e 's/.* //')])
		72	-
		73	- AS_CASE([$xapian_version],
		74	- [1.[[4-9]].[[0-9]]*],
		75	- [AC_MSG_NOTICE([xapian $xapian_version found.])],
		76	- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
81	-	77	-
82	-AS_CASE([$xapian_version],	78	- XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
83	- [1.[[4-9]].[[0-9]]*],	79	- XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
84	- [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],	80	- have_xapian="yes"
85	- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
86	-	81	-
87	+# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)	82	- AC_SUBST(XAPIAN_CXXFLAGS)
88	+# AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")	83	- AC_SUBST(XAPIAN_LIBS)
89	+# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[	84	-])
90	+# AC_MSG_ERROR([	85	+#PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
91	+# *** xapian could not be found; please install it	86	+# have_xapian=yes
92	+# *** e.g., in debian/ubuntu the package would be 'libxapian-dev'	87	+# xapian_version=$($PKG_CONFIG xapian-core --modversion)
93	+# *** If you compiled it yourself, you should ensure that xapian-config	88	+# AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
94	+# *** is in your PATH.])],	89	+#],[
95	+# [xapian_version=$($XAPIAN_CONFIG --version \| sed -e 's/.* //')])	90	+# # fall back to the xapian-config script. Not sure if there are cases where the
		91	+# # pkgconfig does not work, but xapian-config does, so keep this for now.
		92	+# AC_MSG_NOTICE([falling back to xapian-config])
		93	+# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
		94	+# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
		95	+# AC_MSG_ERROR([
		96	+# *** xapian could not be found; please install it
		97	+# *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
		98	+# *** If you compiled it yourself, you should ensure that xapian-config
		99	+# *** is in your PATH.])],
		100	+# [xapian_version=$($XAPIAN_CONFIG --version \| sed -e 's/.* //')])
96	+#	101	+#
97	+#AS_CASE([$xapian_version],	102	+# AS_CASE([$xapian_version],
98	+# [1.[[4-9]].[[0-9]]*],	103	+# [1.[[4-9]].[[0-9]]*],
99	+# [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],	104	+# [AC_MSG_NOTICE([xapian $xapian_version found.])],
100	+# [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])	105	+# [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
101	+#	106	+#
102	XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"	107	+# XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
103	XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"	108	+# XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
104	have_xapian="yes"	109	+# have_xapian="yes"
105	@@ -261,37 +261,19 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")	110	+#
106		111	+# AC_SUBST(XAPIAN_CXXFLAGS)
107	###############################################################################	112	+# AC_SUBST(XAPIAN_LIBS)
108	# check for pmccabe	113	+#])
109	-AC_PATH_PROG([PMCCABE],[pmccabe],[no])
110	-AS_IF([test "x$PMCCABE" = "xno"],[
111	- have_pmccabe="no"
112	- AC_MSG_WARN([
113	- *** Developers: you do not seem to have the pmccabe tool installed.
114	- *** Please install it if you want to run the automated code checks])
115	-],[have_pmccabe="yes"])
116	+#AC_PATH_PROG([PMCCABE],[pmccabe],[no])
117	+#AS_IF([test "x$PMCCABE" = "xno"],[
118	+# have_pmccabe="no"
119	+# AC_MSG_WARN([
120	+# *** Developers: you do not seem to have the pmccabe tool installed.
121	+# *** Please install it if you want to run the automated code checks])
122	+#],[have_pmccabe="yes"])
123	###############################################################################	114	###############################################################################
		115	# we set the set the version of the MuStore (Xapian database) layout
		116	# here; it will become part of the db name, so we can automatically
		117	@@ -258,27 +258,8 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
124		118
125	AC_CONFIG_FILES([	119	AC_CONFIG_FILES([
126	Makefile	120	Makefile
127	-mu/Makefile	121	-mu/Makefile
128	-mu/tests/Makefile	122	-mu/mu-memcheck
129	-lib/Makefile	123	-lib/Makefile
130	-lib/doxyfile	124	-lib/doxyfile
131	-lib/parser/Makefile	125	-lib/utils/Makefile
132	-lib/tests/Makefile	126	-lib/query/Makefile
133	mu4e/Makefile	127	mu4e/Makefile
134	mu4e/mu4e-meta.el	128	mu4e/mu4e-meta.el
135	-guile/Makefile	129	-guile/Makefile
Lines 140-149 Link Here
140	-guile/scripts/Makefile	134	-guile/scripts/Makefile
141	-toys/Makefile	135	-toys/Makefile
142	-toys/mug/Makefile	136	-toys/mug/Makefile
143	-toys/msg2pdf/Makefile
144	-man/Makefile	137	-man/Makefile
145	-m4/Makefile	138	-m4/Makefile
146	-contrib/Makefile	139	-contrib/Makefile
		140	-],[
		141	- [chmod +x mu/mu-memcheck]
147	])	142	])
148	AC_OUTPUT	143	AC_OUTPUT
149		144

Lines 11-16 Link Here

(-)b/mail/mu4e/pkg-plist (-3 / +4 lines)
11	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc	11	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
12	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz	12	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz
13	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc	13	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
		14	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.el.gz
		15	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.elc
14	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz	16	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz
15	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc	17	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
16	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz	18	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz
Lines 21-26 Link Here
21	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc	23	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
22	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el.gz	24	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.el.gz
23	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc	25	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-meta.elc
		26	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.el.gz
		27	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.elc
24	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el.gz	28	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.el.gz
25	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc	29	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-proc.elc
26	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz	30	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz
Lines 35-39 Link Here
35	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc	39	%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
36	%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz	40	%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz
37	%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc	41	%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc
38	%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.el.gz
39	%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.elc
40	-