Attachment 165717 Details for Bug 205973 – Proposed patch

[patch] Proposed patch

smstools3.diff (text/plain), 3.51 KB, created by Guido Falsi on 2016-01-17 14:55:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2016-01-17 14:55:59 UTC

Size: 3.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 406510)
>+++ Makefile	(working copy)
>@@ -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 @@
> 
> 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_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:
>Index: files/patch-scripts_sendsms
>===================================================================
>--- files/patch-scripts_sendsms	(nonexistent)
>+++ files/patch-scripts_sendsms	(working copy)
>@@ -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
>
>Property changes on: files/patch-scripts_sendsms
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src-Makefile
>===================================================================
>--- files/patch-src-Makefile	(revision 406510)
>+++ files/patch-src-Makefile	(working copy)
>@@ -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:

Actions: View | Diff

Attachments on bug 205973: 165717