databases/bbdb: Update to 3.2, fix w/ Emacs 26.1, add pkg-message

PR:		227257
Reported by:	emss@free.fr

5 files changed, 50 insertions, 27 deletions

diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 2fc530a4641b..51f7b69d0d21 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	bbdb
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.2
 CATEGORIES=	databases elisp
-MASTER_SITES=	SAVANNAH
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,32 +12,39 @@ COMMENT=	Big Brother Database
 
 LICENSE=	GPLv3+
 
-.if ${FLAVOR:U} != devel && ${FLAVOR:U} != devel_nox
-# http://pkg.awarnach.mathstat.dal.ca/data/11i386-default/2018-05-30_07h36m11s/logs/errors/bbdb-emacs26-3.1.2_1.log
-BROKEN=		fails to build
-.endif
-
-# do not depend on base texinfo on 10
 BUILD_DEPENDS=	texi2dvi:print/texinfo
 
-USES=		emacs
+USES=		autoreconf emacs
+USE_GITHUB=	yes
+GH_ACCOUNT=	emacsmirror
 USE_TEX=	latex:build
 
 BBDB_LISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-INFO=		bbdb
+# Do not install the info file.  Upstream has yet to add any real content to it.
+#INFO=		bbdb
 PORTDOCS=	bbdb.pdf
 NO_ARCH=	yes
 PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 
+MAKE_JOBS_UNSAFE=	yes
+
 OPTIONS_DEFINE=	DOCS
 
+# See http://lists.nongnu.org/archive/html/bbdb-user/2018-11/msg00003.html
+.if ${FLAVOR:U} != devel_full && ${FLAVOR:U} != devel_nox
+post-configure:
+	${REINPLACE_CMD} -e '/[[:blank:]]*--eval '\''(setq byte-compile-dest-file-function (lambda (_) "$$@"))'\'' \\/d' \
+		${WRKSRC}/lisp/Makefile
+.endif
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \
 		${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
-		${STAGEDIR}${PREFIX}/${INFO_PATH}
+# Do not install the info file.  Upstream has yet to add any real content to it.
+#	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
+#		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/bbdb/distinfo b/databases/bbdb/distinfo
index e83055742595..2f18b76c1ced 100644
--- a/databases/bbdb/distinfo
+++ b/databases/bbdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513893339
-SHA256 (bbdb-3.1.2.tar.gz) = 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf
-SIZE (bbdb-3.1.2.tar.gz) = 378935
+TIMESTAMP = 1542049821
+SHA256 (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 36482abe5e9c11b9262334ae741b8828b9e76e708e54900559a70974f9f0b5df
+SIZE (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 189456
diff --git a/databases/bbdb/pkg-descr b/databases/bbdb/pkg-descr
index 9b1586244486..76a4bd072d1a 100644
--- a/databases/bbdb/pkg-descr
+++ b/databases/bbdb/pkg-descr
@@ -1,10 +1,7 @@
-BBDB is a rolodex-like database program for GNU Emacs.  BBDB stands
-for Insidious Big Brother Database, and is not, repeat, _not_ an
-obscure reference to the Buck Rogers TV series.
+BBDB is the Insidious Big Brother Database for GNU Emacs. It provides an
+address book for email and snail mail addresses, phone numbers and the
+like. It can be linked with various Emacs mail clients (Message and Mail
+mode, Rmail, Gnus, MH-E, Mu4e, VM, and Wanderlust). BBDB is fully
+customizable.
 
-Put the expression below into your ~/.emacs
-
-(require 'bbdb)
-(bbdb-initialize)
-
-WWW: http://bbdb.sourceforge.net/
+WWW: http://savannah.nongnu.org/projects/bbdb/
diff --git a/databases/bbdb/pkg-message b/databases/bbdb/pkg-message
new file mode 100644
index 000000000000..f5bc2ae1046b
--- /dev/null
+++ b/databases/bbdb/pkg-message
@@ -0,0 +1,15 @@
+########################################################################
+Add these lines to your Emacs initialization.
+
+(require 'bbdb-loaddefs)
+(require 'bbdb)
+
+Depending on which mail user agent and other miscellaneous packages you
+use, you may also want to add something like these lines.
+
+(bbdb-initialize 'gnus 'message)
+(bbdb-mua-auto-update-init 'gnus 'message)
+
+Refer to Emacs' help for these two functions, bbdb-initialize and
+bbdb-mua-auto-update-init, for details.
+########################################################################
diff --git a/databases/bbdb/pkg-plist b/databases/bbdb/pkg-plist
index b4550c6bcdce..6c76a7c01dff 100644
--- a/databases/bbdb/pkg-plist
+++ b/databases/bbdb/pkg-plist
@@ -2,6 +2,8 @@
 %%BBDB_LISPDIR%%/bbdb-anniv.elc
 %%BBDB_LISPDIR%%/bbdb-com.el
 %%BBDB_LISPDIR%%/bbdb-com.elc
+%%BBDB_LISPDIR%%/bbdb-gnus-aux.el
+%%BBDB_LISPDIR%%/bbdb-gnus-aux.elc
 %%BBDB_LISPDIR%%/bbdb-gnus.el
 %%BBDB_LISPDIR%%/bbdb-gnus.elc
 %%BBDB_LISPDIR%%/bbdb-ispell.el
@@ -13,13 +15,12 @@
 %%BBDB_LISPDIR%%/bbdb-mhe.elc
 %%BBDB_LISPDIR%%/bbdb-migrate.el
 %%BBDB_LISPDIR%%/bbdb-migrate.elc
+%%BBDB_LISPDIR%%/bbdb-mu4e.el
 %%BBDB_LISPDIR%%/bbdb-mua.el
 %%BBDB_LISPDIR%%/bbdb-mua.elc
 %%BBDB_LISPDIR%%/bbdb-pgp.el
 %%BBDB_LISPDIR%%/bbdb-pgp.elc
 %%BBDB_LISPDIR%%/bbdb-pkg.el
-%%BBDB_LISPDIR%%/bbdb-print.el
-%%BBDB_LISPDIR%%/bbdb-print.elc
 %%BBDB_LISPDIR%%/bbdb-rmail.el
 %%BBDB_LISPDIR%%/bbdb-rmail.elc
 %%BBDB_LISPDIR%%/bbdb-sc.el
@@ -28,6 +29,10 @@
 %%BBDB_LISPDIR%%/bbdb-site.elc
 %%BBDB_LISPDIR%%/bbdb-snarf.el
 %%BBDB_LISPDIR%%/bbdb-snarf.elc
+%%BBDB_LISPDIR%%/bbdb-tex.el
+%%BBDB_LISPDIR%%/bbdb-tex.elc
+%%BBDB_LISPDIR%%/bbdb-vm-aux.el
 %%BBDB_LISPDIR%%/bbdb-vm.el
+%%BBDB_LISPDIR%%/bbdb-wl.el
 %%BBDB_LISPDIR%%/bbdb.el
 %%BBDB_LISPDIR%%/bbdb.elc