3 files changed, 45 insertions, 44 deletions

diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 7be38b5661d0..19ae8e522320 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -2,40 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	bbdb
-PORTVERSION=	2.35
-PORTREVISION=	12
+DISTVERSION=	3.1.2
 CATEGORIES=	databases elisp
-MASTER_SITES=	SF
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+MASTER_SITES=	SAVANNAH
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Big Brother Database
 
-USE_EMACS=	yes
+LICENSE=	GPLv3+
 
-USES=		makeinfo
-ALL_TARGET=	bbdb info
-MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"${MAKEINFO} --no-split\""
-BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
-MAKE_JOBS_UNSAFE=	yes
+# do not depend on base texinfo on 10
+BUILD_DEPENDS=	texi2dvi:print/texinfo
+
+USES=		emacs
+USE_TEX=	latex:build
 
+BBDB_LISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
+INFO=		bbdb
+PORTDOCS=	bbdb.pdf
+NO_ARCH=	yes
+PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-INFO=	bbdb
-.endif
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
-	${INSTALL_DATA} ${WRKSRC}/texinfo/bbdb.info ${STAGEDIR}${PREFIX}/info
-.endif
+	@${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-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/bbdb.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/bbdb/distinfo b/databases/bbdb/distinfo
index c836c9a8b072..e83055742595 100644
--- a/databases/bbdb/distinfo
+++ b/databases/bbdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bbdb-2.35.tar.gz) = c71a46fcd9ae4d68d9fa970d175ff84cd85780dc3f9aec603688deff252aedb8
-SIZE (bbdb-2.35.tar.gz) = 767464
+TIMESTAMP = 1513893339
+SHA256 (bbdb-3.1.2.tar.gz) = 05780f030584ddaa717d04700bc70e7d9e929141223c7f130fc0c778d73241bf
+SIZE (bbdb-3.1.2.tar.gz) = 378935
diff --git a/databases/bbdb/pkg-plist b/databases/bbdb/pkg-plist
index 9d94a0636578..b4550c6bcdce 100644
--- a/databases/bbdb/pkg-plist
+++ b/databases/bbdb/pkg-plist
@@ -1,33 +1,33 @@
-%%BBDB_LISPDIR%%/bbdb.el
-%%BBDB_LISPDIR%%/bbdb.elc
-%%BBDB_LISPDIR%%/bbdb-autoloads.el
+%%BBDB_LISPDIR%%/bbdb-anniv.el
+%%BBDB_LISPDIR%%/bbdb-anniv.elc
 %%BBDB_LISPDIR%%/bbdb-com.el
 %%BBDB_LISPDIR%%/bbdb-com.elc
-%%BBDB_LISPDIR%%/bbdb-ftp.el
-%%BBDB_LISPDIR%%/bbdb-ftp.elc
 %%BBDB_LISPDIR%%/bbdb-gnus.el
-%%BBDB_LISPDIR%%/bbdb-gui.el
-%%BBDB_LISPDIR%%/bbdb-gui.elc
-%%BBDB_LISPDIR%%/bbdb-hooks.el
-%%BBDB_LISPDIR%%/bbdb-hooks.elc
-%%BBDB_LISPDIR%%/bbdb-merge.el
-%%BBDB_LISPDIR%%/bbdb-merge.elc
+%%BBDB_LISPDIR%%/bbdb-gnus.elc
+%%BBDB_LISPDIR%%/bbdb-ispell.el
+%%BBDB_LISPDIR%%/bbdb-ispell.elc
+%%BBDB_LISPDIR%%/bbdb-loaddefs.el
+%%BBDB_LISPDIR%%/bbdb-message.el
+%%BBDB_LISPDIR%%/bbdb-message.elc
 %%BBDB_LISPDIR%%/bbdb-mhe.el
+%%BBDB_LISPDIR%%/bbdb-mhe.elc
 %%BBDB_LISPDIR%%/bbdb-migrate.el
 %%BBDB_LISPDIR%%/bbdb-migrate.elc
+%%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-reportmail.el
 %%BBDB_LISPDIR%%/bbdb-rmail.el
+%%BBDB_LISPDIR%%/bbdb-rmail.elc
 %%BBDB_LISPDIR%%/bbdb-sc.el
 %%BBDB_LISPDIR%%/bbdb-sc.elc
+%%BBDB_LISPDIR%%/bbdb-site.el
+%%BBDB_LISPDIR%%/bbdb-site.elc
 %%BBDB_LISPDIR%%/bbdb-snarf.el
 %%BBDB_LISPDIR%%/bbdb-snarf.elc
-%%BBDB_LISPDIR%%/bbdb-srv.el
 %%BBDB_LISPDIR%%/bbdb-vm.el
-%%BBDB_LISPDIR%%/bbdb-w3.el
-%%BBDB_LISPDIR%%/bbdb-w3.elc
-%%BBDB_LISPDIR%%/bbdb-whois.el
-%%BBDB_LISPDIR%%/bbdb-whois.elc
-%%BBDB_LISPDIR%%/bbdb-xemacs.el
-%%BBDB_LISPDIR%%/bbdb-xemacs.elc
+%%BBDB_LISPDIR%%/bbdb.el
+%%BBDB_LISPDIR%%/bbdb.elc