Attachment #105629 for bug #146129

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

Lines 6-13 Link Here

(-)gnokii/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gnokii	8	PORTNAME= gnokii
9	PORTVERSION= 0.6.28	9	PORTVERSION= 0.6.29
10	PORTREVISION= 2
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= comms	11	CATEGORIES= comms
13	MASTER_SITES= http://www.gnokii.org/download/gnokii/ \	12	MASTER_SITES= http://www.gnokii.org/download/gnokii/ \

Lines 1-3 Link Here

(-)gnokii/distinfo (-3 / +3 lines)
1	MD5 (gnokii-0.6.28.tar.bz2) = 55d5567ea5d1ebf8cdc7ad662691fee1	1	MD5 (gnokii-0.6.29.tar.bz2) = 6111e0158a1129062bda6420db67c313
2	SHA256 (gnokii-0.6.28.tar.bz2) = 16a0720b7658317c28f4383b3e622cc411965932e8aaf60d89967322397c45dc	2	SHA256 (gnokii-0.6.29.tar.bz2) = d1633e934b6b43c681ea96c5830d44683a85f05e64ea03c3ecf0d5096aee8470
3	SIZE (gnokii-0.6.28.tar.bz2) = 1271202	3	SIZE (gnokii-0.6.29.tar.bz2) = 1302020




--- Makefile.in.orig	2010-04-21 15:49:31.000000000 +0200
+++ Makefile.in	2010-04-24 20:09:03.347837666 +0200
@@ -301,9 +301,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = getopt include common gnokii po Docs $(am__append_1) \
+SUBDIRS = include common gnokii po $(am__append_1) \
 	$(am__append_2) $(am__append_3)
-DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd Windows testsuite getopt
+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd Windows testsuite getopt
 EXTRA_DIST = \
 		ChangeLog		\
 		COPYING			\




--- configure.orig	2010-04-21 15:49:32.000000000 +0200
+++ configure	2010-04-25 18:02:53.185508083 +0200
@@ -1060,7 +1060,7 @@
 psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'

 
 ac_prev=
 ac_dashdash=
@@ -7909,20 +7909,6 @@
 
   fi
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on FreeBSD" >&5
-$as_echo_n "checking if building on FreeBSD... " >&6; }
-
-if test `uname -s` = "FreeBSD" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	CPPFLAGS="$CFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on NetBSD" >&5
 $as_echo_n "checking if building on NetBSD... " >&6; }
 
@@ -14858,7 +14844,7 @@
 # First of all, check if the user has set any of the PTHREAD_LIBS,
 # etcetera environment variables, and if threads linking works using
 # them:
+PTHREAD_CFLAGS=""
+PTHREAD_LIBS="-pthread"
 if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
         save_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
@@ -17380,7 +17368,7 @@
 $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
         flag=no
         case "${host_cpu}-${host_os}" in

+                *-aix* | *-darwin*) flag="-D_THREAD_SAFE";;
                 *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
         esac
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
@@ -15461,7 +15447,7 @@
 
 if test "$enable_libical" = "yes"; then
 	OLD_CFLAGS="$CFLAGS"
-	LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
+	LIBS="$LIBS $ICAL_LIBS -pthread -lical"
 	CFLAGS="$CFLAGS $ICAL_CFLAGS"
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libical is installed" >&5
 $as_echo_n "checking whether libical is installed... " >&6; }
@@ -15883,7 +15869,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbluetooth  $LIBS"
+LIBS="-lsdp -lbluetooth  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15914,7 +15900,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5
 $as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
 if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then :
-  BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
+  BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
 else
   ac_cv_have_bt_lib=no
 fi
@@ -16011,7 +15997,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbluetooth  $LIBS"
+LIBS="-lsdp -lbluetooth  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16042,7 +16028,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5
 $as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
 if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then :
-  BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
+  BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
 else
   ac_cv_have_bt_lib=no
 fi
@@ -16612,7 +16598,7 @@
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_open" >&5
 $as_echo "$ac_cv_lib_sdp_sdp_open" >&6; }
 if test "x$ac_cv_lib_sdp_sdp_open" = x""yes; then
-  BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp"
+  BLUETOOTH_LIBS="$BLUETOOTH_LIBS"
 fi
 
 
@@ -21456,7 +21444,7 @@
 $as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
 if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = x""yes; then :
    XPM_CFLAGS="$XINCL"
-                  XPM_LIBS="$XLIBS -lXpm -lX11"
+                  XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
 
 $as_echo "#define XPM 1" >>confdefs.h
 




--- gnokiid/Makefile.in.orig	2010-04-21 15:49:27.000000000 +0200
+++ gnokiid/Makefile.in	2010-04-25 18:04:37.105945495 +0200
@@ -53,7 +53,7 @@
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_gnokiid_OBJECTS = gnokiid-gnokiid.$(OBJEXT)
-gnokiid_OBJECTS = $(am_gnokiid_OBJECTS)

 am__DEPENDENCIES_1 =
 gnokiid_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \
 	$(top_builddir)/common/data/libDATA.la $(am__DEPENDENCIES_1)
@@ -328,8 +328,8 @@
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
 	    } \
 	; done
 




--- Docs/sample/gnokiirc.orig	Wed Nov  9 01:11:42 2005
+++ Docs/sample/gnokiirc	Sat Nov 12 19:11:21 2005
@@ -7,7 +7,7 @@
 
 # Set port to the physical port used to connect to your phone.
 # Linux version is:
-port = /dev/ttyS0
+port = /dev/cuaa0
 #
 # For MacOSX you will need something like:
 # port = /dev/cu.USA28X1P1.1
@@ -45,7 +45,7 @@
 # model = AT
 # If you can't figure out what to put here read the FAQ.
 # If it still doesn't help, consult gnokii-ml or #gnokii at freenode.
-model = 6510
+model = 6210
 # There are few main models that should make use of the certain drivers.
 # These are: 6110, 7110, 6510, 3110, 2110, 6160.
 
@@ -87,7 +87,7 @@
 # port software (eg. minicom). If you have wrong permissions for the
 # directory, a warning will be generated. If you don't want a lockfile, set
 # it to 'no'.
-use_locking = yes
+use_locking = no
 
 # Baudrate to use on serial port connections.
 # Currently used only by models AT and BIP/CIMD. Defaults to 19200.




--- smsd/Makefile.in.orig	2010-04-21 15:49:29.000000000 +0200
+++ smsd/Makefile.in	2010-04-25 18:09:09.881650463 +0200
@@ -105,7 +105,7 @@
 @HAVE_POSTGRES_TRUE@am_libsmsd_pq_la_rpath = -rpath $(plugindir)
 PROGRAMS = $(bin_PROGRAMS)
 am_smsd_OBJECTS = smsd.$(OBJEXT) lowlevel.$(OBJEXT)
-smsd_OBJECTS = $(am_smsd_OBJECTS)

 smsd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
@@ -442,8 +442,8 @@
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
 	    } \
 	; done
 

Lines 21-27 Link Here

(-)gnokii/pkg-plist (-1 / +1 lines)
21	lib/libgnokii.a	21	lib/libgnokii.a
22	lib/libgnokii.la	22	lib/libgnokii.la
23	lib/libgnokii.so	23	lib/libgnokii.so
24	lib/libgnokii.so.5	24	lib/libgnokii.so.6
25	libdata/pkgconfig/gnokii.pc	25	libdata/pkgconfig/gnokii.pc
26	libdata/pkgconfig/xgnokii.pc	26	libdata/pkgconfig/xgnokii.pc
27	sbin/gnokiid	27	sbin/gnokiid

Return to bug 146129

Lines 1-14 Link Here

(-)gnokii/files/patch-Makefile.in (-5 / +5 lines)
1	--- Makefile.in.orig 2009-09-08 23:07:09.846077502 +0200	1	--- Makefile.in.orig 2010-04-21 15:49:31.000000000 +0200
2	+++ Makefile.in 2009-09-08 23:08:46.625927897 +0200	2	+++ Makefile.in 2010-04-24 20:09:03.347837666 +0200
3	@@ -269,9 +269,9 @@	3	@@ -301,9 +301,9 @@
4	top_build_prefix = @top_build_prefix@	4	top_build_prefix = @top_build_prefix@
5	top_builddir = @top_builddir@	5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@	6	top_srcdir = @top_srcdir@
7	-SUBDIRS = getopt include common gnokii po Docs $(am__append_1) \	7	-SUBDIRS = getopt include common gnokii po Docs $(am__append_1) \
8	+SUBDIRS = include common gnokii po $(am__append_1) \	8	+SUBDIRS = include common gnokii po $(am__append_1) \
9	$(am__append_2) $(am__append_3)	9	$(am__append_2) $(am__append_3)
10	-DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt	10	-DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd Windows testsuite getopt
11	+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt	11	+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd Windows testsuite getopt
12	EXTRA_DIST = \	12	EXTRA_DIST = \
13	ChangeLog \	13	ChangeLog \
14	COPYING \	14	COPYING \

Lines 1-6 Link Here

(-)gnokii/files/patch-configure (-52 / +34 lines)
1	--- configure.orig 2009-09-08 22:26:52.251269320 +0200	1	--- configure.orig 2010-04-21 15:49:32.000000000 +0200
2	+++ configure 2009-09-08 22:39:58.432178979 +0200	2	+++ configure 2010-04-25 18:02:53.185508083 +0200
3	@@ -1102,7 +1102,7 @@	3	@@ -1060,7 +1060,7 @@
4	psdir='${docdir}'	4	psdir='${docdir}'
5	libdir='${exec_prefix}/lib'	5	libdir='${exec_prefix}/lib'
6	localedir='${datarootdir}/locale'	6	localedir='${datarootdir}/locale'
Lines 9-45 Link Here
9		9
10	ac_prev=	10	ac_prev=
11	ac_dashdash=	11	ac_dashdash=
12	@@ -9685,20 +9685,6 @@	12	@@ -7909,20 +7909,6 @@
13		13
14	fi	14	fi
15		15
16	-	16	-
17	-{ $as_echo "$as_me:$LINENO: checking if building on FreeBSD" >&5	17	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on FreeBSD" >&5
18	-$as_echo_n "checking if building on FreeBSD... " >&6; }	18	-$as_echo_n "checking if building on FreeBSD... " >&6; }
19	-	19	-
20	-if test `uname -s` = "FreeBSD" ; then	20	-if test `uname -s` = "FreeBSD" ; then
21	- { $as_echo "$as_me:$LINENO: result: yes" >&5	21	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22	-$as_echo "yes" >&6; }	22	-$as_echo "yes" >&6; }
23	- CPPFLAGS="$CFLAGS -I/usr/local/include"	23	- CPPFLAGS="$CFLAGS -I/usr/local/include"
24	- LDFLAGS="$LDFLAGS -L/usr/local/lib"	24	- LDFLAGS="$LDFLAGS -L/usr/local/lib"
25	-else	25	-else
26	- { $as_echo "$as_me:$LINENO: result: no" >&5	26	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
27	-$as_echo "no" >&6; }	27	-$as_echo "no" >&6; }
28	-fi	28	-fi
29	-	29	-
30	{ $as_echo "$as_me:$LINENO: checking if building on NetBSD" >&5	30	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on NetBSD" >&5
31	$as_echo_n "checking if building on NetBSD... " >&6; }	31	$as_echo_n "checking if building on NetBSD... " >&6; }
32		32
33	@@ -16994,6 +16980,8 @@	33	@@ -14858,7 +14844,7 @@
34	# First of all, check if the user has set any of the PTHREAD_LIBS,
35	# etcetera environment variables, and if threads linking works using
36	# them:
37	+PTHREAD_CFLAGS=""
38	+PTHREAD_LIBS="-pthread"
39	if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
40	save_CFLAGS="$CFLAGS"
41	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
42	@@ -17380,7 +17368,7 @@
43	$as_echo_n "checking if more special flags are required for pthreads... " >&6; }	34	$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
44	flag=no	35	flag=no
45	case "${host_cpu}-${host_os}" in	36	case "${host_cpu}-${host_os}" in
Lines 47-113 Link Here
47	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;	38	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;
48	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;	39	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;
49	esac	40	esac
50	{ $as_echo "$as_me:$LINENO: result: ${flag}" >&5	41	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
51	@@ -19174,7 +19162,7 @@	42	@@ -15461,7 +15447,7 @@
52		43
53	if test "$enable_libical" = "yes"; then	44	if test "$enable_libical" = "yes"; then
54	OLD_CFLAGS="$CFLAGS"	45	OLD_CFLAGS="$CFLAGS"
55	- LIBS="$LIBS $ICAL_LIBS -lpthread -lical"	46	- LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
56	+ LIBS="$LIBS $ICAL_LIBS -pthread -lical"	47	+ LIBS="$LIBS $ICAL_LIBS -pthread -lical"
57	CFLAGS="$CFLAGS $ICAL_CFLAGS"	48	CFLAGS="$CFLAGS $ICAL_CFLAGS"
58	{ $as_echo "$as_me:$LINENO: checking whether libical is installed" >&5	49	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libical is installed" >&5
59	$as_echo_n "checking whether libical is installed... " >&6; }	50	$as_echo_n "checking whether libical is installed... " >&6; }
60	@@ -20243,7 +20231,7 @@	51	@@ -15883,7 +15869,7 @@
61	$as_echo_n "(cached) " >&6	52	$as_echo_n "(cached) " >&6
62	else	53	else
63	ac_check_lib_save_LIBS=$LIBS	54	ac_check_lib_save_LIBS=$LIBS
64	-LIBS="-lbluetooth $LIBS"	55	-LIBS="-lbluetooth $LIBS"
65	+LIBS="-lsdp -lbluetooth $LIBS"	56	+LIBS="-lsdp -lbluetooth $LIBS"
66	cat >conftest.$ac_ext <<_ACEOF	57	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
67	/* confdefs.h. */	58	/* end confdefs.h. */
68	_ACEOF	59
69	@@ -20303,7 +20291,7 @@	60	@@ -15914,7 +15900,7 @@
70	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5	61	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5
71	$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }	62	$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
72	if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then	63	if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then :
73	- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes	64	- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
74	+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes	65	+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
75	else	66	else
76	ac_cv_have_bt_lib=no	67	ac_cv_have_bt_lib=no
77	fi	68	fi
78	@@ -20375,7 +20363,7 @@	69	@@ -16011,7 +15997,7 @@
79	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_open" >&5	70	$as_echo_n "(cached) " >&6
80	$as_echo "$ac_cv_lib_sdp_sdp_open" >&6; }	71	else
81	if test "x$ac_cv_lib_sdp_sdp_open" = x""yes; then	72	ac_check_lib_save_LIBS=$LIBS
82	- BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp"	73	-LIBS="-lbluetooth $LIBS"
83	+ BLUETOOTH_LIBS="$BLUETOOTH_LIBS"	74	+LIBS="-lsdp -lbluetooth $LIBS"
84	fi	75	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
85		76	/* end confdefs.h. */
86		77
87	@@ -20516,7 +20504,7 @@	78	@@ -16042,7 +16028,7 @@
88	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5	79	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_bt_aton" >&5
89	$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }	80	$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
90	if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then	81	if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then :
91	- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes	82	- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
92	+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes	83	+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
93	else	84	else
94	ac_cv_have_bt_lib=no	85	ac_cv_have_bt_lib=no
95	fi	86	fi
96	@@ -20588,7 +20576,7 @@	87	@@ -16612,7 +16598,7 @@
97	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_open" >&5
98	$as_echo "$ac_cv_lib_sdp_sdp_open" >&6; }
99	if test "x$ac_cv_lib_sdp_sdp_open" = x""yes; then
100	- BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp"
101	+ BLUETOOTH_LIBS="$BLUETOOTH_LIBS"
102	fi
103
104
105	@@ -21456,7 +21444,7 @@
106	$as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }	88	$as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
107	if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = x""yes; then	89	if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = x""yes; then :
108	XPM_CFLAGS="$XINCL"	90	XPM_CFLAGS="$XINCL"
109	- XPM_LIBS="$XLIBS -lXpm -lX11"	91	- XPM_LIBS="$XLIBS -lXpm -lX11"
110	+ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"	92	+ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
111		93
112	cat >>confdefs.h <<\_ACEOF	94	$as_echo "#define XPM 1" >>confdefs.h
113	#define XPM 1	95

Lines 1-7 Link Here

(-)gnokii/files/patch-gnokiid-Makefile.in (-14 / +14 lines)
1	--- gnokiid/Makefile.in.orig 2008-10-06 08:57:16.000000000 +0200	1	--- gnokiid/Makefile.in.orig 2010-04-21 15:49:27.000000000 +0200
2	+++ gnokiid/Makefile.in 2009-02-26 17:26:31.000000000 +0100	2	+++ gnokiid/Makefile.in 2010-04-25 18:04:37.105945495 +0200
3	@@ -48,7 +48,7 @@	3	@@ -53,7 +53,7 @@
4	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)	4	am__installdirs = "$(DESTDIR)$(bindir)"
5	PROGRAMS = $(bin_PROGRAMS)	5	PROGRAMS = $(bin_PROGRAMS)
6	am_gnokiid_OBJECTS = gnokiid-gnokiid.$(OBJEXT)	6	am_gnokiid_OBJECTS = gnokiid-gnokiid.$(OBJEXT)
7	-gnokiid_OBJECTS = $(am_gnokiid_OBJECTS)	7	-gnokiid_OBJECTS = $(am_gnokiid_OBJECTS)
Lines 9-22 Link Here
9	am__DEPENDENCIES_1 =	9	am__DEPENDENCIES_1 =
10	gnokiid_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \	10	gnokiid_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \
11	$(top_builddir)/common/data/libDATA.la $(am__DEPENDENCIES_1)	11	$(top_builddir)/common/data/libDATA.la $(am__DEPENDENCIES_1)
12	@@ -326,8 +326,8 @@	12	@@ -328,8 +328,8 @@
13	\|\| test -f $$p1 \	13	while read type dir files; do \
14	; then \	14	if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
15	f=`echo "$$p1" \| sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \	15	test -z "$$files" \|\| { \
16	- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \	16	- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
17	- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" \|\| exit 1; \	17	- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" \|\| exit $$?; \
18	+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \	18	+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
19	+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" \|\| exit 1; \	19	+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" \|\| exit $$?; \
20	else :; fi; \	20	} \
21	done	21	; done
22		22

Lines 1-29 Link Here

(-)gnokii/files/patch-gnokiirc (-29 lines)
1	--- Docs/sample/gnokiirc.orig Wed Nov 9 01:11:42 2005
2	+++ Docs/sample/gnokiirc Sat Nov 12 19:11:21 2005
3	@@ -7,7 +7,7 @@
4
5	# Set port to the physical port used to connect to your phone.
6	# Linux version is:
7	-port = /dev/ttyS0
8	+port = /dev/cuaa0
9	#
10	# For MacOSX you will need something like:
11	# port = /dev/cu.USA28X1P1.1
12	@@ -45,7 +45,7 @@
13	# model = AT
14	# If you can't figure out what to put here read the FAQ.
15	# If it still doesn't help, consult gnokii-ml or #gnokii at freenode.
16	-model = 6510
17	+model = 6210
18	# There are few main models that should make use of the certain drivers.
19	# These are: 6110, 7110, 6510, 3110, 2110, 6160.
20
21	@@ -87,7 +87,7 @@
22	# port software (eg. minicom). If you have wrong permissions for the
23	# directory, a warning will be generated. If you don't want a lockfile, set
24	# it to 'no'.
25	-use_locking = yes
26	+use_locking = no
27
28	# Baudrate to use on serial port connections.
29	# Currently used only by models AT and BIP/CIMD. Defaults to 19200.

Lines 1-7 Link Here

(-)gnokii/files/patch-smsd-Makefile.in (-14 / +14 lines)
1	--- smsd/Makefile.in.orig 2008-10-06 08:57:19.000000000 +0200	1	--- smsd/Makefile.in.orig 2010-04-21 15:49:29.000000000 +0200
2	+++ smsd/Makefile.in 2009-02-26 17:35:49.000000000 +0100	2	+++ smsd/Makefile.in 2010-04-25 18:09:09.881650463 +0200
3	@@ -86,7 +86,7 @@	3	@@ -105,7 +105,7 @@
4	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)	4	@HAVE_POSTGRES_TRUE@am_libsmsd_pq_la_rpath = -rpath $(plugindir)
5	PROGRAMS = $(bin_PROGRAMS)	5	PROGRAMS = $(bin_PROGRAMS)
6	am_smsd_OBJECTS = smsd.$(OBJEXT) lowlevel.$(OBJEXT)	6	am_smsd_OBJECTS = smsd.$(OBJEXT) lowlevel.$(OBJEXT)
7	-smsd_OBJECTS = $(am_smsd_OBJECTS)	7	-smsd_OBJECTS = $(am_smsd_OBJECTS)
Lines 9-22 Link Here
9	smsd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \	9	smsd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
10	$(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la	10	$(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la
11	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include	11	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
12	@@ -421,8 +421,8 @@	12	@@ -442,8 +442,8 @@
13	\|\| test -f $$p1 \	13	while read type dir files; do \
14	; then \	14	if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
15	f=`echo "$$p1" \| sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \	15	test -z "$$files" \|\| { \
16	- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \	16	- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
17	- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" \|\| exit 1; \	17	- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" \|\| exit $$?; \
18	+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \	18	+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
19	+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" \|\| exit 1; \	19	+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" \|\| exit $$?; \
20	else :; fi; \	20	} \
21	done	21	; done
22		22