freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unbreak GUILE option. During generation of documentation, docstrings and

Browse Source 
other information is extracted from preprocessed (cc -E) *.c files using
bundled clexer tool, which is part of GINT [1].

Under some circumstances (probably subject to the compiler, as the problem
does not occur on 9.3 and -CURRENT), ``arglist (SCM mbox)'' expression in
`mu_mailbox.c' becomes separated by the linemarker (# 470 "mu_mailbox.c").

Upstream maintainer believes that preprocessor is wrong, but might include
a workaround in clexer for this situation.  Meanwhile, just suppress line
markers with -P switch since they are normally ignored anyway.

http://puszcza.gnu.org.ua/software/gint/ [1]
This commit is contained in:
Alexey Dokuchaev
2016-12-28 11:59:40 +00:00
parent fedfe01227
commit a1e5a44c37
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mail/mailutils/Makefile
View File

@@ -42,7 +42,6 @@ GSSAPI_CONFIGURE_WITH= gssapi
GUILE_LIB_DEPENDS= libguile.so:lang/guile
GUILE_CONFIGURE_WITH= guile
GUILE_BROKEN= does not build: ERROR: invalid arglist syntax: (hash paren_open SCM mbox paren_close)
MH_CONFIGURE_ENABLE= mh
@@ -87,5 +86,6 @@ post-patch:
@${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' \
${WRKSRC}/dotlock/Makefile.in \
${WRKSRC}/maidag/Makefile.in
@${REINPLACE_CMD} -e 's,-E,& -P,' ${WRKSRC}/libmu_scm/Makefile.in
.include <bsd.port.mk>

15
mail/mailutils/pkg-plist
View File

@@ -1,6 +1,7 @@
@(root,mail,2755) bin/dotlock
bin/frm
bin/from
%%GUILE%%bin/guimb
bin/mail
bin/mailutils
bin/mailutils-config
@@ -39,6 +40,7 @@ bin/movemail
bin/popauth
bin/readmsg
bin/sieve
%%GUILE%%bin/sieve2scm
include/mailutils/acl.h
include/mailutils/address.h
include/mailutils/alloc.h
@@ -163,6 +165,7 @@ include/mailutils/url.h
include/mailutils/util.h
include/mailutils/version.h
include/mailutils/wordsplit.h
%%GUILE%%lib/libguile-mailutils-v-3.1.1.so
lib/libmailutils.a
lib/libmailutils.so
lib/libmailutils.so.5
@@ -171,6 +174,10 @@ lib/libmu_auth.a
lib/libmu_auth.so
lib/libmu_auth.so.5
lib/libmu_auth.so.5.0.1
%%GUILE%%lib/libmu_scm.a
%%GUILE%%lib/libmu_scm.so
%%GUILE%%lib/libmu_scm.so.5
%%GUILE%%lib/libmu_scm.so.5.0.1
lib/libmu_dbm.a
lib/libmu_dbm.so
lib/libmu_dbm.so.5
@@ -306,6 +313,14 @@ sbin/pop3d
share/aclocal/mailutils.m4
%%MH%%share/emacs/site-lisp/mailutils-mh.el
%%MH%%share/emacs/site-lisp/mailutils-mh.elc
%%GUILE%%share/guile/site/mailutils/guile-procedures.txt
%%GUILE%%share/guile/site/mailutils/mailutils.scm
%%GUILE%%share/guile/site/mailutils/sieve-core.scm
%%GUILE%%share/guile/site/mailutils/sieve-modules/mimeheader.scm
%%GUILE%%share/guile/site/mailutils/sieve-modules/numaddr.scm
%%GUILE%%share/guile/site/mailutils/sieve-modules/redirect.scm
%%GUILE%%share/guile/site/mailutils/sieve-modules/reject.scm
%%GUILE%%share/guile/site/mailutils/sieve-modules/vacation.scm
%%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo
%%NLS%%share/locale/de/LC_MESSAGES/mailutils.mo
%%NLS%%share/locale/es/LC_MESSAGES/mailutils.mo