- Update to 0.6.7

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

5 files changed, 15 insertions, 40 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 65fc0d7566fd..afb9c13bed86 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gnokii
-PORTVERSION=	0.6.5
+PORTVERSION=	0.6.7
 PORTEPOCH=	1
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
-		http://www.gnokii.org/download/gnokii/0.6.x/ \
-		ftp://ftp.gnokii.org/pub/gnokii/0.6.x/
+MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
+		ftp://ftp.gnokii.org/pub/gnokii/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mad@madpilot.net
diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo
index 5a76dab785d5..ee6aab148f7a 100644
--- a/comms/gnokii/distinfo
+++ b/comms/gnokii/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnokii-0.6.5.tar.bz2) = 73eefa3ac9bdaf2823e15a1636504b1a
-SIZE (gnokii-0.6.5.tar.bz2) = 1884543
+MD5 (gnokii-0.6.7.tar.bz2) = c80d68549c86f287f24c2bee0e929ded
+SIZE (gnokii-0.6.7.tar.bz2) = 1932632
diff --git a/comms/gnokii/files/patch-Makefile.global.in b/comms/gnokii/files/patch-Makefile.global.in
index f179c406ee6f..e009a52dccf7 100644
--- a/comms/gnokii/files/patch-Makefile.global.in
+++ b/comms/gnokii/files/patch-Makefile.global.in
@@ -1,5 +1,5 @@
---- Makefile.global.in.orig	Fri Apr 29 22:40:17 2005
-+++ Makefile.global.in	Fri May  6 03:20:25 2005
+--- Makefile.global.in.orig	Wed May 18 15:08:43 2005
++++ Makefile.global.in	Wed May 18 15:11:40 2005
 @@ -21,14 +21,14 @@
  
  bindir         = @bindir@
@@ -18,12 +18,3 @@
  docdir         = ${prefix}/share/doc/${PACKAGE}
  locdir         = @datadir@/locale
  
-@@ -46,7 +46,7 @@
- CC             = @CC@
- CFLAGS         = @CFLAGS@
- CPPFLAGS       = @CPPFLAGS@
--LIBS           = @LIBS@
-+LIBS           = @LIBS@ -lroken -lcrypt
- LDFLAGS        = @LDFLAGS@
- LEX            = @LEX@
- AR             = @AR@
diff --git a/comms/gnokii/files/patch-config-ltmain.sh b/comms/gnokii/files/patch-config-ltmain.sh
deleted file mode 100644
index e821abd3885d..000000000000
--- a/comms/gnokii/files/patch-config-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/ltmain.sh.orig	Wed Apr 14 20:10:18 2004
-+++ config/ltmain.sh	Wed Apr 14 20:14:14 2004
-@@ -1356,7 +1356,11 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+#	 *-*-openbsd* | *-*-freebsd*)
-+#	this situation is already managed by the ports tree for
-+#	freebsd, so leave it as is(-lc_r is actually needed for machines
-+#	built from freebsd-current source in a short life span :)
-+	 *-*-openbsd*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
diff --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc
index 1f1c6e38f456..c639518ab0c1 100644
--- a/comms/gnokii/files/patch-gnokiirc
+++ b/comms/gnokii/files/patch-gnokiirc
@@ -1,5 +1,5 @@
---- Docs/sample/gnokiirc.orig	Fri Apr 29 22:40:17 2005
-+++ Docs/sample/gnokiirc	Thu May  5 14:23:45 2005
+--- 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 @@
  
  # Set port to the physical serial port used to connect to your phone.
@@ -9,16 +9,16 @@
  #
  # For MacOSX you will need something like:
  # port = /dev/cu.USA28X1P1.1
-@@ -19,7 +19,7 @@
- # port = aa:bb:cc:dd:ee:ff
- 
- # Set model to the model number of your phone
--model = 6110
+@@ -26,7 +26,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
  
  # Initlength controls the number of characters sent to the
  # phone during initialisation.  You can either set it to
-@@ -49,7 +49,7 @@
+@@ -56,7 +56,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'.