- Update to 2.2.18

PR:	ports/114769
Submitted by:	tabthorpe@
Approved by:	maintainer timeout, clsung (mentor)

6 files changed, 23 insertions, 36 deletions

diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile
index 16358199b5c7..8827bf058bc1 100644
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smstools
-PORTVERSION=	2.0.7
-PORTREVISION=	1
+PORTVERSION=	2.2.18
 CATEGORIES=	comms
 MASTER_SITES=	http://www.meinemullemaus.de/software/smstools/packages/
 
diff --git a/comms/smstools/distinfo b/comms/smstools/distinfo
index 448a0e2d4d9c..2c6f2bcf9d35 100644
--- a/comms/smstools/distinfo
+++ b/comms/smstools/distinfo
@@ -1,3 +1,3 @@
-MD5 (smstools-2.0.7.tar.gz) = 580c17d9093542d8d1e9dbec5b508faa
-SHA256 (smstools-2.0.7.tar.gz) = 34345bec44fb1ff4cd136119622e184a1145682d96bc0e960527224f193c53a9
-SIZE (smstools-2.0.7.tar.gz) = 43792
+MD5 (smstools-2.2.18.tar.gz) = b3b6322ee11772ae5daed064584c05ad
+SHA256 (smstools-2.2.18.tar.gz) = 66a1520e52a5d7f473d3b8b871168228de76357468a98efae9c327afa596fd6a
+SIZE (smstools-2.2.18.tar.gz) = 174961
diff --git a/comms/smstools/files/patch-examples_smsd.conf.easy b/comms/smstools/files/patch-examples_smsd.conf.easy
index 3d4a66fddb96..7f083b27c9da 100644
--- a/comms/smstools/files/patch-examples_smsd.conf.easy
+++ b/comms/smstools/files/patch-examples_smsd.conf.easy
@@ -1,5 +1,5 @@
---- examples/smsd.conf.easy	Fri Apr 21 11:25:01 2006
-+++ examples/smsd.conf.easy	Fri Apr 21 12:32:59 2006
+--- examples/smsd.conf.easy.orig	Sat Feb  4 14:52:06 2006
++++ examples/smsd.conf.easy	Fri Jul 20 09:41:03 2007
 @@ -5,6 +5,7 @@
  loglevel = 7
  
diff --git a/comms/smstools/files/patch-examples_smsd.conf.full b/comms/smstools/files/patch-examples_smsd.conf.full
index c7b8e2755ba7..a75f3e0be650 100644
--- a/comms/smstools/files/patch-examples_smsd.conf.full
+++ b/comms/smstools/files/patch-examples_smsd.conf.full
@@ -1,13 +1,12 @@
---- examples/smsd.conf.full	Fri Apr 21 11:25:01 2006
-+++ examples/smsd.conf.full	Fri Apr 21 15:00:32 2006
-@@ -6,20 +6,20 @@
+--- examples/smsd.conf.full.orig	Sat Jul 29 14:58:42 2006
++++ examples/smsd.conf.full	Fri Jul 20 09:39:38 2007
+@@ -6,21 +6,21 @@
  #failed = /var/spool/sms/failed
  incoming = /var/spool/sms/incoming
  #sent = /var/spool/sms/sent
 -mypath = /usr/local/bin
--#logfile = /var/log/smsd.log
 +mypath = %%PREFIX%%/bin
-+logfile = /var/log/smsd.log
+ #logfile = /var/log/smsd.log
  loglevel = 7
 -#alarmhandler = /usr/local/bin/alarmevent
 +#alarmhandler = %%PREFIX%%/bin/alarmevent
@@ -19,16 +18,15 @@
 +#eventhandler = %%PREFIX%%/bin/smsevent
  #stats = /var/log/smsd_stats
  #stats_interval = 3600
--#blacklist = /etc/smsd.black
--#whitelist = /etc/smsd.white
+ #stats_no_zeroes = no
+ #blacklist = /etc/smsd.black
+ #whitelist = /etc/smsd.white
 -#checkhandler = /usr/local/bin/smscheck
-+#blacklist = %%PREFIX%%/etc/smsd.black
-+#whitelist = %%PREFIX%%/etc/smsd.white
 +#checkhandler = %%PREFIX%%/bin/smscheck
  receive_before_send = no
- number_parts = yes
- 
-@@ -45,8 +45,8 @@
+ # autosplit 0=no 1=yes 2=with text numbers 3=concatenated
+ autosplit = 3
+@@ -47,8 +47,8 @@
  
  [GSM1]
  init = ATE0+CPMS="SM"+CNMI=2,0,0,2,1
@@ -39,7 +37,7 @@
  incoming = yes
  queues = OTHER
  #You don't need a PIN for mobile phones
-@@ -58,12 +58,12 @@
+@@ -60,12 +60,12 @@
  cs_convert = yes
  report = no
  memory_start = 1
@@ -55,7 +53,7 @@
  incoming = yes
  queues = OTHER
  #You don't need a PIN for mobile phones
-@@ -75,4 +75,4 @@
+@@ -77,4 +77,4 @@
  cs_convert = yes
  report = no
  memory_start = 1
diff --git a/comms/smstools/files/patch-install.sh b/comms/smstools/files/patch-install.sh
index 2ff6dd535b82..9c2e7f51864f 100644
--- a/comms/smstools/files/patch-install.sh
+++ b/comms/smstools/files/patch-install.sh
@@ -1,13 +1,6 @@
---- install.sh	Fri Apr 21 11:25:01 2006
-+++ install.sh	Fri Apr 21 14:59:22 2006
-@@ -40,32 +40,42 @@
-   fi
- }
- 
--echo ""
- if [ ! -f src/smsd ] && [ ! -f src/smsd.exe ]; then 
-   echo 'Please run "make -s install" instead.'
-   exit 1
+--- install.sh.orig	Sat Jul 29 14:50:42 2006
++++ install.sh	Fri Jul 20 09:49:08 2007
+@@ -47,24 +47,35 @@
  fi
  
  echo "Installing binary program files"
@@ -24,14 +17,12 @@
 -delete /usr/local/bin/putsms
  
  echo "Installing some scripts"
--copy scripts/pkill /usr/local/bin/pkill
 -copy scripts/sendsms /usr/local/bin/sendsms
 -copy scripts/sms2html /usr/local/bin/sms2html
 -copy scripts/sms2unicode /usr/local/bin/sms2unicode
 -copy scripts/unicode2sms /usr/local/bin/unicode2sms
 +copy scripts/sendsms %%PREFIX%%/bin/sendsms
 +copy scripts/sms2html %%PREFIX%%/bin/sms2html
-+copy scripts/sms2xml %%PREFIX%%/bin/sms2xml
 +copy scripts/sms2unicode %%PREFIX%%/bin/sms2unicode
 +copy scripts/unicode2sms %%PREFIX%%/bin/unicode2sms
  
@@ -56,7 +47,7 @@
  
  echo "Creating minimum spool directories"
  makedir /var/spool
-@@ -74,15 +84,5 @@
+@@ -73,15 +84,5 @@
  makedir /var/spool/sms/outgoing
  makedir /var/spool/sms/checked
  
diff --git a/comms/smstools/pkg-plist b/comms/smstools/pkg-plist
index 1fb92894c68c..d060fff4df09 100644
--- a/comms/smstools/pkg-plist
+++ b/comms/smstools/pkg-plist
@@ -1,7 +1,6 @@
 bin/sendsms
 bin/sms2html
 bin/sms2unicode
-bin/sms2xml
 bin/smsd
 bin/unicode2sms
 etc/smsd.conf.sample
@@ -17,7 +16,7 @@ etc/smsd.conf.sample
 %%EXAMPLESDIR%%/smsd.conf.full
 %%EXAMPLESDIR%%/smsevent
 %%EXAMPLESDIR%%/sql_demo
-@dirrm share/examples/smstools
+@dirrm %%EXAMPLESDIR%%
 @cwd /
 @dirrm var/spool/sms/outgoing
 @dirrm var/spool/sms/incoming