6 files changed, 48 insertions, 41 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 219e6e2c9519..dc8d5162a201 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTVERSION=	0.6.10
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
@@ -80,10 +79,10 @@ WITH_PGSQL=	yes
 .else
 PLIST_SUB+=	PGM='@comment '
 .endif
-.if defined(SMSD_WITH_GLIB2)
-USE_GNOME+=	glib20
-.else
+.if defined(SMSD_WITH_GLIB1)
 USE_GNOME+=	glib12
+.else
+USE_GNOME+=	glib20
 .endif
 .endif
 
@@ -92,7 +91,7 @@ CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11='@comment '
 .else
 USE_XPM=	yes
-USE_GNOME+=	gtk12
+USE_GNOME+=	gtk20 gnomelibs
 PLIST_SUB+=	X11=''
 MAN1+=	xgnokii.1
 .endif
@@ -116,10 +115,10 @@ pre-fetch:
 	@${ECHO} "always compiled in."
 	@${ECHO}
 .endif
-.if !defined(SMSD_WITH_GLIB2)
+.if !defined(SMSD_WITH_GLIB1)
 	@${ECHO}
-	@${ECHO} "smsd defaults to using glib1, if you'd rather link with glib2
-	@${ECHO} "define SMSD_WITH_GLIB2=yes"
+	@${ECHO} "smsd defaults to using glib2, if you'd rather link with glib1
+	@${ECHO} "define SMSD_WITH_GLIB1=yes"
 	@${ECHO}
 .endif
 
@@ -138,7 +137,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|<stdint.h>|<inttypes.h>|'
 .endif
-.if defined(SMSD_WITH_GLIB2)
+.if defined(SMSD_WITH_GLIB1)
 	@cd ${WRKSRC} && ${PATCH} -s <${PATCHDIR}/smsd-Makefile-WITH_GLIB.diff
 .endif
 
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 99006ce61eaa..e1da186ffbff 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1,2 +1,3 @@
-MD5 (gnokii-0.6.8.tar.bz2) = 8109a8c3eb8ac0ee3e6ef3314bd2ce82
-SIZE (gnokii-0.6.8.tar.bz2) = 1980384
+MD5 (gnokii-0.6.10.tar.bz2) = 031007358ff9b6e6e2994d408a4fa88a
+SHA256 (gnokii-0.6.10.tar.bz2) = 92659c8b02a50f7a2d40a608b81514176a13216d4a40d35689df9a49f58444f0
+SIZE (gnokii-0.6.10.tar.bz2) = 1916536
diff --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc
index c639518ab0c1..7731e37c38b5 100644
--- a/comms/gnokii/files/patch-gnokiirc
+++ b/comms/gnokii/files/patch-gnokiirc
@@ -1,24 +1,24 @@
---- Docs/sample/gnokiirc.orig	Wed May 18 15:17:32 2005
-+++ Docs/sample/gnokiirc	Wed May 18 15:18:17 2005
-@@ -6,7 +6,7 @@
+--- Docs/sample/gnokiirc.orig	Wed Nov  9 01:11:42 2005
++++ Docs/sample/gnokiirc	Sat Nov 12 19:11:21 2005
+@@ -7,7 +7,7 @@
  
- # Set port to the physical serial port used to connect to your phone.
+ # Set port to the physical 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
-@@ -26,7 +26,7 @@
+@@ -45,7 +45,7 @@
  # model = AT
  # If you can't figure out what to put here read the FAQ.
  # If it still doesn't help, consult gnokii-ml or #gnokii at freenode.
 -model = 6510
 +model = 6210
+ # There are few main models that should make use of the certain drivers.
+ # These are: 6110, 7110, 6510, 3110, 2110, 6160.
  
- # Initlength controls the number of characters sent to the
- # phone during initialisation.  You can either set it to
-@@ -56,7 +56,7 @@
+@@ -87,7 +87,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'.
diff --git a/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff b/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff
index 6a5b8fcd921a..b0fb1800643b 100644
--- a/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff
+++ b/comms/gnokii/files/smsd-Makefile-WITH_GLIB.diff
@@ -1,21 +1,21 @@
---- smsd/Makefile.orig	Wed Oct 20 17:26:17 2004
-+++ smsd/Makefile	Wed Oct 20 17:26:25 2004
-@@ -6,14 +6,14 @@
- # $Id: Makefile,v 1.31 2004/08/03 09:29:09 ja Exp $
+--- 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
+-#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
+-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
index 95419f079104..de143b544a51 100644
--- a/comms/gnokii/pkg-install
+++ b/comms/gnokii/pkg-install
@@ -5,7 +5,11 @@ 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}"
+BINS="${PKG_PREFIX}/bin/gnokii ${SUIDBINS}"
+
+if [ -e ${PKG_PREFIX}/bin/xgnokii ]; then
+	BINS="$BINS ${PKG_PREFIX}/bin/xgnokii"
+fi
 
 case "$2" in
 "PRE-INSTALL")
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 266d2139228f..d4123eb7a399 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -180,6 +180,17 @@ sbin/mgnokiidev
 %%X11%%share/xgnokii/xpm/Preview_6210.xpm
 %%X11%%share/xgnokii/xpm/Preview_6250.xpm
 %%X11%%share/xgnokii/xpm/Preview_7110.xpm
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/calendar
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/contacts
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/dtmf
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/main
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/netmon/gsm
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/sms
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/speeddial
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/xkeyb
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/cables
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/irda
+%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows
 %%X11%%@dirrm share/xgnokii/help/en_US/cables
 %%X11%%@dirrm share/xgnokii/help/en_US/calendar
 %%X11%%@dirrm share/xgnokii/help/en_US/contacts
@@ -209,11 +220,3 @@ sbin/mgnokiidev
 %%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