diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index a4da40e93f1f..8b8dd01114b1 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,120 +1,120 @@
 PORTNAME=	gnokii
 PORTVERSION=	0.6.31
-PORTREVISION=	15
+PORTREVISION=	16
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
 		http://www.gnokii.org/download/gnokii/0.6.x/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Tools to talk to GSM cellular phones
 WWW=		https://www.gnokii.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 GROUPS=		${PORTNAME}
 USES=		gettext gmake gnome iconv libtool localbase pathfix pkgconfig \
 		readline shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
 USE_GNOME=	glib20 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-security
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 SHEBANG_FILES=	smsd/action
 
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 
 CONFLICTS=	smstools sendsms
 
 FIXPREFIX=	Docs/README common/cfgreader.c
 
 OPTIONS_DEFINE=	DOCS ICAL PCSC SMSD USB X11
 OPTIONS_GROUP=	SMSDDB
 OPTIONS_GROUP_SMSDDB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	X11
 
 ICAL_DESC=	Build with IETF iCal support
 USB_DESC=	Build with libusb support
 PCSC_DESC=	Build with PC/SC-Lite support
 SMSD_DESC=	Enable smsd daemon (includes "file" backend)
 SMSDDB_DESC=	Enable database support in smsd (select one or more)
 X11_DESC=	Build graphical version (xgnokii)
 
 ICAL_CONFIGURE_ENABLE=	libical
 ICAL_LIB_DEPENDS=	libical.so:devel/libical
 USB_CONFIGURE_ENABLE=	libusb
 PCSC_CONFIGURE_ENABLE=	libpcsclite
 PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 MYSQL_IMPLIES=		SMSD
 PGSQL_IMPLIES=		SMSD
 SQLITE_IMPLIES=		SMSD
 SMSD_PLIST_SUB=		SMSD=''
 SMSD_PLIST_SUB_OFF=	SMSD='@comment ' MSM='@comment ' PGM='@comment ' SQLT='@comment '
 SMSD_CONFIGURE_OFF=	--disable-smsd
 MYSQL_USES=		mysql ssl
 MYSQL_PLIST_SUB=	MSM=''
 MYSQL_PLIST_SUB_OFF=	MSM='@comment '
 MYSQL_CONFIGURE_OFF=	--disable-mysql
 MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 PGSQL_USES=		pgsql
 PGSQL_PLIST_SUB=	PGM=''
 PGSQL_PLIST_SUB_OFF=	PGM='@comment '
 PGSQL_CONFIGURE_OFF=	--disable-postgres
 SQLITE_USES=		sqlite
 SQLITE_PLIST_SUB=	SQLT=''
 SQLITE_PLIST_SUB_OFF=	SQLT='@comment '
 SQLITE_CONFIGURE_OFF=	--disable-sqlite
 X11_CONFIGURE_WITH=	x
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 X11_USES=		xorg
 X11_USE=		XORG=x11 XORG=xpm \
 			GNOME=cairo GNOME=gdkpixbuf GNOME=gtk20
 X11_PLIST_SUB=		X11=''
 X11_PLIST_SUB_OFF=	X11='@comment '
 
 post-patch:
 .for f in ${FIXPREFIX}
 	@${REINPLACE_CMD} -e "s:/etc/gnokiirc:${PREFIX}/etc/gnokiirc:g" \
 		${WRKSRC}/${f}
 .endfor
 .for f in common/data/virtmodem.c utils/mgnokiidev.c
 	@${REINPLACE_CMD} -E -e "s:^(#ifdef.*)__OpenBSD__:\1__FreeBSD__:" \
 		${WRKSRC}/${f}
 .endfor
 	@${MV} ${WRKSRC}/Docs/man/xgnokii.1x ${WRKSRC}/Docs/man/xgnokii.1
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/xgnokii/xgnokii.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
 		${STAGEDIR}${PREFIX}/etc/gnokiirc.sample
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnokii.so.7.0.0
 
 post-install-DOCS-on:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install -C ${WRKSRC}/Docs
 
 post-install-DOCS-off:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install -C ${WRKSRC}/Docs/man
 
 post-install-SMSD-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/smsd
 	@cd ${WRKSRC}/smsd && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
 	${INSTALL_SCRIPT} ${WRKSRC}/smsd/action ${STAGEDIR}${PREFIX}/share/smsd
 	${INSTALL_DATA} ${WRKSRC}/smsd/README ${STAGEDIR}${PREFIX}/share/smsd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/smsd/*.so
 
 post-install-MYSQL-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/smsd
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${STAGEDIR}${PREFIX}/share/smsd
 
 post-install-PGSQL-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/smsd
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.pq.sql ${STAGEDIR}${PREFIX}/share/smsd
 
 .include <bsd.port.mk>
diff --git a/comms/gnokii/files/patch-configure b/comms/gnokii/files/patch-configure
index 27e7c58a7df6..2154b5a3a921 100644
--- a/comms/gnokii/files/patch-configure
+++ b/comms/gnokii/files/patch-configure
@@ -1,113 +1,104 @@
 --- configure.orig	2011-12-02 14:54:03 UTC
 +++ configure
 @@ -955,7 +955,7 @@ pdfdir='${docdir}'
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
  localedir='${datarootdir}/locale'
 -mandir='${datarootdir}/man'
 +mandir='${prefix}/man'
  
  ac_prev=
  ac_dashdash=
 @@ -7939,19 +7939,6 @@ _ACEOF
    fi
  
  
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on FreeBSD" >&5
 -$as_echo_n "checking if building on FreeBSD... " >&6; }
 -
 -if test `uname -s` = "FreeBSD" ; then
 -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
 -	CPPFLAGS="$CFLAGS -I/usr/local/include"
 -	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 -else
 -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -fi
 -
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if building on NetBSD" >&5
  $as_echo_n "checking if building on NetBSD... " >&6; }
  
 @@ -15803,7 +15790,7 @@ $as_echo "$as_me: WARNING: we do not kno
  $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
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
 @@ -16716,7 +16703,7 @@ $as_echo "#define HAVE_BLUETOOTH 1" >>co
  $as_echo "#define HAVE_BLUETOOTH_BLUEZ /**/" >>confdefs.h
  
  			USE_BLUETOOTH="yes"
 -			BLUETOOTH_LIBS="-lbluetooth"
 +			BLUETOOTH_LIBS="-lsdp -lbluetooth"
  
  		fi
  	fi
 @@ -16849,7 +16836,7 @@ if ${ac_cv_lib_bluetooth_bt_aton+:} fals
    $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.  */
  
 @@ -16880,7 +16867,7 @@ fi
  { $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" = xyes; 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
 @@ -16977,7 +16964,7 @@ if ${ac_cv_lib_bluetooth_bt_aton+:} fals
    $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.  */
  
 @@ -17008,7 +16995,7 @@ fi
  { $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" = xyes; 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
 @@ -17488,8 +17475,7 @@ if ${ac_cv_lib_Xpm_XpmWriteFileFromXpmIm
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lXpm  $XLIBS -lX11
 -             $LIBS"
 +LIBS="-lXpm  $XLIBS -lX11 $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -17521,7 +17507,7 @@ fi
- $as_echo "$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
- if test "x$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" = xyes; then :
-    XPM_CFLAGS="$XINCL"
--                  XPM_LIBS="$XLIBS -lXpm -lX11"
-+                  XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
- 
- $as_echo "#define XPM 1" >>confdefs.h
- 
 @@ -17556,7 +17542,7 @@ $as_echo "$as_me: WARNING: Disabling xgn
     fi
  fi
  
 - if test "x$_support" = "xyes"; then
 + if test "x$x_support" = "xyes"; then
    XGNOKII_TRUE=
    XGNOKII_FALSE='#'
  else