Index: head/comms/ncid/Makefile =================================================================== --- head/comms/ncid/Makefile (revision 525713) +++ head/comms/ncid/Makefile (revision 525714) @@ -1,136 +1,144 @@ # Created by: David # $FreeBSD$ PORTNAME= ncid -PORTVERSION= 1.10.1 -PORTREVISION= 1 +PORTVERSION= 1.11 CATEGORIES= comms MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= egypcio@FreeBSD.org COMMENT= Network based Caller ID package LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/doc/GPL.md BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= libpcre.so:devel/pcre RUN_DEPENDS= bash:shells/bash USES= compiler:c11 gmake perl5 tk shebangfix +USE_GCC= yes -SHEBANG_FILES= extensions/*.sh \ +SHEBANG_FILES= client/ncid.sh \ + desktop/xml \ + doc/mk* \ + extensions/*.sh \ gateway/*.pl gateway/*.sh \ logrotate/*.sh \ + man/mk-pdf \ modules/*.sh \ setup/*.sh \ tools/*.pl tools/*.sh ALL_TARGET= local -MAKE_ARGS= WISH=${WISH} TCLSH=${TCLSH} +MAKE_ARGS= WISH=${WISH} TCLSH=${TCLSH} \ + CC=${CC} HOSTCC=${CC} AR=${AR} INSTALL_TARGET= freebsd-install SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS LOGROTATE OPTIONS_SUB= yes LOGROTATE_DESC= Install logrotate scripts LOGROTATE_RUN_DEPENDS= logrotate:sysutils/logrotate WRKSRC= ${WRKDIR}/${PORTNAME} post-extract: @cd ${WRKSRC}/FreeBSD;for i in *.rc; do \ x=`echo $$i | cut -f 1 -d .`; ${CP} $$i $$x; done .include 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 \ '/install:/s,install-(etc|logrotate),,' @${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' \ -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 .if ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} -e 's|-Wno-stringop-truncation||g' \ ${WRKSRC}/Makefile ${WRKSRC}/server/Makefile .endif do-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_PROGRAM} ${WRKSRC}/server/ncidd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/gateway/ncid2ncid ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/gateway/sip2ncid ${STAGEDIR}${PREFIX}/sbin ${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-fakenum hangup-fcc hangup-nohangup \ hangup-closed-skel hangup-combo-skel hangup-message-skel hangup-skel @${MKDIR} ${STAGEDIR}${PREFIX}/share/ncid/extensions ${INSTALL_SCRIPT} ${WRKSRC}/extensions/${e} ${STAGEDIR}${PREFIX}/share/ncid/extensions .endfor # ncid2ncid and sip2ncid are installed and stripped before this loop with ${INSTALL_PROGRAM} .for f in email2ncid obi2ncid rn2ncid wc2ncid xdmf2ncid yac2ncid ${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-alert ncid-initmodem ncid-kpopup ncid-mysql ncid-mythtv ncid-notify ncid-page \ ncid-samba ncid-skel ncid-speak ncid-wakeup ncid-yac ${INSTALL_SCRIPT} ${WRKSRC}/modules/${g} ${STAGEDIR}${PREFIX}/share/ncid/modules .endfor ${INSTALL_DATA} ${WRKSRC}/server/ncidd.alias ${STAGEDIR}${ETCDIR}/ncidd.alias.sample .for h in cidcall cidalias cidupdate wct ncidutil ${INSTALL_SCRIPT} ${WRKSRC}/tools/${h} ${STAGEDIR}${PREFIX}/bin .endfor .for i in ncid-initmodem ncid-mysql ncid-mythtv ncid-notify ncid-page ncid-samba ncid-speak ncid-yac \ ncid2ncid ncidd obi2ncid rn2ncid sip2ncid wc2ncid xdmf2ncid yac2ncid ${INSTALL_DATA} ${WRKSRC}/FreeBSD/${i} ${STAGEDIR}${PREFIX}/etc/rc.d .endfor .for j in CallingDeposit.rmd CannotBeCompleted.rmd DisconnectedNotInService.rmd NotInService.rmd @${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 ncid-setup ${INSTALL_SCRIPT} ${WRKSRC}/setup/${k} ${STAGEDIR}${PREFIX}/bin .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}/recordings ${INSTALL_DATA} ${WRKSRC}/doc/*.md ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/FreeBSD/README.FreeBSD ${STAGEDIR}${DOCSDIR} -.for l in README.recordings CallingDeposit.pvf CannotBeCompleted.pvf DisconnectedNotInService.pvf NotInService.pvf + ${INSTALL_DATA} ${WRKSRC}/FreeBSD/README-FreeBSD ${STAGEDIR}${DOCSDIR} +.for l in README-recordings CallingDeposit.pvf CannotBeCompleted.pvf DisconnectedNotInService.pvf NotInService.pvf ${INSTALL_DATA} ${WRKSRC}/recordings/${l} ${STAGEDIR}${DOCSDIR}/recordings .endfor + +post-install: + ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/cidupdate post-install-LOGROTATE-on: @${MKDIR} ${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 ${INSTALL_MAN} ${WRKSRC}/logrotate/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 .include Index: head/comms/ncid/distinfo =================================================================== --- head/comms/ncid/distinfo (revision 525713) +++ head/comms/ncid/distinfo (revision 525714) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548838678 -SHA256 (ncid-1.10.1-src.tar.gz) = 3f1de851453f541a4f93b16824b3e0b0282bcecba7383f11cbcb825af1024e21 -SIZE (ncid-1.10.1-src.tar.gz) = 3649543 +TIMESTAMP = 1581345667 +SHA256 (ncid-1.11-src.tar.gz) = a87cc6258a3260504ec566f2bf3c907931368beab3f37e157be141d807c801f9 +SIZE (ncid-1.11-src.tar.gz) = 4143098 Index: head/comms/ncid/files/patch-client_Makefile =================================================================== --- head/comms/ncid/files/patch-client_Makefile (nonexistent) +++ head/comms/ncid/files/patch-client_Makefile (revision 525714) @@ -0,0 +1,11 @@ +--- client/Makefile.orig 2020-02-10 15:15:54 UTC ++++ client/Makefile +@@ -12,7 +12,7 @@ prefix = /usr + prefix2 = + prefix3 = + +-BASH=/bin/bash ++BASH = /usr/local/bin/bash + + BIN = $(prefix)/bin + SHARE = $(prefix)/share Property changes on: head/comms/ncid/files/patch-client_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/ncid/files/patch-gateway_Makefile =================================================================== --- head/comms/ncid/files/patch-gateway_Makefile (nonexistent) +++ head/comms/ncid/files/patch-gateway_Makefile (revision 525714) @@ -0,0 +1,11 @@ +--- gateway/Makefile.orig 2020-02-10 15:16:04 UTC ++++ gateway/Makefile +@@ -27,7 +27,7 @@ prefix = /usr + prefix2 = + prefix3 = + +-BASH = /bin/bash ++BASH = /usr/local/bin/bash + + BIN = $(prefix)/bin + SBIN = $(prefix)/sbin Property changes on: head/comms/ncid/files/patch-gateway_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/ncid/files/patch-server_Makefile =================================================================== --- head/comms/ncid/files/patch-server_Makefile (nonexistent) +++ head/comms/ncid/files/patch-server_Makefile (revision 525714) @@ -0,0 +1,11 @@ +--- server/Makefile.orig 2020-02-10 15:16:13 UTC ++++ server/Makefile +@@ -23,7 +23,7 @@ prefix3 = + settag = __NONE__ + setname = __NONE__ + +-BASH = /bin/bash ++BASH = /usr/local/bin/bash + + BIN = $(prefix)/bin + SBIN = $(prefix)/sbin Property changes on: head/comms/ncid/files/patch-server_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/ncid/pkg-plist =================================================================== --- head/comms/ncid/pkg-plist (revision 525713) +++ head/comms/ncid/pkg-plist (revision 525714) @@ -1,180 +1,182 @@ bin/cidalias bin/cidcall bin/cidupdate bin/email2ncid bin/ncid bin/ncid-email2ncid-setup bin/ncid-mysql-setup bin/ncid-setup bin/ncid2ncid bin/ncidutil bin/obi2ncid bin/rn2ncid bin/wc2ncid bin/wct bin/xdmf2ncid bin/yac2ncid @sample %%ETCDIR%%/email2ncid.conf.sample @sample %%ETCDIR%%/ncid.conf.sample @sample %%ETCDIR%%/ncid2ncid.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%%/xdmf2ncid.conf.sample @sample %%ETCDIR%%/yac2ncid.conf.sample etc/rc.d/ncid-initmodem etc/rc.d/ncid-mysql etc/rc.d/ncid-mythtv etc/rc.d/ncid-notify etc/rc.d/ncid-page etc/rc.d/ncid-samba etc/rc.d/ncid-speak 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 etc/rc.d/xdmf2ncid etc/rc.d/yac2ncid man/man1/cidalias.1.gz man/man1/cidcall.1.gz man/man1/cidupdate.1.gz man/man1/email2ncid.1.gz +man/man1/get-areacodes-list.1.gz man/man1/get-fcc-list.1.gz man/man1/hangup-calls.1.gz man/man1/hangup-closed-skel.1.gz man/man1/hangup-combo-skel.1.gz man/man1/hangup-fakenum.1.gz man/man1/hangup-fcc.1.gz man/man1/hangup-message-skel.1.gz man/man1/hangup-nohangup.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/ncidrotate.1.gz man/man1/ncidutil.1.gz man/man1/obi2ncid.1.gz man/man1/rn2ncid.1.gz man/man1/wc2ncid.1.gz man/man1/wct.1.gz man/man1/xdmf2ncid.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 man/man5/ncidd.blacklist.5.gz man/man5/ncidd.conf.5.gz man/man5/ncidd.whitelist.5.gz man/man5/ncidrotate.conf.5.gz man/man5/obi2ncid.conf.5.gz man/man5/rn2ncid.conf.5.gz man/man5/rotatebysize.conf.5.gz man/man5/sip2ncid.conf.5.gz man/man5/wc2ncid.conf.5.gz man/man5/xdmf2ncid.conf.5.gz man/man5/yac2ncid.conf.5.gz man/man7/ncid_extensions.7.gz man/man7/ncid_gateways.7.gz man/man7/ncid_modules.7.gz man/man7/ncid_recordings.7.gz man/man7/ncid_tools.7.gz man/man8/ncid-mysql-setup.8.gz man/man8/ncidd.8.gz man/man8/sip2ncid.8.gz sbin/ncidd sbin/sip2ncid %%PORTDOCS%%%%DOCSDIR%%/Alias.md %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS.md %%PORTDOCS%%%%DOCSDIR%%/Clients.md %%PORTDOCS%%%%DOCSDIR%%/Devices.md %%PORTDOCS%%%%DOCSDIR%%/Extensions.md %%PORTDOCS%%%%DOCSDIR%%/FAQ.md +%%PORTDOCS%%%%DOCSDIR%%/FakeNum.md %%PORTDOCS%%%%DOCSDIR%%/FCCData.md %%PORTDOCS%%%%DOCSDIR%%/GPL.md %%PORTDOCS%%%%DOCSDIR%%/Gateways.md %%PORTDOCS%%%%DOCSDIR%%/GettingStarted.md %%PORTDOCS%%%%DOCSDIR%%/Hangup.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-Cygwin.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-DEB.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-Fedora.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-FreeBSD.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-Mac.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-Redhat.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL-Win.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/InstallIndex.md %%PORTDOCS%%%%DOCSDIR%%/Log.md %%PORTDOCS%%%%DOCSDIR%%/Message.md %%PORTDOCS%%%%DOCSDIR%%/Modems.md %%PORTDOCS%%%%DOCSDIR%%/Modules.md %%PORTDOCS%%%%DOCSDIR%%/NCID-API.md %%PORTDOCS%%%%DOCSDIR%%/NCID-SDK.md %%PORTDOCS%%%%DOCSDIR%%/NCID-UserManual.md %%PORTDOCS%%%%DOCSDIR%%/Obtain.md -%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD +%%PORTDOCS%%%%DOCSDIR%%/README-FreeBSD %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.md %%PORTDOCS%%%%DOCSDIR%%/TODO.md %%PORTDOCS%%%%DOCSDIR%%/Tools.md %%PORTDOCS%%%%DOCSDIR%%/Use.md %%PORTDOCS%%%%DOCSDIR%%/UserManualIndex.md %%PORTDOCS%%%%DOCSDIR%%/Verbose.md %%PORTDOCS%%%%DOCSDIR%%/recordings/CallingDeposit.pvf %%PORTDOCS%%%%DOCSDIR%%/recordings/CannotBeCompleted.pvf %%PORTDOCS%%%%DOCSDIR%%/recordings/DisconnectedNotInService.pvf %%PORTDOCS%%%%DOCSDIR%%/recordings/NotInService.pvf -%%PORTDOCS%%%%DOCSDIR%%/recordings/README.recordings +%%PORTDOCS%%%%DOCSDIR%%/recordings/README-recordings %%DATADIR%%/extensions/hangup-calls %%DATADIR%%/extensions/hangup-closed-skel %%DATADIR%%/extensions/hangup-combo-skel %%DATADIR%%/extensions/hangup-fakenum %%DATADIR%%/extensions/hangup-fcc %%DATADIR%%/extensions/hangup-message-skel %%DATADIR%%/extensions/hangup-nohangup %%DATADIR%%/extensions/hangup-skel %%DATADIR%%/modules/ncid-alert %%DATADIR%%/modules/ncid-initmodem %%DATADIR%%/modules/ncid-kpopup %%DATADIR%%/modules/ncid-mysql %%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/CannotBeCompleted.rmd %%DATADIR%%/recordings/DisconnectedNotInService.rmd %%DATADIR%%/recordings/NotInService.rmd share/pixmaps/ncid %%LOGROTATE%%%%DATADIR%%/sys/ncid-yearlog %%LOGROTATE%%%%DATADIR%%/sys/ncidrotate %%LOGROTATE%%@sample %%ETCDIR%%/ncidrotate.conf.sample %%LOGROTATE%%etc/logrotate.d/ncid %%LOGROTATE%%man/man1/ncidrotate.1.gz %%LOGROTATE%%man/man5/ncidrotate.conf.5.gz %%LOGROTATE%%man/man5/rotatebysize.conf.5.gz