8 files changed, 72 insertions, 120 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index e2fa2b54e676..d3e6544f163b 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.6.28
-PORTREVISION=	2
+PORTVERSION=	0.6.29
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 9ae19a227065..74a656fb21a7 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnokii-0.6.28.tar.bz2) = 55d5567ea5d1ebf8cdc7ad662691fee1
-SHA256 (gnokii-0.6.28.tar.bz2) = 16a0720b7658317c28f4383b3e622cc411965932e8aaf60d89967322397c45dc
-SIZE (gnokii-0.6.28.tar.bz2) = 1271202
+MD5 (gnokii-0.6.29.tar.bz2) = 6111e0158a1129062bda6420db67c313
+SHA256 (gnokii-0.6.29.tar.bz2) = d1633e934b6b43c681ea96c5830d44683a85f05e64ea03c3ecf0d5096aee8470
+SIZE (gnokii-0.6.29.tar.bz2) = 1302020
diff --git a/comms/gnokii/files/patch-Makefile.in b/comms/gnokii/files/patch-Makefile.in
index dadd4493bafa..89bd064c4b18 100644
--- a/comms/gnokii/files/patch-Makefile.in
+++ b/comms/gnokii/files/patch-Makefile.in
@@ -1,14 +1,14 @@
---- 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 @@
+--- 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 win32 testsuite getopt
-+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite getopt
+-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			\
diff --git a/comms/gnokii/files/patch-configure b/comms/gnokii/files/patch-configure
index 200be54c92cf..7360cca528ba 100644
--- a/comms/gnokii/files/patch-configure
+++ b/comms/gnokii/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2009-09-08 22:26:52.251269320 +0200
-+++ configure	2009-09-08 22:39:58.432178979 +0200
-@@ -1102,7 +1102,7 @@
+--- 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'
@@ -9,37 +9,28 @@
  
  ac_prev=
  ac_dashdash=
-@@ -9685,20 +9685,6 @@
+@@ -7909,20 +7909,6 @@
  
    fi
  
 -
--{ $as_echo "$as_me:$LINENO: checking if building on FreeBSD" >&5
+-{ $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:$LINENO: result: yes" >&5
+-	{ $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:$LINENO: result: no" >&5
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -fi
 -
- { $as_echo "$as_me:$LINENO: checking if building on NetBSD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on NetBSD" >&5
  $as_echo_n "checking if building on NetBSD... " >&6; }
  
-@@ -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
-         save_CFLAGS="$CFLAGS"
-         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-@@ -17380,7 +17368,7 @@
+@@ -14858,7 +14844,7 @@
  $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
          flag=no
          case "${host_cpu}-${host_os}" in
@@ -47,67 +38,58 @@
 +                *-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 @@
+         { $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:$LINENO: checking whether libical is installed" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libical is installed" >&5
  $as_echo_n "checking whether libical is installed... " >&6; }
-@@ -20243,7 +20231,7 @@
+@@ -15883,7 +15869,7 @@
    $as_echo_n "(cached) " >&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
+ 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
+ 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
- 
+@@ -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.  */
  
-@@ -20516,7 +20504,7 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bluetooth_bt_aton" >&5
+@@ -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
+ 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 @@
+@@ -16612,7 +16598,7 @@
  $as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
- if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = x""yes; then
+ 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"
  
- cat >>confdefs.h <<\_ACEOF
- #define XPM 1
+ $as_echo "#define XPM 1" >>confdefs.h
+ 
diff --git a/comms/gnokii/files/patch-gnokiid-Makefile.in b/comms/gnokii/files/patch-gnokiid-Makefile.in
index e688fc352ea4..55c838d3da35 100644
--- a/comms/gnokii/files/patch-gnokiid-Makefile.in
+++ b/comms/gnokii/files/patch-gnokiid-Makefile.in
@@ -1,7 +1,7 @@
---- gnokiid/Makefile.in.orig	2008-10-06 08:57:16.000000000 +0200
-+++ gnokiid/Makefile.in	2009-02-26 17:26:31.000000000 +0100
-@@ -48,7 +48,7 @@
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+--- 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)
@@ -9,14 +9,14 @@
  am__DEPENDENCIES_1 =
  gnokiid_DEPENDENCIES = $(top_builddir)/common/libgnokii.la \
  	$(top_builddir)/common/data/libDATA.la $(am__DEPENDENCIES_1)
-@@ -326,8 +326,8 @@
- 	     || test -f $$p1 \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
+@@ -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
  
diff --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc
deleted file mode 100644
index 7731e37c38b5..000000000000
--- a/comms/gnokii/files/patch-gnokiirc
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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.
diff --git a/comms/gnokii/files/patch-smsd-Makefile.in b/comms/gnokii/files/patch-smsd-Makefile.in
index 83601dce019e..265652b4ff1b 100644
--- a/comms/gnokii/files/patch-smsd-Makefile.in
+++ b/comms/gnokii/files/patch-smsd-Makefile.in
@@ -1,7 +1,7 @@
---- smsd/Makefile.in.orig	2008-10-06 08:57:19.000000000 +0200
-+++ smsd/Makefile.in	2009-02-26 17:35:49.000000000 +0100
-@@ -86,7 +86,7 @@
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+--- 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)
@@ -9,14 +9,14 @@
  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
-@@ -421,8 +421,8 @@
- 	     || test -f $$p1 \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
+@@ -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
  
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 84d3a626a0fe..c58cb8829f0c 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -21,7 +21,7 @@ include/gnokii/wappush.h
 lib/libgnokii.a
 lib/libgnokii.la
 lib/libgnokii.so
-lib/libgnokii.so.5
+lib/libgnokii.so.6
 libdata/pkgconfig/gnokii.pc
 libdata/pkgconfig/xgnokii.pc
 sbin/gnokiid