diff -ruN gnokii.old/Makefile gnokii/Makefile
--- gnokii.old/Makefile	Wed May  4 13:38:44 2005
+++ gnokii/Makefile	Wed May  4 13:39:03 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
diff -ruN gnokii.old/distinfo gnokii/distinfo
--- gnokii.old/distinfo	Wed May  4 13:38:44 2005
+++ gnokii/distinfo	Wed May  4 13:39:29 2005
@@ -1,2 +1,2 @@
-MD5 (gnokii-0.6.4.tar.bz2) = e48e72b4038481509f32e2a7596dc2d5
-SIZE (gnokii-0.6.4.tar.bz2) = 2006834
+MD5 (gnokii-0.6.5.tar.bz2) = 73eefa3ac9bdaf2823e15a1636504b1a
+SIZE (gnokii-0.6.5.tar.bz2) = 1884543
diff -ruN gnokii.old/files/patch-configure gnokii/files/patch-configure
--- gnokii.old/files/patch-configure	Wed May  4 13:38:44 2005
+++ gnokii/files/patch-configure	Wed May  4 18:58:03 2005
@@ -1,27 +1,27 @@
---- configure.orig	Sun Oct 17 21:44:38 2004
-+++ configure	Mon Dec 27 12:48:43 2004
-@@ -26348,13 +26348,15 @@
+--- configure.orig	Fri Apr 29 22:40:40 2005
++++ configure	Wed May  4 18:57:59 2005
+@@ -26347,13 +26347,15 @@
  # 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_LIBS%%%%PTHREAD_CFLAGS%%" != x; then
-+	PTHREAD_CFLAGS="%%PTHREAD_CFLAGS%%"
-+	PTHREAD_LIBS="%%PTHREAD_LIBS%%"
++if test x"-pthread" != x; then
++	PTHREAD_CFLAGS=""
++	PTHREAD_LIBS="-pthread"
          save_CFLAGS="$CFLAGS"
 -        CFLAGS="$CFLAGS $PTHREAD_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%% $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
-@@ -26726,7 +26728,7 @@
+@@ -26725,7 +26727,7 @@
  echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6
          flag=no
          case "${host_cpu}-${host_os}" in
@@ -30,12 +30,21 @@
                  *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
          esac
          echo "$as_me:$LINENO: result: ${flag}" >&5
-@@ -27570,7 +27572,7 @@
+@@ -27569,7 +27571,7 @@
  USE_LIBICAL="no"
  OLD_LIBS="$LIBS"
  OLD_CFLAGS="$CFLAGS"
 -LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
-+LIBS="$LIBS $ICAL_LIBS -L/usr/local %%PTHREAD_LIBS%% -lical"
++LIBS="$LIBS $ICAL_LIBS -L/usr/local -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
+@@ -29111,7 +29113,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6
+ if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
+-   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"
++   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"
+               cat >>confdefs.h <<\_ACEOF
+ #define XPM 1
+ _ACEOF
diff -ruN gnokii.old/files/patch-gnokiirc gnokii/files/patch-gnokiirc
--- gnokii.old/files/patch-gnokiirc	Wed May  4 13:38:44 2005
+++ gnokii/files/patch-gnokiirc	Wed May  4 13:55:50 2005
@@ -1,24 +1,24 @@
---- Docs/sample/gnokiirc.orig	Thu Jan  8 15:16:55 2004
-+++ Docs/sample/gnokiirc	Thu Jan  8 15:17:40 2004
+--- Docs/sample/gnokiirc.orig	Wed May  4 13:42:40 2005
++++ Docs/sample/gnokiirc	Wed May  4 13:55:09 2005
 @@ -6,7 +6,7 @@
  
  # Set port to the physical serial 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
- #
-@@ -14,7 +14,7 @@
+@@ -19,7 +19,7 @@
  # port = aa:bb:cc:dd:ee:ff
-  
+ 
  # Set model to the model number of your phone
 -model = 6110
 +model = 6210
  
  # Initlength controls the number of characters sent to the
  # phone during initialisation.  You can either set it to
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,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'.