- Update to 0.6.5

PR:		ports/80631
Submitted by:	Guido Falsi <mad@madpilot.net> (maintainer)

5 files changed, 28 insertions, 14 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 6c19edbd3747..dd96162b51a4 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
@@ -51,6 +51,10 @@ WITH_ICAL=	yes
 LIB_DEPENDS+=	ical.0:${PORTSDIR}/devel/libical
 .endif
 
+.if ${OSVERSION} < 500000
+LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
+.endif
+
 # If smsd is enabled check if MySQL or PostgreSQL are installed and
 # build the modules, no switches to make this port build those, if
 # you want them, just install them before this port. The port will
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 5c519144edce..5a76dab785d5 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnokii-0.6.4.tar.bz2) = e48e72b4038481509f32e2a7596dc2d5
-SIZE (gnokii-0.6.4.tar.bz2) = 2006834
+MD5 (gnokii-0.6.5.tar.bz2) = 73eefa3ac9bdaf2823e15a1636504b1a
+SIZE (gnokii-0.6.5.tar.bz2) = 1884543
diff --git a/comms/gnokii/files/patch-configure b/comms/gnokii/files/patch-configure
index 38c867b9607d..ba80f155dd65 100644
--- a/comms/gnokii/files/patch-configure
+++ b/comms/gnokii/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Oct 17 21:44:38 2004
-+++ configure	Mon Dec 27 12:48:43 2004
-@@ -26348,13 +26348,15 @@
+--- configure.orig	Fri Apr 29 22:40:40 2005
++++ configure	Thu May  5 14:20:32 2005
+@@ -26347,13 +26347,15 @@
  # First of all, check if the user has set any of the PTHREAD_LIBS,
  # etcetera environment variables, and if threads linking works using
  # them:
@@ -21,7 +21,7 @@
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26726,7 +26728,7 @@
+@@ -26725,7 +26727,7 @@
  echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6
          flag=no
          case "${host_cpu}-${host_os}" in
@@ -30,7 +30,7 @@
                  *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
          esac
          echo "$as_me:$LINENO: result: ${flag}" >&5
-@@ -27570,7 +27572,7 @@
+@@ -27569,7 +27571,7 @@
  USE_LIBICAL="no"
  OLD_LIBS="$LIBS"
  OLD_CFLAGS="$CFLAGS"
@@ -39,3 +39,12 @@
  CFLAGS="$CFLAGS $ICAL_CFLAGS"
  echo "$as_me:$LINENO: checking whether libical is installed" >&5
  echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6
+@@ -29111,7 +29113,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6
+ if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
+-   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"
++   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"
+               cat >>confdefs.h <<\_ACEOF
+ #define XPM 1
+ _ACEOF
diff --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc
index 14fda694b287..1f1c6e38f456 100644
--- a/comms/gnokii/files/patch-gnokiirc
+++ b/comms/gnokii/files/patch-gnokiirc
@@ -1,24 +1,24 @@
---- Docs/sample/gnokiirc.orig	Thu Jan  8 15:16:55 2004
-+++ Docs/sample/gnokiirc	Thu Jan  8 15:17:40 2004
+--- Docs/sample/gnokiirc.orig	Fri Apr 29 22:40:17 2005
++++ Docs/sample/gnokiirc	Thu May  5 14:23:45 2005
 @@ -6,7 +6,7 @@
  
  # 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 @@
+@@ -19,7 +19,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
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,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/pkg-plist b/comms/gnokii/pkg-plist
index ec1990e14ba7..266d2139228f 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -88,6 +88,7 @@ sbin/mgnokiidev
 %%NLS%%share/locale/pl/LC_MESSAGES/gnokii.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/gnokii.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/gnokii.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnokii.mo
 %%SMSD%%share/smsd/README
 %%SMSD%%share/smsd/action
 %%SMSD%%lib/smsd/libfile.a