- Update to 3.1.8

4 files changed, 21 insertions, 89 deletions

diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index 03747dc4f7f3..45bd5e5b6c0a 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smstools
-PORTVERSION=	3.1.5
-PORTREVISION=	1
+PORTVERSION=	3.1.8
 CATEGORIES=	comms
 MASTER_SITES=	http://smstools3.kekekasvi.com/packages/
 DISTNAME=	smstools3-${PORTVERSION}
@@ -32,11 +31,12 @@ SUB_LIST+=	SPOOLDIR="${SPOOLDIR}" LOGDIR="${LOGDIR}" PIDDIR="${PIDDIR}" \
 PLIST_SUB+=	SPOOLDIR="${SPOOLDIR}" LOGDIR="${LOGDIR}" PIDDIR="${PIDDIR}" \
 		SMSD_USER="${SMSD_USER}" SMSD_GROUP="${SMSD_GROUP}"
 
-DOCS=		blacklist.html book.html compiling.html \
-		configure.html configure2.html eventhandler.html \
-		faq.html fileformat.html gpl.html hardwarecomp.html \
-		history3.html index.html license.html localizing.html \
-		run.html statusmonitor.html udh.html windows.html
+DOCS=		at-commands.html blacklist.html book.html compiling.html \
+		configure.html configure2.html error-messages.html \
+		eventhandler.html faq.html fileformat.html gpl.html \
+		hardwarecomp.html history3.html index.html license.html \
+		localizing.html run.html statusmonitor.html udh.html \
+		windows.html
 
 SLIDESHOW=	blacklist.gif eventhandler.gif logfile.gif modem.gif \
 		move_l.gif move_r.gif page1.html page2.html page2.jpg \
@@ -48,13 +48,17 @@ EXAMPLES=	.procmailrc .qmailrc language-ISO-8859-15.fi \
 		language-UTF-8.fi operator_logo1.sms operator_logo2.sms \
 		received_report.sms received_sms.sms send_sms.sms \
 		send_sms_unicode.sms smsd.conf.easy smsd.conf.full \
-		smsd.conf.non-root
+		smsd.conf.net smsd.conf.non-root
 
-SCRIPTS=	checkhandler-utf-8 email2sms eventhandler-utf-8 forwardsms \
-		hex2bin hex2dec mysmsd pkill regular_run sendsms sms2html \
+SCRIPTS=	callhandler checkhandler-utf-8 email2sms eventhandler-utf-8 \
+		eventhandler_report forwardsms hex2bin hex2dec \
+		load_balancing.sh mysmsd pkill regular_run sendsms sms2html \
 		sms2unicode sms2xml sms3 smsevent smsresend smstest.php \
 		sql_demo unicode2sms
 
+PORTDOCS=	*
+PORTEXAMPLES=	.procmailrc .qmailrc *
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_STATS)
@@ -71,7 +75,7 @@ SMSTOOLS_DEFAULT_COMPORT?= /dev/cuau0
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile \
-		${WRKSRC}/install.sh ${WRKSRC}/src/smsd_cfg.c
+		${WRKSRC}/install.sh ${WRKSRC}/src/smsd_cfg.h
 	@${REINPLACE_CMD} 's|/dev/ttyS0|${SMSTOOLS_DEFAULT_COMPORT}|g' \
 		${WRKSRC}/examples/smsd.conf.easy \
 		${WRKSRC}/examples/smsd.conf.full \
diff --git a/comms/smstools3/distinfo b/comms/smstools3/distinfo
index c6d6a51166fc..c93204dcd6f3 100644
--- a/comms/smstools3/distinfo
+++ b/comms/smstools3/distinfo
@@ -1,3 +1,3 @@
-MD5 (smstools3-3.1.5.tar.gz) = dbdb21ba3f58ebdecc9e1d356a01a72c
-SHA256 (smstools3-3.1.5.tar.gz) = 8c403e9ce46d37e33019ac4ebe8c446df54a3a954c334f252621b1c68f6dc056
-SIZE (smstools3-3.1.5.tar.gz) = 251255
+MD5 (smstools3-3.1.8.tar.gz) = ab581790260d404a131ff2511c8ae267
+SHA256 (smstools3-3.1.8.tar.gz) = ab4761f3691253657f241132ad915ea190d9e9c97634082b253d81924f021629
+SIZE (smstools3-3.1.8.tar.gz) = 283752
diff --git a/comms/smstools3/files/patch-src_smsd_cfg.c b/comms/smstools3/files/patch-src_smsd_cfg.c
deleted file mode 100644
index 25346ba0388f..000000000000
--- a/comms/smstools3/files/patch-src_smsd_cfg.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/smsd_cfg.c.orig	2009-06-01 12:58:10.000000000 +0200
-+++ src/smsd_cfg.c	2009-06-15 09:11:18.000000000 +0200
-@@ -1449,7 +1449,7 @@
-   printf("         -t  run smsd in terminal\n");
-   printf("         -C  Communicate with device\n\n");
-   printf("         -V  print copyright and version\n\n");
--  printf("All other options are set by the file /etc/smsd.conf.\n\n");
-+  printf("All other options are set by the file %%PREFIX%%/etc/smsd.conf.\n\n");
-   printf("Output is written to stdout, errors are written to stderr.\n\n");
-   exit(0);
- }
-@@ -1459,7 +1459,7 @@
-   int result;
-   int i;
- 
--  strcpy(configfile,"/etc/smsd.conf");
-+  strcpy(configfile,"%%PREFIX%%/etc/smsd.conf");
-   printstatus=0;
-   arg_infofile[0] = 0;
-   arg_pidfile[0] = 0;
diff --git a/comms/smstools3/pkg-plist b/comms/smstools3/pkg-plist
index f00c75d2030e..96d07866dc12 100644
--- a/comms/smstools3/pkg-plist
+++ b/comms/smstools3/pkg-plist
@@ -3,12 +3,15 @@ bin/sendsms
 bin/sms2html
 bin/sms2unicode
 bin/unicode2sms
+%%DATADIR%%/callhandler
 %%DATADIR%%/checkhandler-utf-8
 %%DATADIR%%/email2sms
 %%DATADIR%%/eventhandler-utf-8
+%%DATADIR%%/eventhandler_report
 %%DATADIR%%/forwardsms
 %%DATADIR%%/hex2bin
 %%DATADIR%%/hex2dec
+%%DATADIR%%/load_balancing.sh
 %%DATADIR%%/mysmsd
 %%DATADIR%%/pkill
 %%DATADIR%%/regular_run
@@ -25,61 +28,6 @@ bin/unicode2sms
 @unexec if [ -f %D/etc/smsd.conf ] && cmp -s %D/etc/smsd.conf %D/etc/smsd.conf.sample; then rm -f %D/etc/smsd.conf; fi
 etc/smsd.conf.sample
 @exec if [ ! -f %D/etc/smsd.conf ] ; then cp -p %D/%F %B/smsd.conf; fi
-%%PORTDOCS%%%%DOCSDIR%%/blacklist.html
-%%PORTDOCS%%%%DOCSDIR%%/book.html
-%%PORTDOCS%%%%DOCSDIR%%/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/configure.html
-%%PORTDOCS%%%%DOCSDIR%%/configure2.html
-%%PORTDOCS%%%%DOCSDIR%%/eventhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/fileformat.html
-%%PORTDOCS%%%%DOCSDIR%%/gpl.html
-%%PORTDOCS%%%%DOCSDIR%%/hardwarecomp.html
-%%PORTDOCS%%%%DOCSDIR%%/history3.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/localizing.html
-%%PORTDOCS%%%%DOCSDIR%%/run.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/blacklist.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/eventhandler.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/logfile.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/modem.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/move_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/move_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page1.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page2.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page2b.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page3.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page4.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page5.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page6.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page7.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/page8.html
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/queue.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/sms.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/smstools3-small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/statistic.gif
-%%PORTDOCS%%%%DOCSDIR%%/slideshow/status.gif
-%%PORTDOCS%%%%DOCSDIR%%/statusmonitor.html
-%%PORTDOCS%%%%DOCSDIR%%/udh.html
-%%PORTDOCS%%%%DOCSDIR%%/windows.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.procmailrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.qmailrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/language-ISO-8859-15.fi
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/language-UTF-8.fi
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/operator_logo1.sms
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/operator_logo2.sms
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/received_report.sms
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/received_sms.sms
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/send_sms.sms
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/send_sms_unicode.sms
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smsd.conf.easy
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smsd.conf.full
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smsd.conf.non-root
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/slideshow
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @exec mkdir -p %%SPOOLDIR%%/incoming %%SPOOLDIR%%/outgoing %%SPOOLDIR%%/checked %%LOGDIR%% %%PIDDIR%%
 @exec chown -R %%SMSD_USER%%:%%SMSD_GROUP%% %%SPOOLDIR%% %%LOGDIR%% %%PIDDIR%%