. update to version 1.16.0;

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

12 files changed, 48 insertions, 198 deletions

diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index ca494feb691..e4a1f7930aa 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.13.0
+PORTVERSION=	1.16.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com/gammu/releases/
@@ -17,24 +17,27 @@ COMMENT=	GNU All Mobile Management Utilities
 BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
 
 CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
+		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+		-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
-MAN1=		gammu.1 gammu-config.1
 USE_GNOME=	pkgconfig
 
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
+.else
+MAN1=		gammu.1 gammu-config.1
 PORTDOCS=	*
+.endif
 
 do-configure:
 	@(cd ${WRKSRC}; \
 	${LOCALBASE}/bin/cmake ${CMAKE_ARGS})
 
 .include <bsd.port.pre.mk>
+
 post-patch:
 .if ${OSVERSION} < 700042
 	@${REINPLACE_CMD} -e 's@ -Wno-pointer-sign@@g' ${WRKSRC}/CMakeLists.txt
 .endif
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/gammu-devel/distinfo b/comms/gammu-devel/distinfo
index dc15bcf1e6c..1d564620f5c 100644
--- a/comms/gammu-devel/distinfo
+++ b/comms/gammu-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gammu-1.13.0.tar.gz) = 862d9dc601459f7e7bc16cb47ee5f84e
-SHA256 (gammu-1.13.0.tar.gz) = cf8af0e96618c484b27302549f319abd8bca1754a3e956a7e139a0c35a9f57d7
-SIZE (gammu-1.13.0.tar.gz) = 1244823
+MD5 (gammu-1.16.0.tar.gz) = a2f25514bfd22138e360d49dd3ee72ab
+SHA256 (gammu-1.16.0.tar.gz) = 73f307a484f158bccddf48465e215afb9b871c977013ecea029e97707b57dc4f
+SIZE (gammu-1.16.0.tar.gz) = 1308232
diff --git a/comms/gammu-devel/files/extra-patch-CMakeLists.txt b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
index b16f168e02b..8d289bbda17 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 bf9452a684c..ff650b5530a 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 ecc9b58a83a..00000000000
--- 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 9f88aa6df41..00000000000
--- 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 \
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index ca494feb691..e4a1f7930aa 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.13.0
+PORTVERSION=	1.16.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com/gammu/releases/
@@ -17,24 +17,27 @@ COMMENT=	GNU All Mobile Management Utilities
 BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
 
 CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX}
+		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+		-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
-MAN1=		gammu.1 gammu-config.1
 USE_GNOME=	pkgconfig
 
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
+.else
+MAN1=		gammu.1 gammu-config.1
 PORTDOCS=	*
+.endif
 
 do-configure:
 	@(cd ${WRKSRC}; \
 	${LOCALBASE}/bin/cmake ${CMAKE_ARGS})
 
 .include <bsd.port.pre.mk>
+
 post-patch:
 .if ${OSVERSION} < 700042
 	@${REINPLACE_CMD} -e 's@ -Wno-pointer-sign@@g' ${WRKSRC}/CMakeLists.txt
 .endif
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index dc15bcf1e6c..1d564620f5c 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,3 +1,3 @@
-MD5 (gammu-1.13.0.tar.gz) = 862d9dc601459f7e7bc16cb47ee5f84e
-SHA256 (gammu-1.13.0.tar.gz) = cf8af0e96618c484b27302549f319abd8bca1754a3e956a7e139a0c35a9f57d7
-SIZE (gammu-1.13.0.tar.gz) = 1244823
+MD5 (gammu-1.16.0.tar.gz) = a2f25514bfd22138e360d49dd3ee72ab
+SHA256 (gammu-1.16.0.tar.gz) = 73f307a484f158bccddf48465e215afb9b871c977013ecea029e97707b57dc4f
+SIZE (gammu-1.16.0.tar.gz) = 1308232
diff --git a/comms/gammu/files/extra-patch-CMakeLists.txt b/comms/gammu/files/extra-patch-CMakeLists.txt
index b16f168e02b..8d289bbda17 100644
--- a/comms/gammu/files/extra-patch-CMakeLists.txt
+++ b/comms/gammu/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/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt
index bf9452a684c..ff650b5530a 100644
--- a/comms/gammu/files/patch-CMakeLists.txt
+++ b/comms/gammu/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/files/patch-cfg-Makefile.cfg b/comms/gammu/files/patch-cfg-Makefile.cfg
deleted file mode 100644
index ecc9b58a83a..00000000000
--- a/comms/gammu/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/files/patch-cfg-Makefile.glo b/comms/gammu/files/patch-cfg-Makefile.glo
deleted file mode 100644
index 9f88aa6df41..00000000000
--- a/comms/gammu/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 \