summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhale <jhale@FreeBSD.org>2016-12-16 08:44:58 +0000
committerjhale <jhale@FreeBSD.org>2016-12-16 08:44:58 +0000
commit4d9f1712e7f059c7d3ebfd4140b2839f081dc1b4 (patch)
tree743b5a16a1156edc0f06adf312c7badfdf62f940
parent529ebe1627a171f1d119bc3fb1439be79d996ba7 (diff)
downloadFreeBSD-ports-4d9f1712e7f059c7d3ebfd4140b2839f081dc1b4.zip
FreeBSD-ports-4d9f1712e7f059c7d3ebfd4140b2839f081dc1b4.tar.gz
Update to 1.38.0
Convert mysql to USES Make patches with "make makepatch"
-rw-r--r--comms/gammu/Makefile10
-rw-r--r--comms/gammu/distinfo6
-rw-r--r--comms/gammu/files/patch-CMakeLists.txt9
-rw-r--r--comms/gammu/files/patch-libgammu_device_bluetooth_blue__bsd.c (renamed from comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c)4
4 files changed, 9 insertions, 20 deletions
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 1a273bf..61d6dc1 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gammu
-PORTVERSION= 1.37.91
+PORTVERSION= 1.38.0
CATEGORIES= comms
MASTER_SITES= http://dl.cihar.com/gammu/releases/
@@ -13,11 +13,9 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:ftp/curl
-#RUN_DEPENDS= cdialog:devel/cdialog
-CONFLICTS= gammu-devel-[1-9]* gammu-python-[1-9]*
-
-CMAKE_ARGS= -DINSTALL_LIBDATA_DIR:PATH=${PREFIX}/libdata
+CMAKE_ARGS= -DINSTALL_LIBDATA_DIR:PATH=${PREFIX}/libdata \
+ -DINSTALL_MAN_DIR:PATH=${PREFIX}/man
USES= cmake:outsource gettext iconv pkgconfig shebangfix tar:xz
SHEBANG_FILES= utils/jadmaker utils/gammu-config
@@ -40,7 +38,7 @@ DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
DBI_CMAKE_OFF= -DWITH_LibDBI:BOOL=OFF
PGSQL_USES= pgsql
PGSQL_CMAKE_OFF= -DWITH_Postgres:BOOL=OFF
-MYSQL_USE= mysql=yes
+MYSQL_USES= mysql
MYSQL_CMAKE_OFF= -DWITH_MySQL:BOOL=OFF
ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
ODBC_CMAKE_OFF= -DWITH_ODBC:BOOL=OFF
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 18b7957..59b1327 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478878437
-SHA256 (gammu-1.37.91.tar.xz) = fb353ed465b1ae408485e55c97f3a9e910af2c271b03a5bf3aab61bb4225fe00
-SIZE (gammu-1.37.91.tar.xz) = 1675144
+TIMESTAMP = 1481869854
+SHA256 (gammu-1.38.0.tar.xz) = 561cc1f116db604a7a2c29c05f2ef7f23a4e1fff1db187b69b277e5516181071
+SIZE (gammu-1.38.0.tar.xz) = 1677156
diff --git a/comms/gammu/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt
index 1ad9966..0cedf56 100644
--- a/comms/gammu/files/patch-CMakeLists.txt
+++ b/comms/gammu/files/patch-CMakeLists.txt
@@ -25,12 +25,3 @@
)
# OpenCellID API key
-@@ -591,7 +589,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
- 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 STRING "Path for man pages installation")
-+set (INSTALL_MAN_DIR "man" CACHE STRING "Path for man pages installation")
- mark_as_advanced (INSTALL_MAN_DIR)
-
- # Phone and protocol configuration
diff --git a/comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c b/comms/gammu/files/patch-libgammu_device_bluetooth_blue__bsd.c
index 0b1efaa..af7f3c6 100644
--- a/comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c
+++ b/comms/gammu/files/patch-libgammu_device_bluetooth_blue__bsd.c
@@ -1,5 +1,5 @@
---- libgammu/device/bluetooth/blue_bsd.c.orig 2016-11-12 10:13:02.619065000 +0800
-+++ libgammu/device/bluetooth/blue_bsd.c 2016-11-12 10:13:27.768173000 +0800
+--- libgammu/device/bluetooth/blue_bsd.c.orig 2016-12-12 13:47:26 UTC
++++ libgammu/device/bluetooth/blue_bsd.c
@@ -10,6 +10,8 @@
#ifdef GSM_ENABLE_BLUETOOTHDEVICE
#ifdef BSD_BLUE_FOUND
OpenPOWER on IntegriCloud