diff options
-rw-r--r-- | comms/gammu-devel/Makefile | 2 | ||||
-rw-r--r-- | comms/gammu-devel/distinfo | 6 | ||||
-rw-r--r-- | comms/gammu-devel/files/patch-CMakeLists.txt | 16 | ||||
-rw-r--r-- | comms/gammu-devel/files/patch-common-CMakeLists.txt | 17 | ||||
-rw-r--r-- | comms/gammu/Makefile | 2 | ||||
-rw-r--r-- | comms/gammu/distinfo | 6 | ||||
-rw-r--r-- | comms/gammu/files/patch-CMakeLists.txt | 16 | ||||
-rw-r--r-- | comms/gammu/files/patch-common-CMakeLists.txt | 17 |
8 files changed, 24 insertions, 58 deletions
diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile index a4ebd85fd3db..ca494feb691b 100644 --- a/comms/gammu-devel/Makefile +++ b/comms/gammu-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gammu -PORTVERSION= 1.12.0 +PORTVERSION= 1.13.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 da0c9ce613b4..dc15bcf1e6c1 100644 --- a/comms/gammu-devel/distinfo +++ b/comms/gammu-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (gammu-1.12.0.tar.gz) = ac0cf002ec67776156ee3605030afc47 -SHA256 (gammu-1.12.0.tar.gz) = 4135840d09aeead86aac4300815ba99d663368d61d4c7cd8fa5dd435d698ee41 -SIZE (gammu-1.12.0.tar.gz) = 1211045 +MD5 (gammu-1.13.0.tar.gz) = 862d9dc601459f7e7bc16cb47ee5f84e +SHA256 (gammu-1.13.0.tar.gz) = cf8af0e96618c484b27302549f319abd8bca1754a3e956a7e139a0c35a9f57d7 +SIZE (gammu-1.13.0.tar.gz) = 1244823 diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt index a723b9e5c035..bf9452a684c0 100644 --- a/comms/gammu-devel/files/patch-CMakeLists.txt +++ b/comms/gammu-devel/files/patch-CMakeLists.txt @@ -1,19 +1,19 @@ ---- 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") +--- CMakeLists.txt.orig 2007-08-08 16:30:55.000000000 +0400 ++++ CMakeLists.txt 2007-08-21 00:18:05.000000000 +0400 +@@ -601,7 +604,7 @@ + set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "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") +-set (INSTALL_MAN_DIR "share/man" CACHE STRING "Path for man pages installation") ++set (INSTALL_MAN_DIR "man" CACHE STRING "Path for man pages installation") mark_as_advanced (INSTALL_MAN_DIR) # Generate pkgconfig file -@@ -688,7 +688,7 @@ +@@ -662,7 +665,7 @@ install ( FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc" -- DESTINATION "lib/pkgconfig" +- DESTINATION "${INSTALL_LIB_DIR}/pkgconfig" + DESTINATION "libdata/pkgconfig" COMPONENT "development" ) diff --git a/comms/gammu-devel/files/patch-common-CMakeLists.txt b/comms/gammu-devel/files/patch-common-CMakeLists.txt deleted file mode 100644 index 748e62ef15e9..000000000000 --- a/comms/gammu-devel/files/patch-common-CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- 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/Makefile b/comms/gammu/Makefile index a4ebd85fd3db..ca494feb691b 100644 --- a/comms/gammu/Makefile +++ b/comms/gammu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gammu -PORTVERSION= 1.12.0 +PORTVERSION= 1.13.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 da0c9ce613b4..dc15bcf1e6c1 100644 --- a/comms/gammu/distinfo +++ b/comms/gammu/distinfo @@ -1,3 +1,3 @@ -MD5 (gammu-1.12.0.tar.gz) = ac0cf002ec67776156ee3605030afc47 -SHA256 (gammu-1.12.0.tar.gz) = 4135840d09aeead86aac4300815ba99d663368d61d4c7cd8fa5dd435d698ee41 -SIZE (gammu-1.12.0.tar.gz) = 1211045 +MD5 (gammu-1.13.0.tar.gz) = 862d9dc601459f7e7bc16cb47ee5f84e +SHA256 (gammu-1.13.0.tar.gz) = cf8af0e96618c484b27302549f319abd8bca1754a3e956a7e139a0c35a9f57d7 +SIZE (gammu-1.13.0.tar.gz) = 1244823 diff --git a/comms/gammu/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt index a723b9e5c035..bf9452a684c0 100644 --- a/comms/gammu/files/patch-CMakeLists.txt +++ b/comms/gammu/files/patch-CMakeLists.txt @@ -1,19 +1,19 @@ ---- 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") +--- CMakeLists.txt.orig 2007-08-08 16:30:55.000000000 +0400 ++++ CMakeLists.txt 2007-08-21 00:18:05.000000000 +0400 +@@ -601,7 +604,7 @@ + set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "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") +-set (INSTALL_MAN_DIR "share/man" CACHE STRING "Path for man pages installation") ++set (INSTALL_MAN_DIR "man" CACHE STRING "Path for man pages installation") mark_as_advanced (INSTALL_MAN_DIR) # Generate pkgconfig file -@@ -688,7 +688,7 @@ +@@ -662,7 +665,7 @@ install ( FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc" -- DESTINATION "lib/pkgconfig" +- DESTINATION "${INSTALL_LIB_DIR}/pkgconfig" + DESTINATION "libdata/pkgconfig" COMPONENT "development" ) diff --git a/comms/gammu/files/patch-common-CMakeLists.txt b/comms/gammu/files/patch-common-CMakeLists.txt deleted file mode 100644 index 748e62ef15e9..000000000000 --- a/comms/gammu/files/patch-common-CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- 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) |