From owner-svn-ports-all@freebsd.org Thu Jan 12 11:54:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A30EBCAC8E2; Thu, 12 Jan 2017 11:54:08 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 639771CD7; Thu, 12 Jan 2017 11:54:08 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CBs7oj038018; Thu, 12 Jan 2017 11:54:07 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CBs7Dv038015; Thu, 12 Jan 2017 11:54:07 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701121154.v0CBs7Dv038015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Thu, 12 Jan 2017 11:54:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431256 - head/comms/ncid X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 11:54:08 -0000 Author: cpm Date: Thu Jan 12 11:54:07 2017 New Revision: 431256 URL: https://svnweb.freebsd.org/changeset/ports/431256 Log: - Update to 1.6 - Update LICENSE - Add shells/bash to RUN_DEPENDS - Update PORTDOCS files - Add missing files from distribution - Use INSTALL_SCRIPTS instead of INSTALL_PROGRAM to properly install scripts - Convert config files to @sample in pkg-plist - Drop maintainership Changelog: https://sourceforge.net/p/ncid/news/2016/11/ncid-16-released/ Reviewed by: amdmi3, junovitch Approved by: amdmi3, junovitch (mentors) Differential Revision: D8914 Modified: head/comms/ncid/Makefile head/comms/ncid/distinfo head/comms/ncid/pkg-plist Modified: head/comms/ncid/Makefile ============================================================================== --- head/comms/ncid/Makefile Thu Jan 12 11:49:44 2017 (r431255) +++ head/comms/ncid/Makefile Thu Jan 12 11:54:07 2017 (r431256) @@ -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 @@ LOGROTATE_RUN_DEPENDS= logrotate:sysutil 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 @@ post-patch: 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,21 +98,29 @@ ncid-page ncid-samba ncid-speak ncid-yac @${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 ${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 Modified: head/comms/ncid/distinfo ============================================================================== --- head/comms/ncid/distinfo Thu Jan 12 11:49:44 2017 (r431255) +++ head/comms/ncid/distinfo Thu Jan 12 11:54:07 2017 (r431256) @@ -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 Modified: head/comms/ncid/pkg-plist ============================================================================== --- head/comms/ncid/pkg-plist Thu Jan 12 11:49:44 2017 (r431255) +++ head/comms/ncid/pkg-plist Thu Jan 12 11:54:07 2017 (r431256) @@ -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 @@ bin/yac2ncid %%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 @@ etc/rc.d/yac2ncid 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/rn2ncid.1.gz 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/ncid-modules.7.gz 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