. the new developer switched from gmake to cmake, the port mainly rewritten;

. update to version 1.12.0;
. remove 4.x traces.

7 files changed, 110 insertions, 98 deletions

diff --git a/comms/gammu-devel/files/extra-patch-CMakeLists.txt b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
new file mode 100644
index 000000000000..b16f168e02be
--- /dev/null
+++ b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
@@ -0,0 +1,39 @@
+--- CMakeLists.txt.orig	2007-08-11 19:35:06.000000000 +0400
++++ CMakeLists.txt	2007-08-11 19:35:43.000000000 +0400
+@@ -693,36 +693,6 @@
+     )
+ 
+ install (
+-    FILES ${DOCS}
+-    DESTINATION "${INSTALL_DOC_DIR}"
+-    COMPONENT "basic-documentation"
+-    )
+-
+-install (
+-    FILES ${SYMBIAN_FILES}
+-    DESTINATION "${INSTALL_DOC_DIR}/symbian"
+-    COMPONENT "gnapplet"
+-    )
+-
+-foreach (DOC ${DEVELDOCS})
+-    string (REGEX REPLACE "docs/develop(.*)/[^/]*$" "\\1" DIRNAME ${DOC})
+-    install (
+-        FILES ${DOC}
+-        DESTINATION "${INSTALL_DOC_DIR}/devel/${DIRNAME}"
+-        COMPONENT "developer-documentation"
+-        )
+-endforeach (DOC)
+-
+-foreach (EXAMPLE ${EXAMPLES})
+-    string (REGEX REPLACE "(docs/examples|other/php)(.*)/[^/]*$" "\\2" DIRNAME ${EXAMPLE})
+-    install (
+-        FILES ${EXAMPLE}
+-        DESTINATION "${INSTALL_DOC_DIR}/examples/${DIRNAME}"
+-        COMPONENT "developer-documentation"
+-        )
+-endforeach (EXAMPLE)
+-
+-install (
+     FILES ${MAN1_PAGES}
+     DESTINATION "${INSTALL_MAN_DIR}/man1"
+     COMPONENT "basic-documentation"
diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a723b9e5c035
--- /dev/null
+++ b/comms/gammu-devel/files/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+--- CMakeLists.txt.orig	2007-06-12 14:30:30.000000000 +0400
++++ CMakeLists.txt	2007-08-10 04:20:32.000000000 +0400
+@@ -627,7 +627,7 @@
+ set (INSTALL_DOC_DIR "share/doc/gammu" CACHE FILEPATH "Path for documentation installation")
+ mark_as_advanced (INSTALL_DOC_DIR)
+ 
+-set (INSTALL_MAN_DIR "share/man" CACHE FILEPATH "Path for man pages installation")
++set (INSTALL_MAN_DIR "man" CACHE FILEPATH "Path for man pages installation")
+ mark_as_advanced (INSTALL_MAN_DIR)
+ 
+ # Generate pkgconfig file
+@@ -688,7 +688,7 @@
+ 
+ install (
+     FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc"
+-    DESTINATION "lib/pkgconfig"
++    DESTINATION "libdata/pkgconfig"
+     COMPONENT "development"
+     )
+ 
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
index c841c156b5de..c7629e4612e7 100644
--- a/comms/gammu-devel/files/patch-bluetooth
+++ b/comms/gammu-devel/files/patch-bluetooth
@@ -1,5 +1,5 @@
---- common/device/bluetoth/bluez.c.orig	Wed Sep 14 21:47:08 2005
-+++ common/device/bluetoth/bluez.c	Wed Nov 23 22:11:16 2005
+--- common/device/bluetoth/bluez.c.orig	2007-03-10 19:47:59.000000000 +0300
++++ common/device/bluetoth/bluez.c	2007-06-29 20:00:48.000000000 +0400
 @@ -23,6 +23,8 @@
  #ifdef GSM_ENABLE_BLUETOOTHDEVICE
  #ifdef GSM_ENABLE_BLUEZ
@@ -22,7 +22,7 @@
  
  #include "../../gsmcomon.h"
  #include "../devfunc.h"
-@@ -44,21 +42,21 @@
+@@ -44,7 +42,7 @@
  GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
  {
  	GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
@@ -31,6 +31,8 @@
  	bdaddr_t			bdaddr;
  	int 				fd;
  
+@@ -53,15 +51,15 @@
+ 
  	smprintf(s, "Connecting to RF channel %i\n",port);
  
 -	fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
@@ -49,7 +51,7 @@
  
  	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
  		dbgprintf("Can't bind socket\n");
-@@ -67,9 +65,9 @@
+@@ -70,9 +68,9 @@
  	}
  
  	str2ba(device, &bdaddr);
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.cfg b/comms/gammu-devel/files/patch-cfg-Makefile.cfg
new file mode 100644
index 000000000000..ecc9b58a83a0
--- /dev/null
+++ b/comms/gammu-devel/files/patch-cfg-Makefile.cfg
@@ -0,0 +1,11 @@
+--- cfg/Makefile.cfg.orig	2007-08-10 03:03:45.000000000 +0400
++++ cfg/Makefile.cfg	2007-08-10 03:04:04.000000000 +0400
+@@ -39,7 +39,7 @@
+ INSTALL_BIN_DIR	= ${exec_prefix}/bin
+ INSTALL_DOC_DIR = ${datarootdir}/doc/gammu
+ INSTALL_LOC_DIR = ${datarootdir}/locale
+-INSTALL_MAN_DIR = ${datarootdir}/man/man1
++INSTALL_MAN_DIR = ${prefix}/man/man1
+ INSTALL_LIB_DIR = ${exec_prefix}/lib
+ INSTALL_H_DIR	= ${prefix}/include/gammu
+ RPM_DIR         = /usr/src/rpm
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.glo b/comms/gammu-devel/files/patch-cfg-Makefile.glo
index cd6c225165ac..9f88aa6df417 100644
--- a/comms/gammu-devel/files/patch-cfg-Makefile.glo
+++ b/comms/gammu-devel/files/patch-cfg-Makefile.glo
@@ -1,31 +1,33 @@
---- cfg/Makefile.glo.orig	Fri Feb 23 23:50:00 2007
-+++ cfg/Makefile.glo	Tue Apr 10 23:43:11 2007
+--- cfg/Makefile.glo.orig	2007-05-17 14:50:38.000000000 +0400
++++ cfg/Makefile.glo	2007-06-29 20:15:03.000000000 +0400
 @@ -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
+-all: gammu locales
++all: gammu locales shared
  
  $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
  	@echo Linking gammu
-@@ -234,12 +234,14 @@
- 	@$(INSTALL) -m 0644 $(TOPDIR)/ChangeLog $(DESTDIR)$(INSTALL_DOC_DIR)
+@@ -235,6 +235,8 @@
  	@$(INSTALL) -m 0644 $(TOPDIR)/README $(DESTDIR)$(INSTALL_DOC_DIR)
+ 	@$(INSTALL) -m 0644 $(TOPDIR)/SUPPORTERS $(DESTDIR)$(INSTALL_DOC_DIR)
  	@$(INSTALL) -m 0644 $(TOPDIR)/COPYING $(DESTDIR)$(INSTALL_DOC_DIR)
 +
 +installman:
  	@echo Installing man to $(DESTDIR)$(INSTALL_MAN_DIR)
  	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_MAN_DIR)
- 	@$(INSTALL) -m 0644 $(TOPDIR)/docs/docs/english/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)
- 	@$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/english/gammu.1
+ 	@$(INSTALL) -m 0644 $(TOPDIR)/docs/user/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)
+@@ -242,7 +244,7 @@
+ 	@$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/user/gammu.1
+ 	@$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/user/gammu-config.1
   
--install: uninstall all installdocs installlocales installonly
-+install: uninstall all installdocs installman installlocales installlibonly
+-install: uninstall all installdocs installlocales installonly installutils
++install: uninstall all installdocs installman installlocales installonly installutils
  
- installonly: all
- 	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -247,7 +249,7 @@
+ installutils:
+ 	@echo Installing utilities to $(DESTDIR)$(INSTALL_BIN_DIR)
+@@ -255,7 +257,7 @@
  	@$(INSTALL) -m 0755 $(TOPDIR)/gammu/gammu $(DESTDIR)$(INSTALL_BIN_DIR)
  
  installshared: installlib
@@ -34,7 +36,7 @@
  
  installlibonly: shared
  	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -256,8 +258,7 @@
+@@ -264,8 +266,7 @@
  
  	@echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
  	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
@@ -44,7 +46,7 @@
  	@$(LN) -s $(LIBGAMMU_MJR_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_SHRTNAME)
   
  	@echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)
-@@ -276,8 +277,8 @@
+@@ -284,8 +285,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-CMakeLists.txt b/comms/gammu-devel/files/patch-common-CMakeLists.txt
new file mode 100644
index 000000000000..748e62ef15e9
--- /dev/null
+++ b/comms/gammu-devel/files/patch-common-CMakeLists.txt
@@ -0,0 +1,17 @@
+--- common/CMakeLists.txt.orig	2007-06-07 19:16:17.000000000 +0400
++++ common/CMakeLists.txt	2007-08-06 01:35:01.000000000 +0400
+@@ -102,6 +102,14 @@
+     endif (NOT "${BLUEZ_LIBRARIES}" STREQUAL "") 
+ endif (BLUEZ_FOUND)
+ 
++if (ICONV_FOUND)
++    target_link_libraries (Gammu ${ICONV_LIBRARIES})
++    include_directories (${ICONV_INCLUDE_DIR})
++    if (NOT "${ICONV_LIBRARIES}" STREQUAL "") 
++        set (GAMMU_LIBS "${GAMMU_LIBS} -l${ICONV_LIBRARIES}")
++    endif (NOT "${ICONV_LIBRARIES}" STREQUAL "") 
++endif (ICONV_FOUND)
++
+ if (NOT HAVE_SIN)
+     target_link_libraries (Gammu m)
+ endif (NOT HAVE_SIN)
diff --git a/comms/gammu-devel/files/patch-configure.in b/comms/gammu-devel/files/patch-configure.in
deleted file mode 100644
index 1be761b36415..000000000000
--- a/comms/gammu-devel/files/patch-configure.in
+++ /dev/null
@@ -1,79 +0,0 @@
---- cfg/autoconf/configure.in.orig	Tue Mar  8 19:16:22 2005
-+++ cfg/autoconf/configure.in	Fri Nov 11 21:09:43 2005
-@@ -184,18 +184,18 @@
-          fi
-      fi
-      if test "$gsm_blue_stack" = unknown ; then
--         AC_CHECK_HEADERS(bluetooth/bluetooth.h, 
--                 [gsm_blue_stack=Bluez
-+         AC_CHECK_HEADERS(bluetooth.h, 
-+                 [gsm_blue_stack=FreeBSD
-                  LDLIBS="$LDLIBS -lbluetooth"
-                  AC_CHECK_LIB(sdp, sdp_list_append, LDLIBS="$LDLIBS -lsdp")
-                  AC_DEFINE(GSM_ENABLE_BLUEZ)
-                  ])
-      fi
-   
--     dnl Path for Bluez bluetooth library
-+     dnl Path for FreeBSD bluetooth library
-      gsm_bt_dir=""
-      AC_ARG_WITH(bluedir,
--             [  --with-bluedir=DIR      Specifies the base libbluetooth from Bluez],
-+             [  --with-bluedir=DIR      Specifies the base libbluetooth from FreeBSD],
-              [ if test x$withval = xyes; then
-                      AC_MSG_WARN(Usage is: --with-bluedir=DIR)
-                else
-@@ -292,7 +292,7 @@
-         [  --disable-bluefbus      Disable Nokia FBUS2 over Bluetooth stack
-                           (Nokia 6210)],
-         [gsm_enable_bluefbus2="no"],
--        [if test $gsm_blue_stack = Bluez; then
-+        [if test $gsm_blue_stack = FreeBSD; then
-                 AC_DEFINE(GSM_ENABLE_BLUEFBUS2)
-                 gsm_enable_bluefbus2="yes"
-           else
-@@ -302,7 +302,7 @@
-         [  --disable-bluephonet    Disable Nokia PHONET FBUS over Bluetooth
-                           stack (all new Nokias)],
-         [gsm_enable_bluephonet="no"],
--        [if test $gsm_blue_stack = Bluez; then
-+        [if test $gsm_blue_stack = FreeBSD; then
-                 AC_DEFINE(GSM_ENABLE_BLUEPHONET)
-                 gsm_enable_bluephonet="yes"
-           else
-@@ -311,7 +311,7 @@
- AC_ARG_ENABLE(blueat,
-         [  --disable-blueat        Disable AT commands over Bluetooth stack],
-         [gsm_enable_blueat="no"],
--        [if test $gsm_blue_stack = Bluez; then
-+        [if test $gsm_blue_stack = FreeBSD; then
-                 AC_DEFINE(GSM_ENABLE_BLUEAT)
-                 gsm_enable_blueat="yes"
-           else
-@@ -320,7 +320,7 @@
- AC_ARG_ENABLE(blueobex,
-         [  --disable-blueobex      Disable OBEX over Bluetooth stack],
-         [gsm_enable_blueobex="no"],
--        [if test $gsm_blue_stack = Bluez; then
-+        [if test $gsm_blue_stack = FreeBSD; then
-                 AC_DEFINE(GSM_ENABLE_BLUEOBEX)
-                 gsm_enable_blueobex="yes"
-           else
-@@ -355,7 +355,7 @@
- AC_ARG_ENABLE(bluerfsearch,
-         [  --disable-bluerfsearch  Disable searching for RF channels with Bluetooth stack],
-         [gsm_enable_bluerfsearch="no"],
--        [if test $gsm_blue_stack = Bluez; then
-+        [if test $gsm_blue_stack = FreeBSD; then
-                 AC_DEFINE(BLUETOOTH_RF_SEARCHING)
-                 gsm_enable_bluerfsearch="yes"
-           fi])  
-@@ -443,7 +443,7 @@
-   Binaries                                      - $bindir
-   RPM making directory                          - $RPM_DIR
-   Temporary directory                           - $TEMP_DIR
--  Bluez library path                            - $gsm_bt_dir
-+  FreeBSD Bluetooth library path                - $gsm_bt_dir
-   
-   General options
-   ---------------