diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index cc032c802662..31426cf61834 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,121 +1,117 @@
 PORTNAME=	gnokii
 PORTVERSION=	0.6.31
-PORTREVISION=	12
+PORTREVISION=	13
 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
 
 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 tar:bzip2
+		readline shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
 USE_GNOME=	glib20 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-security
+SHEBANG_FILES=	smsd/action utils/sendsms
 
 SUB_FILES+=	pkg-message
 PORTDOCS=	*
 
 CONFLICTS=	smstools sendsms
 
-FIXPREFIX=	Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \
-		common/cfgreader.c
+FIXPREFIX=	Docs/README common/cfgreader.c
 
-OPTIONS_DEFINE=	DOCS ICAL PCSC SMSD SMSDDB USB X11
-OPTIONS_MULTI=	SMSDDB
-OPTIONS_MULTI_SMSDDB=	MYSQL PGSQL SQLITE
+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
 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
-X11_USES=		gnome xorg
+			libfreetype.so:print/freetype2 \
+			libharfbuzz.so:print/harfbuzz
+X11_USES=		xorg
 X11_USE=		XORG=x11 XORG=xpm \
 			GNOME=cairo GNOME=gdkpixbuf2 GNOME=gtk20
 X11_PLIST_SUB=		X11=''
 X11_PLIST_SUB_OFF=	X11='@comment '
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/bash/sh/" ${WRKSRC}/smsd/action
 .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
-# fix test(1) conditions in configure script
-	@${REINPLACE_CMD} -E \
-		-e 's|([[:space:]]+test[[:space:]]+.+)==([[:space:]]+"yes")|\1=\2|' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${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} -p ${STAGEDIR}${PREFIX}/share/smsd
+	@${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} -p ${STAGEDIR}${PREFIX}/share/smsd
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/smsd
 	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${STAGEDIR}${PREFIX}/share/smsd
 
 post-install-PGSQL-on:
-	@${MKDIR} -p ${STAGEDIR}${PREFIX}/share/smsd
+	@${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-utils_sendsms b/comms/gnokii/files/patch-utils_sendsms
new file mode 100644
index 000000000000..60d568b48a74
--- /dev/null
+++ b/comms/gnokii/files/patch-utils_sendsms
@@ -0,0 +1,26 @@
+--- utils/sendsms.orig	2011-12-02 14:53:04 UTC
++++ utils/sendsms
+@@ -1,4 +1,4 @@
+-#!/bin/bash 
++#!/bin/sh
+ ###############################################################################
+ #	SENDSMS   --  Script to send sms by 'gnokii'
+ #   Author : Gabriele Zappi - Rimini <gzappi@inwind.it>
+@@ -342,7 +342,7 @@ parse_stdin $*
+ # 	help
+ # fi
+ 
+-if ! type -all "dialog" >/dev/null 2>&1 ; then
++if ! type "dialog" >/dev/null 2>&1 ; then
+ echo
+ echo "${PROGNAME}: error:"
+ echo "Can't find 'dialog', i can't run without 'dialog' on your system."
+@@ -354,7 +354,7 @@ if [ $SW_SKIPGNOKITST = no ] ; then
+ fi
+ 
+ if [ $SW_SKIPGNOKITST = no ] ; then
+-	if ! type -all "$GNOKII" >/dev/null 2>&1 ; then
++	if ! type "$GNOKII" >/dev/null 2>&1 ; then
+ 	echo
+ 	echo "${PROGNAME}: error:"
+ 	echo "Can't find 'gnokii'. This script needs 'gnokii' in order to work."
diff --git a/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff b/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff
deleted file mode 100644
index b0fb1800643b..000000000000
--- a/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- smsd/Makefile.orig	Sun Nov 13 16:00:45 2005
-+++ smsd/Makefile	Sun Nov 13 16:00:54 2005
-@@ -7,14 +7,14 @@
- # $Id: Makefile,v 1.33 2005/08/10 07:33:43 ja Exp $
- #
- 
--#GLIBCFLAGS = glib-config --cflags
--#GLIBLDLIBS = glib-config --libs
-+GLIBCFLAGS = glib-config --cflags
-+GLIBLDLIBS = glib-config --libs
- 
- # Comment out above lines and uncomment below lines if you want compile smsd
- # with glib2 instead of glib1.
- #
--GLIBCFLAGS = pkg-config --cflags glib-2.0
--GLIBLDLIBS = pkg-config --libs glib-2.0
-+#GLIBCFLAGS = pkg-config --cflags glib-2.0
-+#GLIBLDLIBS = pkg-config --libs glib-2.0
- 
- TOPDIR=..
- include $(TOPDIR)/Makefile.global
diff --git a/comms/gnokii/pkg-install b/comms/gnokii/pkg-install
deleted file mode 100644
index a5434dd5022f..000000000000
--- a/comms/gnokii/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-SUIDBINS="${PKG_PREFIX}/sbin/gnokiid ${PKG_PREFIX}/sbin/mgnokiidev"
-BINS="${PKG_PREFIX}/bin/gnokii ${SUIDBINS}"
-
-if [ -e ${PKG_PREFIX}/bin/xgnokii ]; then
-	BINS="$BINS ${PKG_PREFIX}/bin/xgnokii"
-fi
-
-case "$2" in
-"POST-INSTALL")
-	chgrp gnokii $BINS
-	chmod 750 ${BINS}
-	chmod u+s ${SUIDBINS}
-	;;
-
-esac
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 6e265fbc7577..a42ff19d3377 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -1,54 +1,54 @@
-bin/gnokii
-bin/sendsms
-%%X11%%bin/xgnokii
+@(,gnokii,0750) bin/gnokii
+@(,gnokii,0755) bin/sendsms
+%%X11%%@(,gnokii,0750) bin/xgnokii
 etc/gnokiirc.sample
 include/gnokii.h
 include/gnokii/bitmaps.h
 include/gnokii/call.h
 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
 include/gnokii/sms.h
 include/gnokii/statemachine.h
 include/gnokii/virtmodem.h
 include/gnokii/wappush.h
 lib/libgnokii.a
 lib/libgnokii.so
 lib/libgnokii.so.7
 lib/libgnokii.so.7.0.0
 libdata/pkgconfig/gnokii.pc
 libdata/pkgconfig/xgnokii.pc
 man/man1/gnokii.1.gz
 man/man1/sendsms.1.gz
 man/man1/xgnokii.1.gz
 man/man8/gnokiid.8.gz
 man/man8/mgnokiidev.8.gz
 %%SMSD%%man/man8/smsd.8.gz
-sbin/gnokiid
-sbin/mgnokiidev
-%%SMSD%%sbin/smsd
+@(,gnokii,4750) sbin/gnokiid
+@(,gnokii,4750) sbin/mgnokiidev
+%%SMSD%%@(,gnokii,0750) sbin/smsd
 share/locale/de/LC_MESSAGES/gnokii.mo
 share/locale/fi/LC_MESSAGES/gnokii.mo
 share/locale/fr/LC_MESSAGES/gnokii.mo
 share/locale/it/LC_MESSAGES/gnokii.mo
 share/locale/pl/LC_MESSAGES/gnokii.mo
 share/locale/pt/LC_MESSAGES/gnokii.mo
 share/locale/sv/LC_MESSAGES/gnokii.mo
 %%SMSD%%share/smsd/README
 %%SMSD%%share/smsd/action
 %%SMSD%%lib/smsd/libsmsd_file.a
 %%SMSD%%lib/smsd/libsmsd_file.so
 %%MSM%%lib/smsd/libsmsd_mysql.a
 %%MSM%%lib/smsd/libsmsd_mysql.so
 %%MSM%%share/smsd/sms.tables.mysql.sql
 %%PGM%%lib/smsd/libsmsd_pq.a
 %%PGM%%lib/smsd/libsmsd_pq.so
 %%PGM%%share/smsd/sms.tables.pq.sql
 %%SQLT%%lib/smsd/libsmsd_sqlite.a
 %%SQLT%%lib/smsd/libsmsd_sqlite.so
 %%X11%%share/applications/xgnokii.desktop