5 files changed, 28 insertions, 27 deletions

diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index 9ee0c0b21c8e..9896f0a5015a 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.09.00
+PORTVERSION=	1.10.0
 CATEGORIES=	comms
-MASTER_SITES=	http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/ \
-		http://dl.cihar.com/gammu/stable/1_0x/
+MASTER_SITES=	ftp://dl.cihar.com/gammu/releases/ \
+		http://dl.cihar.com/gammu/releases/
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	GNU All Mobile Management Utilities
diff --git a/comms/gammu-devel/distinfo b/comms/gammu-devel/distinfo
index 52652a87856b..f563e442ba25 100644
--- a/comms/gammu-devel/distinfo
+++ b/comms/gammu-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gammu-1.09.00.tar.gz) = 0d555102bd4d0bc7b4e609abc462fb01
-SHA256 (gammu-1.09.00.tar.gz) = 7746961a708f3b48bd31165b0fc99b051a35be60b49a6c51774fdf13a1c0bc65
-SIZE (gammu-1.09.00.tar.gz) = 1137894
+MD5 (gammu-1.10.0.tar.gz) = 7732cf48a1593164bcf6710bda41e6c8
+SHA256 (gammu-1.10.0.tar.gz) = d8a77264e5e799dca201bb0fb88068b7eac92e94ed07c94f76e5fd283991ea83
+SIZE (gammu-1.10.0.tar.gz) = 1142836
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.glo b/comms/gammu-devel/files/patch-cfg-Makefile.glo
index c2a88cd1ae03..cd6c225165ac 100644
--- a/comms/gammu-devel/files/patch-cfg-Makefile.glo
+++ b/comms/gammu-devel/files/patch-cfg-Makefile.glo
@@ -1,18 +1,18 @@
---- cfg/Makefile.glo.orig	Tue Apr 12 10:26:08 2005
-+++ cfg/Makefile.glo	Tue Sep  6 08:38:21 2005
-@@ -122,7 +122,7 @@
- 	@echo Making $<
- 	@$(CC) -c $(CFLAGS) -I$(TOPDIR)/common/ $(CPPFLAGS) $*.c -o $*.o
+--- cfg/Makefile.glo.orig	Fri Feb 23 23:50:00 2007
++++ cfg/Makefile.glo	Tue Apr 10 23:43:11 2007
+@@ -126,7 +126,7 @@
+ # Add special flags for gammu binary
+ 	@$(CC) -c $(CFLAGS) $(CPPFLAGS) $*.c -o $*.o $(if $(subst gammu/gammu.c,,$<),,$(GAMMU_CFLAGS))
  
 -all: gammu
 +all: gammu shared
  
  $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
  	@echo Linking gammu
-@@ -225,12 +225,14 @@
- 	@$(INSTALL) -m 0644 $(TOPDIR)/changelog $(DESTDIR)$(INSTALL_DOC_DIR)
- 	@$(INSTALL) -m 0644 $(TOPDIR)/readme.txt $(DESTDIR)$(INSTALL_DOC_DIR)
- 	@$(INSTALL) -m 0644 $(TOPDIR)/copying $(DESTDIR)$(INSTALL_DOC_DIR)
+@@ -234,12 +234,14 @@
+ 	@$(INSTALL) -m 0644 $(TOPDIR)/ChangeLog $(DESTDIR)$(INSTALL_DOC_DIR)
+ 	@$(INSTALL) -m 0644 $(TOPDIR)/README $(DESTDIR)$(INSTALL_DOC_DIR)
+ 	@$(INSTALL) -m 0644 $(TOPDIR)/COPYING $(DESTDIR)$(INSTALL_DOC_DIR)
 +
 +installman:
  	@echo Installing man to $(DESTDIR)$(INSTALL_MAN_DIR)
@@ -25,7 +25,7 @@
  
  installonly: all
  	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -238,7 +240,7 @@
+@@ -247,7 +249,7 @@
  	@$(INSTALL) -m 0755 $(TOPDIR)/gammu/gammu $(DESTDIR)$(INSTALL_BIN_DIR)
  
  installshared: installlib
@@ -34,17 +34,17 @@
  
  installlibonly: shared
  	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -247,8 +249,7 @@
+@@ -256,8 +258,7 @@
  
  	@echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
  	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	@$(INSTALL) -m 0644 $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(INSTALL_LIB_DIR)
--	@$(LN) -s libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so.$(SONAME_MAJOR)
-+	@$(INSTALL) -m 0644 $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so.$(SONAME_MAJOR)
- 	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so
+-	@$(INSTALL) -m 0755 $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+-	@$(LN) -s $(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_MJR_NAME)
++	@$(INSTALL) -m 0755 $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so.$(SONAME_MAJOR)
+ 	@$(LN) -s $(LIBGAMMU_MJR_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_SHRTNAME)
   
  	@echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)
-@@ -267,8 +268,8 @@
+@@ -276,8 +277,8 @@
  	@$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h
  
  	@echo Installing pkgconfig file
diff --git a/comms/gammu-devel/files/patch-common.device.devfunc.c b/comms/gammu-devel/files/patch-common.device.devfunc.c
index f6dddacea0cb..6dea7c02c241 100644
--- a/comms/gammu-devel/files/patch-common.device.devfunc.c
+++ b/comms/gammu-devel/files/patch-common.device.devfunc.c
@@ -1,9 +1,9 @@
---- common/device/devfunc.c.orig	Sun Nov 20 22:01:18 2005
-+++ common/device/devfunc.c	Thu Jan 19 18:35:48 2006
-@@ -17,6 +17,8 @@
-  */
+--- common/device/devfunc.c.orig	Fri Feb 23 23:50:01 2007
++++ common/device/devfunc.c	Tue Apr 10 23:46:39 2007
+@@ -18,6 +18,8 @@
  
  #include <string.h>
+ #include <fcntl.h>
 +#include <sys/stat.h>
 +#include <sys/socket.h>
  #ifdef WIN32
diff --git a/comms/gammu-devel/pkg-plist b/comms/gammu-devel/pkg-plist
index add6f6295c1f..201ff7f2b6a6 100644
--- a/comms/gammu-devel/pkg-plist
+++ b/comms/gammu-devel/pkg-plist
@@ -9,10 +9,11 @@ bin/gammu
 libdata/pkgconfig/gammu.pc
 lib/libGammu.a
 lib/libGammu.so
-lib/libGammu.so.0
+lib/libGammu.so.1
 include/gammu/config.h
 include/gammu/gammu.h
 include/gammu/gsmcomon.h
+include/gammu/gsmerror.h
 include/gammu/gsmstate.h
 include/gammu/device/devfunc.h
 include/gammu/device/bluetoth/affix.h