Updates this abandoned port to a usable version (0.3.3 pre22) that:

- works with a lot more phones
- has many more features
- has a nice (optional) GUI

Change MAINTAINER to anders@fix.no, with approval from previous MAINTAINER.

PR:		27045
Submitted by:	Anders Nordby <anders@fix.no>

13 files changed, 276 insertions, 105 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 74a0a59bada5..eff4ac149290 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,19 +6,82 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.2.3
+PORTVERSION=	0.3.3
 CATEGORIES=	comms
-MASTER_SITES=	ftp://multivac.fatburen.org/pub/gnokii/ \
-		ftp://multivac.fatburen.org/pub/gnokii/old/
+MASTER_SITES=	ftp://ftp.gnokii.org/pub/gnokii/pre/ \
+		http://linuxcare.com.au/download/gnokii/pre/ \
+		ftp://multivac.fatburen.org/pub/gnokii/pre/ \
+		ftp://urtica.linuxnews.pl/pub/people/pkot/gnokii/
+DISTNAME=	${PORTNAME}-${PORTVERSION}_pre22
 
-MAINTAINER=	staffanu@nada.kth.se
+MAINTAINER=	anders@fix.no
+
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 USE_GMAKE=	yes
+USE_AUTOCONF=	yes
+.if !defined(WITHOUT_X11)
+USE_XPM=	yes
+USE_GTK=	yes
+.endif
+
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--with-libintl=${PREFIX} --enable-security \
+			--with-xgnokiidir=${PREFIX}/share
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=	X11='@comment '
+.else
+PLIST_SUB+=	X11=''
+.endif
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
+
+NO_PACKAGE=	"Group needs to be created"
+MAN1=	gnokii.1
+MAN8=	todologo.8
+
+DOCDIR=${WRKSRC}/Docs
+DOCDEST=${PREFIX}/share/doc/gnokii
+FIXPREFIX=	Docs/DataCalls-QuickStart Docs/README common/cfgreader.c
+
+post-patch:
+.for f in ${FIXPREFIX}
+	${PERL} -pi -e "s@/etc/gnokiirc@${PREFIX}/etc/gnokiirc@g" \
+	${WRKSRC}/${f}
+.endfor
 
-do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/gnokii ${PREFIX}/bin/gnokii
+pre-install:
+	@${SH} ${SCRIPTDIR}/creategroup
 
 post-install:
-	strip ${PREFIX}/bin/gnokii
+	@${INSTALL_DATA} ${DOCDIR}/sample/gnokiirc ${PREFIX}/etc/
+	${INSTALL_MAN} ${DOCDIR}/man/todologo.8 ${PREFIX}/man/man8/
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC} && ${GMAKE} install-docs)
+	@${INSTALL} -d -o root -g wheel -m 0755 ${DOCDEST}
+	@${INSTALL_DATA} ${DOCDIR}/ChangeLog ${PREFIX}/share/doc/gnokii/
+	@${INSTALL_DATA} ${DOCDIR}/Bugs ${DOCDEST}/
+	@${INSTALL_DATA} ${DOCDIR}/FAQ ${DOCDEST}/
+	@${INSTALL_DATA} ${DOCDIR}/ChangeLog ${DOCDEST}/
+	@${INSTALL_DATA} ${DOCDIR}/CodingStyle ${DOCDEST}/
+	@${INSTALL_DATA} ${DOCDIR}/README-2110 ${DOCDEST}/
+	@${INSTALL_DATA} ${DOCDIR}/test.vcs ${PREFIX}/share/doc/gnokii/
+	@${INSTALL} -d -o root -g wheel -m 0755 ${DOCDEST}/protocol
+	@${INSTALL_DATA} ${DOCDIR}/protocol/6110.txt ${DOCDEST}/protocol/
+	@${INSTALL_DATA} ${DOCDIR}/protocol/7110.txt ${DOCDEST}/protocol/
+	@${INSTALL} -d -o root -g wheel -m 0755 ${DOCDEST}/sample
+	@${INSTALL_DATA} ${DOCDIR}/sample/options ${DOCDEST}/sample/
+	@${INSTALL_DATA} ${DOCDIR}/sample/pap-secrets ${DOCDEST}/sample/
+	@${INSTALL_DATA} ${DOCDIR}/sample/ppp-gnokii ${DOCDEST}/sample/
+	@${INSTALL_DATA} ${DOCDIR}/sample/ppp-on ${DOCDEST}/sample/
+.else
+	${INSTALL_MAN} ${DOCDIR}/man/gnokii.1 ${PREFIX}/man/man1/
+.endif
+	@${ECHO} "================================================================================"
+	@${ECHO} "The default config is installed in ${PREFIX}/etc/gnokiirc, and is configured"
+	@${ECHO} "for Nokia 6110 phones connected on COM1. Have a look at the"
+	@${ECHO} "documentation/manpages for more information."
+	@${ECHO} "================================================================================"
 
 .include <bsd.port.mk>
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 2fa91d5c3ae4..17a72b8367a6 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1 +1 @@
-MD5 (gnokii-0.2.3.tar.gz) = e3d511ca575b78b2f7022324fcf324ab
+MD5 (gnokii-0.3.3_pre22.tar.gz) = 78a2b820caf46a1467f7e6fe72ddf00e
diff --git a/comms/gnokii/files/patch-Makefile.global.in b/comms/gnokii/files/patch-Makefile.global.in
new file mode 100644
index 000000000000..132bd593b3c5
--- /dev/null
+++ b/comms/gnokii/files/patch-Makefile.global.in
@@ -0,0 +1,11 @@
+--- Makefile.global.in.orig	Tue May  1 21:42:36 2001
++++ Makefile.global.in	Tue May  1 21:42:46 2001
+@@ -27,7 +27,7 @@
+ libdir         = @libdir@/${PACKAGE}
+ xgnokii_libdir = @XGNOKIIDIR@/@XPACKAGE@
+ mandir         = @mandir@/man1/
+-docdir         = ${prefix}/doc/${PACKAGE}
++docdir         = ${prefix}/share/doc/${PACKAGE}
+ locdir         = @datadir@/locale
+ 
+ BIN_MODE       = 0755
diff --git a/comms/gnokii/files/patch-aa b/comms/gnokii/files/patch-aa
deleted file mode 100644
index e9c6b1b9b060..000000000000
--- a/comms/gnokii/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-*** Makefile.orig	Fri Mar  5 00:21:14 1999
---- Makefile	Wed Mar 17 00:02:57 1999
-***************
-*** 7,15 ****
-  CC = gcc
-  
-  # Set up compilation/linking flags.
-! CFLAGS = -D_REENTRANT -Wall -g -O0 -pthread 
-  
-! LDFLAGS = -lpthread
-  
-  GNOKII_OBJS = gnokii.o gsm-api.o fbus-3810.o fbus-6110.o
-  
---- 7,15 ----
-  CC = gcc
-  
-  # Set up compilation/linking flags.
-! CFLAGS = -D_THREAD_SAFE -Wall -g -O0 -pthread 
-  
-! LDFLAGS = -pthread
-  
-  GNOKII_OBJS = gnokii.o gsm-api.o fbus-3810.o fbus-6110.o
-  
diff --git a/comms/gnokii/files/patch-ab b/comms/gnokii/files/patch-ab
deleted file mode 100644
index 2f64bb02ed49..000000000000
--- a/comms/gnokii/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-*** fbus-3810.c.orig	Wed Mar 17 00:02:05 1999
---- fbus-3810.c	Wed Mar 17 00:04:20 1999
-***************
-*** 24,30 ****
-  #include	<unistd.h>
-  #include	<fcntl.h>
-  #include	<ctype.h>
-! #include	<sys/signal.h>
-  #include	<sys/types.h>
-  #include	<sys/time.h>
-  #include	<string.h>
---- 24,30 ----
-  #include	<unistd.h>
-  #include	<fcntl.h>
-  #include	<ctype.h>
-! #include	<signal.h>
-  #include	<sys/types.h>
-  #include	<sys/time.h>
-  #include	<string.h>
-***************
-*** 537,543 ****
-  		/* Set up and install handler before enabling async IO on port. */
-  	sig_io.sa_handler = FB38_SigHandler;
-  	sig_io.sa_flags = 0;
-- 	sig_io.sa_restorer = NULL;
-  	sigaction (SIGIO, &sig_io, NULL);
-  
-  		/* Allow process/thread to receive SIGIO */
---- 537,542 ----
diff --git a/comms/gnokii/files/patch-ac b/comms/gnokii/files/patch-ac
deleted file mode 100644
index 8d15b10032d3..000000000000
--- a/comms/gnokii/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
-*** fbus-6110.c.orig	Wed Mar 17 00:05:17 1999
---- fbus-6110.c	Wed Mar 17 00:05:09 1999
-***************
-*** 24,30 ****
-  #include	<unistd.h>
-  #include	<fcntl.h>
-  #include	<ctype.h>
-! #include	<sys/signal.h>
-  #include	<sys/types.h>
-  #include	<sys/time.h>
-  #include	<string.h>
---- 24,30 ----
-  #include	<unistd.h>
-  #include	<fcntl.h>
-  #include	<ctype.h>
-! #include	<signal.h>
-  #include	<sys/types.h>
-  #include	<sys/time.h>
-  #include	<string.h>
-***************
-*** 218,224 ****
-  		/* Set up and install handler before enabling async IO on port. */
-  	sig_io.sa_handler = FB61_SigHandler;
-  	sig_io.sa_flags = 0;
-- 	sig_io.sa_restorer = NULL;
-  	sigaction (SIGIO, &sig_io, NULL);
-  
-  		/* Allow process/thread to receive SIGIO */
---- 218,223 ----
diff --git a/comms/gnokii/files/patch-configure.in b/comms/gnokii/files/patch-configure.in
new file mode 100644
index 000000000000..0705db5b2ad9
--- /dev/null
+++ b/comms/gnokii/files/patch-configure.in
@@ -0,0 +1,10 @@
+--- configure.in.orig	Sun Apr 15 14:35:18 2001
++++ configure.in	Tue May  1 22:50:59 2001
+@@ -15,7 +15,6 @@
+ AC_PREFIX_DEFAULT("/usr/local")
+ 
+ dnl ======================== Default setting
+-CFLAGS="-O2 -Wall"
+ ALL_LINGUAS="cs de et fi nl sk pl it"
+ 
+ dnl ======================== Checks for programs.
diff --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc
new file mode 100644
index 000000000000..95967271e571
--- /dev/null
+++ b/comms/gnokii/files/patch-gnokiirc
@@ -0,0 +1,11 @@
+--- Docs/sample/gnokiirc.orig	Thu May  3 00:55:27 2001
++++ Docs/sample/gnokiirc	Thu May  3 00:55:36 2001
+@@ -5,7 +5,7 @@
+ [global]
+ 
+ # Set port to the physical serial port used to connect to your phone
+-port = /dev/ttyS0
++port = /dev/cuaa0
+ 
+ # Set model to the model number of your phone
+ model = 6110
diff --git a/comms/gnokii/pkg-comment b/comms/gnokii/pkg-comment
index 71465d65fd6b..0dc4b0ab6030 100644
--- a/comms/gnokii/pkg-comment
+++ b/comms/gnokii/pkg-comment
@@ -1 +1 @@
-Software to talk to Nokia 3810/3110/8110/6110 cellular phones
+Tools to talk to Nokia cellular phones
diff --git a/comms/gnokii/pkg-descr b/comms/gnokii/pkg-descr
index 8e20c4693f5d..efb459ad77b3 100644
--- a/comms/gnokii/pkg-descr
+++ b/comms/gnokii/pkg-descr
@@ -1,7 +1,8 @@
-Software to talk to Nokia 3810/3110/8110/6110 cellular phones.  The
-software is under development and is currently not especially useful.
+Gnokii is a tool suite and modem driver for Nokia mobile phones. It currently
+supports most phones from the 3810/8110, 5110/6110, and 2110 series, details
+including bugs specific to each series appear in the files README-3810,
+README-6110 and README-2110 respectively.
 
-WWW: http://multivac.fatburen.org/gnokii/
+WWW: http://www.gnokii.org/
 
-- Staffan Ulfberg
-staffanu@nada.kth.se
+- Anders Nordby <anders@fix.no>
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 0defe085ef0f..7f1f3349c535 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -1 +1,151 @@
 bin/gnokii
+%%X11%%bin/xgnokii
+%%X11%%bin/xlogos
+sbin/gnokiid
+sbin/mgnokiidev
+bin/todologo
+etc/gnokiirc
+share/locale/it/LC_MESSAGES/gnokii.mo
+share/locale/pl/LC_MESSAGES/gnokii.mo
+share/locale/de/LC_MESSAGES/gnokii.mo
+share/locale/nl/LC_MESSAGES/gnokii.mo
+share/locale/sk/LC_MESSAGES/gnokii.mo
+share/locale/cs/LC_MESSAGES/gnokii.mo
+share/locale/et/LC_MESSAGES/gnokii.mo
+share/locale/fi/LC_MESSAGES/gnokii.mo
+%%X11%%share/xgnokii/help/C
+%%X11%%share/xgnokii/help/POSIX
+%%X11%%share/xgnokii/help/en_US/cables/cables.html
+%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
+%%X11%%share/xgnokii/help/en_US/irda/irda.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.gif
+%%X11%%share/xgnokii/help/en_US/netmon/net_mon2.gif
+%%X11%%share/xgnokii/help/en_US/netmon/net_mon3.gif
+%%X11%%share/xgnokii/help/en_US/netmon/nm2_5110.gif
+%%X11%%share/xgnokii/help/en_US/netmon/nm_3210.gif
+%%X11%%share/xgnokii/help/en_US/netmon/nm_5110.gif
+%%X11%%share/xgnokii/help/en_US/netmon/nm_9110.gif
+%%X11%%share/xgnokii/help/en_US/netmon/tip.gif
+%%X11%%share/xgnokii/help/en_US/windows/calendar/index.html
+%%X11%%share/xgnokii/help/en_US/windows/contacts/index.html
+%%X11%%share/xgnokii/help/en_US/windows/dtmf/index.html
+%%X11%%share/xgnokii/help/en_US/windows/main/index.html
+%%X11%%share/xgnokii/help/en_US/windows/netmon/index.html
+%%X11%%share/xgnokii/help/en_US/windows/sms/index.html
+%%X11%%share/xgnokii/help/en_US/windows/speeddial/index.html
+%%X11%%share/xgnokii/help/en_US/windows/xkeyb/index.html
+%%X11%%share/xgnokii/help/en_US/sample/gnokiirc
+%%X11%%share/xgnokii/help/en_US/config.html
+%%X11%%share/xgnokii/help/en_US/faq.html
+%%X11%%share/xgnokii/help/en_US/index.html
+%%X11%%share/xgnokii/help/en_US/styl.css
+%%X11%%share/xgnokii/help/en_US/CREDITS
+%%X11%%share/xgnokii/help/en_US/COPYING
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/f2mbus2.gif
+%%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.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon2.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_mon3.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/net_spis.htm
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm2_5110.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_3210.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_5110.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/nm_9110.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/gsm/tip.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/dir0.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/dir1.gif
+%%X11%%share/xgnokii/help/pl_PL/netmon/glowna.htm
+%%X11%%share/xgnokii/help/pl_PL/netmon/htm.gif
+%%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/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/sms.html
+%%X11%%share/xgnokii/help/pl_PL/speeddial.html
+%%X11%%share/xgnokii/help/pl_PL/xkeyb.html
+%%X11%%share/xgnokii/xpm/6110.xpm
+%%X11%%share/xgnokii/xpm/6150.xpm
+%%X11%%share/xgnokii/xpm/5110.xpm
+%%X11%%share/xgnokii/xpm/Preview_6110.xpm
+%%X11%%share/xgnokii/xpm/Preview_6150.xpm
+%%X11%%share/xgnokii/xpm/Preview_6210.xpm
+%%X11%%@dirrm share/xgnokii/help/en_US/cables
+%%X11%%@dirrm share/xgnokii/help/en_US/calendar
+%%X11%%@dirrm share/xgnokii/help/en_US/contacts
+%%X11%%@dirrm share/xgnokii/help/en_US/dtmf
+%%X11%%@dirrm share/xgnokii/help/en_US/firmware
+%%X11%%@dirrm share/xgnokii/help/en_US/irda
+%%X11%%@dirrm share/xgnokii/help/en_US/main
+%%X11%%@dirrm share/xgnokii/help/en_US/netmon/gsm
+%%X11%%@dirrm share/xgnokii/help/en_US/netmon
+%%X11%%@dirrm share/xgnokii/help/en_US/sms
+%%X11%%@dirrm share/xgnokii/help/en_US/speeddial
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/calendar
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/contacts
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/dtmf
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/main
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/netmon
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/sms
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/speeddial
+%%X11%%@dirrm share/xgnokii/help/en_US/windows/xkeyb
+%%X11%%@dirrm share/xgnokii/help/en_US/xkeyb
+%%X11%%@dirrm share/xgnokii/help/en_US/windows
+%%X11%%@dirrm share/xgnokii/help/en_US/sample
+%%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/en_US
+%%X11%%@dirrm share/xgnokii/help
+%%X11%%@dirrm share/xgnokii/xpm
+%%X11%%@dirrm share/xgnokii
+%%PORTDOCS%%share/doc/gnokii/test.vcs
+%%PORTDOCS%%share/doc/gnokii/sample/ppp-on
+%%PORTDOCS%%share/doc/gnokii/sample/ppp-gnokii
+%%PORTDOCS%%share/doc/gnokii/sample/pap-secrets
+%%PORTDOCS%%share/doc/gnokii/sample/options
+%%PORTDOCS%%share/doc/gnokii/protocol/7110.txt
+%%PORTDOCS%%share/doc/gnokii/protocol/6110.txt
+%%PORTDOCS%%share/doc/gnokii/packaging-howto
+%%PORTDOCS%%share/doc/gnokii/gnokii.nol
+%%PORTDOCS%%share/doc/gnokii/gnokii-ir-howto
+%%PORTDOCS%%share/doc/gnokii/gettext-howto
+%%PORTDOCS%%share/doc/gnokii/README-WIN32
+%%PORTDOCS%%share/doc/gnokii/README-6110
+%%PORTDOCS%%share/doc/gnokii/README-3810
+%%PORTDOCS%%share/doc/gnokii/README-2110
+%%PORTDOCS%%share/doc/gnokii/README
+%%PORTDOCS%%share/doc/gnokii/FAQ
+%%PORTDOCS%%share/doc/gnokii/DataCalls-QuickStart
+%%PORTDOCS%%share/doc/gnokii/ChangeLog
+%%PORTDOCS%%share/doc/gnokii/CodingStyle
+%%PORTDOCS%%share/doc/gnokii/CREDITS
+%%PORTDOCS%%share/doc/gnokii/Bugs
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample
+%%PORTDOCS%%@dirrm share/doc/gnokii/protocol
+%%PORTDOCS%%@dirrm share/doc/gnokii
diff --git a/comms/gnokii/scripts/creategroup b/comms/gnokii/scripts/creategroup
new file mode 100644
index 000000000000..ce829947a3fb
--- /dev/null
+++ b/comms/gnokii/scripts/creategroup
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+PATH=/bin:/usr/sbin
+
+GROUP=gnokii
+
+if pw group show "${GROUP}" 2>/dev/null; then
+	echo "You already have a group \"${GROUP}\", so I will use it."
+else
+	if pw groupadd ${GROUP}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
diff --git a/comms/gnokii/scripts/post-extract b/comms/gnokii/scripts/post-extract
deleted file mode 100644
index ca393b3db04b..000000000000
--- a/comms/gnokii/scripts/post-extract
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cat <<EOF
----------------------------------------------------------------------
-Notice: The gnokii software is currently configured to build for the
-3810/3110/8110 cellular phones.  If you want to compile it for the
-6110 (not yet implemented, but might be good for testers), edit the
-file work/gnokii-0.2.3/gnokii.c and change the #define for MODEL to
-reflect this.
----------------------------------------------------------------------
-EOF