Date: Wed, 2 Nov 2016 11:29:28 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425138 - in head/comms/smstools3: . files Message-ID: <201611021129.uA2BTSdb072243@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Nov 2 11:29:28 2016 New Revision: 425138 URL: https://svnweb.freebsd.org/changeset/ports/425138 Log: - 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 Added: head/comms/smstools3/files/patch-scripts_sendsms (contents, props changed) Modified: head/comms/smstools3/Makefile head/comms/smstools3/distinfo head/comms/smstools3/files/patch-Makefile head/comms/smstools3/files/patch-examples-smsd.conf.easy head/comms/smstools3/files/patch-install.sh head/comms/smstools3/files/patch-src-Makefile Modified: head/comms/smstools3/Makefile ============================================================================== --- head/comms/smstools3/Makefile Wed Nov 2 11:15:40 2016 (r425137) +++ head/comms/smstools3/Makefile Wed Nov 2 11:29:28 2016 (r425138) @@ -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} Modified: head/comms/smstools3/distinfo ============================================================================== --- head/comms/smstools3/distinfo Wed Nov 2 11:15:40 2016 (r425137) +++ head/comms/smstools3/distinfo Wed Nov 2 11:29:28 2016 (r425138) @@ -1,2 +1,3 @@ +TIMESTAMP = 1478085197 SHA256 (smstools3-3.1.15.tar.gz) = ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 SIZE (smstools3-3.1.15.tar.gz) = 300088 Modified: head/comms/smstools3/files/patch-Makefile ============================================================================== --- head/comms/smstools3/files/patch-Makefile Wed Nov 2 11:15:40 2016 (r425137) +++ head/comms/smstools3/files/patch-Makefile Wed Nov 2 11:29:28 2016 (r425138) @@ -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 Modified: head/comms/smstools3/files/patch-examples-smsd.conf.easy ============================================================================== --- head/comms/smstools3/files/patch-examples-smsd.conf.easy Wed Nov 2 11:15:40 2016 (r425137) +++ head/comms/smstools3/files/patch-examples-smsd.conf.easy Wed Nov 2 11:29:28 2016 (r425138) @@ -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 Modified: head/comms/smstools3/files/patch-install.sh ============================================================================== --- head/comms/smstools3/files/patch-install.sh Wed Nov 2 11:15:40 2016 (r425137) +++ head/comms/smstools3/files/patch-install.sh Wed Nov 2 11:29:28 2016 (r425138) @@ -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 Added: head/comms/smstools3/files/patch-scripts_sendsms ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/smstools3/files/patch-scripts_sendsms Wed Nov 2 11:29:28 2016 (r425138) @@ -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 Modified: head/comms/smstools3/files/patch-src-Makefile ============================================================================== --- head/comms/smstools3/files/patch-src-Makefile Wed Nov 2 11:15:40 2016 (r425137) +++ head/comms/smstools3/files/patch-src-Makefile Wed Nov 2 11:29:28 2016 (r425138) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611021129.uA2BTSdb072243>