Attachment #165717 for bug #205973

View | Details | Raw Unified | Return to bug 205973
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-3 / +7 lines)
3		3
4	PORTNAME= smstools	4	PORTNAME= smstools
5	PORTVERSION= 3.1.15	5	PORTVERSION= 3.1.15
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= comms	7	CATEGORIES= comms
8	MASTER_SITES= http://smstools3.kekekasvi.com/packages/	8	MASTER_SITES= http://smstools3.kekekasvi.com/packages/
9	DISTNAME= smstools3-${PORTVERSION}	9	DISTNAME= smstools3-${PORTVERSION}
Lines 16-23 Link Here
16		16
17	CONFLICTS= gnokii-[0-9]* smstools-2.* sendsms-[0-9]*	17	CONFLICTS= gnokii-[0-9]* smstools-2.* sendsms-[0-9]*
18		18
19	OPTIONS_DEFINE= STATS EXAMPLES DOCS	19	OPTIONS_DEFINE= STATS UTF8 EXAMPLES DOCS
20	OPTIONS_DEFAULT= STATS	20	OPTIONS_DEFAULT= STATS UTF8
21	STATS_DESC= Build status and statistics support	21	STATS_DESC= Build status and statistics support
22		22
23	WRKSRC= ${WRKDIR}/smstools3	23	WRKSRC= ${WRKDIR}/smstools3
Lines 46-51 Link Here
46	STATS_CFLAGS= -I${LOCALBASE}/include	46	STATS_CFLAGS= -I${LOCALBASE}/include
47	STATS_CFLAGS_OFF= -DNOSTATS	47	STATS_CFLAGS_OFF= -DNOSTATS
48		48
		49	UTF8_USES= iconv
		50	UTF8_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB}
		51	UTF8_CFLAGS= -DUSE_ICONV
		52
49	SMSTOOLS_DEFAULT_COMPORT?= /dev/cuau0	53	SMSTOOLS_DEFAULT_COMPORT?= /dev/cuau0
50		54
51	post-patch:	55	post-patch:

Line 0 Link Here

(-)files/patch-scripts_sendsms (+11 lines)
	1	--- scripts/sendsms.orig 2010-07-08 12:41:13 UTC
	2	+++ scripts/sendsms
	3	@@ -80,7 +80,7 @@ echo "Text: $TEXT"
	4
	5	ALPHABET=""
	6	if which iconv > /dev/null 2>&1; then
	7	- if ! $ECHO -n "$TEXT" \| iconv -t ISO-8859-15 >/dev/null 2>&1; then
	8	+ if $ECHO -n "$TEXT" \| iconv -t ISO-8859-15 2>&1 \| grep "invalid" > /dev/null; then
	9	ALPHABET="Alphabet: UCS"
	10	fi
	11	fi




--- 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).
 

 
 # Uncomment for Solaris
 # CFLAGS += -D SOLARIS
@@ -9,13 +9,13 @@ CFLAGS = -D NUMBER_OF_MODEMS=64
 # CC=gcc
 
 # Comment this out, to enable statistics

 
 # Comment this out if iconv is not available on the system
 #CFLAGS += -D USE_ICONV
 
 # 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 $@ $^ $(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` $(LDFLAGS)
 endif
 
 clean:

Return to bug 205973

Lines 1-5 Link Here

(-)files/patch-src-Makefile (-6 / +22 lines)
1	--- src/Makefile.orig 2010-06-16 14:02:36.000000000 +0200	1	--- src/Makefile.orig 2010-09-21 11:29:14 UTC
2	+++ src/Makefile 2010-07-06 22:00:30.303633098 +0200	2	+++ src/Makefile
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	# In case of windows, use os_cygwin=yes setting in the configuration file (smsd.conf).	4	# In case of windows, use os_cygwin=yes setting in the configuration file (smsd.conf).
5		5
Lines 9-15 Link Here
9		9
10	# Uncomment for Solaris	10	# Uncomment for Solaris
11	# CFLAGS += -D SOLARIS	11	# CFLAGS += -D SOLARIS
12	@@ -9,7 +9,7 @@	12	@@ -9,13 +9,13 @@ CFLAGS = -D NUMBER_OF_MODEMS=64
13	# CC=gcc	13	# CC=gcc
14		14
15	# Comment this out, to enable statistics	15	# Comment this out, to enable statistics
Lines 18-29 Link Here
18		18
19	# Comment this out if iconv is not available on the system	19	# Comment this out if iconv is not available on the system
20	#CFLAGS += -D USE_ICONV	20	#CFLAGS += -D USE_ICONV
21	@@ -50,7 +50,7 @@	21
		22	# Uncomment this is iconv is used and it's not included in libc:
		23	-#LFLAGS += -liconv
		24	+#LDFLAGS += -liconv
		25
		26	# Uncomment this to force smsd to run in terminal mode
		27	#CFLAGS += -D TERMINAL
		28	@@ -43,14 +43,14 @@ smsd: smsd.c extras.o locking.o cfgfile.
		29
		30	ifneq (,$(findstring SOLARIS,$(CFLAGS)))
		31	ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS)))
		32	-override LFLAGS += -lsocket -lnsl
		33	+override LDFLAGS += -lsocket -lnsl
		34	endif
		35	endif
		36
22	ifneq (,$(findstring NOSTATS,$(CFLAGS)))	37	ifneq (,$(findstring NOSTATS,$(CFLAGS)))
23	$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS)	38	- $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS)
		39	+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
24	else	40	else
25	- $(CC) `mm-config --cflags` $(CFLAGS) -o $@ $^ `mm-config --ldflags --libs` $(LFLAGS)	41	- $(CC) `mm-config --cflags` $(CFLAGS) -o $@ $^ `mm-config --ldflags --libs` $(LFLAGS)
26	+ $(CC) `$(LOCALBASE)/bin/mm-config --cflags` $(CFLAGS) -o $@ $^ `$(LOCALBASE)/bin/mm-config --ldflags --libs` $(LFLAGS)	42	+ $(CC) `$(LOCALBASE)/bin/mm-config --cflags` $(CFLAGS) -o $@ $^ `$(LOCALBASE)/bin/mm-config --ldflags --libs` $(LDFLAGS)
27	endif	43	endif
28		44
29	clean:	45	clean: