Index: comms/ncid/Makefile
===================================================================
--- comms/ncid/Makefile
+++ comms/ncid/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	ncid
-PORTVERSION=	1.4
+PORTVERSION=	1.6
 CATEGORIES=	comms
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	cpm@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network based Caller ID package
 
 LICENSE=	GPLv3
@@ -16,9 +16,14 @@
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		gmake perl5 tk shebangfix
-SHEBANG_FILES=	extensions/hangup-message.sh \
+SHEBANG_FILES=	extensions/hangup-calls.sh \
+		extensions/hangup-closed-skel.sh \
+		extensions/hangup-message-skel.sh \
 		extensions/hangup-skel.sh \
-		logrotate/ncidrotate.sh
+		logrotate/ncidrotate.sh \
+		setup/ncid-email2ncid-setup.sh \
+		setup/ncid-mysql-setup.sh \
+		setup/ncid-setup.sh
 ALL_TARGET=	local
 MAKE_ARGS=	WISH=${WISH} TCLSH=${TCLSH}
 INSTALL_TARGET=	freebsd-install
@@ -62,7 +67,7 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/gateway/sip2ncid ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/client/ncid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/client/ncid.conf ${STAGEDIR}${ETCDIR}
-.for e in hangup-message.sh hangup-skel.sh
+.for e in hangup-calls.sh hangup-closed-skel.sh hangup-message-skel.sh hangup-skel.sh
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/extensions
 	${INSTALL_SCRIPT} ${WRKSRC}/extensions/${e} ${STAGEDIR}${PREFIX}/share/ncid/extensions
 .endfor
@@ -77,7 +82,7 @@
 	${INSTALL_DATA}	${WRKSRC}/modules/${g} ${STAGEDIR}${PREFIX}/share/ncid/modules
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/server/ncidd.alias ${STAGEDIR}${ETCDIR}
-.for h in cidcall cidalias cidupdate wct ncidutil
+.for h in cidcall cidalias cidupdate wct ncidutil ncid-yearlog
 	${INSTALL_DATA} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin
 .endfor
 .for i in ncidd ncid2ncid obi2ncid rn2ncid sip2ncid wc2ncid yac2ncid ncid-mythtv ncid-notify \
@@ -88,6 +93,10 @@
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/recordings
 	${INSTALL_DATA} ${WRKSRC}/recordings/${j} ${STAGEDIR}${PREFIX}/share/ncid/recordings
 .endfor
+.for k in ncid-email2ncid-setup.sh ncid-mysql-setup.sh ncid-setup.sh
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/setup
+	${INSTALL_DATA} ${WRKSRC}/setup/${k} ${STAGEDIR}${PREFIX}/share/ncid/setup
+.endfor
 	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/man/*.7 ${STAGEDIR}${MAN7PREFIX}/man/man7
@@ -96,7 +105,7 @@
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/recordings
-.for k in README.recordings NumberDisconnected.pvf CallingDeposit.pvf NotInService.pvf
+.for k in README.recordings NumberDisconnected.rmd CallingDeposit.rmd NotInService.rmd
 	${INSTALL_DATA} ${WRKSRC}/recordings/${k} ${STAGEDIR}${DOCSDIR}/recordings
 .endfor
 
Index: comms/ncid/distinfo
===================================================================
--- comms/ncid/distinfo
+++ comms/ncid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470326955
-SHA256 (ncid-1.4-src.tar.gz) = aad7b03a0a28412cd67544650e74636f8277e3fe9d9432c6587920c1a31d9c3f
-SIZE (ncid-1.4-src.tar.gz) = 2872361
+TIMESTAMP = 1482762108
+SHA256 (ncid-1.6-src.tar.gz) = 9e1917252cae16d82f1e4b641994447b2f57d5fef7de7f8918082913a13104f4
+SIZE (ncid-1.6-src.tar.gz) = 3170106
Index: comms/ncid/pkg-plist
===================================================================
--- comms/ncid/pkg-plist
+++ comms/ncid/pkg-plist
@@ -2,6 +2,7 @@
 bin/cidcall
 bin/cidupdate
 bin/ncid
+bin/ncid-yearlog
 bin/ncid2ncid
 bin/ncidutil
 bin/obi2ncid
@@ -9,7 +10,9 @@
 bin/wc2ncid
 bin/wct
 bin/yac2ncid
-%%DATADIR%%/extensions/hangup-message.sh
+%%DATADIR%%/extensions/hangup-calls.sh
+%%DATADIR%%/extensions/hangup-closed-skel.sh
+%%DATADIR%%/extensions/hangup-message-skel.sh
 %%DATADIR%%/extensions/hangup-skel.sh
 %%DATADIR%%/modules/ncid-alert
 %%DATADIR%%/modules/ncid-initmodem
@@ -25,6 +28,9 @@
 %%DATADIR%%/recordings/CallingDeposit.rmd
 %%DATADIR%%/recordings/NotInService.rmd
 %%DATADIR%%/recordings/NumberDisconnected.rmd
+%%DATADIR%%/setup/ncid-email2ncid-setup.sh
+%%DATADIR%%/setup/ncid-mysql-setup.sh
+%%DATADIR%%/setup/ncid-setup.sh
 %%LOGROTATE%%%%DATADIR%%/sys/ncidrotate.sh
 %%LOGROTATE%%etc/logrotate.d/ncid
 %%LOGROTATE%%man/man1/ncidrotate.1.gz
@@ -49,19 +55,26 @@
 man/man1/cidalias.1.gz
 man/man1/cidcall.1.gz
 man/man1/cidupdate.1.gz
-man/man1/hangup-message.1.gz
+man/man1/email2ncid.1.gz
+man/man1/hangup-calls.1.gz
+man/man1/hangup-closed-skel.1.gz
+man/man1/hangup-message-skel.1.gz
 man/man1/hangup-skel.1.gz
 man/man1/ncid-alert.1.gz
+man/man1/ncid-email2ncid-setup.1.gz
 man/man1/ncid-initmodem.1.gz
 man/man1/ncid-kpopup.1.gz
+man/man1/ncid-mysql.1.gz
 man/man1/ncid-mythtv.1.gz
 man/man1/ncid-notify.1.gz
 man/man1/ncid-page.1.gz
 man/man1/ncid-samba.1.gz
+man/man1/ncid-setup.1.gz
 man/man1/ncid-skel.1.gz
 man/man1/ncid-speak.1.gz
 man/man1/ncid-wakeup.1.gz
 man/man1/ncid-yac.1.gz
+man/man1/ncid-yearlog.1.gz
 man/man1/ncid.1.gz
 man/man1/ncid2ncid.1.gz
 man/man1/ncidutil.1.gz
@@ -70,6 +83,7 @@
 man/man1/wc2ncid.1.gz
 man/man1/wct.1.gz
 man/man1/yac2ncid.1.gz
+man/man5/email2ncid.conf.5.gz
 man/man5/ncid.conf.5.gz
 man/man5/ncid2ncid.conf.5.gz
 man/man5/ncidd.alias.5.gz
@@ -85,6 +99,7 @@
 man/man7/ncidgateways.7.gz
 man/man7/ncidtools.7.gz
 man/man8/ncidd.8.gz
+man/man8/ncid-mysql-setup.8.gz
 man/man8/sip2ncid.8.gz
 sbin/ncidd
 sbin/sip2ncid