Update to 0.6.28

PR:		138674
Submitted by:	maintainer

10 files changed, 112 insertions, 571 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 3c3b6ff6752d..44566f5d0560 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.6.27
-PORTREVISION=	3
+PORTVERSION=	0.6.28
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
@@ -32,7 +31,7 @@ CONFIGURE_ENV+=	MSGFMT="${LOCALBASE}/bin/msgfmt" \
 		XGETTEXT="${LOCALBASE}/bin/xgettext" \
 		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-L../common -L${LOCALBASE}/lib" \
+		LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \
 		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
 
 PKGDEINSTALL=	${PKGINSTALL}
@@ -117,20 +116,6 @@ post-patch:
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${MV} ${WRKSRC}/Docs/man/xgnokii.1x ${WRKSRC}/Docs/man/xgnokii.1
 
-post-build:
-.if defined(WITH_SMSD)
-.if defined(WITH_MYSQL)
-	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_SOURCES/libsmsd_mysql_la_SOURCES/' ${WRKSRC}/smsd/Makefile.in
-	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_LDFLAGS/libsmsd_mysql_la_LDFLAGS/' ${WRKSRC}/smsd/Makefile.in
-	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_LIBADD/libsmsd_mysql_la_LIBADD/' ${WRKSRC}/smsd/Makefile.in
-.endif
-.if defined(WITH_PGSQL)
-	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_SOURCES/libsmsd_pq_la_SOURCES/' ${WRKSRC}/smsd/Makefile.in
-	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_LDFLAGS/libsmsd_pq_la_LDFLAGS/' ${WRKSRC}/smsd/Makefile.in
-	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_LIBADD/libsmsd_pq_la_LIBADD/' ${WRKSRC}/smsd/Makefile.in
-.endif
-.endif
-
 pre-install:
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 8471bf2430f3..9ae19a227065 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnokii-0.6.27.tar.bz2) = fd0ae7996a2e2a2c29e9f3c625df8f3d
-SHA256 (gnokii-0.6.27.tar.bz2) = 69f1d75f755a2918e9577cf28dacea9d6fca9b9d722813341d50d12acb8ee886
-SIZE (gnokii-0.6.27.tar.bz2) = 1491564
+MD5 (gnokii-0.6.28.tar.bz2) = 55d5567ea5d1ebf8cdc7ad662691fee1
+SHA256 (gnokii-0.6.28.tar.bz2) = 16a0720b7658317c28f4383b3e622cc411965932e8aaf60d89967322397c45dc
+SIZE (gnokii-0.6.28.tar.bz2) = 1271202
diff --git a/comms/gnokii/files/patch-Makefile.in b/comms/gnokii/files/patch-Makefile.in
index bbaa5eb32a77..dadd4493bafa 100644
--- a/comms/gnokii/files/patch-Makefile.in
+++ b/comms/gnokii/files/patch-Makefile.in
@@ -1,14 +1,14 @@
---- Makefile.in.orig	2008-06-02 15:48:31.000000000 +0200
-+++ Makefile.in	2008-06-02 15:48:47.000000000 +0200
-@@ -279,9 +279,9 @@
- target_vendor = @target_vendor@
+--- Makefile.in.orig	2009-09-08 23:07:09.846077502 +0200
++++ Makefile.in	2009-09-08 23:08:46.625927897 +0200
+@@ -269,9 +269,9 @@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = include common gnokii po patches Docs $(am__append_1) \
-+SUBDIRS = include common gnokii po patches $(am__append_1) \
+-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 win32 testsuite patches getopt
-+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite patches getopt
+-DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt
++DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt
  EXTRA_DIST = \
  		ChangeLog		\
  		COPYING			\
diff --git a/comms/gnokii/files/patch-common-devices-unixbluetooth.c b/comms/gnokii/files/patch-common-devices-unixbluetooth.c
index 5bb9bb09a702..8cd7f1eac865 100644
--- a/comms/gnokii/files/patch-common-devices-unixbluetooth.c
+++ b/comms/gnokii/files/patch-common-devices-unixbluetooth.c
@@ -1,321 +1,20 @@
---- common/devices/unixbluetooth.c.orig	2008-10-05 12:14:31.000000000 +0200
-+++ common/devices/unixbluetooth.c	2009-02-17 17:03:58.000000000 +0100
-@@ -54,6 +54,8 @@
- #include <netgraph/bluetooth/include/ng_hci.h>
- #include <netgraph/bluetooth/include/ng_l2cap.h>
- #include <netgraph/bluetooth/include/ng_btsocket.h>
-+#include <bluetooth.h>
+--- common/devices/unixbluetooth.c.orig	2009-06-23 20:24:56.000000000 +0200
++++ common/devices/unixbluetooth.c	2009-09-08 22:21:31.450731259 +0200
+@@ -51,7 +51,7 @@
+ #ifdef HAVE_BLUETOOTH_NETGRAPH	/* FreeBSD / netgraph */
+ 
+ #include <bluetooth.h>
+-#include <sdp.h>
 +#include </usr/include/sdp.h>
  
  #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
  #define BDADDR_ANY NG_HCI_BDADDR_ANY
-@@ -86,11 +88,6 @@
- 
- #endif	/* HAVE_BT_ATON */
- 
--static int str2ba(const char *str, bdaddr_t *ba)
--{
--	return !bt_aton(str, ba);
--}
--
- #else	/* Linux / BlueZ support */
- 
- #include <bluetooth/bluetooth.h>
-@@ -100,6 +97,272 @@
- 
- #endif
- 
-+#ifdef HAVE_BLUETOOTH_NETGRAPH	/* FreeBSD / netgraph */
-+
-+/*
-+** FreeBSD version of the find_service_channel function.
-+** Written by Guido Falsi <mad@madpilot.net>.
-+** Contains code taken from FreeBSD's sdpcontrol and rfcomm_sppd
-+** programs, which are Copyright (c) 2001-2003 Maksim Yevmenkin
-+** <m_evmenkin@yahoo.com>.
-+*/
-+
-+static int find_service_channel(bdaddr_t *adapter, bdaddr_t *device, int only_gnapplet, uint16_t svclass_id)
-+{
-+	uint8_t getchan = 0;
-+	uint32_t i, good = 0;
-+	char name[64];
-+	void *ss = NULL;
-+
-+	uint32_t attrs[] =
-+	{
-+		SDP_ATTR_RANGE( SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET,
-+			SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET),
-+		SDP_ATTR_RANGE( SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST,
-+			SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST),
-+	};
-+	#define attrs_len	(sizeof(attrs)/sizeof(attrs[0]))
-+
-+	/* Buffer for the attributes */
-+	#define NRECS   25      /* request this much records from the SDP server */
-+	#define BSIZE   256     /* one attribute buffer size */
-+	static uint8_t          buffer[NRECS * attrs_len][BSIZE];
-+
-+	/* SDP attributes */
-+	static sdp_attr_t       values[NRECS * attrs_len];
-+	#define values_len      (sizeof(values)/sizeof(values[0]))
-+
-+	/* Initialize attribute values array */
-+	for (i = 0; i < values_len; i ++) {
-+		values[i].flags = SDP_ATTR_INVALID;
-+		values[i].attr = 0;
-+		values[i].vlen = BSIZE; 
-+		values[i].value = buffer[i];
-+	}
-+
-+	if ((ss = sdp_open(adapter, device)) == NULL)
-+		return -1;
-+
-+	if (sdp_error(ss) != 0)
-+	{
-+		sdp_close(ss);
-+		return -1;
-+	}
-+
-+	if (sdp_search(ss, 1, &svclass_id, attrs_len, attrs, values_len, values) != 0)
-+	{
-+		sdp_close(ss);
-+		return -1;
-+	}
-+
-+	for (i = 0; i < values_len; i++)
-+	{
-+		if (values[i].flags != SDP_ATTR_OK)
-+			break;
-+
-+		union {
-+			uint8_t		uint8;
-+			uint16_t	uint16;
-+			uint32_t	uint32;
-+			uint64_t	uint64;
-+			int128_t	int128;
-+		}			value;
-+		uint8_t *start, *end;
-+		uint32_t type, len;
-+
-+		start = values[i].value;
-+		end = values[i].value + values[i].vlen;
-+
-+		switch (values[i].attr) {
-+		case SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST:
-+			if(getchan) {
-+				SDP_GET8(type, start);
-+				switch (type) {
-+				case SDP_DATA_SEQ8:
-+					SDP_GET8(len, start);
-+					break;
-+
-+				case SDP_DATA_SEQ16:
-+					SDP_GET16(len, start);
-+					break;
-+
-+				case SDP_DATA_SEQ32:
-+					SDP_GET32(len, start);
-+					break;
-+
-+				default:
-+					sdp_close(ss);
-+					return -1;
-+					break;
-+				}
-+
-+				SDP_GET8(type, start);
-+				switch (type) {
-+				case SDP_DATA_SEQ8:
-+					SDP_GET8(len, start);
-+					break;
-+
-+				case SDP_DATA_SEQ16:
-+					SDP_GET16(len, start);
-+					break;
-+
-+				case SDP_DATA_SEQ32:
-+					SDP_GET32(len, start);
-+					break;
-+
-+				default:
-+					sdp_close(ss);
-+					return -1;
-+					break;
-+				}
-+
-+				while (start < end) {
-+					SDP_GET8(type, start);
-+					switch (type) {
-+					case SDP_DATA_UUID16:
-+						SDP_GET16(value.uint16, start);
-+						break;
-+
-+					case SDP_DATA_UUID32:
-+						SDP_GET32(value.uint32, start);
-+						break;
-+
-+					case SDP_DATA_UUID128:
-+						SDP_GET_UUID128(&value.int128, start);
-+						break;
-+
-+					default:
-+						sdp_close(ss);
-+						return -1;
-+						break;
-+					}
-+					if(value.uint16 == 3) {
-+						SDP_GET8(type, start);
-+						switch (type) {
-+						case SDP_DATA_UINT8:
-+						case SDP_DATA_INT8:
-+							SDP_GET8(value.uint8, start);
-+							return value.uint8;
-+							break;
-+
-+						case SDP_DATA_UINT16:
-+						case SDP_DATA_INT16:
-+							SDP_GET16(value.uint16, start);
-+							return value.uint16;
-+							break;
-+
-+						case SDP_DATA_UINT32:
-+						case SDP_DATA_INT32:
-+							SDP_GET32(value.uint32, start);
-+							return value.uint32;
-+							break;
-+
-+						default:
-+							sdp_close(ss);
-+							return -1;
-+							break;
-+						}
-+					} else {
-+						SDP_GET8(type, start);
-+						switch (type) {
-+						case SDP_DATA_SEQ8:
-+						case SDP_DATA_UINT8:
-+						case SDP_DATA_INT8:
-+						case SDP_DATA_BOOL:
-+							SDP_GET8(value.uint8, start);
-+							break;
-+
-+						case SDP_DATA_SEQ16:
-+						case SDP_DATA_UINT16:
-+						case SDP_DATA_INT16:
-+						case SDP_DATA_UUID16:
-+							SDP_GET16(value.uint16, start);
-+							break;
-+
-+						case SDP_DATA_SEQ32:
-+						case SDP_DATA_UINT32:
-+						case SDP_DATA_INT32:
-+						case SDP_DATA_UUID32:
-+							SDP_GET32(value.uint32, start);
-+							break;
-+
-+						case SDP_DATA_UINT64:
-+						case SDP_DATA_INT64:
-+							SDP_GET64(value.uint64, start);
-+							break;
-+
-+						case SDP_DATA_UINT128:
-+						case SDP_DATA_INT128:
-+							SDP_GET128(&value.int128, start);
-+							break;
-+
-+						default:
-+							sdp_close(ss);
-+							return -1;
-+							break;
-+						}
-+					}
-+				}
-+			}
-+			start += len;
-+			break;
-+
-+		case SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET:
-+			SDP_GET8(type, start);
-+			switch (type) {
-+				case SDP_DATA_STR8:
-+				case SDP_DATA_URL8:
-+					SDP_GET8(len, start);
-+					snprintf(name, sizeof(name), "%*.*s", len, len, (char *) start);
-+					start += len;
-+					break;
-+
-+				case SDP_DATA_STR16:
-+				case SDP_DATA_URL16:
-+					SDP_GET16(len, start);
-+					snprintf(name, sizeof(name), "%*.*s", len, len, (char *) start);
-+					start += len;
-+					break;
-+
-+				case SDP_DATA_STR32:
-+				case SDP_DATA_URL32:
-+					SDP_GET32(len, start);
-+					snprintf(name, sizeof(name), "%*.*s", len, len, (char *) start);
-+					start += len;
-+					break;
-+
-+				default:
-+					sdp_close(ss);
-+					return -1;
-+			}
-+			if (name == NULL)
-+				return -1;
-+
-+			if (strcmp(name, "gnapplet") == 0) {
-+				if (only_gnapplet != 0)
-+					getchan = 1;
-+				break;
-+			}
-+
-+			if (strstr(name, "Nokia PC Suite") != NULL)
-+				break;
-+
-+			if (strstr(name, "Bluetooth Serial Port") != NULL)
-+				break;
-+
-+			if (strstr(name, "m-Router Connectivity") != NULL)
-+				break;
-+
-+			getchan = 1;
-+			break;
-+		}
-+	}
-+
-+	sdp_close(ss);
-+	return -1;
-+}
-+
-+#else
- /*
-  * Taken from gnome-phone-manager
-  */
-@@ -204,6 +467,8 @@
- 	return channel;
- }
- 
-+#endif
-+
- static int get_serial_channel(bdaddr_t *device)
- {
- 	bdaddr_t src;
-@@ -211,9 +476,15 @@
- 
- 	bacpy(&src, BDADDR_ANY);
+@@ -66,7 +66,7 @@
+ #ifdef HAVE_BLUETOOTH_NETBT	/* FreeBSD / netbt */
  
-+#ifdef HAVE_BLUETOOTH_NETGRAPH	/* FreeBSD / netgraph */
-+	channel = find_service_channel(&src, device, 0, SDP_SERVICE_CLASS_SERIAL_PORT);
-+	if (channel < 0)
-+		channel = find_service_channel(&src, device, 0, SDP_SERVICE_CLASS_DIALUP_NETWORKING);
-+#else
- 	channel = find_service_channel(&src, device, 0, SERIAL_PORT_SVCLASS_ID);
- 	if (channel < 0)
- 		channel = find_service_channel(&src, device, 0, DIALUP_NET_SVCLASS_ID);
-+#endif
+ #include <bluetooth.h>
+-#include <sdp.h> 
++#include </usr/include/sdp.h> 
  
- 	return channel;
- }
+ #define GNOKII_SERIAL_PORT_CLASS	SDP_SERVICE_CLASS_SERIAL_PORT
+ #define GNOKII_DIALUP_NETWORK_CLASS	SDP_SERVICE_CLASS_DIALUP_NETWORKING
diff --git a/comms/gnokii/files/patch-configure b/comms/gnokii/files/patch-configure
index 4ef4a5e408e0..200be54c92cf 100644
--- a/comms/gnokii/files/patch-configure
+++ b/comms/gnokii/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2008-10-06 08:57:27.000000000 +0200
-+++ configure	2009-06-06 10:08:00.153654659 +0200
-@@ -1057,7 +1057,7 @@
+--- configure.orig	2009-09-08 22:26:52.251269320 +0200
++++ configure	2009-09-08 22:39:58.432178979 +0200
+@@ -1102,7 +1102,7 @@
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
  localedir='${datarootdir}/locale'
@@ -9,154 +9,102 @@
  
  ac_prev=
  ac_dashdash=
-@@ -8050,18 +8050,18 @@
-   fi
+@@ -9685,20 +9685,6 @@
  
+   fi
  
--{ echo "$as_me:$LINENO: checking if building on FreeBSD" >&5
--echo $ECHO_N "checking if building on FreeBSD... $ECHO_C" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking if building on FreeBSD" >&5
+-$as_echo_n "checking if building on FreeBSD... " >&6; }
 -
 -if test `uname -s` = "FreeBSD" ; then
--	{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 -	CPPFLAGS="$CFLAGS -I/usr/local/include"
 -	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 -else
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -fi
-+#{ echo "$as_me:$LINENO: checking if building on FreeBSD" >&5
-+#echo $ECHO_N "checking if building on FreeBSD... $ECHO_C" >&6; }
-+#
-+#if test `uname -s` = "FreeBSD" ; then
-+#	{ echo "$as_me:$LINENO: result: yes" >&5
-+#echo "${ECHO_T}yes" >&6; }
-+#	CPPFLAGS="$CFLAGS -I/usr/local/include"
-+#	LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+#else
-+#	{ echo "$as_me:$LINENO: result: no" >&5
-+#echo "${ECHO_T}no" >&6; }
-+#fi
- 
- 
+-
+ { $as_echo "$as_me:$LINENO: checking if building on NetBSD" >&5
+ $as_echo_n "checking if building on NetBSD... " >&6; }
  
-@@ -24163,13 +24163,15 @@
+@@ -16994,6 +16980,8 @@
  # First of all, check if the user has set any of the PTHREAD_LIBS,
  # etcetera environment variables, and if threads linking works using
  # them:
--if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+if test x"-pthread" != x; then
-+	PTHREAD_CFLAGS=""
-+	PTHREAD_LIBS="-pthread"
++PTHREAD_CFLAGS=""
++PTHREAD_LIBS="-pthread"
+ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
          save_CFLAGS="$CFLAGS"
--        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        CFLAGS="$CFLAGS "
-         save_LIBS="$LIBS"
--        LIBS="$PTHREAD_LIBS $LIBS"
--        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
--echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
-+        LIBS="-pthread $LIBS"
-+        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=-pthread with CFLAGS=" >&5
-+echo $ECHO_N "checking for pthread_join in LIBS=-pthread with CFLAGS=... $ECHO_C" >&6; }
-         cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24533,7 +24535,7 @@
- echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
+         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* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
 +                *-aix* | *-darwin*) flag="-D_THREAD_SAFE";;
                  *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
          esac
-         { echo "$as_me:$LINENO: result: ${flag}" >&5
-@@ -26561,9 +26563,9 @@
- fi
- 
+         { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
+@@ -19174,7 +19162,7 @@
  
--if test "$enable_libical" == "yes"; then
-+if test "$enable_libical" = "yes"; then
+ 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"
- 	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5
- echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }
-@@ -26650,7 +26652,7 @@
-   enable_libusb=yes
- fi
- 
--if test "$enable_libusb" == "yes"; then
-+if test "$enable_libusb" = "yes"; then
- 	{ echo "$as_me:$LINENO: checking whether libusb is installed" >&5
- echo $ECHO_N "checking whether libusb is installed... $ECHO_C" >&6; }
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -26872,7 +26874,7 @@
-   enable_irda=yes
- fi
- 
--if test "$enable_irda" == "yes"; then
-+if test "$enable_irda" = "yes"; then
- 	{ echo "$as_me:$LINENO: checking for linux/irda.h" >&5
- echo $ECHO_N "checking for linux/irda.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_linux_irda_h+set}" = set; then
-@@ -26955,7 +26957,7 @@
-   enable_bluetooth=yes
- fi
- 
--if test "$enable_bluetooth" == "yes"; then
-+if test "$enable_bluetooth" = "yes"; then
- 	{ echo "$as_me:$LINENO: checking for the bluetooth support" >&5
- echo $ECHO_N "checking for the bluetooth support... $ECHO_C" >&6; }
- 	{ echo "$as_me:$LINENO: checking for the struct sockaddr_rc in <bluetooth/rfcomm.h>" >&5
-@@ -27025,7 +27027,7 @@
- 
- 	fi
- fi
--if test "$enable_bluetooth" == "yes"; then
-+if test "$enable_bluetooth" = "yes"; then
- 	{ echo "$as_me:$LINENO: checking for the MacOS X bluetooth support" >&5
- echo $ECHO_N "checking for the MacOS X bluetooth support... $ECHO_C" >&6; }
- 
-@@ -27526,7 +27528,7 @@
- 	fi
- fi
- 
--if test "$enable_bluetooth" == "yes"; then
-+if test "$enable_bluetooth" = "yes"; then
- 	{ echo "$as_me:$LINENO: checking for the FreeBSD/netgraph bluetooth support" >&5
- echo $ECHO_N "checking for the FreeBSD/netgraph bluetooth support... $ECHO_C" >&6; }
- 	{ echo "$as_me:$LINENO: checking for the struct sockaddr_rfcomm in <netgraph/.../ng_btsocket.h>" >&5
-@@ -27602,7 +27604,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ 	{ $as_echo "$as_me:$LINENO: checking whether libical is installed" >&5
+ $as_echo_n "checking whether libical is installed... " >&6; }
+@@ -20243,7 +20231,7 @@
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lbluetooth  $LIBS"
-+LIBS="-lsdp -lbluetooth $LIBS"
++LIBS="-lsdp -lbluetooth  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27658,7 +27660,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5
- echo "${ECHO_T}$ac_cv_lib_bluetooth_bt_aton" >&6; }
- if test $ac_cv_lib_bluetooth_bt_aton = yes; then
--  BLUETOOTH_LIBS="$LIBS -lbluetooth"
-+  BLUETOOTH_LIBS="-lsdp -lbluetooth $LIBS"
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_BT_ATON
- _ACEOF
-@@ -27676,7 +27678,7 @@
-   enable_libpcsclite=yes
+@@ -20303,7 +20291,7 @@
+ { $as_echo "$as_me:$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
+@@ -20375,7 +20363,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
+ 
  
--if test "$enable_libpcsclite" == "yes"; then
-+if test "$enable_libpcsclite" = "yes"; then
+@@ -20516,7 +20504,7 @@
+ { $as_echo "$as_me:$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
+@@ -20588,7 +20576,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
  
  
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -28474,7 +28476,7 @@
- echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
- if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
+@@ -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"
diff --git a/comms/gnokii/files/patch-gnokii-Makefile.in b/comms/gnokii/files/patch-gnokii-Makefile.in
index 9e75758b50a2..f8cb8100cf82 100644
--- a/comms/gnokii/files/patch-gnokii-Makefile.in
+++ b/comms/gnokii/files/patch-gnokii-Makefile.in
@@ -1,6 +1,6 @@
---- gnokii/Makefile.in.orig	2009-02-26 17:09:49.000000000 +0100
-+++ gnokii/Makefile.in	2009-02-26 17:20:21.000000000 +0100
-@@ -57,7 +57,7 @@
+--- gnokii/Makefile.in.orig	2009-09-08 23:05:42.870592830 +0200
++++ gnokii/Makefile.in	2009-09-08 23:10:05.004848245 +0200
+@@ -61,12 +61,12 @@
  	gnokii-gnokii-security.$(OBJEXT) \
  	gnokii-gnokii-settings.$(OBJEXT) gnokii-gnokii-sms.$(OBJEXT) \
  	gnokii-gnokii-todo.$(OBJEXT) gnokii-gnokii-utils.$(OBJEXT) \
@@ -9,3 +9,18 @@
  gnokii_OBJECTS = $(am_gnokii_OBJECTS)
  am__DEPENDENCIES_1 =
  gnokii_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/getopt/libgetopt.a
++	$(am__DEPENDENCIES_1)
+ gnokii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(gnokii_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+@@ -289,7 +289,7 @@
+ # Compile getopt1.c and getopt.c unconditionally on all platforms, it
+ # has its own magic for the platforms that already have it.
+ gnokii_LDADD = $(top_builddir)/common/libgnokii.la $(INTLLIBS) \
+-	$(TERMLDFLAGS) $(TERMLIBS) $(top_builddir)/getopt/libgetopt.a
++	$(TERMLDFLAGS) $(TERMLIBS)
+ gnokii_CFLAGS = -I$(top_srcdir)/include
+ 
+ #FIXME cross compiling
diff --git a/comms/gnokii/files/patch-gnokii-gnokii-security.c b/comms/gnokii/files/patch-gnokii-gnokii-security.c
deleted file mode 100644
index ed4297602226..000000000000
--- a/comms/gnokii/files/patch-gnokii-gnokii-security.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gnokii/gnokii-security.c.orig	Thu May 10 20:50:16 2007
-+++ gnokii/gnokii-security.c	Thu Jun 21 11:56:13 2007
-@@ -131,12 +131,14 @@
- 
- 	if (isatty(fd)) {
- 		strncpy(pass, getpass(prompt), length - 1);
-+/*		FreeBSD uses standard C library, no getline, sorry.
- 	} else {
- 		err = getline(&s, &s_len, stdin);
- 		if (err > 0 && s) {
- 			strncpy(pass, s, length - 1);
- 			free(s);
- 		}
-+*/
- 	}
- 	pass[length - 1] = 0;
- #endif
diff --git a/comms/gnokii/files/patch-gnokii-gnokii-utils.c b/comms/gnokii/files/patch-gnokii-gnokii-utils.c
deleted file mode 100644
index 56402ad1f15e..000000000000
--- a/comms/gnokii/files/patch-gnokii-gnokii-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnokii/gnokii-utils.c.orig	2007-12-06 14:24:37.000000000 +0100
-+++ gnokii/gnokii-utils.c	2007-12-06 14:25:25.000000000 +0100
-@@ -43,6 +43,8 @@
- 
- #include <stdio.h>
- #include <signal.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include "gnokii-app.h"
- #include "gnokii.h"
diff --git a/comms/gnokii/files/patch-gnokii-gnokii.c b/comms/gnokii/files/patch-gnokii-gnokii.c
deleted file mode 100644
index dd16da5aed4b..000000000000
--- a/comms/gnokii/files/patch-gnokii-gnokii.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnokii/gnokii.c.orig	2009-02-03 23:23:35.000000000 +0100
-+++ gnokii/gnokii.c	2009-02-03 23:24:01.000000000 +0100
-@@ -1082,7 +1082,7 @@
- 			else
- 				len = strlen(input);
- 			if (len > 0)
--				argv[argc++] = strndup(input, len);
-+				argv[argc++] = strdup(input);
- 			input = tmp;
- 		} while (input);
- 		argv[argc] = NULL;
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 0c8308b9560e..84d3a626a0fe 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -9,6 +9,7 @@ include/gnokii/common.h
 include/gnokii/data.h
 include/gnokii/encoding.h
 include/gnokii/error.h
+include/gnokii/mms.h
 include/gnokii/networks.h
 include/gnokii/ringtones.h
 include/gnokii/rlp-common.h
@@ -20,7 +21,7 @@ include/gnokii/wappush.h
 lib/libgnokii.a
 lib/libgnokii.la
 lib/libgnokii.so
-lib/libgnokii.so.4
+lib/libgnokii.so.5
 libdata/pkgconfig/gnokii.pc
 libdata/pkgconfig/xgnokii.pc
 sbin/gnokiid
@@ -55,72 +56,4 @@ share/locale/zh_CN/LC_MESSAGES/gnokii.mo
 %%SMSD%%@dirrm lib/smsd
 %%SMSD%%@dirrm share/smsd
 %%X11%%share/applications/xgnokii.desktop
-%%X11%%share/xgnokii/help/en_US/faq.html
-%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
-%%X11%%share/xgnokii/help/en_US/index.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net0.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net1.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net2.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net3.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net4.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net5.html
-%%X11%%share/xgnokii/help/en_US/netmon/faq_net6.html
-%%X11%%share/xgnokii/help/en_US/netmon/net_mon1.png
-%%X11%%share/xgnokii/help/en_US/netmon/net_mon2.png
-%%X11%%share/xgnokii/help/en_US/netmon/net_mon3.png
-%%X11%%share/xgnokii/help/en_US/netmon/nm2_5110.png
-%%X11%%share/xgnokii/help/en_US/netmon/nm_3210.png
-%%X11%%share/xgnokii/help/en_US/netmon/nm_5110.png
-%%X11%%share/xgnokii/help/en_US/netmon/nm_9110.png
-%%X11%%share/xgnokii/help/en_US/netmon/tip.png
-%%X11%%share/xgnokii/help/en_US/styl.css
-%%X11%%share/xgnokii/help/pl_PL/calendar.html
-%%X11%%share/xgnokii/help/pl_PL/contacts.html
-%%X11%%share/xgnokii/help/pl_PL/dtmf.html
-%%X11%%share/xgnokii/help/pl_PL/index.html
-%%X11%%share/xgnokii/help/pl_PL/netmon.html
-%%X11%%share/xgnokii/help/pl_PL/netmon/dir0.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/dir1.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/glowna.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus2.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_loga.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net0.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net1.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net2.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net3.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net4.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net5.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net6.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faqkable.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/firmware.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/index.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon1.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon2.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon3.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_spis.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm2_5110.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_3210.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_5110.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_9110.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/tip.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/htm.png
-%%X11%%share/xgnokii/help/pl_PL/netmon/index.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/konw.js
-%%X11%%share/xgnokii/help/pl_PL/netmon/spis.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/spis_d.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/spis_d2.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/spis_g.htm
-%%X11%%share/xgnokii/help/pl_PL/netmon/styl.css
-%%X11%%share/xgnokii/help/pl_PL/sms.html
-%%X11%%share/xgnokii/help/pl_PL/speeddial.html
-%%X11%%share/xgnokii/help/pl_PL/xkeyb.html
-%%X11%%@dirrm share/xgnokii/help/en_US/firmware
-%%X11%%@dirrm share/xgnokii/help/en_US/netmon
-%%X11%%@dirrm share/xgnokii/help/en_US
-%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon/gsm
-%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon
-%%X11%%@dirrm share/xgnokii/help/pl_PL
-%%X11%%@dirrm share/xgnokii/help
-%%X11%%@dirrm share/xgnokii
 %%X11%%@dirrmtry share/applications