- Add UTF8 option [1]

- Patch sendsms script to correctly parse iconv command output [2]

While here:

- Add TIMESTAMP to distinfo
- Regenerate patches
- Unsilence post-install target

PR:		205973 [1], 205978 [2]
Submitted by:	satorium77@gmail.com

7 files changed, 58 insertions, 26 deletions

diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index d8e791b5a92b..9dafe9d7b3db 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	smstools
 PORTVERSION=	3.1.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms
 MASTER_SITES=	http://smstools3.kekekasvi.com/packages/
 DISTNAME=	smstools3-${PORTVERSION}
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	gnokii-[0-9]* smstools-2.* sendsms-[0-9]*
 
-OPTIONS_DEFINE=	STATS EXAMPLES DOCS
-OPTIONS_DEFAULT=	STATS
+OPTIONS_DEFINE=	STATS UTF8 EXAMPLES DOCS
+OPTIONS_DEFAULT=	STATS UTF8
 STATS_DESC=	Build status and statistics support
 
 WRKSRC=		${WRKDIR}/smstools3
@@ -46,6 +46,10 @@ STATS_LIB_DEPENDS=	libmm.so:devel/mm
 STATS_CFLAGS=	-I${LOCALBASE}/include
 STATS_CFLAGS_OFF=	-DNOSTATS
 
+UTF8_USES=		iconv
+UTF8_LDFLAGS=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
+UTF8_CFLAGS=		-DUSE_ICONV
+
 SMSTOOLS_DEFAULT_COMPORT?=	/dev/cuau0
 
 post-patch:
@@ -64,22 +68,22 @@ post-patch:
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/smsd
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@for file in `${FIND} ${WRKSRC}/scripts -type f ! -name 'README' ! -name '*.bak'`; do \
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	for file in `${FIND} ${WRKSRC}/scripts -type f ! -name 'README' ! -name '*.bak'`; do \
 		${INSTALL_SCRIPT} $$file ${STAGEDIR}${DATADIR}/; \
 	done
 .for FILE in sendsms sms2html sms2unicode unicode2sms
-	@${LN} -sf ${DATADIR}/${FILE} ${STAGEDIR}${PREFIX}/bin/${FILE}
+	${LN} -sf ${DATADIR}/${FILE} ${STAGEDIR}${PREFIX}/bin/${FILE}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/examples/smsd.conf.easy ${STAGEDIR}${PREFIX}/etc/smsd.conf.sample
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/slideshow
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/slideshow/* ${STAGEDIR}${DOCSDIR}/slideshow
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@for file in `${FIND} ${WRKSRC}/examples -type f ! -name 'README'`; do \
+	${INSTALL_DATA} ${WRKSRC}/examples/smsd.conf.easy ${STAGEDIR}${PREFIX}/etc/smsd.conf.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/slideshow
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/slideshow/* ${STAGEDIR}${DOCSDIR}/slideshow
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	for file in `${FIND} ${WRKSRC}/examples -type f ! -name 'README'`; do \
 		${INSTALL_SCRIPT} $$file ${STAGEDIR}${EXAMPLESDIR}/; \
 	done
-	@${MKDIR} ${STAGEDIR}${SPOOLDIR}/incoming ${STAGEDIR}${SPOOLDIR}/outgoing \
+	${MKDIR} ${STAGEDIR}${SPOOLDIR}/incoming ${STAGEDIR}${SPOOLDIR}/outgoing \
 		${STAGEDIR}${SPOOLDIR}/checked ${STAGEDIR}${LOGDIR} \
 		${STAGEDIR}${PIDDIR}
 
diff --git a/comms/smstools3/distinfo b/comms/smstools3/distinfo
index 4942cf218d5e..130f5a90ce1a 100644
--- a/comms/smstools3/distinfo
+++ b/comms/smstools3/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1478085197
 SHA256 (smstools3-3.1.15.tar.gz) = ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59
 SIZE (smstools3-3.1.15.tar.gz) = 300088
diff --git a/comms/smstools3/files/patch-Makefile b/comms/smstools3/files/patch-Makefile
index 2218e6384696..ceab80335f2f 100644
--- a/comms/smstools3/files/patch-Makefile
+++ b/comms/smstools3/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2007-04-22 13:42:22.000000000 +0200
-+++ Makefile	2009-06-15 09:28:29.000000000 +0200
+--- Makefile.orig	2007-04-22 11:42:22 UTC
++++ Makefile
 @@ -2,21 +2,21 @@
  
  # If you change destination of executables, remember to change
diff --git a/comms/smstools3/files/patch-examples-smsd.conf.easy b/comms/smstools3/files/patch-examples-smsd.conf.easy
index f3e198c677de..678defaa339d 100644
--- a/comms/smstools3/files/patch-examples-smsd.conf.easy
+++ b/comms/smstools3/files/patch-examples-smsd.conf.easy
@@ -1,5 +1,5 @@
---- examples/smsd.conf.easy.orig	2006-02-04 20:52:06.000000000 +0100
-+++ examples/smsd.conf.easy	2014-06-26 15:07:50.021638337 +0200
+--- examples/smsd.conf.easy.orig	2006-02-04 19:52:06 UTC
++++ examples/smsd.conf.easy
 @@ -1,9 +1,12 @@
  # Example smsd.conf. Read the manual for a description
  
diff --git a/comms/smstools3/files/patch-install.sh b/comms/smstools3/files/patch-install.sh
index 280b64b7ae3a..4bedaea7d9aa 100644
--- a/comms/smstools3/files/patch-install.sh
+++ b/comms/smstools3/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	2007-04-22 13:43:17.000000000 +0200
-+++ install.sh	2013-10-16 12:22:40.725619989 +0200
+--- install.sh.orig	2007-04-22 11:43:17 UTC
++++ install.sh
 @@ -3,7 +3,7 @@
  
  BINDIR=$1
@@ -9,7 +9,7 @@
  fi
  
  makepath()
-@@ -84,38 +84,6 @@
+@@ -84,38 +84,6 @@ fi
  delete $BINDIR/getsms
  delete $BINDIR/putsms
  
diff --git a/comms/smstools3/files/patch-scripts_sendsms b/comms/smstools3/files/patch-scripts_sendsms
new file mode 100644
index 000000000000..e58196e787a3
--- /dev/null
+++ b/comms/smstools3/files/patch-scripts_sendsms
@@ -0,0 +1,11 @@
+--- scripts/sendsms.orig	2010-07-08 12:41:13 UTC
++++ scripts/sendsms
+@@ -80,7 +80,7 @@ echo "Text: $TEXT"
+ 
+ ALPHABET=""
+ if which iconv > /dev/null 2>&1; then
+-  if ! $ECHO -n "$TEXT" | iconv -t ISO-8859-15 >/dev/null 2>&1; then
++  if $ECHO -n "$TEXT" | iconv -t ISO-8859-15 2>&1 | grep "invalid" > /dev/null; then
+     ALPHABET="Alphabet: UCS"
+   fi
+ fi
diff --git a/comms/smstools3/files/patch-src-Makefile b/comms/smstools3/files/patch-src-Makefile
index ed41d81adb7e..ad904e1b18a4 100644
--- a/comms/smstools3/files/patch-src-Makefile
+++ b/comms/smstools3/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2010-06-16 14:02:36.000000000 +0200
-+++ src/Makefile	2010-07-06 22:00:30.303633098 +0200
+--- src/Makefile.orig	2010-09-21 11:29:14 UTC
++++ src/Makefile
 @@ -1,7 +1,7 @@
  # In case of windows, use os_cygwin=yes setting in the configuration file (smsd.conf).
  
@@ -9,7 +9,7 @@
  
  # Uncomment for Solaris
  # CFLAGS += -D SOLARIS
-@@ -9,7 +9,7 @@
+@@ -9,13 +9,13 @@ CFLAGS = -D NUMBER_OF_MODEMS=64
  # CC=gcc
  
  # Comment this out, to enable statistics
@@ -18,12 +18,28 @@
  
  # Comment this out if iconv is not available on the system
  #CFLAGS += -D USE_ICONV
-@@ -50,7 +50,7 @@
+ 
+ # Uncomment this is iconv is used and it's not included in libc:
+-#LFLAGS += -liconv
++#LDFLAGS += -liconv
+ 
+ # Uncomment this to force smsd to run in terminal mode
+ #CFLAGS += -D TERMINAL
+@@ -43,14 +43,14 @@ smsd: smsd.c extras.o locking.o cfgfile.
+ 
+ ifneq (,$(findstring SOLARIS,$(CFLAGS)))
+ ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
+-override LFLAGS += -lsocket -lnsl
++override LDFLAGS += -lsocket -lnsl
+ endif
+ endif
+ 
  ifneq (,$(findstring NOSTATS,$(CFLAGS)))
- 	$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS)
+-	$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS)
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
  else 
 -	$(CC) `mm-config --cflags` $(CFLAGS) -o $@ $^ `mm-config --ldflags --libs` $(LFLAGS)
-+	$(CC) `$(LOCALBASE)/bin/mm-config --cflags` $(CFLAGS) -o $@ $^ `$(LOCALBASE)/bin/mm-config --ldflags --libs` $(LFLAGS)
++	$(CC) `$(LOCALBASE)/bin/mm-config --cflags` $(CFLAGS) -o $@ $^ `$(LOCALBASE)/bin/mm-config --ldflags --libs` $(LDFLAGS)
  endif
  
  clean: