Page MenuHomeFreeBSD
Files F144562525

D7419.diff
No OneTemporary
Actions

D7419.diff
View Options

Index: head/comms/ncid/Makefile
===================================================================
--- head/comms/ncid/Makefile
+++ head/comms/ncid/Makefile
@@ -2,35 +2,39 @@
# $FreeBSD$
PORTNAME= ncid
-PORTVERSION= 1.3
+PORTVERSION= 1.4
CATEGORIES= comms
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
-MAINTAINER= cpm@fbsd.es
+MAINTAINER= cpm@FreeBSD.org
COMMENT= Network based Caller ID package
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/doc/GPL.md
-USES= gmake perl5 tk
+BUILD_DEPENDS= bash:shells/bash
+
+USES= gmake perl5 tk shebangfix
+SHEBANG_FILES= extensions/hangup-message.sh \
+ extensions/hangup-skel.sh \
+ logrotate/ncidrotate.sh
ALL_TARGET= local
MAKE_ARGS= WISH=${WISH} TCLSH=${TCLSH}
INSTALL_TARGET= freebsd-install
-MAKE_JOBS_UNSAFE= yes
SUB_FILES= pkg-message
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS LOGROTATE
+OPTIONS_SUB= yes
+
+LOGROTATE_DESC= Install logrotate scripts
+
+LOGROTATE_RUN_DEPENDS= logrotate:sysutils/logrotate
WRKSRC= ${WRKDIR}/${PORTNAME}
-PORTDOCS= Alias.md CHANGES CONTRIBUTORS.md Clients.md Devices.md FAQ.md GPL.md \
- Gateways.md GettingStarted.md Hangup.md INSTALL-Cygwin.md INSTALL-Fedora.md \
- INSTALL-FreeBSD.md INSTALL-Mac.md INSTALL-Raspbian.md INSTALL-Redhat.md \
- INSTALL-TiVo.md INSTALL-Ubuntu.md INSTALL-Win.md INSTALL.md InstallIndex.md \
- Makefile Modems.md Modules.md NCID-API.md NCID-SDK.md Obtain.md README.docdir \
- ReleaseNotes.md TODO.md Tools.md Use.md UserManualIndex.md Verbose.md mk-epub \
- ncid-1.jpg ncid-cover.jpg
+PORTDOCS= *
post-extract:
@cd ${WRKSRC}/FreeBSD;for i in *.rc; do \
@@ -52,35 +56,56 @@
-e 's|$$(SHARE)/ncid|$${DATADIR}|g' ${WRKSRC}/Makefile
do-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
${INSTALL_PROGRAM} ${WRKSRC}/server/ncidd ${STAGEDIR}${PREFIX}/sbin
+ ${INSTALL_DATA} ${WRKSRC}/server/ncidd.conf ${STAGEDIR}${ETCDIR}
${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}/client/ncid.conf ${STAGEDIR}${ETCDIR}
+.for e in hangup-message.sh hangup-skel.sh
+ @${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
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ncid2ncid
.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
+ ${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
${INSTALL_DATA} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin
.endfor
-.for i in ncidd ncid2ncid rn2ncid sip2ncid wc2ncid yac2ncid ncid-mythtv ncid-notify \
+.for i in ncidd ncid2ncid obi2ncid 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
+.for j in NumberDisconnected.rmd CallingDeposit.rmd NotInService.rmd
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/recordings
+ ${INSTALL_DATA} ${WRKSRC}/recordings/${j} ${STAGEDIR}${PREFIX}/share/ncid/recordings
+.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}
-.for j in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR}
+ @${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
+ ${INSTALL_DATA} ${WRKSRC}/recordings/${k} ${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
+ @${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
+ ${INSTALL_MAN} ${WRKSRC}/logrotate/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+
.include <bsd.port.mk>
Index: head/comms/ncid/distinfo
===================================================================
--- head/comms/ncid/distinfo
+++ head/comms/ncid/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ncid-1.3-src.tar.gz) = 4f8a01a79e01f7e878a42d8cf6493064c09a292d2b8d2bb4dd19754eac16bc7b
-SIZE (ncid-1.3-src.tar.gz) = 2210159
+TIMESTAMP = 1470326955
+SHA256 (ncid-1.4-src.tar.gz) = aad7b03a0a28412cd67544650e74636f8277e3fe9d9432c6587920c1a31d9c3f
+SIZE (ncid-1.4-src.tar.gz) = 2872361
Index: head/comms/ncid/pkg-plist
===================================================================
--- head/comms/ncid/pkg-plist
+++ head/comms/ncid/pkg-plist
@@ -4,11 +4,34 @@
bin/ncid
bin/ncid2ncid
bin/ncidutil
+bin/obi2ncid
bin/rn2ncid
bin/wc2ncid
bin/wct
bin/yac2ncid
+%%DATADIR%%/extensions/hangup-message.sh
+%%DATADIR%%/extensions/hangup-skel.sh
+%%DATADIR%%/modules/ncid-alert
+%%DATADIR%%/modules/ncid-initmodem
+%%DATADIR%%/modules/ncid-kpopup
+%%DATADIR%%/modules/ncid-mythtv
+%%DATADIR%%/modules/ncid-notify
+%%DATADIR%%/modules/ncid-page
+%%DATADIR%%/modules/ncid-samba
+%%DATADIR%%/modules/ncid-skel
+%%DATADIR%%/modules/ncid-speak
+%%DATADIR%%/modules/ncid-wakeup
+%%DATADIR%%/modules/ncid-yac
+%%DATADIR%%/recordings/CallingDeposit.rmd
+%%DATADIR%%/recordings/NotInService.rmd
+%%DATADIR%%/recordings/NumberDisconnected.rmd
+%%LOGROTATE%%%%DATADIR%%/sys/ncidrotate.sh
+%%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
etc/rc.d/ncid-initmodem
etc/rc.d/ncid-mythtv
etc/rc.d/ncid-notify
@@ -18,6 +41,7 @@
etc/rc.d/ncid-yac
etc/rc.d/ncid2ncid
etc/rc.d/ncidd
+etc/rc.d/obi2ncid
etc/rc.d/rn2ncid
etc/rc.d/sip2ncid
etc/rc.d/wc2ncid
@@ -25,6 +49,8 @@
man/man1/cidalias.1.gz
man/man1/cidcall.1.gz
man/man1/cidupdate.1.gz
+man/man1/hangup-message.1.gz
+man/man1/hangup-skel.1.gz
man/man1/ncid-alert.1.gz
man/man1/ncid-initmodem.1.gz
man/man1/ncid-kpopup.1.gz
@@ -62,5 +88,4 @@
man/man8/sip2ncid.8.gz
sbin/ncidd
sbin/sip2ncid
-%%DATADIR%%
share/pixmaps/ncid

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 10, 3:02 PM (19 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28626720
Default Alt Text
D7419.diff (6 KB)

Event Timeline