View | Details | Raw Unified | Return to bug 249244 | Differences between
and this patch

Collapse All | Expand All

(-)mu/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mu
4
PORTNAME=	mu
5
PORTVERSION=	1.2
5
PORTVERSION=	1.4.13
6
CATEGORIES=	mail
6
CATEGORIES=	mail
7
7
8
MAINTAINER=	hrs@FreeBSD.org
8
MAINTAINER=	hrs@FreeBSD.org
Lines 16-22 Link Here
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=		gmake autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
20
		libtool makeinfo pkgconfig
20
		libtool makeinfo pkgconfig
21
USE_GITHUB=	yes
21
USE_GITHUB=	yes
22
GH_ACCOUNT=	djcb
22
GH_ACCOUNT=	djcb
(-)mu/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1577309838
1
TIMESTAMP = 1599781859
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
(-)mu/pkg-plist (-16 / +2 lines)
Lines 1-9 Link Here
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
5
%%GUILE%%lib/libguile-mu.so.0
6
%%GUILE%%lib/libguile-mu.so.0.0.0
7
man/man1/mu-add.1.gz
3
man/man1/mu-add.1.gz
8
man/man1/mu-cfind.1.gz
4
man/man1/mu-cfind.1.gz
9
man/man1/mu-easy.1.gz
5
man/man1/mu-easy.1.gz
Lines 11-16 Link Here
11
man/man1/mu-find.1.gz
7
man/man1/mu-find.1.gz
12
man/man1/mu-help.1.gz
8
man/man1/mu-help.1.gz
13
man/man1/mu-index.1.gz
9
man/man1/mu-index.1.gz
10
man/man1/mu-info.1.gz
11
man/man1/mu-init.1.gz
14
man/man1/mu-mkdir.1.gz
12
man/man1/mu-mkdir.1.gz
15
man/man1/mu-remove.1.gz
13
man/man1/mu-remove.1.gz
16
man/man1/mu-script.1.gz
14
man/man1/mu-script.1.gz
Lines 18-35 Link Here
18
man/man1/mu-verify.1.gz
16
man/man1/mu-verify.1.gz
19
man/man1/mu-view.1.gz
17
man/man1/mu-view.1.gz
20
man/man1/mu.1.gz
18
man/man1/mu.1.gz
21
man/man1/mug.1.gz
22
man/man5/mu-bookmarks.5.gz
19
man/man5/mu-bookmarks.5.gz
23
man/man7/mu-query.7.gz
20
man/man7/mu-query.7.gz
24
%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
21
%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
25
%%GUILE%%share/guile/site/2.0/mu.scm
26
%%GUILE%%share/guile/site/2.0/mu/plot.scm
27
%%GUILE%%share/guile/site/2.0/mu/script.scm
28
%%GUILE%%share/guile/site/2.0/mu/stats.scm
29
%%GUILE%%%%DATADIR%%/scripts/find-dups.scm
30
%%GUILE%%%%DATADIR%%/scripts/msgs-count.scm
31
%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm
32
%%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm
33
%%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm
34
%%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm
35
%%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm
(-)mu4e/Makefile (-8 / +2 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	mu4e
3
PORTNAME=	mu4e
4
PORTVERSION=	1.2
4
PORTVERSION=	1.4.13
5
PORTREVISION=	2
6
CATEGORIES=	mail
5
CATEGORIES=	mail
7
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
6
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
8
7
Lines 13-19 Link Here
13
12
14
RUN_DEPENDS=	mu:mail/mu
13
RUN_DEPENDS=	mu:mail/mu
15
14
16
USES=		autoreconf emacs makeinfo pkgconfig
15
USES=		gmake autoreconf emacs makeinfo pkgconfig
17
USE_GITHUB=	yes
16
USE_GITHUB=	yes
18
GH_PROJECT=	mu
17
GH_PROJECT=	mu
19
GH_ACCOUNT=	djcb
18
GH_ACCOUNT=	djcb
Lines 34-44 Link Here
34
OPTIONS_DEFINE=		DOCS
33
OPTIONS_DEFINE=		DOCS
35
OPTIONS_SUB=		yes
34
OPTIONS_SUB=		yes
36
35
37
pre-build:
38
	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
39
	    ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
40
	    >> ${BUILD_WRKSRC}/Makefile
41
42
post-install:
36
post-install:
43
	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
37
	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
44
	    ${GZIP_CMD} *.el
38
	    ${GZIP_CMD} *.el
(-)mu4e/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1577310090
1
TIMESTAMP = 1599781274
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
(-)mu4e/files/byte-compile.mk (-18 lines)
Lines 1-18 Link Here
1
# $FreeBSD$
2
.el.elc:
3
	if test '$(EMACS)' != no; then \
4
	  am__dir=. am__subdir_includes=''; \
5
	  case $@ in */*) \
6
	    am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
7
	    am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
8
	  esac; \
9
	  test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
10
	  $(EMACS) --batch \
11
	    $(AM_ELCFLAGS) $(ELCFLAGS) \
12
	    $$am__subdir_includes -L $(builddir) -L $(srcdir) \
13
	    --eval '(setq byte-compile-dest-file-function (lambda (_) "/tmp/$@"))' \
14
	    -f batch-byte-compile '$<'; \
15
	    if [ -f "/tmp/$@" ]; then \
16
		cp /tmp/$@ $@ && rm -f /tmp/$@; \
17
	    fi; \
18
	else :; fi
(-)mu4e/files/patch-configure.ac (-149 lines)
Lines 1-149 Link Here
1
--- configure.ac.orig	2019-04-07 07:54:18 UTC
2
+++ configure.ac
3
@@ -37,31 +37,31 @@ AC_SUBST(prefix)
4
 
5
 # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
6
 # when a c++ compiler is not found. Weird, huh?
7
-AC_PROG_CXX
8
-AC_PROG_CC
9
-AC_PROG_CC_STDC
10
-AC_PROG_CC_C99
11
+#AC_PROG_CXX
12
+#AC_PROG_CC
13
+#AC_PROG_CC_STDC
14
+#AC_PROG_CC_C99
15
 AC_PROG_INSTALL
16
-AC_HEADER_STDC
17
+#AC_HEADER_STDC
18
 
19
 extra_flags="-Wformat-security		\
20
              -Wstack-protector		\
21
 	     -Wstack-protector-all	\
22
 	     -Wno-cast-function-type"
23
 
24
-AX_CXX_COMPILE_STDCXX_14
25
-m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
26
-AX_VALGRIND_CHECK
27
+#AX_CXX_COMPILE_STDCXX_14
28
+#m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
29
+#AX_VALGRIND_CHECK
30
 
31
 # for now, use AM_PROG_LIBTOOL, as we don't want to require
32
 # a too new setup for autotools/libtool
33
-AM_PROG_LIBTOOL
34
+#AM_PROG_LIBTOOL
35
 #LT_INIT([disable-shared])
36
 
37
 AC_PROG_AWK
38
 AC_CHECK_PROG(SORT,sort,sort)
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
 
47
 # glib2?
48
 # we pick some late-2012 version
49
-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)
50
+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.32 gobject-2.0 gio-2.0)
51
 AC_SUBST(GLIB_CFLAGS)
52
 AC_SUBST(GLIB_LIBS)
53
 glib_version="`$PKG_CONFIG --modversion glib-2.0`"
54
 
55
 # gmime, version 3.0 or higher
56
-PKG_CHECK_MODULES(GMIME,gmime-3.0)
57
+# PKG_CHECK_MODULES(GMIME,gmime-3.0)
58
 AC_SUBST(GMIME_CFLAGS)
59
 AC_SUBST(GMIME_LIBS)
60
 gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
61
 
62
 # 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])
64
+# 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"],[
66
   AC_SUBST(JSON_GLIB_CFLAGS)
67
   AC_SUBST(JSON_GLIB_LIBS)
68
@@ -172,21 +172,21 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
69
 AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
70
 
71
 # xapian checking - we need 1.4 at least
72
-AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
73
-AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
74
-AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
75
-   AC_MSG_ERROR([
76
-   *** xapian could not be found; please install it
77
-   *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
78
-   *** If you compiled it yourself, you should ensure that xapian-config
79
-   *** is in your PATH.])],
80
-   [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
81
-
82
-AS_CASE([$xapian_version],
83
-	[1.[[4-9]].[[0-9]]*],
84
-	  [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
85
-	[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
86
-
87
+# AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
88
+# AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
89
+# AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
90
+#   AC_MSG_ERROR([
91
+#    *** xapian could not be found; please install it
92
+#    *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
93
+#    *** If you compiled it yourself, you should ensure that xapian-config
94
+#    *** is in your PATH.])],
95
+#    [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
96
+#
97
+#AS_CASE([$xapian_version],
98
+#	[1.[[4-9]].[[0-9]]*],
99
+#	  [AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
100
+#	[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
101
+#
102
 XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
103
 XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
104
 have_xapian="yes"
105
@@ -261,37 +261,19 @@ AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
106
 
107
 ###############################################################################
108
 # check for pmccabe
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
 ###############################################################################
124
 
125
 AC_CONFIG_FILES([
126
 Makefile
127
-mu/Makefile
128
-mu/tests/Makefile
129
-lib/Makefile
130
-lib/doxyfile
131
-lib/parser/Makefile
132
-lib/tests/Makefile
133
 mu4e/Makefile
134
 mu4e/mu4e-meta.el
135
-guile/Makefile
136
-guile/texi.texi
137
-guile/mu/Makefile
138
-guile/examples/Makefile
139
-guile/tests/Makefile
140
-guile/scripts/Makefile
141
-toys/Makefile
142
-toys/mug/Makefile
143
-toys/msg2pdf/Makefile
144
-man/Makefile
145
-m4/Makefile
146
-contrib/Makefile
147
 ])
148
 AC_OUTPUT
149
 
(-)mu4e/pkg-plist (-4 / +8 lines)
Lines 3-16 Link Here
3
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
3
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
4
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
4
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
5
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
5
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
6
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
7
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
6
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
8
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
7
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
9
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
8
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
9
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
10
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
10
%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
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
42
share/info/dir
39
%%EMACS_SITE_LISPDIR%%/mu4e/org-old-mu4e.elc
43
share/info/mu4e.info

Return to bug 249244