6 files changed, 54 insertions, 11 deletions

diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
index 6bcb572883e7..7c14ce80b78f 100644
--- a/comms/ncid/Makefile
+++ b/comms/ncid/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ncid
-PORTVERSION=	1.10.1
-PORTREVISION=	1
+PORTVERSION=	1.11
 CATEGORIES=	comms
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -19,16 +18,22 @@ 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
@@ -118,11 +123,14 @@ ncid2ncid ncidd obi2ncid rn2ncid sip2ncid wc2ncid xdmf2ncid yac2ncid
 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
diff --git a/comms/ncid/distinfo b/comms/ncid/distinfo
index ac0e7bd2d7bb..23203b93938a 100644
--- a/comms/ncid/distinfo
+++ b/comms/ncid/distinfo
@@ -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
diff --git a/comms/ncid/files/patch-client_Makefile b/comms/ncid/files/patch-client_Makefile
new file mode 100644
index 000000000000..c5d382139229
--- /dev/null
+++ b/comms/ncid/files/patch-client_Makefile
@@ -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
diff --git a/comms/ncid/files/patch-gateway_Makefile b/comms/ncid/files/patch-gateway_Makefile
new file mode 100644
index 000000000000..158949886b16
--- /dev/null
+++ b/comms/ncid/files/patch-gateway_Makefile
@@ -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
diff --git a/comms/ncid/files/patch-server_Makefile b/comms/ncid/files/patch-server_Makefile
new file mode 100644
index 000000000000..65d0fbe9f34d
--- /dev/null
+++ b/comms/ncid/files/patch-server_Makefile
@@ -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
diff --git a/comms/ncid/pkg-plist b/comms/ncid/pkg-plist
index e0682691477c..1372f8fbf0c8 100644
--- a/comms/ncid/pkg-plist
+++ b/comms/ncid/pkg-plist
@@ -47,6 +47,7 @@ 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
@@ -112,6 +113,7 @@ sbin/sip2ncid
 %%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
@@ -134,7 +136,7 @@ sbin/sip2ncid
 %%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
@@ -145,7 +147,7 @@ sbin/sip2ncid
 %%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