diff -urN /usr/ports/comms/gammu/Makefile comms/gammu/Makefile --- /usr/ports/comms/gammu/Makefile 2016-04-01 23:25:39.622557000 +0900 +++ comms/gammu/Makefile 2016-04-18 00:00:00.000000000 +0900 @@ -2,10 +2,9 @@ # $FreeBSD: head/comms/gammu/Makefile 412344 2016-04-01 13:29:15Z mat $ 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,36 +13,42 @@ 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 - -USES= cmake gettext pkgconfig python shebangfix -SHEBANG_FILES= utils/jadmaker utils/gammu-config +USES= cmake:outsource gettext iconv pkgconfig shebangfix tar:xz +SHEBANG_FILES= utils/gammu-config utils/jadmaker bash_CMD= /bin/sh USE_GNOME= glib20 +CMAKE_ARGS= -DINSTALL_LIBDATA_DIR:PATH=${PREFIX}/libdata USE_LDCONFIG= yes -PLIST_SUB+= VERSION=${PORTVERSION} PORTDOCS= * -OPTIONS_DEFINE= BASH +CONFLICTS= gammu-devel-[1-9]* gammu-python-[1-9]* + +OPTIONS_DEFINE= BASH DBI DOCS PGSQL MYSQL ODBC +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 +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 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}/;;}) + @${REINPLACE_CMD} -e \ + '/initgroups/s|"grp.h"|"unistd.h"| ; \ + /"-O2"/d ; \ + /COPYING/d ; \ + s|"share/man"|"man"|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + '/BASH/s|"/etc/|"etc/|' ${WRKSRC}/contrib/CMakeLists.txt .include diff -urN /usr/ports/comms/gammu/distinfo comms/gammu/distinfo --- /usr/ports/comms/gammu/distinfo 2016-02-06 06:15:49.087982000 +0900 +++ comms/gammu/distinfo 2016-04-18 00:00:00.000000000 +0900 @@ -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 -urN /usr/ports/comms/gammu/files/extra-patch-contrib_CMakeLists.txt comms/gammu/files/extra-patch-contrib_CMakeLists.txt --- /usr/ports/comms/gammu/files/extra-patch-contrib_CMakeLists.txt 2015-12-11 00:02:06.138625000 +0900 +++ comms/gammu/files/extra-patch-contrib_CMakeLists.txt 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/comms/gammu/files/patch-CMakeLists.txt comms/gammu/files/patch-CMakeLists.txt --- /usr/ports/comms/gammu/files/patch-CMakeLists.txt 2015-12-11 00:02:06.139106000 +0900 +++ comms/gammu/files/patch-CMakeLists.txt 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2015-12-08 10:38:11 UTC -+++ CMakeLists.txt -@@ -116,7 +116,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) --check_symbol_exists (initgroups "grp.h" HAVE_INITGROUPS) -+check_symbol_exists (initgroups "unistd.h" HAVE_INITGROUPS) - 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) - 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 -urN /usr/ports/comms/gammu/pkg-descr comms/gammu/pkg-descr --- /usr/ports/comms/gammu/pkg-descr 2015-08-24 03:56:15.941279000 +0900 +++ comms/gammu/pkg-descr 2016-04-18 00:00:00.000000000 +0900 @@ -1,24 +1,21 @@ -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 -C and built on top of libGammu. +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 features, however support level differs from phone to phone and you might want to check Gammu Phone Database for user experiences with various phones. Generally following features are supported: - * Call listing, initiating and handling; - * SMS retrieval, backup and sending; - * MMS retrieval; - * Phonebook listing, export and import (also from standard - formats such as vCard); - * Calendar and tasks listing, export and import (also from - standard formats such as vCalendar or iCalendar); - * Retrieval of phone and network information; - * Access to phone file system (note that some phones work also - as USB storage devices and those are not accessible through - Gammu). + * Call listing, initiating and handling + * SMS retrieval, backup and sending + * MMS retrieval + * Phonebook listing, export and import (also from standard formats + such as vCard) + * Calendar and tasks listing, export and import (also from standard + formats such as vCalendar or iCalendar) + * Retrieval of phone and network information + * Access to phone file system (note that some phones work also as USB + storage devices and those are not accessible through Gammu) WWW: http://wammu.eu/gammu/ diff -urN /usr/ports/comms/gammu/pkg-plist comms/gammu/pkg-plist --- /usr/ports/comms/gammu/pkg-plist 2015-12-11 00:02:06.224691000 +0900 +++ comms/gammu/pkg-plist 2016-04-18 00:00:00.000000000 +0900 @@ -5,6 +5,8 @@ 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,21 +34,20 @@ 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%% +lib/libGammu.so.7.1.37.2 lib/libgsmsd.so lib/libgsmsd.so.7 -lib/libgsmsd.so.7.%%VERSION%% +lib/libgsmsd.so.7.1.37.2 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