By me:

- Update to 0.5.0.
- Add ftp.gnokii.org as MASTER_SITE, as it is back.

And from Simon:

- Fix package building - use pkg-install for adding/removing the gnokii
group.
- Use REINPLACE_CMD instead of sed for cleanliness.
- Unbreak building on -current.

PR:		ports/47516
Submitted by:	Simon Schubert <corecode@corecode.ath.cx> (partly)

12 files changed, 215 insertions, 95 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index c6653cbd7aa9..b7943be3b205 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.4.3
+PORTVERSION=	0.5.0
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/ \
-		http://freesoftware.fsf.org/download/gnokii/
-#		ftp://ftp.gnokii.org/pub/gnokii/
+		http://freesoftware.fsf.org/download/gnokii/ \
+		ftp://ftp.gnokii.org/pub/gnokii/
 
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Tools to talk to Nokia cellular phones
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 .if !defined(WITHOUT_X11)
 USE_XPM=	yes
@@ -27,7 +28,7 @@ INSTALLS_SHLIB=	yes
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--with-libintl=${LOCALBASE} --enable-security \
+CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE} --enable-security \
 			--with-xgnokiidir=${PREFIX}/share
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
@@ -36,9 +37,10 @@ PLIST_SUB+=	X11='@comment '
 PLIST_SUB+=	X11=''
 .endif
 CONFIGURE_ENV+=	MSGFMT="${LOCALBASE}/bin/msgfmt" \
-		XGETTEXT="${LOCALBASE}/bin/xgettext"
+		XGETTEXT="${LOCALBASE}/bin/xgettext" \
+		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-NO_PACKAGE=	"Group needs to be created"
 MAN1=	gnokii.1 todologo.1
 .if !defined(WITHOUT_X11)
 MAN1+=	xgnokii.1
@@ -46,30 +48,31 @@ MAN1+=	xgnokii.1
 MAN8=	gnokiid.8 mgnokiidev.8
 
 INSTALL_TARGET=	install-suid
+PKGDEINSTALL=	${PKGINSTALL}
 
 FIXPREFIX=	Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \
 		common/cfgreader.c po/et.po po/sl.po
 
 post-patch:
 .for f in ${FIXPREFIX}
-	@${SED} -e "s:/etc/gnokiirc:${PREFIX}/etc/gnokiirc:g" \
-	< ${WRKSRC}/${f} > ${WRKSRC}/${f}.post_sed
-	@${CP} ${WRKSRC}/${f}.post_sed ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e "s:/etc/gnokiirc:${PREFIX}/etc/gnokiirc:g" \
+		${WRKSRC}/${f}
+.endfor
+	@${REINPLACE_CMD} -e "s:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:; \
+		s:%%PTHREAD_CFLAGS%%:${PTHREAD_CFLAGS}:" ${WRKSRC}/configure
+.for f in common/data/virtmodem.c utils/mgnokiidev.c
+	@${REINPLACE_CMD} -E -e "s:^(#ifdef.*)__OpenBSD__:\1__FreeBSD__:" \
+		${WRKSRC}/${f}
 .endfor
-	@${SED} -e "s:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:" \
-		-e "s:%%PTHREAD_CFLAGS%%:${PTHREAD_CFLAGS}:" \
-	< ${WRKSRC}/configure > ${WRKSRC}/configure.post_sed
-	@${CP} ${WRKSRC}/configure.post_sed ${WRKSRC}/configure
 
 pre-install:
-	@${SH} ${SCRIPTDIR}/creategroup
+	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@(cd ${WRKSRC} && ${GMAKE} install-docs)
 	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
 		${PREFIX}/etc/gnokiirc.sample
-	${INSTALL_DATA} ${WRKSRC}/common/libgnokii.so ${PREFIX}/lib/
-	@(cd ${PREFIX}/lib && ${LN} -s libgnokii.so libgnokii.so.0)
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index b2dfd91d3da6..2ee145429d50 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1 +1 @@
-MD5 (gnokii-0.4.3.tar.gz) = ecf5c04d1bef362cc0b4940e2c647e09
+MD5 (gnokii-0.5.0.tar.gz) = 30c8f3e2c6ef684578500cba088006df
diff --git a/comms/gnokii/files/patch-Docs-Makefile b/comms/gnokii/files/patch-Docs-Makefile
index 726d8ff324da..a7ff5cc2849b 100644
--- a/comms/gnokii/files/patch-Docs-Makefile
+++ b/comms/gnokii/files/patch-Docs-Makefile
@@ -1,25 +1,23 @@
---- Docs/Makefile.orig	Thu Aug  8 23:07:58 2002
-+++ Docs/Makefile	Thu Aug  8 23:08:44 2002
-@@ -32,19 +32,20 @@
+--- Docs/Makefile.orig	Tue May 20 20:53:33 2003
++++ Docs/Makefile	Tue May 20 20:54:25 2003
+@@ -62,6 +62,7 @@
  	@echo
  
  install:
 +ifndef NOPORTDOCS
- 	$(INSTALL) -d $(DESTDIR)/$(docdir)
- 	@for xxx in $(INSTALL_DOCS); do \
- 	    if [ -e $$xxx ]; then \
- 		$(INSTALL) -m 0444 $$xxx $(DESTDIR)/$(docdir)/$$xxx; \
- 	    fi; \
- 	done
-+endif
- 	$(INSTALL) -d $(DESTDIR)/$(man1dir)
- 	$(INSTALL) -d $(DESTDIR)/$(man8dir)
- 	$(INSTALL) $(GNOKII1_MAN) $(DESTDIR)/$(man1dir)
- 	$(INSTALL) $(GNOKII8_MAN) $(DESTDIR)/$(man8dir)
+ 	$(INSTALL) -d $(DESTDIR)$(docdir)
+ 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/logo
+ 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/ringtone
+@@ -78,10 +79,10 @@
+ 	$(INSTALL) $(GNOKII1_MAN) $(DESTDIR)$(man1dir)
+ 	$(INSTALL) $(GNOKII8_MAN) $(DESTDIR)$(man8dir)
  	if [ "x$(HAVE_XGNOKII)" = "xyes" ]; then \
--		$(INSTALL) -d $(DESTDIR)/$(xmandir); \
--		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)/$(xmandir); \
+-		$(INSTALL) -d $(DESTDIR)$(xmandir); \
+-		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)$(xmandir); \
 +		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)/$(xmandir)/xgnokii.1; \
  	fi
  	@echo "done"
++endif
  
+ clean:
+ 	$(RM) *~
diff --git a/comms/gnokii/files/patch-Makefile.global.in b/comms/gnokii/files/patch-Makefile.global.in
index 5680ed4a0a1f..008f1472e53f 100644
--- a/comms/gnokii/files/patch-Makefile.global.in
+++ b/comms/gnokii/files/patch-Makefile.global.in
@@ -1,6 +1,6 @@
---- Makefile.global.in.orig	Mon Aug  5 18:21:20 2002
-+++ Makefile.global.in	Thu Aug  8 23:39:06 2002
-@@ -22,13 +22,13 @@
+--- Makefile.global.in.orig	Tue May 20 20:34:17 2003
++++ Makefile.global.in	Tue May 20 20:37:15 2003
+@@ -22,14 +22,14 @@
  
  bindir         = @bindir@
  sbindir        = @sbindir@
@@ -9,6 +9,7 @@
  libdir         = @libdir@
 -xgnokii_libdir = @XGNOKIIDIR@/share/@XPACKAGE@
 +xgnokii_libdir = ${prefix}/share/@XPACKAGE@
+ includedir     = @includedir@
  man1dir        = @mandir@/man1/
  man8dir        = @mandir@/man8/
 -xmandir        = @XGNOKIIDIR@/man/man1/
diff --git a/comms/gnokii/files/patch-common-Makefile b/comms/gnokii/files/patch-common-Makefile
new file mode 100644
index 000000000000..cae242f53a05
--- /dev/null
+++ b/comms/gnokii/files/patch-common-Makefile
@@ -0,0 +1,41 @@
+--- common/Makefile.orig	Tue May 20 21:04:08 2003
++++ common/Makefile	Tue May 20 21:21:55 2003
+@@ -41,15 +41,12 @@
+ 	misc.o \
+ 	snprintf.o
+ 
+-ifdef NO_SHARED
+-GNOKII_LIB=libgnokii.a
+-else
++GNOKII_LIBNOSHARED  =libgnokii.a
+ GNOKII_LIB  =libgnokii.so
+ GNOKII_LIBM =$(GNOKII_LIB).$(MAJOR_NUMBER)
+ GNOKII_LIBMM=$(GNOKII_LIBM).$(MINOR_NUMBER)
+-endif
+ 
+-all: $(GNOKII_LIB)
++all: $(GNOKII_LIB) $(GNOKII_LIBNOSHARED)
+ 
+ phones/PHONES.o:
+ 	$(MAKE) -C phones PHONES.o
+@@ -64,8 +61,7 @@
+ 	$(CC) -o gnokii-debug $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o ../gnokii/gnokii.o
+ 
+ libgnokii.so: $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
+-	$(CC) -shared -Wl,-soname,$(GNOKII_LIBM) -o $(GNOKII_LIBMM) $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
+-	ln -sf $(GNOKII_LIBMM) $(GNOKII_LIBM)
++	$(CC) -shared -Wl,-soname,$(GNOKII_LIBM) -o $(GNOKII_LIBM) $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
+ 	ln -sf $(GNOKII_LIBM) $(GNOKII_LIB)
+ 
+ libgnokii.a: $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
+@@ -84,8 +80,8 @@
+ 
+ install:
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
+-	$(INSTALL) $(GNOKII_LIBMM) $(DESTDIR)$(libdir)
+-	cd $(DESTDIR)$(libdir) && ln -sf $(GNOKII_LIBMM) $(GNOKII_LIBM)
++	$(INSTALL) $(GNOKII_LIBM) $(DESTDIR)$(libdir)
++	$(INSTALL) $(GNOKII_LIBNOSHARED) $(DESTDIR)$(libdir)
+ 	cd $(DESTDIR)$(libdir) && ln -sf $(GNOKII_LIBM) $(GNOKII_LIB)
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig
diff --git a/comms/gnokii/files/patch-configure b/comms/gnokii/files/patch-configure
index 715ecb972263..d816fd14e3d0 100644
--- a/comms/gnokii/files/patch-configure
+++ b/comms/gnokii/files/patch-configure
@@ -1,13 +1,13 @@
---- configure.orig	Thu Aug  8 23:11:28 2002
-+++ configure	Thu Aug  8 23:12:05 2002
-@@ -1973,8 +1973,8 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
+--- configure.orig	Tue May 20 20:29:43 2003
++++ configure	Tue May 20 20:30:35 2003
+@@ -6407,8 +6407,8 @@
+ echo "${ECHO_T}$ac_cv_lib_c_r_pthread_attr_init" >&6
+ if test $ac_cv_lib_c_r_pthread_attr_init = yes; then
+ 
 -                    PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"
--                    PTHREAD_LIBS="-pthread" 
+-                    PTHREAD_LIBS="-pthread"
 +                    PTHREAD_CFLAGS="$PTHREAD_CFLAGS %%PTHREAD_CFLAGS%%"
 +                    PTHREAD_LIBS="%%PTHREAD_LIBS%%"
- else
-   echo "$ac_t""no" 1>&6
+ fi
+ 
  fi
diff --git a/comms/gnokii/files/patch-gnokii-Makefile b/comms/gnokii/files/patch-gnokii-Makefile
deleted file mode 100644
index 5cab81797031..000000000000
--- a/comms/gnokii/files/patch-gnokii-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- gnokii/Makefile.orig	Mon Aug  5 18:21:20 2002
-+++ gnokii/Makefile	Thu Aug  8 23:26:03 2002
-@@ -25,12 +25,10 @@
- 	GNOKII_LIB=libgnokii.so
- endif
- 
--LDLIBS += -L$(TOPDIR)/common -lgnokii
--
- all: gnokii
- 
- gnokii: $(OBJS) $(TOPDIR)/common/gsm-filetypes.o $(TOPDIR)/common/$(GNOKII_LIB)
--	$(CC) $(LDFLAGS) $(OBJS) $(TOPDIR)/common/gsm-filetypes.o $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS) $(TOPDIR)/common/gsm-filetypes.o -L$(TOPDIR)/common -lgnokii $(LDLIBS) -o $@
- 
- $(TOPDIR)/getopt/libgetopt.a:
- 	$(MAKE) -C $(TOPDIR)/getopt
diff --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc
index f11b412b40f3..0f38b9603175 100644
--- a/comms/gnokii/files/patch-gnokiirc
+++ b/comms/gnokii/files/patch-gnokiirc
@@ -1,19 +1,24 @@
---- Docs/sample/gnokiirc.orig	Fri May 10 00:31:47 2002
-+++ Docs/sample/gnokiirc	Thu May 23 02:07:50 2002
-@@ -5,10 +5,10 @@
- [global]
+--- Docs/sample/gnokiirc.orig	Tue May 20 20:31:08 2003
++++ Docs/sample/gnokiirc	Tue May 20 20:32:23 2003
+@@ -6,7 +6,7 @@
  
- # Set port to the physical serial port used to connect to your phone
+ # 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 @@
+ # 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
-@@ -38,7 +38,7 @@
+@@ -50,7 +50,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'.
@@ -22,12 +27,3 @@
  
  # Baudrate to use on serial port connections.
  # Currently used only by models AT and BIP/CIMD. Defaults to 19200.
-@@ -58,7 +58,7 @@
- 
- # If defined (not commented out by '#') it will quit Gnokii anytime
- # when DCD line will drop.
--require_dcd = 1
-+#require_dcd = 1
- 
- # Run the specified script(s) right after opening and initializing the device
- # and before any communucation (right before closing for disconnect_script).
diff --git a/comms/gnokii/files/patch-po-Makefile.in.in b/comms/gnokii/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..79af0f06f158
--- /dev/null
+++ b/comms/gnokii/files/patch-po-Makefile.in.in
@@ -0,0 +1,12 @@
+--- po/Makefile.in.in.orig	Tue May 20 23:06:48 2003
++++ po/Makefile.in.in	Tue May 20 23:09:16 2003
+@@ -209,6 +209,9 @@
+ 	  done; \
+ 	done
+ 
++install-suid: install
++	@echo
++
+ # Define this as empty until I found a useful application.
+ installcheck:
+ 
diff --git a/comms/gnokii/pkg-install b/comms/gnokii/pkg-install
new file mode 100644
index 000000000000..95419f079104
--- /dev/null
+++ b/comms/gnokii/pkg-install
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+GROUP=gnokii
+
+SUIDBINS="${PKG_PREFIX}/sbin/gnokiid ${PKG_PREFIX}/sbin/mgnokiidev"
+BINS="${PKG_PREFIX}/bin/gnokii ${PKG_PREFIX}/bin/xgnokii ${SUIDBINS}"
+
+case "$2" in
+"PRE-INSTALL")
+	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
+	;;
+
+"POST-INSTALL")
+	chgrp $GROUP $BINS
+	chmod 750 ${BINS}
+	chmod u+s ${SUIDBINS}
+	;;
+
+"DEINSTALL")
+	if [ -z "`pw groupshow $GROUP 2>&1 | sed -E -e 's/^([^:]+:){3}(.*)$/\2/'`" ]; then
+		echo "Removing empty group \"$GROUP\"."
+		pw groupdel $GROUP
+	fi
+	;;
+
+esac
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 034ff0146926..c1081f98cee7 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -1,22 +1,78 @@
 bin/gnokii
+bin/ppm2nokia
+bin/sendsms
 bin/todologo
 %%X11%%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/networks.h
+include/gnokii/ringtones.h
+include/gnokii/rlp-common.h
+include/gnokii/sms.h
+include/gnokii/statemachine.h
+include/gnokii/virtmodem.h
+@dirrm include/gnokii
+lib/libgnokii.a
 lib/libgnokii.so
-lib/libgnokii.so.0
+lib/libgnokii.so.1
+lib/pkgconfig/gnokii.pc
 sbin/gnokiid
 sbin/mgnokiidev
+%%PORTDOCS%%share/doc/gnokii/Bugs
 %%PORTDOCS%%share/doc/gnokii/CREDITS
 %%PORTDOCS%%share/doc/gnokii/DataCalls-QuickStart
 %%PORTDOCS%%share/doc/gnokii/README
+%%PORTDOCS%%share/doc/gnokii/README-2110
 %%PORTDOCS%%share/doc/gnokii/README-3810
 %%PORTDOCS%%share/doc/gnokii/README-6110
+%%PORTDOCS%%share/doc/gnokii/README-6510
+%%PORTDOCS%%share/doc/gnokii/README-7110
+%%PORTDOCS%%share/doc/gnokii/README-MacOSX
 %%PORTDOCS%%share/doc/gnokii/README-WIN32
+%%PORTDOCS%%share/doc/gnokii/README-dancall
+%%PORTDOCS%%share/doc/gnokii/README-ericsson
+%%PORTDOCS%%share/doc/gnokii/README-siemens
+%%PORTDOCS%%share/doc/gnokii/README.libsms
 %%PORTDOCS%%share/doc/gnokii/gettext-howto
+%%PORTDOCS%%share/doc/gnokii/gnokii-IrDA-Linux
+%%PORTDOCS%%share/doc/gnokii/gnokii-hackers-howto
 %%PORTDOCS%%share/doc/gnokii/gnokii-ir-howto
-%%PORTDOCS%%share/doc/gnokii/gnokii.nol
+%%PORTDOCS%%share/doc/gnokii/logos.txt
 %%PORTDOCS%%share/doc/gnokii/packaging-howto
+%%PORTDOCS%%share/doc/gnokii/ringtones.txt
+%%PORTDOCS%%share/doc/gnokii/sample/gnokiirc
+%%PORTDOCS%%share/doc/gnokii/sample/logo/bronto.xpm
+%%PORTDOCS%%share/doc/gnokii/sample/logo/gnokii.xpm
+%%PORTDOCS%%share/doc/gnokii/sample/logo/gnokiiop.xpm
+%%PORTDOCS%%share/doc/gnokii/sample/logo/horse.xpm
+%%PORTDOCS%%share/doc/gnokii/sample/logo/horse2.xpm
+%%PORTDOCS%%share/doc/gnokii/sample/logo/pacman.xpm
+%%PORTDOCS%%share/doc/gnokii/sample/magic
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/cimd-connect
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/options
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/pap-secrets
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/ppp-6210-modem
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/ppp-FILES
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/ppp-gnokii
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/ppp-hscsd
+%%PORTDOCS%%share/doc/gnokii/sample/ppp/ppp-on
+%%PORTDOCS%%share/doc/gnokii/sample/ringtone/star.imelody
+%%PORTDOCS%%share/doc/gnokii/sample/ringtone/star.rtttl
+%%PORTDOCS%%share/doc/gnokii/sample/vCalendar/test.vcs
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample/logo
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample/ringtone
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample/vCalendar
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample/vCard
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample/ppp
+%%PORTDOCS%%@dirrm share/doc/gnokii/sample
 %%PORTDOCS%%@dirrm share/doc/gnokii
+%%PORTDOCS%%@exec mkdir -m 755 %D/share/doc/gnokii/sample/vCard
 share/locale/cs/LC_MESSAGES/gnokii.mo
 share/locale/de/LC_MESSAGES/gnokii.mo
 share/locale/et/LC_MESSAGES/gnokii.mo
@@ -142,3 +198,11 @@ share/locale/sl/LC_MESSAGES/gnokii.mo
 %%X11%%@dirrm share/xgnokii/help
 %%X11%%@dirrm share/xgnokii/xpm
 %%X11%%@dirrm share/xgnokii
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/calendar
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/contacts
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/dtmf
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/main
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/netmon/gsm
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/sms
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/speeddial
+%%X11%%@exec mkdir -m 755 %D/share/xgnokii/help/en_US/xkeyb
diff --git a/comms/gnokii/scripts/creategroup b/comms/gnokii/scripts/creategroup
deleted file mode 100644
index ce829947a3fb..000000000000
--- a/comms/gnokii/scripts/creategroup
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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