. update to version 1.16.0;

. add INSTALL_LIBDATA_DIR to CMAKE_ARGS;
. exclude manual pages for NOPORTDOCS case.

4 files changed, 12 insertions, 90 deletions

diff --git a/comms/gammu-devel/files/extra-patch-CMakeLists.txt b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
index b16f168e02be..8d289bbda171 100644
--- a/comms/gammu-devel/files/extra-patch-CMakeLists.txt
+++ b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
@@ -1,18 +1,17 @@
---- 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 @@
+--- CMakeLists.txt.orig	2007-12-16 23:09:38.185441426 +0300
++++ CMakeLists.txt	2007-12-16 23:12:28.043527300 +0300
+@@ -768,37 +768,6 @@
+     DESTINATION "${INSTALL_LIBDATA_DIR}/pkgconfig"
      )
  
- install (
+-install (
 -    FILES ${DOCS}
 -    DESTINATION "${INSTALL_DOC_DIR}"
--    COMPONENT "basic-documentation"
 -    )
 -
 -install (
 -    FILES ${SYMBIAN_FILES}
 -    DESTINATION "${INSTALL_DOC_DIR}/symbian"
--    COMPONENT "gnapplet"
 -    )
 -
 -foreach (DOC ${DEVELDOCS})
@@ -20,7 +19,6 @@
 -    install (
 -        FILES ${DOC}
 -        DESTINATION "${INSTALL_DOC_DIR}/devel/${DIRNAME}"
--        COMPONENT "developer-documentation"
 -        )
 -endforeach (DOC)
 -
@@ -29,11 +27,14 @@
 -    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"
+-    FILES ${MAN1_PAGES}
+-    DESTINATION "${INSTALL_MAN_DIR}/man1"
+-    )
+-
+ add_subdirectory(common)
+ 
+ # Include tests, we build them also when cross compiling
diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt
index bf9452a684c0..ff650b5530a6 100644
--- a/comms/gammu-devel/files/patch-CMakeLists.txt
+++ b/comms/gammu-devel/files/patch-CMakeLists.txt
@@ -9,12 +9,3 @@
  mark_as_advanced (INSTALL_MAN_DIR)
  
  # Generate pkgconfig file
-@@ -662,7 +665,7 @@
- 
- install (
-     FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc"
--    DESTINATION "${INSTALL_LIB_DIR}/pkgconfig"
-+    DESTINATION "libdata/pkgconfig"
-     COMPONENT "development"
-     )
- 
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.cfg b/comms/gammu-devel/files/patch-cfg-Makefile.cfg
deleted file mode 100644
index ecc9b58a83a0..000000000000
--- a/comms/gammu-devel/files/patch-cfg-Makefile.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 9f88aa6df417..000000000000
--- a/comms/gammu-devel/files/patch-cfg-Makefile.glo
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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 locales
-+all: gammu locales shared
- 
- $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
- 	@echo Linking gammu
-@@ -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/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 installutils
-+install: uninstall all installdocs installman installlocales installonly installutils
- 
- 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
--installlib: uninstall makelib installdocs installlocales installlibonly
-+installlib: uninstall makelib installman installdocs installlocales installlibonly
- 
- installlibonly: shared
- 	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -264,8 +266,7 @@
- 
- 	@echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
- 	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	@$(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)
-@@ -284,8 +285,8 @@
- 	@$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h
- 
- 	@echo Installing pkgconfig file
--	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	@$(INSTALL) -m 0644 cfg/pkgconfig/gammu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	@$(INSTALL) -m 0755 -d $(prefix)/libdata/pkgconfig
-+	@$(INSTALL) -m 0644 cfg/pkgconfig/gammu.pc $(prefix)/libdata/pkgconfig
- 
- apidoc:
- 	@if test -z "$(DOXYGEN)" ; then \