Page MenuHomeFreeBSD
Files F151961985

D8914.id23857.diff
No OneTemporary
Actions

D8914.id23857.diff
View Options

Index: comms/ncid/Makefile
===================================================================
--- comms/ncid/Makefile
+++ comms/ncid/Makefile
@@ -2,23 +2,28 @@
# $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
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/doc/GPL.md
BUILD_DEPENDS= bash:shells/bash
+RUN_DEPENDS= bash:shells/bash
USES= gmake perl5 tk shebangfix
-SHEBANG_FILES= extensions/hangup-message.sh \
- extensions/hangup-skel.sh \
- logrotate/ncidrotate.sh
+SHEBANG_FILES= extensions/*.sh \
+ gateway/*.pl \
+ gateway/*.sh \
+ logrotate/*.sh \
+ modules/*.sh \
+ setup/*.sh \
+ tools/*.pl
ALL_TARGET= local
MAKE_ARGS= WISH=${WISH} TCLSH=${TCLSH}
INSTALL_TARGET= freebsd-install
@@ -34,7 +39,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-PORTDOCS= *
+PORTDOCS= CHANGES Clients.md Gateways.md Log.md Tools.md ReleaseNotes.md
post-extract:
@cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
@@ -58,27 +63,32 @@
do-install:
@${MKDIR} ${STAGEDIR}${ETCDIR}
${INSTALL_PROGRAM} ${WRKSRC}/server/ncidd ${STAGEDIR}${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/server/ncidd.conf ${STAGEDIR}${ETCDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/gateway/ncid2ncid ${STAGEDIR}${PREFIX}/bin
${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
+ ${INSTALL_SCRIPT} ${WRKSRC}/client/ncid ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/client/ncid.conf ${STAGEDIR}${ETCDIR}/ncid.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/gateway/ncid2ncid.conf ${STAGEDIR}${ETCDIR}/ncid2ncid.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/gateway/sip2ncid.conf ${STAGEDIR}${ETCDIR}/sip2ncid.conf.sample
+.for d in ncidd.alias ncidd.conf ncidd.blacklist ncidd.whitelist
+ ${INSTALL_DATA} ${WRKSRC}/server/${d} ${STAGEDIR}${ETCDIR}/${d}.sample
+.endfor
+.for e in hangup-calls hangup-closed-skel hangup-message-skel hangup-skel
@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/extensions
${INSTALL_SCRIPT} ${WRKSRC}/extensions/${e} ${STAGEDIR}${PREFIX}/share/ncid/extensions
.endfor
-.for f in ncid2ncid obi2ncid rn2ncid yac2ncid wc2ncid
- ${INSTALL_DATA} ${WRKSRC}/gateway/${f} ${STAGEDIR}${PREFIX}/bin
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ncid2ncid
+.for f in email2ncid obi2ncid rn2ncid yac2ncid wc2ncid
+ ${INSTALL_SCRIPT} ${WRKSRC}/gateway/${f} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/gateway/${f}.conf ${STAGEDIR}${ETCDIR}/${f}.conf.sample
.endfor
${INSTALL_DATA} ${WRKSRC}/client/ncid.gif ${STAGEDIR}${PREFIX}/share/pixmaps/ncid
@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/modules
.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/modules
+ ${INSTALL_SCRIPT} ${WRKSRC}/modules/${g} ${STAGEDIR}${PREFIX}/share/ncid/modules
.endfor
- ${INSTALL_DATA} ${WRKSRC}/server/ncidd.alias ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/server/ncidd.alias ${STAGEDIR}${ETCDIR}/ncidd.alias.sample
.for h in cidcall cidalias cidupdate wct ncidutil
- ${INSTALL_DATA} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin
.endfor
.for i in ncidd ncid2ncid obi2ncid rn2ncid sip2ncid wc2ncid yac2ncid ncid-mythtv ncid-notify \
ncid-page ncid-samba ncid-speak ncid-yac ncid-initmodem
@@ -88,6 +98,11 @@
@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/recordings
${INSTALL_DATA} ${WRKSRC}/recordings/${j} ${STAGEDIR}${PREFIX}/share/ncid/recordings
.endfor
+.for k in ncid-email2ncid-setup ncid-mysql-setup
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/setup
+ ${INSTALL_SCRIPT} ${WRKSRC}/setup/ncid-setup ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${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
@@ -94,15 +109,18 @@
${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${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
- ${INSTALL_DATA} ${WRKSRC}/recordings/${k} ${STAGEDIR}${DOCSDIR}/recordings
+.for l in README.recordings NumberDisconnected.pvf CallingDeposit.pvf NotInService.pvf
+ ${INSTALL_DATA} ${WRKSRC}/recordings/${l} ${STAGEDIR}${DOCSDIR}/recordings
.endfor
post-install-LOGROTATE-on:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/sys
- ${INSTALL_SCRIPT} ${WRKSRC}/logrotate/ncidrotate.sh ${STAGEDIR}${PREFIX}/share/ncid/sys
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/ncid-yearlog ${STAGEDIR}${PREFIX}/share/ncid/sys
+ ${INSTALL_SCRIPT} ${WRKSRC}/logrotate/ncidrotate ${STAGEDIR}${PREFIX}/share/ncid/sys
+ ${INSTALL_DATA} ${WRKSRC}/logrotate/ncidrotate.conf ${STAGEDIR}${ETCDIR}/ncidrotate.conf.sample
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/logrotate.d
${INSTALL_DATA} ${WRKSRC}/logrotate/ncid ${STAGEDIR}${PREFIX}/etc/logrotate.d
${INSTALL_MAN} ${WRKSRC}/logrotate/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
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
@@ -1,16 +1,20 @@
bin/cidalias
bin/cidcall
bin/cidupdate
+bin/email2ncid
bin/ncid
bin/ncid2ncid
bin/ncidutil
+bin/ncid-setup
bin/obi2ncid
bin/rn2ncid
bin/wc2ncid
bin/wct
bin/yac2ncid
-%%DATADIR%%/extensions/hangup-message.sh
-%%DATADIR%%/extensions/hangup-skel.sh
+%%DATADIR%%/extensions/hangup-calls
+%%DATADIR%%/extensions/hangup-closed-skel
+%%DATADIR%%/extensions/hangup-message-skel
+%%DATADIR%%/extensions/hangup-skel
%%DATADIR%%/modules/ncid-alert
%%DATADIR%%/modules/ncid-initmodem
%%DATADIR%%/modules/ncid-kpopup
@@ -25,13 +29,30 @@
%%DATADIR%%/recordings/CallingDeposit.rmd
%%DATADIR%%/recordings/NotInService.rmd
%%DATADIR%%/recordings/NumberDisconnected.rmd
-%%LOGROTATE%%%%DATADIR%%/sys/ncidrotate.sh
+%%DATADIR%%/setup/ncid-email2ncid-setup
+%%DATADIR%%/setup/ncid-mysql-setup
+%%LOGROTATE%%%%DATADIR%%/sys/ncid-yearlog
+%%LOGROTATE%%%%DATADIR%%/sys/ncidrotate
+%%LOGROTATE%%%%ETCDIR%%/ncidrotate.conf.sample
%%LOGROTATE%%etc/logrotate.d/ncid
%%LOGROTATE%%man/man1/ncidrotate.1.gz
%%LOGROTATE%%man/man5/ncidrotate.conf.5.gz
-%%ETCDIR%%/ncid.conf
-%%ETCDIR%%/ncidd.alias
-%%ETCDIR%%/ncidd.conf
+%%PORTDOCS%%%%DOCSDIR%%/recordings/CallingDeposit.pvf
+%%PORTDOCS%%%%DOCSDIR%%/recordings/NotInService.pvf
+%%PORTDOCS%%%%DOCSDIR%%/recordings/NumberDisconnected.pvf
+%%PORTDOCS%%%%DOCSDIR%%/recordings/README.recordings
+@sample %%ETCDIR%%/email2ncid.conf.sample
+@sample %%ETCDIR%%/ncid2ncid.conf.sample
+@sample %%ETCDIR%%/ncid.conf.sample
+@sample %%ETCDIR%%/ncidd.alias.sample
+@sample %%ETCDIR%%/ncidd.blacklist.sample
+@sample %%ETCDIR%%/ncidd.conf.sample
+@sample %%ETCDIR%%/ncidd.whitelist.sample
+@sample %%ETCDIR%%/obi2ncid.conf.sample
+@sample %%ETCDIR%%/rn2ncid.conf.sample
+@sample %%ETCDIR%%/sip2ncid.conf.sample
+@sample %%ETCDIR%%/wc2ncid.conf.sample
+@sample %%ETCDIR%%/yac2ncid.conf.sample
etc/rc.d/ncid-initmodem
etc/rc.d/ncid-mythtv
etc/rc.d/ncid-notify
@@ -49,19 +70,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 +98,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 +114,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

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 7:25 PM (16 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31365890
Default Alt Text
D8914.id23857.diff (9 KB)

Event Timeline