3 files changed, 112 insertions, 56 deletions

diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index 697e79e13aa2..fe108dfced9e 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -2,60 +2,85 @@
 # $FreeBSD$
 
 PORTNAME=	ncid
-PORTVERSION=	0.84
+PORTVERSION=	0.89
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.1//g}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cjpugmed@gmail.com
 COMMENT=	Network based Caller ID package
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-MAN1=		ncid.1 ncid2ncid.1 ncidrotate.1 yac2ncid.1 ncidmodules.1 ncidtools.1 \
-		cidalias.1 cidcall.1 cidupdate.1 ncid-initmodem.1 ncid-kpopup.1 ncid-mythtv.1 \
-		ncid-page.1 ncid-samba.1 ncid-skel.1 ncid-speak.1 ncid-yac.1
-MAN5=		ncid.conf.5 ncidmodules.conf.5 ncidd.alias.5 ncidrotate.conf.5 ncidd.blacklist.5 \
-		ncidsip.conf.5 sip2ncid.conf.5 ncidd.conf.5 ncid2ncid.conf.5 yac2ncid.conf.5
-MAN8=		ncidd.8 ncidsip.8 sip2ncid.8
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-USES=		gmake tk
+USES=		gmake perl5 tk
 ALL_TARGET=	local
 MAKE_ARGS=	WISH=${WISH} TCLSH=${TCLSH}
 INSTALL_TARGET=	freebsd-install
+
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+WRKSRC=	${WRKDIR}/${PORTNAME}
+PORTDOCS=	CHANGES CONTRIBUTORS.md Devices.md FAQ.md Gateways.md GettingStarted.md \
+		INSTALL-Cygwin.md INSTALL-Fedora.md INSTALL-FreeBSD.md INSTALL-Mac.md \
+		INSTALL-Raspbian.md INSTALL-TiVo.md INSTALL-Ubuntu.md INSTALL-Win.md \
+		INSTALL.md LICENSE Modems.md NCID-SDK.odt README.docdir ReleaseNotes.md \
+		TODO.md Verbose.md mk-epub ncid-1.jpg
+
+.include <bsd.port.options.mk>
+
 post-extract:
-	@cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
+	cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
 		x=`echo $$i | cut -f 1 -d .`; ${CP} $$i $$x; done
 
 post-patch:
-	@${GREP} -lr 'etc/ncid' ${WRKSRC}/|${XARGS} ${REINPLACE_CMD} -Ee\
-		's,(/usr/local/etc/ncid|/etc/ncid),${ETCDIR},g'
-	@${FIND} ${WRKSRC}/ -name Makefile|${XARGS} ${REINPLACE_CMD} -Ee\
+	${GREP} -lr 'etc/ncid' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -Ee \
+		's,(/usr/local/etc/ncid | /etc/ncid),${ETCDIR},g'
+	${FIND} ${WRKSRC}/ -name Makefile | ${XARGS} ${REINPLACE_CMD} -Ee \
 		'/install:/s,install-(etc|logrotate),,'
-	@${REINPLACE_CMD} -Ee '/mkdir.*(INIT|ROTATE|BIN|LOG|ETC)/d;\
+	${REINPLACE_CMD} -Ee '/mkdir.*(INIT|ROTATE|BIN|LOG|ETC)/d ;\
 		/CFLAGS.*=/s|=|+=|' ${WRKSRC}/Makefile
 # Respect PREFIX/MANPREFIX/DATADIR
-	@${REINPLACE_CMD} -e's|prefix.*= /usr/local|prefix=$${PREFIX}|g' \
+	${REINPLACE_CMD} -e 's|prefix.*= /usr/local|prefix=$${PREFIX}|g' \
 		-e 's|$$(prefix)/bin|$${PREFIX}/bin|g' \
 		-e 's|$$(prefix)/sbin|$${PREFIX}/sbin|g' \
 		-e 's|$$(prefix)/share|$${PREFIX}/share|g' \
 		-e 's|$$(SHARE)/man|$${MANPREFIX}/man/|g' \
 		-e 's|$$(SHARE)/ncid|$${DATADIR}|g' ${WRKSRC}/Makefile
 
-post-install:
-	@${INSTALL} -d ${ETCDIR}/
-	@cd ${WRKSRC};for i in server/*.alias scripts/*.conf;do\
-		ib=`basename $$i`;\
-		${INSTALL_DATA} $$i ${ETCDIR}/$$ib.dist;\
-		${CP} -n ${ETCDIR}/$$ib.dist ${ETCDIR}/$$ib || ${TRUE} ;\
-		${ECHO_CMD} "@unexec cd %D/${ETCDIR_REL}/;! cmp -s $$ib $$ib.dist||\
-			${RM} -f $$ib">>${TMPPLIST};\
-		${ECHO_CMD} "${ETCDIR_REL}/$$ib.dist">>${TMPPLIST};\
-		${ECHO_CMD} "@exec ${CP} -n %D/%F %D/${ETCDIR_REL}/$$ib">>${TMPPLIST};\
-	done
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/${ETCDIR_REL} 2>/dev/null || true">>${TMPPLIST}
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/server/ncidd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/gateway/sip2ncid ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/client/ncid ${STAGEDIR}${PREFIX}/bin
+.for f in ncid2ncid rn2ncid yac2ncid wc2ncid
+	${INSTALL_DATA} ${WRKSRC}/gateway/${f} ${STAGEDIR}${PREFIX}/bin
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ncid2ncid
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/client/ncid.gif ${STAGEDIR}${PREFIX}/share/pixmaps/ncid
+.for g in ncid-page ncid-samba ncid-speak ncid-mythtv ncid-kpopup ncid-skel \
+ncid-alert ncid-yac ncid-initmodem ncid-notify ncid-wakeup
+	${INSTALL_DATA}	${WRKSRC}/modules/${g} ${STAGEDIR}${PREFIX}/share/ncid
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/server/ncidd.alias ${STAGEDIR}${ETCDIR}
+.for h in cidcall cidalias cidupdate wct ncidutil
+	${INSTALL_DATA} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin
+.endfor
+.for i in ncidd ncid2ncid rn2ncid sip2ncid wc2ncid yac2ncid ncid-mythtv ncid-notify \
+ncid-page ncid-samba ncid-speak ncid-yac ncid-initmodem
+	${INSTALL_DATA} ${WRKSRC}/FreeBSD/${i} ${STAGEDIR}${PREFIX}/etc/rc.d
+.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for j in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR}
+.endfor
+.endif
+	${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
+	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/comms/ncid/distinfo b/comms/ncid/distinfo
index a07faad54fa1..23003d4f4d53 100644
--- a/comms/ncid/distinfo
+++ b/comms/ncid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncid-0.84-src.tar.gz) = 6e65d0f1ca58279ca79abc45fa9421ec84ab172ed4154086fbf1c4c18a70cdb3
-SIZE (ncid-0.84-src.tar.gz) = 335510
+SHA256 (ncid-0.89-src.tar.gz) = 4dd45fffe85196123f3d805ec0a180ad566eb41b38f41270e0a18777d2a5ad1b
+SIZE (ncid-0.89-src.tar.gz) = 560880
diff --git a/comms/ncid/pkg-plist b/comms/ncid/pkg-plist
index f9e075fffcc2..2eb2751c3c85 100644
--- a/comms/ncid/pkg-plist
+++ b/comms/ncid/pkg-plist
@@ -1,34 +1,65 @@
-sbin/ncidd
-sbin/ncidsip
-sbin/sip2ncid
-bin/ncid
-bin/ncid2ncid
 bin/cidalias
 bin/cidcall
 bin/cidupdate
+bin/ncid
+bin/ncid2ncid
+bin/ncidutil
+bin/rn2ncid
+bin/wc2ncid
+bin/wct
 bin/yac2ncid
-etc/logrotate.d/ncid
-@dirrm etc/logrotate.d
+%%ETCDIR%%/ncidd.alias
 etc/rc.d/ncid-initmodem
+etc/rc.d/ncid-mythtv
+etc/rc.d/ncid-notify
 etc/rc.d/ncid-page
 etc/rc.d/ncid-samba
-etc/rc.d/ncid-yac
-etc/rc.d/ncidsip
-etc/rc.d/yac2ncid
-etc/rc.d/ncid-mythtv
 etc/rc.d/ncid-speak
-etc/rc.d/ncidd
+etc/rc.d/ncid-yac
 etc/rc.d/ncid2ncid
+etc/rc.d/ncidd
+etc/rc.d/rn2ncid
 etc/rc.d/sip2ncid
-%%DATADIR%%/ncid-initmodem
-%%DATADIR%%/ncidrotate
-%%DATADIR%%/ncid-kpopup
-%%DATADIR%%/ncid-mythtv
-%%DATADIR%%/ncid-page
-%%DATADIR%%/ncid-samba
-%%DATADIR%%/ncid-skel
-%%DATADIR%%/ncid-speak
-%%DATADIR%%/ncid-yac
-@dirrm %%DATADIR%%
-share/pixmaps/ncid/ncid.gif
-@dirrmtry share/pixmaps/ncid
+etc/rc.d/wc2ncid
+etc/rc.d/yac2ncid
+man/man1/cidalias.1.gz
+man/man1/cidcall.1.gz
+man/man1/cidupdate.1.gz
+man/man1/ncid-alert.1.gz
+man/man1/ncid-initmodem.1.gz
+man/man1/ncid-kpopup.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-skel.1.gz
+man/man1/ncid-speak.1.gz
+man/man1/ncid-wakeup.1.gz
+man/man1/ncid-yac.1.gz
+man/man1/ncid.1.gz
+man/man1/ncid2ncid.1.gz
+man/man1/ncidutil.1.gz
+man/man1/rn2ncid.1.gz
+man/man1/wc2ncid.1.gz
+man/man1/wct.1.gz
+man/man1/yac2ncid.1.gz
+man/man5/ncid.conf.5.gz
+man/man5/ncid2ncid.conf.5.gz
+man/man5/ncidd.alias.5.gz
+man/man5/ncidd.blacklist.5.gz
+man/man5/ncidd.conf.5.gz
+man/man5/ncidd.whitelist.5.gz
+man/man5/rn2ncid.conf.5.gz
+man/man5/sip2ncid.conf.5.gz
+man/man5/wc2ncid.conf.5.gz
+man/man5/yac2ncid.conf.5.gz
+man/man7/ncid-modules.7.gz
+man/man7/ncidgateways.7.gz
+man/man7/ncidtools.7.gz
+man/man8/ncidd.8.gz
+man/man8/sip2ncid.8.gz
+sbin/ncidd
+sbin/sip2ncid
+%%DATADIR%%
+share/pixmaps/ncid
+@dirrmtry %%ETCDIR%%