Attachment #99574 for bug #138674

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




#

PORTNAME=	gnokii
PORTVERSION=	0.6.28
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	comms
MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \

		XGETTEXT="${LOCALBASE}/bin/xgettext" \
		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \
		LDFLAGS="-L${LOCALBASE}/lib" \
		LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \
		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"

PKGDEINSTALL=	${PKGINSTALL}

		${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


Lines 1-3 Link Here

(-)gnokii/distinfo (-3 / +3 lines)
1	MD5 (gnokii-0.6.27.tar.bz2) = fd0ae7996a2e2a2c29e9f3c625df8f3d	1	MD5 (gnokii-0.6.28.tar.bz2) = 55d5567ea5d1ebf8cdc7ad662691fee1
2	SHA256 (gnokii-0.6.27.tar.bz2) = 69f1d75f755a2918e9577cf28dacea9d6fca9b9d722813341d50d12acb8ee886	2	SHA256 (gnokii-0.6.28.tar.bz2) = 16a0720b7658317c28f4383b3e622cc411965932e8aaf60d89967322397c45dc
3	SIZE (gnokii-0.6.27.tar.bz2) = 1491564	3	SIZE (gnokii-0.6.28.tar.bz2) = 1271202




--- 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 = 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 getopt
+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt
 EXTRA_DIST = \
 		ChangeLog		\
 		COPYING			\




--- 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
@@ -66,7 +66,7 @@
 #ifdef HAVE_BLUETOOTH_NETBT	/* FreeBSD / netbt */
 #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);
 
 #include <bluetooth.h>
-#include <sdp.h> 
+#include </usr/include/sdp.h> 
+		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
 
 #define GNOKII_SERIAL_PORT_CLASS	SDP_SERVICE_CLASS_SERIAL_PORT
 #define GNOKII_DIALUP_NETWORK_CLASS	SDP_SERVICE_CLASS_DIALUP_NETWORKING




--- 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'

 
 ac_prev=
 ac_dashdash=
@@ -9685,20 +9685,6 @@
   fi
 
   fi
 
-
-{ $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
-	{ $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
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
 { $as_echo "$as_me:$LINENO: checking if building on NetBSD" >&5
 $as_echo_n "checking if building on NetBSD... " >&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
 
 
 
@@ -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:
+PTHREAD_CFLAGS=""
+PTHREAD_LIBS="-pthread"
 if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+	PTHREAD_LIBS="-pthread"
         save_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
@@ -17380,7 +17368,7 @@
 $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
-        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; }
         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
         { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
@@ -19174,7 +19162,7 @@
 fi
 
 
 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"
 	{ $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
 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
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbluetooth  $LIBS"
+LIBS="-lsdp -lbluetooth  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -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
 _ACEOF
@@ -27676,7 +27678,7 @@
   enable_libpcsclite=yes
 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
 
 
@@ -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
 
 
@@ -21456,7 +21444,7 @@
 $as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
 if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = x""yes; then
 if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
    XPM_CFLAGS="$XINCL"
-                  XPM_LIBS="$XLIBS -lXpm -lX11"
+                  XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"




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

 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




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

Lines 1-11 Link Here

(-)gnokii/files/patch-gnokii-gnokii-utils.c (-11 lines)
1	--- gnokii/gnokii-utils.c.orig 2007-12-06 14:24:37.000000000 +0100
2	+++ gnokii/gnokii-utils.c 2007-12-06 14:25:25.000000000 +0100
3	@@ -43,6 +43,8 @@
4
5	#include <stdio.h>
6	#include <signal.h>
7	+#include <sys/types.h>
8	+#include <sys/stat.h>
9
10	#include "gnokii-app.h"
11	#include "gnokii.h"

Lines 1-11 Link Here

(-)gnokii/files/patch-gnokii-gnokii.c (-11 lines)
1	--- gnokii/gnokii.c.orig 2009-02-03 23:23:35.000000000 +0100
2	+++ gnokii/gnokii.c 2009-02-03 23:24:01.000000000 +0100
3	@@ -1082,7 +1082,7 @@
4	else
5	len = strlen(input);
6	if (len > 0)
7	- argv[argc++] = strndup(input, len);
8	+ argv[argc++] = strdup(input);
9	input = tmp;
10	} while (input);
11	argv[argc] = NULL;




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

lib/libgnokii.a
lib/libgnokii.la
lib/libgnokii.so
lib/libgnokii.so.5
libdata/pkgconfig/gnokii.pc
libdata/pkgconfig/xgnokii.pc
sbin/gnokiid

%%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

Return to bug 138674

Lines 6-13 Link Here

(-)gnokii/Makefile (-17 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= gnokii	8	PORTNAME= gnokii
9	PORTVERSION= 0.6.27	9	PORTVERSION= 0.6.28
10	PORTREVISION= 3
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 32-38 Link Here
32	XGETTEXT="${LOCALBASE}/bin/xgettext" \	31	XGETTEXT="${LOCALBASE}/bin/xgettext" \
33	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \	32	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \
34	LDFLAGS="-L${LOCALBASE}/lib" \	33	LDFLAGS="-L${LOCALBASE}/lib" \
35	LIBS="-L../common -L${LOCALBASE}/lib" \	34	LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \
36	PKG_CONFIG="${LOCALBASE}/bin/pkg-config"	35	PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
37		36
38	PKGDEINSTALL= ${PKGINSTALL}	37	PKGDEINSTALL= ${PKGINSTALL}
Lines 117-136 Link Here
117	${WRKSRC}/${CONFIGURE_SCRIPT}	116	${WRKSRC}/${CONFIGURE_SCRIPT}
118	@${MV} ${WRKSRC}/Docs/man/xgnokii.1x ${WRKSRC}/Docs/man/xgnokii.1	117	@${MV} ${WRKSRC}/Docs/man/xgnokii.1x ${WRKSRC}/Docs/man/xgnokii.1
119		118
120	post-build:
121	.if defined(WITH_SMSD)
122	.if defined(WITH_MYSQL)
123	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_SOURCES/libsmsd_mysql_la_SOURCES/' ${WRKSRC}/smsd/Makefile.in
124	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_LDFLAGS/libsmsd_mysql_la_LDFLAGS/' ${WRKSRC}/smsd/Makefile.in
125	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_LIBADD/libsmsd_mysql_la_LIBADD/' ${WRKSRC}/smsd/Makefile.in
126	.endif
127	.if defined(WITH_PGSQL)
128	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_SOURCES/libsmsd_pq_la_SOURCES/' ${WRKSRC}/smsd/Makefile.in
129	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_LDFLAGS/libsmsd_pq_la_LDFLAGS/' ${WRKSRC}/smsd/Makefile.in
130	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_LIBADD/libsmsd_pq_la_LIBADD/' ${WRKSRC}/smsd/Makefile.in
131	.endif
132	.endif
133
134	pre-install:	119	pre-install:
135	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	120	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
136		121

Lines 1-14 Link Here

(-)gnokii/files/patch-Makefile.in (-8 / +8 lines)
1	--- Makefile.in.orig 2008-06-02 15:48:31.000000000 +0200	1	--- Makefile.in.orig 2009-09-08 23:07:09.846077502 +0200
2	+++ Makefile.in 2008-06-02 15:48:47.000000000 +0200	2	+++ Makefile.in 2009-09-08 23:08:46.625927897 +0200
3	@@ -279,9 +279,9 @@	3	@@ -269,9 +269,9 @@
4	target_vendor = @target_vendor@	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 = include common gnokii po patches Docs $(am__append_1) \	7	-SUBDIRS = getopt include common gnokii po Docs $(am__append_1) \
8	+SUBDIRS = include common gnokii po patches $(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 patches getopt	10	-DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt
11	+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite patches getopt	11	+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt
12	EXTRA_DIST = \	12	EXTRA_DIST = \
13	ChangeLog \	13	ChangeLog \
14	COPYING \	14	COPYING \

Lines 1-321 Link Here

(-)gnokii/files/patch-common-devices-unixbluetooth.c (-315 / +14 lines)
1	--- common/devices/unixbluetooth.c.orig 2008-10-05 12:14:31.000000000 +0200	1	--- common/devices/unixbluetooth.c.orig 2009-06-23 20:24:56.000000000 +0200
2	+++ common/devices/unixbluetooth.c 2009-02-17 17:03:58.000000000 +0100	2	+++ common/devices/unixbluetooth.c 2009-09-08 22:21:31.450731259 +0200
3	@@ -54,6 +54,8 @@	3	@@ -51,7 +51,7 @@
4	#include <netgraph/bluetooth/include/ng_hci.h>	4	#ifdef HAVE_BLUETOOTH_NETGRAPH /* FreeBSD / netgraph */
5	#include <netgraph/bluetooth/include/ng_l2cap.h>	5
6	#include <netgraph/bluetooth/include/ng_btsocket.h>	6	#include <bluetooth.h>
7	+#include <bluetooth.h>	7	-#include <sdp.h>
8	+#include </usr/include/sdp.h>	8	+#include </usr/include/sdp.h>
9		9
10	#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM	10	#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
11	#define BDADDR_ANY NG_HCI_BDADDR_ANY	11	#define BDADDR_ANY NG_HCI_BDADDR_ANY
12	@@ -86,11 +88,6 @@	12	@@ -66,7 +66,7 @@
13		13	#ifdef HAVE_BLUETOOTH_NETBT /* FreeBSD / netbt */
14	#endif /* HAVE_BT_ATON */
15
16	-static int str2ba(const char str, bdaddr_t ba)
17	-{
18	- return !bt_aton(str, ba);
19	-}
20	-
21	#else /* Linux / BlueZ support */
22
23	#include <bluetooth/bluetooth.h>
24	@@ -100,6 +97,272 @@
25
26	#endif
27
28	+#ifdef HAVE_BLUETOOTH_NETGRAPH /* FreeBSD / netgraph */
29	+
30	+/*
31	+** FreeBSD version of the find_service_channel function.
32	+** Written by Guido Falsi <mad@madpilot.net>.
33	+** Contains code taken from FreeBSD's sdpcontrol and rfcomm_sppd
34	+** programs, which are Copyright (c) 2001-2003 Maksim Yevmenkin
35	+** <m_evmenkin@yahoo.com>.
36	+*/
37	+
38	+static int find_service_channel(bdaddr_t adapter, bdaddr_t device, int only_gnapplet, uint16_t svclass_id)
39	+{
40	+ uint8_t getchan = 0;
41	+ uint32_t i, good = 0;
42	+ char name[64];
43	+ void *ss = NULL;
44	+
45	+ uint32_t attrs[] =
46	+ {
47	+ SDP_ATTR_RANGE( SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET,
48	+ SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET),
49	+ SDP_ATTR_RANGE( SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST,
50	+ SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST),
51	+ };
52	+ #define attrs_len (sizeof(attrs)/sizeof(attrs[0]))
53	+
54	+ /* Buffer for the attributes */
55	+ #define NRECS 25 /* request this much records from the SDP server */
56	+ #define BSIZE 256 /* one attribute buffer size */
57	+ static uint8_t buffer[NRECS * attrs_len][BSIZE];
58	+
59	+ /* SDP attributes */
60	+ static sdp_attr_t values[NRECS * attrs_len];
61	+ #define values_len (sizeof(values)/sizeof(values[0]))
62	+
63	+ /* Initialize attribute values array */
64	+ for (i = 0; i < values_len; i ++) {
65	+ values[i].flags = SDP_ATTR_INVALID;
66	+ values[i].attr = 0;
67	+ values[i].vlen = BSIZE;
68	+ values[i].value = buffer[i];
69	+ }
70	+
71	+ if ((ss = sdp_open(adapter, device)) == NULL)
72	+ return -1;
73	+
74	+ if (sdp_error(ss) != 0)
75	+ {
76	+ sdp_close(ss);
77	+ return -1;
78	+ }
79	+
80	+ if (sdp_search(ss, 1, &svclass_id, attrs_len, attrs, values_len, values) != 0)
81	+ {
82	+ sdp_close(ss);
83	+ return -1;
84	+ }
85	+
86	+ for (i = 0; i < values_len; i++)
87	+ {
88	+ if (values[i].flags != SDP_ATTR_OK)
89	+ break;
90	+
91	+ union {
92	+ uint8_t uint8;
93	+ uint16_t uint16;
94	+ uint32_t uint32;
95	+ uint64_t uint64;
96	+ int128_t int128;
97	+ } value;
98	+ uint8_t start, end;
99	+ uint32_t type, len;
100	+
101	+ start = values[i].value;
102	+ end = values[i].value + values[i].vlen;
103	+
104	+ switch (values[i].attr) {
105	+ case SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST:
106	+ if(getchan) {
107	+ SDP_GET8(type, start);
108	+ switch (type) {
109	+ case SDP_DATA_SEQ8:
110	+ SDP_GET8(len, start);
111	+ break;
112	+
113	+ case SDP_DATA_SEQ16:
114	+ SDP_GET16(len, start);
115	+ break;
116	+
117	+ case SDP_DATA_SEQ32:
118	+ SDP_GET32(len, start);
119	+ break;
120	+
121	+ default:
122	+ sdp_close(ss);
123	+ return -1;
124	+ break;
125	+ }
126	+
127	+ SDP_GET8(type, start);
128	+ switch (type) {
129	+ case SDP_DATA_SEQ8:
130	+ SDP_GET8(len, start);
131	+ break;
132	+
133	+ case SDP_DATA_SEQ16:
134	+ SDP_GET16(len, start);
135	+ break;
136	+
137	+ case SDP_DATA_SEQ32:
138	+ SDP_GET32(len, start);
139	+ break;
140	+
141	+ default:
142	+ sdp_close(ss);
143	+ return -1;
144	+ break;
145	+ }
146	+
147	+ while (start < end) {
148	+ SDP_GET8(type, start);
149	+ switch (type) {
150	+ case SDP_DATA_UUID16:
151	+ SDP_GET16(value.uint16, start);
152	+ break;
153	+
154	+ case SDP_DATA_UUID32:
155	+ SDP_GET32(value.uint32, start);
156	+ break;
157	+
158	+ case SDP_DATA_UUID128:
159	+ SDP_GET_UUID128(&value.int128, start);
160	+ break;
161	+
162	+ default:
163	+ sdp_close(ss);
164	+ return -1;
165	+ break;
166	+ }
167	+ if(value.uint16 == 3) {
168	+ SDP_GET8(type, start);
169	+ switch (type) {
170	+ case SDP_DATA_UINT8:
171	+ case SDP_DATA_INT8:
172	+ SDP_GET8(value.uint8, start);
173	+ return value.uint8;
174	+ break;
175	+
176	+ case SDP_DATA_UINT16:
177	+ case SDP_DATA_INT16:
178	+ SDP_GET16(value.uint16, start);
179	+ return value.uint16;
180	+ break;
181	+
182	+ case SDP_DATA_UINT32:
183	+ case SDP_DATA_INT32:
184	+ SDP_GET32(value.uint32, start);
185	+ return value.uint32;
186	+ break;
187	+
188	+ default:
189	+ sdp_close(ss);
190	+ return -1;
191	+ break;
192	+ }
193	+ } else {
194	+ SDP_GET8(type, start);
195	+ switch (type) {
196	+ case SDP_DATA_SEQ8:
197	+ case SDP_DATA_UINT8:
198	+ case SDP_DATA_INT8:
199	+ case SDP_DATA_BOOL:
200	+ SDP_GET8(value.uint8, start);
201	+ break;
202	+
203	+ case SDP_DATA_SEQ16:
204	+ case SDP_DATA_UINT16:
205	+ case SDP_DATA_INT16:
206	+ case SDP_DATA_UUID16:
207	+ SDP_GET16(value.uint16, start);
208	+ break;
209	+
210	+ case SDP_DATA_SEQ32:
211	+ case SDP_DATA_UINT32:
212	+ case SDP_DATA_INT32:
213	+ case SDP_DATA_UUID32:
214	+ SDP_GET32(value.uint32, start);
215	+ break;
216	+
217	+ case SDP_DATA_UINT64:
218	+ case SDP_DATA_INT64:
219	+ SDP_GET64(value.uint64, start);
220	+ break;
221	+
222	+ case SDP_DATA_UINT128:
223	+ case SDP_DATA_INT128:
224	+ SDP_GET128(&value.int128, start);
225	+ break;
226	+
227	+ default:
228	+ sdp_close(ss);
229	+ return -1;
230	+ break;
231	+ }
232	+ }
233	+ }
234	+ }
235	+ start += len;
236	+ break;
237	+
238	+ case SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET:
239	+ SDP_GET8(type, start);
240	+ switch (type) {
241	+ case SDP_DATA_STR8:
242	+ case SDP_DATA_URL8:
243	+ SDP_GET8(len, start);
244	+ snprintf(name, sizeof(name), "%.s", len, len, (char *) start);
245	+ start += len;
246	+ break;
247	+
248	+ case SDP_DATA_STR16:
249	+ case SDP_DATA_URL16:
250	+ SDP_GET16(len, start);
251	+ snprintf(name, sizeof(name), "%.s", len, len, (char *) start);
252	+ start += len;
253	+ break;
254	+
255	+ case SDP_DATA_STR32:
256	+ case SDP_DATA_URL32:
257	+ SDP_GET32(len, start);
258	+ snprintf(name, sizeof(name), "%.s", len, len, (char *) start);
259	+ start += len;
260	+ break;
261	+
262	+ default:
263	+ sdp_close(ss);
264	+ return -1;
265	+ }
266	+ if (name == NULL)
267	+ return -1;
268	+
269	+ if (strcmp(name, "gnapplet") == 0) {
270	+ if (only_gnapplet != 0)
271	+ getchan = 1;
272	+ break;
273	+ }
274	+
275	+ if (strstr(name, "Nokia PC Suite") != NULL)
276	+ break;
277	+
278	+ if (strstr(name, "Bluetooth Serial Port") != NULL)
279	+ break;
280	+
281	+ if (strstr(name, "m-Router Connectivity") != NULL)
282	+ break;
283	+
284	+ getchan = 1;
285	+ break;
286	+ }
287	+ }
288	+
289	+ sdp_close(ss);
290	+ return -1;
291	+}
292	+
293	+#else
294	/*
295	* Taken from gnome-phone-manager
296	*/
297	@@ -204,6 +467,8 @@
298	return channel;
299	}
300
301	+#endif
302	+
303	static int get_serial_channel(bdaddr_t *device)
304	{
305	bdaddr_t src;
306	@@ -211,9 +476,15 @@
307
308	bacpy(&src, BDADDR_ANY);
309		14
310	+#ifdef HAVE_BLUETOOTH_NETGRAPH /* FreeBSD / netgraph */	15	#include <bluetooth.h>
311	+ channel = find_service_channel(&src, device, 0, SDP_SERVICE_CLASS_SERIAL_PORT);	16	-#include <sdp.h>
312	+ if (channel < 0)	17	+#include </usr/include/sdp.h>
313	+ channel = find_service_channel(&src, device, 0, SDP_SERVICE_CLASS_DIALUP_NETWORKING);
314	+#else
315	channel = find_service_channel(&src, device, 0, SERIAL_PORT_SVCLASS_ID);
316	if (channel < 0)
317	channel = find_service_channel(&src, device, 0, DIALUP_NET_SVCLASS_ID);
318	+#endif
319		18
320	return channel;	19	#define GNOKII_SERIAL_PORT_CLASS SDP_SERVICE_CLASS_SERIAL_PORT
321	}	20	#define GNOKII_DIALUP_NETWORK_CLASS SDP_SERVICE_CLASS_DIALUP_NETWORKING

Lines 1-6 Link Here

(-)gnokii/files/patch-configure (-117 / +65 lines)
1	--- configure.orig 2008-10-06 08:57:27.000000000 +0200	1	--- configure.orig 2009-09-08 22:26:52.251269320 +0200
2	+++ configure 2009-06-06 10:08:00.153654659 +0200	2	+++ configure 2009-09-08 22:39:58.432178979 +0200
3	@@ -1057,7 +1057,7 @@	3	@@ -1102,7 +1102,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-162 Link Here
9		9
10	ac_prev=	10	ac_prev=
11	ac_dashdash=	11	ac_dashdash=
12	@@ -8050,18 +8050,18 @@	12	@@ -9685,20 +9685,6 @@
13	fi
14		13
		14	fi
15		15
16	-{ echo "$as_me:$LINENO: checking if building on FreeBSD" >&5	16	-
17	-echo $ECHO_N "checking if building on FreeBSD... $ECHO_C" >&6; }	17	-{ $as_echo "$as_me:$LINENO: checking if building on FreeBSD" >&5
		18	-$as_echo_n "checking if building on FreeBSD... " >&6; }
18	-	19	-
19	-if test `uname -s` = "FreeBSD" ; then	20	-if test `uname -s` = "FreeBSD" ; then
20	- { echo "$as_me:$LINENO: result: yes" >&5	21	- { $as_echo "$as_me:$LINENO: result: yes" >&5
21	-echo "${ECHO_T}yes" >&6; }	22	-$as_echo "yes" >&6; }
22	- CPPFLAGS="$CFLAGS -I/usr/local/include"	23	- CPPFLAGS="$CFLAGS -I/usr/local/include"
23	- LDFLAGS="$LDFLAGS -L/usr/local/lib"	24	- LDFLAGS="$LDFLAGS -L/usr/local/lib"
24	-else	25	-else
25	- { echo "$as_me:$LINENO: result: no" >&5	26	- { $as_echo "$as_me:$LINENO: result: no" >&5
26	-echo "${ECHO_T}no" >&6; }	27	-$as_echo "no" >&6; }
27	-fi	28	-fi
28	+#{ echo "$as_me:$LINENO: checking if building on FreeBSD" >&5	29	-
29	+#echo $ECHO_N "checking if building on FreeBSD... $ECHO_C" >&6; }	30	{ $as_echo "$as_me:$LINENO: checking if building on NetBSD" >&5
30	+#	31	$as_echo_n "checking if building on NetBSD... " >&6; }
31	+#if test `uname -s` = "FreeBSD" ; then
32	+# { echo "$as_me:$LINENO: result: yes" >&5
33	+#echo "${ECHO_T}yes" >&6; }
34	+# CPPFLAGS="$CFLAGS -I/usr/local/include"
35	+# LDFLAGS="$LDFLAGS -L/usr/local/lib"
36	+#else
37	+# { echo "$as_me:$LINENO: result: no" >&5
38	+#echo "${ECHO_T}no" >&6; }
39	+#fi
40
41
42		32
43	@@ -24163,13 +24163,15 @@	33	@@ -16994,6 +16980,8 @@
44	# First of all, check if the user has set any of the PTHREAD_LIBS,	34	# First of all, check if the user has set any of the PTHREAD_LIBS,
45	# etcetera environment variables, and if threads linking works using	35	# etcetera environment variables, and if threads linking works using
46	# them:	36	# them:
47	-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then	37	+PTHREAD_CFLAGS=""
48	+if test x"-pthread" != x; then	38	+PTHREAD_LIBS="-pthread"
49	+ PTHREAD_CFLAGS=""	39	if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
50	+ PTHREAD_LIBS="-pthread"
51	save_CFLAGS="$CFLAGS"	40	save_CFLAGS="$CFLAGS"
52	- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"	41	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
53	+ CFLAGS="$CFLAGS "	42	@@ -17380,7 +17368,7 @@
54	save_LIBS="$LIBS"	43	$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
55	- LIBS="$PTHREAD_LIBS $LIBS"
56	- { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
57	-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
58	+ LIBS="-pthread $LIBS"
59	+ { echo "$as_me:$LINENO: checking for pthread_join in LIBS=-pthread with CFLAGS=" >&5
60	+echo $ECHO_N "checking for pthread_join in LIBS=-pthread with CFLAGS=... $ECHO_C" >&6; }
61	cat >conftest.$ac_ext <<_ACEOF
62	/* confdefs.h. */
63	_ACEOF
64	@@ -24533,7 +24535,7 @@
65	echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
66	flag=no	44	flag=no
67	case "${host_cpu}-${host_os}" in	45	case "${host_cpu}-${host_os}" in
68	- -aix \| -freebsd \| -darwin) flag="-D_THREAD_SAFE";;	46	- -aix \| -freebsd \| -darwin) flag="-D_THREAD_SAFE";;
69	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;	47	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;
70	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;	48	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;
71	esac	49	esac
72	{ echo "$as_me:$LINENO: result: ${flag}" >&5	50	{ $as_echo "$as_me:$LINENO: result: ${flag}" >&5
73	@@ -26561,9 +26563,9 @@	51	@@ -19174,7 +19162,7 @@
74	fi
75
76		52
77	-if test "$enable_libical" == "yes"; then	53	if test "$enable_libical" = "yes"; then
78	+if test "$enable_libical" = "yes"; then
79	OLD_CFLAGS="$CFLAGS"	54	OLD_CFLAGS="$CFLAGS"
80	- LIBS="$LIBS $ICAL_LIBS -lpthread -lical"	55	- LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
81	+ LIBS="$LIBS $ICAL_LIBS -pthread -lical"	56	+ LIBS="$LIBS $ICAL_LIBS -pthread -lical"
82	CFLAGS="$CFLAGS $ICAL_CFLAGS"	57	CFLAGS="$CFLAGS $ICAL_CFLAGS"
83	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5	58	{ $as_echo "$as_me:$LINENO: checking whether libical is installed" >&5
84	echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }	59	$as_echo_n "checking whether libical is installed... " >&6; }
85	@@ -26650,7 +26652,7 @@	60	@@ -20243,7 +20231,7 @@
86	enable_libusb=yes	61	$as_echo_n "(cached) " >&6
87	fi
88
89	-if test "$enable_libusb" == "yes"; then
90	+if test "$enable_libusb" = "yes"; then
91	{ echo "$as_me:$LINENO: checking whether libusb is installed" >&5
92	echo $ECHO_N "checking whether libusb is installed... $ECHO_C" >&6; }
93	cat >conftest.$ac_ext <<_ACEOF
94	@@ -26872,7 +26874,7 @@
95	enable_irda=yes
96	fi
97
98	-if test "$enable_irda" == "yes"; then
99	+if test "$enable_irda" = "yes"; then
100	{ echo "$as_me:$LINENO: checking for linux/irda.h" >&5
101	echo $ECHO_N "checking for linux/irda.h... $ECHO_C" >&6; }
102	if test "${ac_cv_header_linux_irda_h+set}" = set; then
103	@@ -26955,7 +26957,7 @@
104	enable_bluetooth=yes
105	fi
106
107	-if test "$enable_bluetooth" == "yes"; then
108	+if test "$enable_bluetooth" = "yes"; then
109	{ echo "$as_me:$LINENO: checking for the bluetooth support" >&5
110	echo $ECHO_N "checking for the bluetooth support... $ECHO_C" >&6; }
111	{ echo "$as_me:$LINENO: checking for the struct sockaddr_rc in <bluetooth/rfcomm.h>" >&5
112	@@ -27025,7 +27027,7 @@
113
114	fi
115	fi
116	-if test "$enable_bluetooth" == "yes"; then
117	+if test "$enable_bluetooth" = "yes"; then
118	{ echo "$as_me:$LINENO: checking for the MacOS X bluetooth support" >&5
119	echo $ECHO_N "checking for the MacOS X bluetooth support... $ECHO_C" >&6; }
120
121	@@ -27526,7 +27528,7 @@
122	fi
123	fi
124
125	-if test "$enable_bluetooth" == "yes"; then
126	+if test "$enable_bluetooth" = "yes"; then
127	{ echo "$as_me:$LINENO: checking for the FreeBSD/netgraph bluetooth support" >&5
128	echo $ECHO_N "checking for the FreeBSD/netgraph bluetooth support... $ECHO_C" >&6; }
129	{ echo "$as_me:$LINENO: checking for the struct sockaddr_rfcomm in <netgraph/.../ng_btsocket.h>" >&5
130	@@ -27602,7 +27604,7 @@
131	echo $ECHO_N "(cached) $ECHO_C" >&6
132	else	62	else
133	ac_check_lib_save_LIBS=$LIBS	63	ac_check_lib_save_LIBS=$LIBS
134	-LIBS="-lbluetooth $LIBS"	64	-LIBS="-lbluetooth $LIBS"
135	+LIBS="-lsdp -lbluetooth $LIBS"	65	+LIBS="-lsdp -lbluetooth $LIBS"
136	cat >conftest.$ac_ext <<_ACEOF	66	cat >conftest.$ac_ext <<_ACEOF
137	/* confdefs.h. */	67	/* confdefs.h. */
138	_ACEOF	68	_ACEOF
139	@@ -27658,7 +27660,7 @@	69	@@ -20303,7 +20291,7 @@
140	{ echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5	70	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5
141	echo "${ECHO_T}$ac_cv_lib_bluetooth_bt_aton" >&6; }	71	$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
142	if test $ac_cv_lib_bluetooth_bt_aton = yes; then	72	if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then
143	- BLUETOOTH_LIBS="$LIBS -lbluetooth"	73	- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
144	+ BLUETOOTH_LIBS="-lsdp -lbluetooth $LIBS"	74	+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
145	cat >>confdefs.h <<\_ACEOF	75	else
146	#define HAVE_BT_ATON	76	ac_cv_have_bt_lib=no
147	_ACEOF
148	@@ -27676,7 +27678,7 @@
149	enable_libpcsclite=yes
150	fi	77	fi
		78	@@ -20375,7 +20363,7 @@
		79	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sdp_sdp_open" >&5
		80	$as_echo "$ac_cv_lib_sdp_sdp_open" >&6; }
		81	if test "x$ac_cv_lib_sdp_sdp_open" = x""yes; then
		82	- BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp"
		83	+ BLUETOOTH_LIBS="$BLUETOOTH_LIBS"
		84	fi
		85
151		86
152	-if test "$enable_libpcsclite" == "yes"; then	87	@@ -20516,7 +20504,7 @@
153	+if test "$enable_libpcsclite" = "yes"; then	88	{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5
		89	$as_echo "$ac_cv_lib_bluetooth_bt_aton" >&6; }
		90	if test "x$ac_cv_lib_bluetooth_bt_aton" = x""yes; then
		91	- BLUETOOTH_LIBS="-lbluetooth" ac_cv_have_bt_lib=yes
		92	+ BLUETOOTH_LIBS="-lsdp -lbluetooth" ac_cv_have_bt_lib=yes
		93	else
		94	ac_cv_have_bt_lib=no
		95	fi
		96	@@ -20588,7 +20576,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
154		103
155		104
156	if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then	105	@@ -21456,7 +21444,7 @@
157	@@ -28474,7 +28476,7 @@	106	$as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
158	echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }	107	if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = x""yes; then
159	if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
160	XPM_CFLAGS="$XINCL"	108	XPM_CFLAGS="$XINCL"
161	- XPM_LIBS="$XLIBS -lXpm -lX11"	109	- XPM_LIBS="$XLIBS -lXpm -lX11"
162	+ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"	110	+ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"

Lines 1-6 Link Here

(-)gnokii/files/patch-gnokii-Makefile.in (-3 / +18 lines)
1	--- gnokii/Makefile.in.orig 2009-02-26 17:09:49.000000000 +0100	1	--- gnokii/Makefile.in.orig 2009-09-08 23:05:42.870592830 +0200
2	+++ gnokii/Makefile.in 2009-02-26 17:20:21.000000000 +0100	2	+++ gnokii/Makefile.in 2009-09-08 23:10:05.004848245 +0200
3	@@ -57,7 +57,7 @@	3	@@ -61,12 +61,12 @@
4	gnokii-gnokii-security.$(OBJEXT) \	4	gnokii-gnokii-security.$(OBJEXT) \
5	gnokii-gnokii-settings.$(OBJEXT) gnokii-gnokii-sms.$(OBJEXT) \	5	gnokii-gnokii-settings.$(OBJEXT) gnokii-gnokii-sms.$(OBJEXT) \
6	gnokii-gnokii-todo.$(OBJEXT) gnokii-gnokii-utils.$(OBJEXT) \	6	gnokii-gnokii-todo.$(OBJEXT) gnokii-gnokii-utils.$(OBJEXT) \
Lines 9-11 Link Here
9	gnokii_OBJECTS = $(am_gnokii_OBJECTS)	9	gnokii_OBJECTS = $(am_gnokii_OBJECTS)
10	am__DEPENDENCIES_1 =	10	am__DEPENDENCIES_1 =
11	gnokii_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \	11	gnokii_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \
		12	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		13	- $(am__DEPENDENCIES_1) $(top_builddir)/getopt/libgetopt.a
		14	+ $(am__DEPENDENCIES_1)
		15	gnokii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
		16	--mode=link $(CCLD) $(gnokii_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
		17	$(LDFLAGS) -o $@
		18	@@ -289,7 +289,7 @@
		19	# Compile getopt1.c and getopt.c unconditionally on all platforms, it
		20	# has its own magic for the platforms that already have it.
		21	gnokii_LDADD = $(top_builddir)/common/libgnokii.la $(INTLLIBS) \
		22	- $(TERMLDFLAGS) $(TERMLIBS) $(top_builddir)/getopt/libgetopt.a
		23	+ $(TERMLDFLAGS) $(TERMLIBS)
		24	gnokii_CFLAGS = -I$(top_srcdir)/include
		25
		26	#FIXME cross compiling

Lines 1-17 Link Here

(-)gnokii/files/patch-gnokii-gnokii-security.c (-17 lines)
1	--- gnokii/gnokii-security.c.orig Thu May 10 20:50:16 2007
2	+++ gnokii/gnokii-security.c Thu Jun 21 11:56:13 2007
3	@@ -131,12 +131,14 @@
4
5	if (isatty(fd)) {
6	strncpy(pass, getpass(prompt), length - 1);
7	+/* FreeBSD uses standard C library, no getline, sorry.
8	} else {
9	err = getline(&s, &s_len, stdin);
10	if (err > 0 && s) {
11	strncpy(pass, s, length - 1);
12	free(s);
13	}
14	+*/
15	}
16	pass[length - 1] = 0;
17	#endif

Lines 9-14 Link Here

(-)gnokii/pkg-plist (-69 / +2 lines)
9	include/gnokii/data.h	9	include/gnokii/data.h
10	include/gnokii/encoding.h	10	include/gnokii/encoding.h
11	include/gnokii/error.h	11	include/gnokii/error.h
		12	include/gnokii/mms.h
12	include/gnokii/networks.h	13	include/gnokii/networks.h
13	include/gnokii/ringtones.h	14	include/gnokii/ringtones.h
14	include/gnokii/rlp-common.h	15	include/gnokii/rlp-common.h
Lines 20-26 Link Here
20	lib/libgnokii.a	21	lib/libgnokii.a
21	lib/libgnokii.la	22	lib/libgnokii.la
22	lib/libgnokii.so	23	lib/libgnokii.so
23	lib/libgnokii.so.4	24	lib/libgnokii.so.5
24	libdata/pkgconfig/gnokii.pc	25	libdata/pkgconfig/gnokii.pc
25	libdata/pkgconfig/xgnokii.pc	26	libdata/pkgconfig/xgnokii.pc
26	sbin/gnokiid	27	sbin/gnokiid
Lines 55-126 Link Here
55	%%SMSD%%@dirrm lib/smsd	56	%%SMSD%%@dirrm lib/smsd
56	%%SMSD%%@dirrm share/smsd	57	%%SMSD%%@dirrm share/smsd
57	%%X11%%share/applications/xgnokii.desktop	58	%%X11%%share/applications/xgnokii.desktop
58	%%X11%%share/xgnokii/help/en_US/faq.html
59	%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
60	%%X11%%share/xgnokii/help/en_US/index.html
61	%%X11%%share/xgnokii/help/en_US/netmon/faq_net0.html
62	%%X11%%share/xgnokii/help/en_US/netmon/faq_net1.html
63	%%X11%%share/xgnokii/help/en_US/netmon/faq_net2.html
64	%%X11%%share/xgnokii/help/en_US/netmon/faq_net3.html
65	%%X11%%share/xgnokii/help/en_US/netmon/faq_net4.html
66	%%X11%%share/xgnokii/help/en_US/netmon/faq_net5.html
67	%%X11%%share/xgnokii/help/en_US/netmon/faq_net6.html
68	%%X11%%share/xgnokii/help/en_US/netmon/net_mon1.png
69	%%X11%%share/xgnokii/help/en_US/netmon/net_mon2.png
70	%%X11%%share/xgnokii/help/en_US/netmon/net_mon3.png
71	%%X11%%share/xgnokii/help/en_US/netmon/nm2_5110.png
72	%%X11%%share/xgnokii/help/en_US/netmon/nm_3210.png
73	%%X11%%share/xgnokii/help/en_US/netmon/nm_5110.png
74	%%X11%%share/xgnokii/help/en_US/netmon/nm_9110.png
75	%%X11%%share/xgnokii/help/en_US/netmon/tip.png
76	%%X11%%share/xgnokii/help/en_US/styl.css
77	%%X11%%share/xgnokii/help/pl_PL/calendar.html
78	%%X11%%share/xgnokii/help/pl_PL/contacts.html
79	%%X11%%share/xgnokii/help/pl_PL/dtmf.html
80	%%X11%%share/xgnokii/help/pl_PL/index.html
81	%%X11%%share/xgnokii/help/pl_PL/netmon.html
82	%%X11%%share/xgnokii/help/pl_PL/netmon/dir0.png
83	%%X11%%share/xgnokii/help/pl_PL/netmon/dir1.png
84	%%X11%%share/xgnokii/help/pl_PL/netmon/glowna.htm
85	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus.png
86	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus2.png
87	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_loga.htm
88	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net0.htm
89	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net1.htm
90	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net2.htm
91	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net3.htm
92	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net4.htm
93	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net5.htm
94	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faq_net6.htm
95	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/faqkable.htm
96	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/firmware.htm
97	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/index.htm
98	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon1.png
99	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon2.png
100	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon3.png
101	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_spis.htm
102	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm2_5110.png
103	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_3210.png
104	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_5110.png
105	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_9110.png
106	%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/tip.png
107	%%X11%%share/xgnokii/help/pl_PL/netmon/htm.png
108	%%X11%%share/xgnokii/help/pl_PL/netmon/index.htm
109	%%X11%%share/xgnokii/help/pl_PL/netmon/konw.js
110	%%X11%%share/xgnokii/help/pl_PL/netmon/spis.htm
111	%%X11%%share/xgnokii/help/pl_PL/netmon/spis_d.htm
112	%%X11%%share/xgnokii/help/pl_PL/netmon/spis_d2.htm
113	%%X11%%share/xgnokii/help/pl_PL/netmon/spis_g.htm
114	%%X11%%share/xgnokii/help/pl_PL/netmon/styl.css
115	%%X11%%share/xgnokii/help/pl_PL/sms.html
116	%%X11%%share/xgnokii/help/pl_PL/speeddial.html
117	%%X11%%share/xgnokii/help/pl_PL/xkeyb.html
118	%%X11%%@dirrm share/xgnokii/help/en_US/firmware
119	%%X11%%@dirrm share/xgnokii/help/en_US/netmon
120	%%X11%%@dirrm share/xgnokii/help/en_US
121	%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon/gsm
122	%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon
123	%%X11%%@dirrm share/xgnokii/help/pl_PL
124	%%X11%%@dirrm share/xgnokii/help
125	%%X11%%@dirrm share/xgnokii
126	%%X11%%@dirrmtry share/applications	59	%%X11%%@dirrmtry share/applications