11 files changed, 184 insertions, 46 deletions

diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index 35ac83e93368..7fc6854544b5 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.28.90
+PORTVERSION=	1.29.92
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/
@@ -17,42 +17,43 @@ COMMENT=	GNU All Mobile Management Utilities - Development version
 
 RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
 
-IGNORE=		the devel release are currently suspended, install comms/gammu, new release is 1.29.0
+CONFLICTS=	gammu-[1-9]* gammu-python-[1-9]*
 
-CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${PREFIX}/libdata
+LICENSE=	GPLv2
 
-USE_CMAKE=	yes
-USE_GNOME=	pkgconfig
+CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
-.if defined(WITH_PYTHON_GAMMU)
-USE_PYTHON=	YES
-PLIST_SUB=	WITH_PYTHON_GAMMU=""
-.else
-PLIST_SUB=	WITH_PYTHON_GAMMU="@comment "
-.endif
+USE_CMAKE=	yes
+USE_PYTHON=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	glib20
+USE_BZIP2=	yes
 
 PORTDOCS=	*
 
 .if defined(NOPORTDOCS)
-CMAKE_ARGS+=	-DINSTALL_DOC=OFF -DINSTALL_PHP_EXAMPLES=OFF -DINSTALL_MEDIA=OFF \
-		-DINSTALL_GNAPPLET=OFF
+CMAKE_ARGS+=	-DINSTALL_DOC=OFF -DINSTALL_PHP_EXAMPLES=OFF -DINSTALL_MEDIA=OFF
 .else
 MAN1=		gammu.1 gammu-config.1 jadmaker.1 gammu-smsd.1 gammu-smsd-inject.1 \
-		gammu-smsd-monitor.1
-MAN5=		gammu-smsdrc.5 gammurc.5
-MAN7=		gammu-smsd-dbi.7 gammu-smsd-files.7 gammu-smsd-mysql.7 \
-		gammu-smsd-null.7 gammu-smsd-pgsql.7 gammu-smsd-run.7 gammu-smsd-tables.7
+		gammu-smsd-monitor.1 gammu-detect.1
+MAN5=		gammu-backup.5 gammu-smsbackup.5 gammu-smsdrc.5 gammurc.5
+MAN7=		gammu-smsd-files.7 gammu-smsd-mysql.7 gammu-smsd-pgsql.7 \
+		gammu-smsd-dbi.7 gammu-smsd-tables.7 gammu-smsd-null.7 \
+		gammu-smsd-run.7 gammu-smsd-odbc.7 gammu-smsd-sql.7
+
 .endif
 
+post-install:
+.for opt in -Qold -O
+	${PYTHON_CMD} ${opt} -m compileall -l ${PYTHONPREFIX_SITELIBDIR}/gammu
+.endfor
+
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,bash,sh,g ; s,dialog,cdialog,g' ${WRKSRC}/utils/gammu-config
+	@${REINPLACE_CMD} -i '' -e 's:bash:sh:' -e 's:dialog:cdialog:' ${WRKSRC}/utils/gammu-config
 .if ${OSVERSION} < 700042
 	@${REINPLACE_CMD} -e 's@ -Wno-pointer-sign@@g' ${WRKSRC}/CMakeLists.txt
 .endif
-.if ${OSVERSION} > 900000
-	@${REINPLACE_CMD} -e '16d' ${WRKSRC}/libgammu/misc/misc.c
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/gammu-devel/distinfo b/comms/gammu-devel/distinfo
index 512a3bac6464..0b6059151a66 100644
--- a/comms/gammu-devel/distinfo
+++ b/comms/gammu-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gammu-1.28.90.tar.gz) = b6d79bcf156cea17c0a0f7c7c5d1e4cf104adfeb17b59824af7154cececbf337
-SIZE (gammu-1.28.90.tar.gz) = 3873142
+SHA256 (gammu-1.29.92.tar.bz2) = f84bbc6ab77943ebe4128f56e53db1421693123724af6f5e974ede70268bf818
+SIZE (gammu-1.29.92.tar.bz2) = 6221288
diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt
index 3e7fdfc4e1e8..65f4890aea4d 100644
--- a/comms/gammu-devel/files/patch-CMakeLists.txt
+++ b/comms/gammu-devel/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2009-02-25 19:46:07.000000000 +0300
-+++ CMakeLists.txt	2009-03-11 13:04:48.000000000 +0300
-@@ -547,7 +547,7 @@
+--- CMakeLists.txt.orig	2011-03-15 13:15:29.000000000 -0300
++++ CMakeLists.txt	2011-05-19 10:21:23.000000000 -0300
+@@ -640,7 +640,7 @@
  set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
  mark_as_advanced (INSTALL_DOC_DIR)
  
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
index d1a3f820c11b..cbdcf14b82d3 100644
--- a/comms/gammu-devel/files/patch-bluetooth
+++ b/comms/gammu-devel/files/patch-bluetooth
@@ -1,8 +1,8 @@
---- libgammu/device/bluetoth/bluez.c.orig	2007-03-10 19:47:59.000000000 +0300
-+++ libgammu/device/bluetoth/bluez.c	2007-06-29 20:00:48.000000000 +0400
+--- libgammu/device/bluetoth/bluez.c.orig	2010-07-12 15:51:05.000000000 +0400
++++ libgammu/device/bluetoth/bluez.c	2011-01-28 13:21:17.936545967 +0300
 @@ -23,6 +23,8 @@
  #ifdef GSM_ENABLE_BLUETOOTHDEVICE
- #ifdef GSM_ENABLE_BLUEZ
+ #ifdef BLUEZ_FOUND
  
 +#define BDADDR_ANY NG_HCI_BDADDR_ANY
 +
@@ -31,7 +31,7 @@
  	bdaddr_t			bdaddr;
  	int 				fd;
  
-@@ -53,15 +51,15 @@
+@@ -53,15 +51,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
  
  	smprintf(s, "Connecting to RF channel %i\n",port);
  
@@ -50,8 +50,8 @@
 +	laddr.rfcomm_channel 	= 0;
  
  	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
- 		dbgprintf("Can't bind socket\n");
-@@ -70,9 +68,9 @@
+ 		smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
+@@ -70,9 +68,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
  	}
  
  	str2ba(device, &bdaddr);
@@ -63,4 +63,4 @@
 +	raddr.rfcomm_channel 	= port;
  
  	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
- 		dbgprintf("Can't connect\n");
+ 		smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
diff --git a/comms/gammu-devel/files/patch-common.device.devfunc.c b/comms/gammu-devel/files/patch-common.device.devfunc.c
index cb474f2af445..9de9b4827fe5 100644
--- a/comms/gammu-devel/files/patch-common.device.devfunc.c
+++ b/comms/gammu-devel/files/patch-common.device.devfunc.c
@@ -1,11 +1,11 @@
---- libgammu/device/devfunc.c.orig	Fri Feb 23 23:50:01 2007
-+++ libgammu/device/devfunc.c	Tue Apr 10 23:46:39 2007
-@@ -19,6 +19,8 @@
+--- libgammu/device/devfunc.c.orig	2010-07-12 15:51:05.000000000 +0400
++++ libgammu/device/devfunc.c	2011-01-28 13:21:17.938543134 +0300
+@@ -15,6 +15,8 @@
  #include <string.h>
  #include <fcntl.h>
  #include <stdlib.h>
 +#include <sys/stat.h>
 +#include <sys/socket.h>
  #ifdef WIN32
+ #  include <winsock2.h>
  #  include <io.h>
- #else
diff --git a/comms/gammu-devel/files/patch-common.service.gsmmisc.c b/comms/gammu-devel/files/patch-common.service.gsmmisc.c
index 8e9d933cdfc2..2654e3a8ba91 100644
--- a/comms/gammu-devel/files/patch-common.service.gsmmisc.c
+++ b/comms/gammu-devel/files/patch-common.service.gsmmisc.c
@@ -1,6 +1,6 @@
---- libgammu/service/gsmmisc.c.orig	Fri Dec 30 18:18:47 2005
-+++ libgammu/service/gsmmisc.c	Fri Dec 30 18:19:07 2005
-@@ -3,6 +3,7 @@
+--- libgammu/service/gsmmisc.c.orig	2010-07-12 15:51:05.000000000 +0400
++++ libgammu/service/gsmmisc.c	2011-01-28 13:21:17.940543932 +0300
+@@ -5,6 +5,7 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/stat.h>
diff --git a/comms/gammu-devel/files/patch-contrib.sqlreply.c.Makefile b/comms/gammu-devel/files/patch-contrib.sqlreply.c.Makefile
new file mode 100644
index 000000000000..5b156ee6c7e9
--- /dev/null
+++ b/comms/gammu-devel/files/patch-contrib.sqlreply.c.Makefile
@@ -0,0 +1,14 @@
+--- contrib/sqlreply/c/Makefile.orig	2011-05-19 14:38:18.000000000 -0300
++++ contrib/sqlreply/c/Makefile	2011-05-19 14:38:31.000000000 -0300
+@@ -7,8 +7,8 @@
+ 
+ michal: michal.o
+ 	@echo Linking
+-	@$(CC) michal.o -L/usr/lib/mysql -lmysqlclient -lz -o michal
++	@$(CC) michal.o -L/usr/local/lib/mysql -lmysqlclient -lz -o michal
+ 
+ clean:
+ 	@rm michal michal.o
+-	
+\ No newline at end of file
++	
diff --git a/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c b/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c
new file mode 100644
index 000000000000..347f41055865
--- /dev/null
+++ b/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c
@@ -0,0 +1,13 @@
+--- contrib/sqlreply/c/michal.c.orig	2011-05-19 14:55:52.000000000 -0300
++++ contrib/sqlreply/c/michal.c	2011-05-19 14:51:33.000000000 -0300
+@@ -13,8 +13,8 @@
+ #else
+ #include <stdio.h>
+ #include <time.h>
+-#include <mysql/mysql.h>
+-#include <mysql/mysqld_error.h>
++#include <mysql.h>
++#include <mysqld_error.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ #endif
diff --git a/comms/gammu-devel/files/patch-docs.man.CMakeLists.txt b/comms/gammu-devel/files/patch-docs.man.CMakeLists.txt
new file mode 100644
index 000000000000..d5daea3ee851
--- /dev/null
+++ b/comms/gammu-devel/files/patch-docs.man.CMakeLists.txt
@@ -0,0 +1,28 @@
+--- docs/man/CMakeLists.txt.orig	2011-05-19 14:16:17.000000000 -0300
++++ docs/man/CMakeLists.txt	2011-05-19 14:16:48.000000000 -0300
+@@ -16,10 +16,10 @@
+     COMPONENT "manpages"
+     )
+ 
+-file(GLOB MAN5_PAGES "*.7")
++file(GLOB MAN7_PAGES "*.7")
+ 
+ install (
+-    FILES ${MAN5_PAGES}
++    FILES ${MAN7_PAGES}
+     DESTINATION "${INSTALL_MAN_DIR}/man7"
+     COMPONENT "manpages"
+     )
+@@ -43,10 +43,10 @@
+         COMPONENT "manpages"
+         )
+ 
+-    file(GLOB MAN5_PAGES "${LANG}/*.7")
++    file(GLOB MAN7_PAGES "${LANG}/*.7")
+ 
+     install (
+-        FILES ${MAN5_PAGES}
++        FILES ${MAN7_PAGES}
+         DESTINATION "${INSTALL_MAN_DIR}/${LANG}/man7"
+         COMPONENT "manpages"
+         )
diff --git a/comms/gammu-devel/pkg-descr b/comms/gammu-devel/pkg-descr
index 40d2dc7e6cc7..89d34297095d 100644
--- a/comms/gammu-devel/pkg-descr
+++ b/comms/gammu-devel/pkg-descr
@@ -5,7 +5,7 @@ your PC. It has many features, such as SMS handling, Calendar,
 Java support, ringtones, pictures, and many, many other good
 things.
 
-WWW: http://www.gammu.org/wiki/index.php?title=Gammu:Main_Page
+WWW: http://wammy.eu/
 
 - Kirill Bezzubets
 <kirill@solaris.ru>
diff --git a/comms/gammu-devel/pkg-plist b/comms/gammu-devel/pkg-plist
index e825fbfd8770..d24499a3a6c2 100644
--- a/comms/gammu-devel/pkg-plist
+++ b/comms/gammu-devel/pkg-plist
@@ -36,9 +36,91 @@ lib/libGammu.a
 lib/libgsmsd.a
 libdata/pkgconfig/gammu.pc
 libdata/pkgconfig/gammu-smsd.pc
-%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/__init__.py
-%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/_gammu.so
-%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/Data.py
-%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/Worker.py
+share/locale/af/LC_MESSAGES/gammu.mo
+share/locale/af/LC_MESSAGES/libgammu.mo
+share/locale/ar/LC_MESSAGES/gammu.mo
+share/locale/ar/LC_MESSAGES/libgammu.mo
+share/locale/bg/LC_MESSAGES/gammu.mo
+share/locale/bg/LC_MESSAGES/libgammu.mo
+share/locale/ca/LC_MESSAGES/gammu.mo
+share/locale/ca/LC_MESSAGES/libgammu.mo
+share/locale/cs/LC_MESSAGES/gammu.mo
+share/locale/cs/LC_MESSAGES/libgammu.mo
+share/locale/da/LC_MESSAGES/gammu.mo
+share/locale/da/LC_MESSAGES/libgammu.mo
+share/locale/de/LC_MESSAGES/gammu.mo
+share/locale/de/LC_MESSAGES/libgammu.mo
+share/locale/el/LC_MESSAGES/gammu.mo
+share/locale/el/LC_MESSAGES/libgammu.mo
+share/locale/en_GB/LC_MESSAGES/gammu.mo
+share/locale/en_GB/LC_MESSAGES/libgammu.mo
+share/locale/es/LC_MESSAGES/gammu.mo
+share/locale/es/LC_MESSAGES/libgammu.mo
+share/locale/et/LC_MESSAGES/gammu.mo
+share/locale/et/LC_MESSAGES/libgammu.mo
+share/locale/fi/LC_MESSAGES/gammu.mo
+share/locale/fi/LC_MESSAGES/libgammu.mo
+share/locale/fr/LC_MESSAGES/gammu.mo
+share/locale/fr/LC_MESSAGES/libgammu.mo
+share/locale/gl/LC_MESSAGES/gammu.mo
+share/locale/gl/LC_MESSAGES/libgammu.mo
+share/locale/he/LC_MESSAGES/gammu.mo
+share/locale/he/LC_MESSAGES/libgammu.mo
+share/locale/hu/LC_MESSAGES/gammu.mo
+share/locale/hu/LC_MESSAGES/libgammu.mo
+share/locale/id/LC_MESSAGES/gammu.mo
+share/locale/id/LC_MESSAGES/libgammu.mo
+share/locale/it/LC_MESSAGES/gammu.mo
+share/locale/it/LC_MESSAGES/libgammu.mo
+share/locale/ko/LC_MESSAGES/gammu.mo
+share/locale/ko/LC_MESSAGES/libgammu.mo
+share/locale/nl/LC_MESSAGES/gammu.mo
+share/locale/nl/LC_MESSAGES/libgammu.mo
+share/locale/pl/LC_MESSAGES/gammu.mo
+share/locale/pl/LC_MESSAGES/libgammu.mo
+share/locale/pt_BR/LC_MESSAGES/gammu.mo
+share/locale/pt_BR/LC_MESSAGES/libgammu.mo
+share/locale/ru/LC_MESSAGES/gammu.mo
+share/locale/ru/LC_MESSAGES/libgammu.mo
+share/locale/sk/LC_MESSAGES/gammu.mo
+share/locale/sk/LC_MESSAGES/libgammu.mo
+share/locale/sv/LC_MESSAGES/gammu.mo
+share/locale/sv/LC_MESSAGES/libgammu.mo
+share/locale/sw/LC_MESSAGES/gammu.mo
+share/locale/sw/LC_MESSAGES/libgammu.mo
+share/locale/tr/LC_MESSAGES/gammu.mo
+share/locale/tr/LC_MESSAGES/libgammu.mo
+share/locale/zh_CN/LC_MESSAGES/gammu.mo
+share/locale/zh_CN/LC_MESSAGES/libgammu.mo
+share/locale/zh_TW/LC_MESSAGES/gammu.mo
+share/locale/zh_TW/LC_MESSAGES/libgammu.mo
+%%DATADIR%%/gnapplet.ini
+%%DATADIR%%/gnapplet.sis
+%%DATADIR%%/series60-remote.sis
+%%PYTHON_SITELIBDIR%%/gammu/__init__.py
+%%PYTHON_SITELIBDIR%%/gammu/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gammu/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gammu/_gammu.so
+%%PYTHON_SITELIBDIR%%/gammu/Data.py
+%%PYTHON_SITELIBDIR%%/gammu/Data.pyc
+%%PYTHON_SITELIBDIR%%/gammu/Data.pyo
+%%PYTHON_SITELIBDIR%%/gammu/Worker.py
+%%PYTHON_SITELIBDIR%%/gammu/Worker.pyc
+%%PYTHON_SITELIBDIR%%/gammu/Worker.pyo
+%%PYTHON_SITELIBDIR%%/gammu/data.py
+%%PYTHON_SITELIBDIR%%/gammu/data.pyc
+%%PYTHON_SITELIBDIR%%/gammu/data.pyo
+%%PYTHON_SITELIBDIR%%/gammu/exception.py
+%%PYTHON_SITELIBDIR%%/gammu/exception.pyc
+%%PYTHON_SITELIBDIR%%/gammu/exception.pyo
+%%PYTHON_SITELIBDIR%%/gammu/smsd.py
+%%PYTHON_SITELIBDIR%%/gammu/smsd.pyc
+%%PYTHON_SITELIBDIR%%/gammu/smsd.pyo
+%%PYTHON_SITELIBDIR%%/gammu/worker.py
+%%PYTHON_SITELIBDIR%%/gammu/worker.pyc
+%%PYTHON_SITELIBDIR%%/gammu/worker.pyo
+@dirrmtry share/locale/sw/LC_MESSAGES
+@dirrmtry share/locale/sw
 @dirrm include/gammu
-%%WITH_PYTHON_GAMMU%%@dirrm %%PYTHON_SITELIBDIR%%/gammu
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/gammu