Update to version 1.24.0.

Remove patches incorporated upstream.

8 files changed, 8 insertions, 90 deletions

diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index bb95f987b13c..6443ff30d4ef 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.23.1
-PORTREVISION=	2
+PORTVERSION=	1.24.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com/gammu/releases/
diff --git a/comms/gammu-devel/distinfo b/comms/gammu-devel/distinfo
index c0a2b1cfa445..4f812dac8d39 100644
--- a/comms/gammu-devel/distinfo
+++ b/comms/gammu-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gammu-1.23.1.tar.gz) = 60853feea8d5b22b5cebfeec911caa14
-SHA256 (gammu-1.23.1.tar.gz) = 175f17d9413d6e9c59a3134899c915a08dc119400337d994560213727560ccd2
-SIZE (gammu-1.23.1.tar.gz) = 2852548
+MD5 (gammu-1.24.0.tar.gz) = e804256e5af7be2cdf802ec853d73efe
+SHA256 (gammu-1.24.0.tar.gz) = 3bdb48434067fe177485f82081b141b77f07b20e4f25c5e2e3a0c0521e27cc4d
+SIZE (gammu-1.24.0.tar.gz) = 2935668
diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt
index 0291659a6532..3e7fdfc4e1e8 100644
--- a/comms/gammu-devel/files/patch-CMakeLists.txt
+++ b/comms/gammu-devel/files/patch-CMakeLists.txt
@@ -9,32 +9,3 @@
  mark_as_advanced (INSTALL_MAN_DIR)
  
  # Phone and protocol configuration
-@@ -698,11 +698,13 @@
-     COMPONENT "pkgconfig"
-     )
- 
-+if(INSTALL_DOC)
- install (
-     FILES ${DOCS}
-     DESTINATION "${INSTALL_DOC_DIR}"
-     COMPONENT "docs"
-     )
-+endif(INSTALL_DOC)
- 
- # We want some tests. Even when cross compiling for Windows tests can be
- # done in Wine. This is better than nothing, even though Wine is a bit
-@@ -860,10 +860,14 @@
- 
- add_subdirectory(utils)
- 
-+option(INSTALL_DOC "Install documentation" ON)
-+
-+if(INSTALL_DOC)
- add_subdirectory(docs/config)
- add_subdirectory(docs/develop)
- add_subdirectory(docs/sql)
- add_subdirectory(docs/user)
-+endif(WITH_DOC)
- 
- add_subdirectory(contrib)
- 
diff --git a/comms/gammu-devel/files/patch-gammu-backupsms.c b/comms/gammu-devel/files/patch-gammu-backupsms.c
deleted file mode 100644
index e1299e151bb9..000000000000
--- a/comms/gammu-devel/files/patch-gammu-backupsms.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gammu/backupsms.c.orig	2009-03-12 10:06:22.000000000 +0300
-+++ gammu/backupsms.c	2009-03-12 10:06:38.000000000 +0300
-@@ -23,7 +23,7 @@
- 	GSM_SMSFolders		folders;
- 	bool			BackupFromFolder[GSM_MAX_SMS_FOLDERS];
- 	bool			start = true;
--	bool			DeleteAfter, askdelete = true;
-+	bool			DeleteAfter = false, askdelete = true;
- 	int			j, smsnum = 0;
- 
- 	if (argc == 4) {
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index bb95f987b13c..6443ff30d4ef 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.23.1
-PORTREVISION=	2
+PORTVERSION=	1.24.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com/gammu/releases/
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index c0a2b1cfa445..4f812dac8d39 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,3 +1,3 @@
-MD5 (gammu-1.23.1.tar.gz) = 60853feea8d5b22b5cebfeec911caa14
-SHA256 (gammu-1.23.1.tar.gz) = 175f17d9413d6e9c59a3134899c915a08dc119400337d994560213727560ccd2
-SIZE (gammu-1.23.1.tar.gz) = 2852548
+MD5 (gammu-1.24.0.tar.gz) = e804256e5af7be2cdf802ec853d73efe
+SHA256 (gammu-1.24.0.tar.gz) = 3bdb48434067fe177485f82081b141b77f07b20e4f25c5e2e3a0c0521e27cc4d
+SIZE (gammu-1.24.0.tar.gz) = 2935668
diff --git a/comms/gammu/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt
index 0291659a6532..3e7fdfc4e1e8 100644
--- a/comms/gammu/files/patch-CMakeLists.txt
+++ b/comms/gammu/files/patch-CMakeLists.txt
@@ -9,32 +9,3 @@
  mark_as_advanced (INSTALL_MAN_DIR)
  
  # Phone and protocol configuration
-@@ -698,11 +698,13 @@
-     COMPONENT "pkgconfig"
-     )
- 
-+if(INSTALL_DOC)
- install (
-     FILES ${DOCS}
-     DESTINATION "${INSTALL_DOC_DIR}"
-     COMPONENT "docs"
-     )
-+endif(INSTALL_DOC)
- 
- # We want some tests. Even when cross compiling for Windows tests can be
- # done in Wine. This is better than nothing, even though Wine is a bit
-@@ -860,10 +860,14 @@
- 
- add_subdirectory(utils)
- 
-+option(INSTALL_DOC "Install documentation" ON)
-+
-+if(INSTALL_DOC)
- add_subdirectory(docs/config)
- add_subdirectory(docs/develop)
- add_subdirectory(docs/sql)
- add_subdirectory(docs/user)
-+endif(WITH_DOC)
- 
- add_subdirectory(contrib)
- 
diff --git a/comms/gammu/files/patch-gammu-backupsms.c b/comms/gammu/files/patch-gammu-backupsms.c
deleted file mode 100644
index e1299e151bb9..000000000000
--- a/comms/gammu/files/patch-gammu-backupsms.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gammu/backupsms.c.orig	2009-03-12 10:06:22.000000000 +0300
-+++ gammu/backupsms.c	2009-03-12 10:06:38.000000000 +0300
-@@ -23,7 +23,7 @@
- 	GSM_SMSFolders		folders;
- 	bool			BackupFromFolder[GSM_MAX_SMS_FOLDERS];
- 	bool			start = true;
--	bool			DeleteAfter, askdelete = true;
-+	bool			DeleteAfter = false, askdelete = true;
- 	int			j, smsnum = 0;
- 
- 	if (argc == 4) {