diff options
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/gammu/Makefile | 37 | ||||
| -rw-r--r-- | comms/gammu/distinfo | 4 | ||||
| -rw-r--r-- | comms/gammu/files/extra-patch-contrib_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | comms/gammu/files/patch-CMakeLists.txt | 22 | ||||
| -rw-r--r-- | comms/gammu/files/patch-contrib_CMakeLists.txt | 14 | ||||
| -rw-r--r-- | comms/gammu/pkg-descr | 4 | ||||
| -rw-r--r-- | comms/gammu/pkg-plist | 5 |
7 files changed, 57 insertions, 40 deletions
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile index 57e477c9c6d9..9a3a8446159c 100644 --- a/comms/gammu/Makefile +++ b/comms/gammu/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= gammu -PORTVERSION= 1.37.0 +PORTVERSION= 1.37.2 CATEGORIES= comms -MASTER_SITES= http://dl.cihar.com/gammu/releases/ \ - http://dl.cihar.com.nyud.net/gammu/releases/ +MASTER_SITES= http://dl.cihar.com/gammu/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= GNU All Mobile Management Utilities @@ -14,12 +13,13 @@ 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=${LOCALBASE}/libdata +CMAKE_ARGS= -DINSTALL_LIBDATA_DIR:PATH=${PREFIX}/libdata -USES= cmake gettext pkgconfig python shebangfix +USES= cmake:outsource gettext iconv pkgconfig shebangfix tar:xz SHEBANG_FILES= utils/jadmaker utils/gammu-config bash_CMD= /bin/sh USE_GNOME= glib20 @@ -28,22 +28,21 @@ PLIST_SUB+= VERSION=${PORTVERSION} PORTDOCS= * -OPTIONS_DEFINE= BASH +OPTIONS_DEFINE= BASH DBI DOCS PGSQL MYSQL ODBC +OPTIONS_DEFAULT= BASH +OPTIONS_SUB= yes BASH_BUILD_DEPENDS= bash:shells/bash BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS} -BASH_PLIST_FILES= etc/bash_completion.d/gammu -BASH_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-contrib_CMakeLists.txt - -post-patch: - @${REINPLACE_CMD} -i '' -e 's:/etc/bash_completion.d:${PREFIX}/etc/bash_completion.d:' \ - ${WRKSRC}/contrib/CMakeLists.txt - -post-install: - (cd ${STAGEDIR}${PREFIX} && \ - ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \ - ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) +BASH_CMAKE_OFF= -DINSTALL_BASH_COMPLETION:BOOL=OFF +DBI_DESC= Database support via LibDBI +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_CMAKE_OFF= -DWITH_MySQL:BOOL=OFF +ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_CMAKE_OFF= -DWITH_ODBC:BOOL=OFF .include <bsd.port.mk> diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo index d5324ae4f962..50eeb47bf225 100644 --- a/comms/gammu/distinfo +++ b/comms/gammu/distinfo @@ -1,2 +1,2 @@ -SHA256 (gammu-1.37.0.tar.gz) = 4661d50266ac2742c13d2cb3e362b1049f536d95cc911db735c4dafbf92bfeff -SIZE (gammu-1.37.0.tar.gz) = 3000108 +SHA256 (gammu-1.37.2.tar.xz) = 5057cf7435c49d385e1f5c0d8f5723af58dc9727d748a78d103ad202b1baa9d0 +SIZE (gammu-1.37.2.tar.xz) = 1664676 diff --git a/comms/gammu/files/extra-patch-contrib_CMakeLists.txt b/comms/gammu/files/extra-patch-contrib_CMakeLists.txt deleted file mode 100644 index 327f38da58bf..000000000000 --- a/comms/gammu/files/extra-patch-contrib_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/CMakeLists.txt.orig 2015-12-08 10:38:11 UTC -+++ contrib/CMakeLists.txt -@@ -10,7 +10,7 @@ option(INSTALL_MEDIA "Install sample med - option(INSTALL_PHP_EXAMPLES "Install PHP example scripts" ON) - - if (BASH_BIN) -- option(INSTALL_BASH_COMPLETION "Install bash completion script for Gammu" ON) -+ option(INSTALL_BASH_COMPLETION "Install bash completion script for Gammu" OFF) - else (BASH_BIN) - option(INSTALL_BASH_COMPLETION "Install bash completion script for Gammu" OFF) - endif (BASH_BIN) diff --git a/comms/gammu/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt index f4a9305afaa4..1ad99660b929 100644 --- a/comms/gammu/files/patch-CMakeLists.txt +++ b/comms/gammu/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2015-12-08 10:38:11 UTC +--- CMakeLists.txt.orig 2016-04-13 11:37:33 UTC +++ CMakeLists.txt -@@ -116,7 +116,7 @@ check_symbol_exists (getpwnam "pwd.h" HA +@@ -117,7 +117,7 @@ check_symbol_exists (getpwnam "pwd.h" HA check_symbol_exists (getgrnam "grp.h" HAVE_GETGRNAM) check_symbol_exists (getpwuid "pwd.h" HAVE_GETPWUID) check_symbol_exists (getuid "unistd.h" HAVE_GETUID) @@ -9,7 +9,23 @@ check_symbol_exists (setuid "unistd.h" HAVE_SETUID) check_symbol_exists (setgid "unistd.h" HAVE_SETGID) check_symbol_exists (SIGHUP "signal.h" HAVE_SIGHUP) -@@ -590,7 +590,7 @@ mark_as_advanced (INSTALL_DATA_DIR) +@@ -415,7 +415,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP + # + # Warnings related flags + # +- MACRO_TUNE_COMPILER("-O2") + MACRO_TUNE_COMPILER("-Wall") + MACRO_TUNE_COMPILER("-Werror-implicit-function-declaration") + MACRO_TUNE_COMPILER("-Wno-deprecated-declarations") +@@ -547,7 +546,6 @@ endif (BUILD_SHARED_LIBS) + set (DOCS + README.rst + ChangeLog +- COPYING + ) + + # 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) diff --git a/comms/gammu/files/patch-contrib_CMakeLists.txt b/comms/gammu/files/patch-contrib_CMakeLists.txt new file mode 100644 index 000000000000..410503026cda --- /dev/null +++ b/comms/gammu/files/patch-contrib_CMakeLists.txt @@ -0,0 +1,14 @@ +--- contrib/CMakeLists.txt.orig 2016-04-13 11:37:33 UTC ++++ contrib/CMakeLists.txt +@@ -83,10 +83,7 @@ if (INSTALL_PHP_EXAMPLES) + endif (INSTALL_PHP_EXAMPLES) + + if (INSTALL_BASH_COMPLETION) +- macro_optional_find_package (BashCompletion) +- if (NOT BASH_COMPLETION_FOUND) +- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") +- endif (NOT BASH_COMPLETION_FOUND) ++ set (BASH_COMPLETION_COMPLETIONSDIR "etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") + install ( + FILES bash-completion/gammu + DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR} diff --git a/comms/gammu/pkg-descr b/comms/gammu/pkg-descr index 1dbbd2a0f6f7..a65005caf504 100644 --- a/comms/gammu/pkg-descr +++ b/comms/gammu/pkg-descr @@ -1,7 +1,5 @@ -Gammu (Gnu All Mobile Management Utilities) - Gammu is the name of the project as well as name of command line -utility, which you can use to control your phone. It is written in +utility, which you can use to control mobile phone. It is written in C and built on top of libGammu. Gammu command line utility provides access to wide range of phone diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist index fb1704dc5aec..44d5814f5389 100644 --- a/comms/gammu/pkg-plist +++ b/comms/gammu/pkg-plist @@ -5,6 +5,8 @@ bin/gammu-smsd bin/gammu-smsd-inject bin/gammu-smsd-monitor bin/jadmaker +%%BASH%%etc/bash_completion.d/gammu +include/gammu/gammu.h include/gammu/gammu-backup.h include/gammu/gammu-bitmap.h include/gammu/gammu-calendar.h @@ -32,7 +34,6 @@ include/gammu/gammu-statemachine.h include/gammu/gammu-types.h include/gammu/gammu-unicode.h include/gammu/gammu-wap.h -include/gammu/gammu.h lib/libGammu.so lib/libGammu.so.7 lib/libGammu.so.7.%%VERSION%% @@ -41,12 +42,12 @@ lib/libgsmsd.so.7 lib/libgsmsd.so.7.%%VERSION%% libdata/pkgconfig/gammu.pc libdata/pkgconfig/gammu-smsd.pc +man/man1/gammu.1.gz man/man1/gammu-config.1.gz man/man1/gammu-detect.1.gz man/man1/gammu-smsd-inject.1.gz man/man1/gammu-smsd-monitor.1.gz man/man1/gammu-smsd.1.gz -man/man1/gammu.1.gz man/man1/jadmaker.1.gz man/man5/gammu-backup.5.gz man/man5/gammu-smsbackup.5.gz |