From owner-svn-ports-branches@freebsd.org Mon Oct 19 09:18:45 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98B19A18577; Mon, 19 Oct 2015 09:18:45 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 607471B36; Mon, 19 Oct 2015 09:18:45 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9J9IiIM023010; Mon, 19 Oct 2015 09:18:44 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9J9IiBG023009; Mon, 19 Oct 2015 09:18:44 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510190918.t9J9IiBG023009@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 09:18:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399652 - branches/2014Q4/sysutils/zfs-replicate X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 09:18:45 -0000 Author: koobs Date: Mon Oct 19 09:18:44 2015 New Revision: 399652 URL: https://svnweb.freebsd.org/changeset/ports/399652 Log: MFH: r399647 sysutils/zfs-replicate: Fix WWW URL (404) PR: 203830 Reported by: Yonas Yanfa Approved by: portmgr (blanket) Approved by: portmgr (erwin) Modified: branches/2014Q4/sysutils/zfs-replicate/pkg-descr Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/sysutils/zfs-replicate/pkg-descr ============================================================================== --- branches/2014Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 09:03:44 2015 (r399651) +++ branches/2014Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 09:18:44 2015 (r399652) @@ -1,4 +1,4 @@ zfs-replicate makes migrating a few filesystems and many snapshots to a new zpool more easier. -WWW: http://blogs.sun.com/constantin/entry/useful_zfs_snapshot_replicator_script +WWW: https://blogs.oracle.com/constantin/entry/useful_zfs_snapshot_replicator_script From owner-svn-ports-branches@freebsd.org Mon Oct 19 09:22:32 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 774DEA18866; Mon, 19 Oct 2015 09:22:32 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31111212; Mon, 19 Oct 2015 09:22:32 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9J9MV6f025870; Mon, 19 Oct 2015 09:22:31 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9J9MUJi025860; Mon, 19 Oct 2015 09:22:30 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510190922.t9J9MUJi025860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 09:22:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399653 - in branches/2015Q4/lang: python27 python27/files python32 python32/files python33 python33/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 09:22:32 -0000 Author: koobs Date: Mon Oct 19 09:22:30 2015 New Revision: 399653 URL: https://svnweb.freebsd.org/changeset/ports/399653 Log: MFH: r399611 lang/python{27,32,33}: Fix missing shlib path in python-config In Python 3.4+, upstream added and switched to using a shell implementation of the python-config script [1]. The Python implementation (python-config.py) remained used by all versions < 3.4. While the shell implementation returns the path to the Python shared library when using the --ldflags script argument, the Python implementation of the script does not. The bug has been reported, but has not yet been merged [2]. The Python ports currently default to including ${LOCALBASE}/lib in LIBS when the NLS option is enabled (which it is by default). When built *with* NLS (gettext) support, the flags added to LIBS are returned in `pythonX.Y-config --ldflags` output, which happens to match the path to the Python shared library. If the NLS option is disabled, ${LOCALBASE}/lib is not added to LIBS, and are therefore not returned in --ldflags output. This results in potential linking errors for software that uses python-config to obtain the correct library path, when the NLS option is disabled: $ make WITH=PYTHON -C audio/alsa-lib [...] --- smixer-python.la --- CCLD smixer-python.la /usr/bin/ld: cannot find -lpython2.7 This change modifies the python-config.in script to match the shell implementation, outputting the library path in --ldflags output. While I'm here: for Python 3.2 and Python 3.3 ports, backport a library order change [3]. This could affect linking with static libraries. Use standard length lines and reduce diffs in pkg-message [1] https://bugs.python.org/issue16235 [2] https://bugs.python.org/issue7352 [2] https://bugs.python.org/issue18096 PR: 197757 Submitted by: jbeich Approved by: portmgr (erwin) Added: branches/2015Q4/lang/python27/files/patch-Misc_python-config.in - copied unchanged from r399611, head/lang/python27/files/patch-Misc_python-config.in branches/2015Q4/lang/python32/files/patch-Misc_python-config.in - copied unchanged from r399611, head/lang/python32/files/patch-Misc_python-config.in branches/2015Q4/lang/python33/files/patch-Misc_python-config.in - copied unchanged from r399611, head/lang/python33/files/patch-Misc_python-config.in Modified: branches/2015Q4/lang/python27/Makefile branches/2015Q4/lang/python27/pkg-message branches/2015Q4/lang/python32/Makefile branches/2015Q4/lang/python32/pkg-message branches/2015Q4/lang/python33/Makefile branches/2015Q4/lang/python33/pkg-message Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/lang/python27/Makefile ============================================================================== --- branches/2015Q4/lang/python27/Makefile Mon Oct 19 09:18:44 2015 (r399652) +++ branches/2015Q4/lang/python27/Makefile Mon Oct 19 09:22:30 2015 (r399653) @@ -2,6 +2,7 @@ PORTNAME= python27 PORTVERSION= 2.7.10 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Copied: branches/2015Q4/lang/python27/files/patch-Misc_python-config.in (from r399611, head/lang/python27/files/patch-Misc_python-config.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/lang/python27/files/patch-Misc_python-config.in Mon Oct 19 09:22:30 2015 (r399653, copy of r399611, head/lang/python27/files/patch-Misc_python-config.in) @@ -0,0 +1,21 @@ +# pythonx.y-config --ldflags out of /usr and missing -L +# https://bugs.python.org/issue7352 + +--- Misc/python-config.in.orig 2015-10-18 07:24:01 UTC ++++ Misc/python-config.in +@@ -21,6 +21,7 @@ except getopt.error: + if not opts: + exit_with_usage() + ++libdir = sysconfig.EXEC_PREFIX + '/lib' + pyver = sysconfig.get_config_var('VERSION') + getvar = sysconfig.get_config_var + +@@ -50,6 +51,7 @@ for opt in opt_flags: + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags': ++ libs.insert(0, '-L' + libdir) + if not getvar('Py_ENABLE_SHARED'): + libs.insert(0, '-L' + getvar('LIBPL')) + if not getvar('PYTHONFRAMEWORK'): Modified: branches/2015Q4/lang/python27/pkg-message ============================================================================== --- branches/2015Q4/lang/python27/pkg-message Mon Oct 19 09:18:44 2015 (r399652) +++ branches/2015Q4/lang/python27/pkg-message Mon Oct 19 09:22:30 2015 (r399653) @@ -1,4 +1,4 @@ -===================================================================== +=========================================================================== Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: @@ -8,4 +8,4 @@ gdbm databases/py-gdbm sqlite3 databases/py-sqlite3 tkinter x11-toolkits/py-tkinter -===================================================================== +=========================================================================== Modified: branches/2015Q4/lang/python32/Makefile ============================================================================== --- branches/2015Q4/lang/python32/Makefile Mon Oct 19 09:18:44 2015 (r399652) +++ branches/2015Q4/lang/python32/Makefile Mon Oct 19 09:22:30 2015 (r399653) @@ -2,7 +2,7 @@ PORTNAME= python32 PORTVERSION= 3.2.5 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Copied: branches/2015Q4/lang/python32/files/patch-Misc_python-config.in (from r399611, head/lang/python32/files/patch-Misc_python-config.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/lang/python32/files/patch-Misc_python-config.in Mon Oct 19 09:22:30 2015 (r399653, copy of r399611, head/lang/python32/files/patch-Misc_python-config.in) @@ -0,0 +1,32 @@ +# pythonx.y-config --ldflags out of /usr and missing -L +# https://bugs.python.org/issue7352 + +# Fix library order returned by python-config. [#18096] +# bugs.python.org/18096 + +--- Misc/python-config.in.orig 2013-05-15 16:33:52 UTC ++++ Misc/python-config.in +@@ -22,6 +22,7 @@ except getopt.error: + if not opts: + exit_with_usage() + ++libdir = sysconfig.get_config_var('exec_prefix') + '/lib' + pyver = sysconfig.get_config_var('VERSION') + getvar = sysconfig.get_config_var + +@@ -45,11 +46,13 @@ for opt in opt_flags: + print(' '.join(flags)) + + elif opt in ('--libs', '--ldflags'): +- libs = getvar('LIBS').split() + getvar('SYSLIBS').split() +- libs.append('-lpython' + pyver + sys.abiflags) ++ libs = ['-lpython' + pyver + sys.abiflags] ++ libs += getvar('LIBS').split() ++ libs += getvar('SYSLIBS').split() + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags': ++ libs.insert(0, '-L' + libdir) + if not getvar('Py_ENABLE_SHARED'): + libs.insert(0, '-L' + getvar('LIBPL')) + if not getvar('PYTHONFRAMEWORK'): Modified: branches/2015Q4/lang/python32/pkg-message ============================================================================== --- branches/2015Q4/lang/python32/pkg-message Mon Oct 19 09:18:44 2015 (r399652) +++ branches/2015Q4/lang/python32/pkg-message Mon Oct 19 09:22:30 2015 (r399653) @@ -1,10 +1,10 @@ -==== -Note that some of the standard modules are provided as separate -ports since they require extra dependencies: +=========================================================================== + +Note that some standard Python modules are provided as separate ports +as they require additional dependencies. They are available as: gdbm databases/py-gdbm sqlite3 databases/py-sqlite3 tkinter x11-toolkits/py-tkinter -Install them as needed. -==== +=========================================================================== Modified: branches/2015Q4/lang/python33/Makefile ============================================================================== --- branches/2015Q4/lang/python33/Makefile Mon Oct 19 09:18:44 2015 (r399652) +++ branches/2015Q4/lang/python33/Makefile Mon Oct 19 09:22:30 2015 (r399653) @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} Copied: branches/2015Q4/lang/python33/files/patch-Misc_python-config.in (from r399611, head/lang/python33/files/patch-Misc_python-config.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/lang/python33/files/patch-Misc_python-config.in Mon Oct 19 09:22:30 2015 (r399653, copy of r399611, head/lang/python33/files/patch-Misc_python-config.in) @@ -0,0 +1,32 @@ +# pythonx.y-config --ldflags out of /usr and missing -L +# https://bugs.python.org/issue7352 + +# Fix library order returned by python-config. [#18096] +# bugs.python.org/18096 + +--- Misc/python-config.in.orig 2015-10-18 09:00:25 UTC ++++ Misc/python-config.in +@@ -22,6 +22,7 @@ except getopt.error: + if not opts: + exit_with_usage() + ++libdir = sysconfig.get_config_var('exec_prefix') + '/lib' + pyver = sysconfig.get_config_var('VERSION') + getvar = sysconfig.get_config_var + +@@ -45,11 +46,13 @@ for opt in opt_flags: + print(' '.join(flags)) + + elif opt in ('--libs', '--ldflags'): +- libs = getvar('LIBS').split() + getvar('SYSLIBS').split() +- libs.append('-lpython' + pyver + sys.abiflags) ++ libs = ['-lpython' + pyver + sys.abiflags] ++ libs += getvar('LIBS').split() ++ libs += getvar('SYSLIBS').split() + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags': ++ libs.insert(0, '-L' + libdir) + if not getvar('Py_ENABLE_SHARED'): + libs.insert(0, '-L' + getvar('LIBPL')) + if not getvar('PYTHONFRAMEWORK'): Modified: branches/2015Q4/lang/python33/pkg-message ============================================================================== --- branches/2015Q4/lang/python33/pkg-message Mon Oct 19 09:18:44 2015 (r399652) +++ branches/2015Q4/lang/python33/pkg-message Mon Oct 19 09:22:30 2015 (r399653) @@ -1,10 +1,10 @@ -==== -Note that some of the standard modules are provided as separate -ports since they require extra dependencies: +=========================================================================== + +Note that some standard Python modules are provided as separate ports +as they require additional dependencies. They are available as: gdbm databases/py-gdbm sqlite3 databases/py-sqlite3 tkinter x11-toolkits/py-tkinter -Install them as needed. -==== +=========================================================================== From owner-svn-ports-branches@freebsd.org Mon Oct 19 11:10:52 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99624A187AB; Mon, 19 Oct 2015 11:10:52 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 726B7B60; Mon, 19 Oct 2015 11:10:52 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JBAp7c055463; Mon, 19 Oct 2015 11:10:51 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JBApNr055459; Mon, 19 Oct 2015 11:10:51 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191110.t9JBApNr055459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 11:10:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399658 - in branches/2014Q4/net/turnserver: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 11:10:52 -0000 Author: koobs Date: Mon Oct 19 11:10:51 2015 New Revision: 399658 URL: https://svnweb.freebsd.org/changeset/ports/399658 Log: MFH: r399657 net/turnserver: Fix build with No-SSLv3 turnserver will not build if OpenSSL was built without SSLv3 (--no-ssl3). LibreSSL 2.3.0 has removed SSLv3 support completely. This change fixes the build when SSLv3 is not available While I'm here, add LICENSE_FILE PR: 203700 Submitted by: cpbsdmail gmail com Approved by: mom040267 gmail com (maintainer) Approved by: portmgr (erwin) Added: branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Modified: branches/2014Q4/net/turnserver/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/turnserver/Makefile ============================================================================== --- branches/2014Q4/net/turnserver/Makefile Mon Oct 19 11:06:50 2015 (r399657) +++ branches/2014Q4/net/turnserver/Makefile Mon Oct 19 11:10:51 2015 (r399658) @@ -2,6 +2,7 @@ PORTNAME= turnserver PORTVERSION= 3.2.4.4 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/:prog \ http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ @@ -15,6 +16,7 @@ MAINTAINER= mom040267@gmail.com COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 Copied: branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c (from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c Mon Oct 19 11:10:51 2015 (r399658, copy of r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) @@ -0,0 +1,21 @@ +--- src/apps/common/apputils.c.orig 2015-09-30 07:05:14 UTC ++++ src/apps/common/apputils.c +@@ -1037,13 +1037,15 @@ static const char* turn_get_method(const + if(!method) + return mdefault; + else { +- ++#ifndef OPENSSL_NO_SSL3 + if(method == SSLv3_server_method()) { + return "SSLv3"; + } else if(method == SSLv3_client_method()) { + return "SSLv3"; +- } else if(method == SSLv23_server_method()) { +- return "SSLv23"; ++ } else ++#endif ++ if(method == SSLv23_server_method()) { ++ return "SSLv23"; + } else if(method == SSLv23_client_method()) { + return "SSLv23"; + } else if(method == TLSv1_server_method()) { Copied: branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c (from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Mon Oct 19 11:10:51 2015 (r399658, copy of r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) @@ -0,0 +1,14 @@ +--- src/apps/uclient/mainuclient.c.orig 2015-09-30 07:05:14 UTC ++++ src/apps/uclient/mainuclient.c +@@ -483,9 +483,11 @@ int main(int argc, char **argv) + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv23_client_method()); + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); + root_tls_ctx_num++; ++#ifndef OPENSSL_NO_SSL3 + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv3_client_method()); + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); + root_tls_ctx_num++; ++#endif + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(TLSv1_client_method()); + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); + root_tls_ctx_num++; From owner-svn-ports-branches@freebsd.org Mon Oct 19 12:32:13 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C91E9A1895F; Mon, 19 Oct 2015 12:32:13 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x22a.google.com (mail-pa0-x22a.google.com [IPv6:2607:f8b0:400e:c03::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3E308F0; Mon, 19 Oct 2015 12:32:10 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by padhk11 with SMTP id hk11so29203328pad.1; Mon, 19 Oct 2015 05:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=l0lyNSvEMCjGk9UeY75PqYh+lCiftcUN9xUQczAwvjU=; b=Bo1ns/BDUa/1rbjIeWIFp+EdJvm3aWEQT5ro/t4mHwwDjBB4CoEsypysZxEJnbZ0SX 0YU8nUt40wsN6EkEca7pBMGc4rDPkV3YpedJM/xtR3jweofII4MjLHjkg2zq3Rcd9N4S qC4m8pXeLuebyMZT8s0wq3w2RA2SUWCacXJ82j0H+zo78hpXeGMitYHTgZGz72Av1J8t +Voyu4gdXS08Ad1QCrq8BFZ7o+RYWNpHkOzFNOdYshFUPs7VTRZVwd5dqwWm9UtBBrNc CSv6m7dx2Xw3cWV1imromCimqzBP+OzmVcvczsyQHkKpIwQISJJG83if0hSo3Z6UnLOY qG5Q== X-Received: by 10.66.235.194 with SMTP id uo2mr34138706pac.41.1445257930262; Mon, 19 Oct 2015 05:32:10 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01::1? (2001-44b8-31ae-7b01-0000-0000-0000-0001.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::1]) by smtp.gmail.com with ESMTPSA id jt1sm26302651pbc.83.2015.10.19.05.32.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 05:32:09 -0700 (PDT) Sender: Kubilay Kocak Subject: Re: svn commit: r399652 - branches/2014Q4/sysutils/zfs-replicate To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <201510190918.t9J9IiBG023009@repo.freebsd.org> From: Kubilay Kocak Message-ID: <5624E2C3.9080400@FreeBSD.org> Date: Mon, 19 Oct 2015 23:32:03 +1100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:42.0) Gecko/20100101 Thunderbird/42.0 MIME-Version: 1.0 In-Reply-To: <201510190918.t9J9IiBG023009@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 12:32:13 -0000 On 19/10/2015 8:18 PM, Kubilay Kocak wrote: > Author: koobs > Date: Mon Oct 19 09:18:44 2015 > New Revision: 399652 > URL: https://svnweb.freebsd.org/changeset/ports/399652 > > Log: > MFH: r399647 > > sysutils/zfs-replicate: Fix WWW URL (404) > > PR: 203830 > Reported by: Yonas Yanfa > Approved by: portmgr (blanket) > > Approved by: portmgr (erwin) > > Modified: > branches/2014Q4/sysutils/zfs-replicate/pkg-descr > Directory Properties: > branches/2014Q4/ (props changed) > > Modified: branches/2014Q4/sysutils/zfs-replicate/pkg-descr > ============================================================================== > --- branches/2014Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 09:03:44 2015 (r399651) > +++ branches/2014Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 09:18:44 2015 (r399652) > @@ -1,4 +1,4 @@ > zfs-replicate makes migrating a few filesystems and many > snapshots to a new zpool more easier. > > -WWW: http://blogs.sun.com/constantin/entry/useful_zfs_snapshot_replicator_script > +WWW: https://blogs.oracle.com/constantin/entry/useful_zfs_snapshot_replicator_script > OK pointyhat #1, this should have been 2015Q4 From owner-svn-ports-branches@freebsd.org Mon Oct 19 12:32:33 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 900DFA18991; Mon, 19 Oct 2015 12:32:33 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x232.google.com (mail-pa0-x232.google.com [IPv6:2607:f8b0:400e:c03::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61958A06; Mon, 19 Oct 2015 12:32:33 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by pasz6 with SMTP id z6so29702178pas.2; Mon, 19 Oct 2015 05:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=NpUFk5RApimWNhBr8ZMKJVvy0OZ1U6LUk99gfLytMYs=; b=a/G242ZCHyM8E413Ap3d4WmOaW8D5q8tL9/hkdw7zR2yLhiJ+NiN3HxGjDmfCjSzXj dqe6wKVLbF33YaCcA2YiF8i1cN0jO7SIhdZX5kOet6OPuDOl1kfmcdN1ApkX+UpP5pRQ 3WZ7PDyJhlkFCBArB8Xebh0yLMFiDUDhu0UASe+huS8DZ8CQM+5sqRcwxiI5OwmNWAXv UgV2O+OXyi0t00tVinZAaOTJRro7fugHGkhtbCMxBCrLe7xlXYFvIChIvB0xb4ee1D2J A3SfKhKhqeXqVSfMdZosREr9kUWz0JLMQ4ELEpuZci1QXtZXAXEeIJqe0VrLaBSloL3K 8wXQ== X-Received: by 10.68.204.37 with SMTP id kv5mr34256785pbc.64.1445257952980; Mon, 19 Oct 2015 05:32:32 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01::1? (2001-44b8-31ae-7b01-0000-0000-0000-0001.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::1]) by smtp.gmail.com with ESMTPSA id qy7sm36577473pab.37.2015.10.19.05.32.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 05:32:32 -0700 (PDT) Sender: Kubilay Kocak Subject: Re: svn commit: r399658 - in branches/2014Q4/net/turnserver: . files To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <201510191110.t9JBApNr055459@repo.freebsd.org> From: Kubilay Kocak Message-ID: <5624E2DA.6080908@FreeBSD.org> Date: Mon, 19 Oct 2015 23:32:26 +1100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:42.0) Gecko/20100101 Thunderbird/42.0 MIME-Version: 1.0 In-Reply-To: <201510191110.t9JBApNr055459@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 12:32:33 -0000 On 19/10/2015 10:10 PM, Kubilay Kocak wrote: > Author: koobs > Date: Mon Oct 19 11:10:51 2015 > New Revision: 399658 > URL: https://svnweb.freebsd.org/changeset/ports/399658 > > Log: > MFH: r399657 > > net/turnserver: Fix build with No-SSLv3 > > turnserver will not build if OpenSSL was built without SSLv3 > (--no-ssl3). > > LibreSSL 2.3.0 has removed SSLv3 support completely. > > This change fixes the build when SSLv3 is not available > > While I'm here, add LICENSE_FILE > > PR: 203700 > Submitted by: cpbsdmail gmail com > Approved by: mom040267 gmail com (maintainer) > > Approved by: portmgr (erwin) > > Added: > branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c > - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c > branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c > - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c > Modified: > branches/2014Q4/net/turnserver/Makefile > Directory Properties: > branches/2014Q4/ (props changed) > > Modified: branches/2014Q4/net/turnserver/Makefile > ============================================================================== > --- branches/2014Q4/net/turnserver/Makefile Mon Oct 19 11:06:50 2015 (r399657) > +++ branches/2014Q4/net/turnserver/Makefile Mon Oct 19 11:10:51 2015 (r399658) > @@ -2,6 +2,7 @@ > > PORTNAME= turnserver > PORTVERSION= 3.2.4.4 > +PORTREVISION= 1 > CATEGORIES= net > MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/:prog \ > http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ > @@ -15,6 +16,7 @@ MAINTAINER= mom040267@gmail.com > COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 > > LICENSE= BSD3CLAUSE > +LICENSE_FILE= ${WRKSRC}/LICENSE > > LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 > > > Copied: branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c (from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c Mon Oct 19 11:10:51 2015 (r399658, copy of r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) > @@ -0,0 +1,21 @@ > +--- src/apps/common/apputils.c.orig 2015-09-30 07:05:14 UTC > ++++ src/apps/common/apputils.c > +@@ -1037,13 +1037,15 @@ static const char* turn_get_method(const > + if(!method) > + return mdefault; > + else { > +- > ++#ifndef OPENSSL_NO_SSL3 > + if(method == SSLv3_server_method()) { > + return "SSLv3"; > + } else if(method == SSLv3_client_method()) { > + return "SSLv3"; > +- } else if(method == SSLv23_server_method()) { > +- return "SSLv23"; > ++ } else > ++#endif > ++ if(method == SSLv23_server_method()) { > ++ return "SSLv23"; > + } else if(method == SSLv23_client_method()) { > + return "SSLv23"; > + } else if(method == TLSv1_server_method()) { > > Copied: branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c (from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Mon Oct 19 11:10:51 2015 (r399658, copy of r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) > @@ -0,0 +1,14 @@ > +--- src/apps/uclient/mainuclient.c.orig 2015-09-30 07:05:14 UTC > ++++ src/apps/uclient/mainuclient.c > +@@ -483,9 +483,11 @@ int main(int argc, char **argv) > + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv23_client_method()); > + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); > + root_tls_ctx_num++; > ++#ifndef OPENSSL_NO_SSL3 > + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv3_client_method()); > + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); > + root_tls_ctx_num++; > ++#endif > + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(TLSv1_client_method()); > + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); > + root_tls_ctx_num++; > OK pointyhat #2, this should have been 2015Q4 From owner-svn-ports-branches@freebsd.org Mon Oct 19 13:04:59 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB88FA183DB; Mon, 19 Oct 2015 13:04:59 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53D301EE2; Mon, 19 Oct 2015 13:04:59 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JD4wQp090481; Mon, 19 Oct 2015 13:04:58 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JD4wkZ090479; Mon, 19 Oct 2015 13:04:58 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191304.t9JD4wkZ090479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 13:04:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399665 - in branches/2014Q4: net/turnserver net/turnserver/files sysutils/zfs-replicate X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 13:04:59 -0000 Author: koobs Date: Mon Oct 19 13:04:58 2015 New Revision: 399665 URL: https://svnweb.freebsd.org/changeset/ports/399665 Log: Revert r399652 & r399658 Revert two commits that we're supposed to be MFH'd to the 2015Q4 branch, but instead because pointyhat, ended up in 2014Q4. Identified by: kwm Approved by: portmgr (bapt) Deleted: branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Modified: branches/2014Q4/net/turnserver/Makefile branches/2014Q4/sysutils/zfs-replicate/pkg-descr Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/turnserver/Makefile ============================================================================== --- branches/2014Q4/net/turnserver/Makefile Mon Oct 19 12:50:59 2015 (r399664) +++ branches/2014Q4/net/turnserver/Makefile Mon Oct 19 13:04:58 2015 (r399665) @@ -2,7 +2,6 @@ PORTNAME= turnserver PORTVERSION= 3.2.4.4 -PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/:prog \ http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ @@ -16,7 +15,6 @@ MAINTAINER= mom040267@gmail.com COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 Modified: branches/2014Q4/sysutils/zfs-replicate/pkg-descr ============================================================================== --- branches/2014Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 12:50:59 2015 (r399664) +++ branches/2014Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 13:04:58 2015 (r399665) @@ -1,4 +1,4 @@ zfs-replicate makes migrating a few filesystems and many snapshots to a new zpool more easier. -WWW: https://blogs.oracle.com/constantin/entry/useful_zfs_snapshot_replicator_script +WWW: http://blogs.sun.com/constantin/entry/useful_zfs_snapshot_replicator_script From owner-svn-ports-branches@freebsd.org Mon Oct 19 13:32:38 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C137AA18C41; Mon, 19 Oct 2015 13:32:38 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9061DF53; Mon, 19 Oct 2015 13:32:38 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JDWbFb099135; Mon, 19 Oct 2015 13:32:37 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JDWbdf099134; Mon, 19 Oct 2015 13:32:37 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191332.t9JDWbdf099134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 13:32:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399667 - branches/2015Q4/sysutils/zfs-replicate X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 13:32:38 -0000 Author: koobs Date: Mon Oct 19 13:32:37 2015 New Revision: 399667 URL: https://svnweb.freebsd.org/changeset/ports/399667 Log: MFH: r399647 sysutils/zfs-replicate: Fix WWW URL (404) PR: 203830 Reported by: Yonas Yanfa Approved by: portmgr (blanket) Approved by: portmgr (erwin) Modified: branches/2015Q4/sysutils/zfs-replicate/pkg-descr Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/sysutils/zfs-replicate/pkg-descr ============================================================================== --- branches/2015Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 13:30:28 2015 (r399666) +++ branches/2015Q4/sysutils/zfs-replicate/pkg-descr Mon Oct 19 13:32:37 2015 (r399667) @@ -1,4 +1,4 @@ zfs-replicate makes migrating a few filesystems and many snapshots to a new zpool more easier. -WWW: http://blogs.sun.com/constantin/entry/useful_zfs_snapshot_replicator_script +WWW: https://blogs.oracle.com/constantin/entry/useful_zfs_snapshot_replicator_script From owner-svn-ports-branches@freebsd.org Mon Oct 19 13:34:35 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53E31A18CEA; Mon, 19 Oct 2015 13:34:35 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A7631145; Mon, 19 Oct 2015 13:34:35 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JDYYHx099836; Mon, 19 Oct 2015 13:34:34 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JDYXgG099832; Mon, 19 Oct 2015 13:34:33 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191334.t9JDYXgG099832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 13:34:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399669 - in branches/2015Q4/net/turnserver: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 13:34:35 -0000 Author: koobs Date: Mon Oct 19 13:34:33 2015 New Revision: 399669 URL: https://svnweb.freebsd.org/changeset/ports/399669 Log: MFH: r399657 net/turnserver: Fix build with No-SSLv3 turnserver will not build if OpenSSL was built without SSLv3 (--no-ssl3). LibreSSL 2.3.0 has removed SSLv3 support completely. This change fixes the build when SSLv3 is not available While I'm here, add LICENSE_FILE PR: 203700 Submitted by: cpbsdmail gmail com Approved by: mom040267 gmail com (maintainer) Approved by: portmgr (erwin) Added: branches/2015Q4/net/turnserver/files/patch-src_apps_common_apputils.c - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c branches/2015Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Modified: branches/2015Q4/net/turnserver/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/net/turnserver/Makefile ============================================================================== --- branches/2015Q4/net/turnserver/Makefile Mon Oct 19 13:34:20 2015 (r399668) +++ branches/2015Q4/net/turnserver/Makefile Mon Oct 19 13:34:33 2015 (r399669) @@ -2,6 +2,7 @@ PORTNAME= turnserver PORTVERSION= 4.5.0.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/:prog \ http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ @@ -15,6 +16,7 @@ MAINTAINER= mom040267@gmail.com COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 Copied: branches/2015Q4/net/turnserver/files/patch-src_apps_common_apputils.c (from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/net/turnserver/files/patch-src_apps_common_apputils.c Mon Oct 19 13:34:33 2015 (r399669, copy of r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) @@ -0,0 +1,21 @@ +--- src/apps/common/apputils.c.orig 2015-09-30 07:05:14 UTC ++++ src/apps/common/apputils.c +@@ -1037,13 +1037,15 @@ static const char* turn_get_method(const + if(!method) + return mdefault; + else { +- ++#ifndef OPENSSL_NO_SSL3 + if(method == SSLv3_server_method()) { + return "SSLv3"; + } else if(method == SSLv3_client_method()) { + return "SSLv3"; +- } else if(method == SSLv23_server_method()) { +- return "SSLv23"; ++ } else ++#endif ++ if(method == SSLv23_server_method()) { ++ return "SSLv23"; + } else if(method == SSLv23_client_method()) { + return "SSLv23"; + } else if(method == TLSv1_server_method()) { Copied: branches/2015Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c (from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Mon Oct 19 13:34:33 2015 (r399669, copy of r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) @@ -0,0 +1,14 @@ +--- src/apps/uclient/mainuclient.c.orig 2015-09-30 07:05:14 UTC ++++ src/apps/uclient/mainuclient.c +@@ -483,9 +483,11 @@ int main(int argc, char **argv) + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv23_client_method()); + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); + root_tls_ctx_num++; ++#ifndef OPENSSL_NO_SSL3 + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv3_client_method()); + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); + root_tls_ctx_num++; ++#endif + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(TLSv1_client_method()); + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); + root_tls_ctx_num++; From owner-svn-ports-branches@freebsd.org Mon Oct 19 13:36:46 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94BDBA18DCA; Mon, 19 Oct 2015 13:36:46 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61609128C; Mon, 19 Oct 2015 13:36:46 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JDajFh000127; Mon, 19 Oct 2015 13:36:45 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JDajOb000126; Mon, 19 Oct 2015 13:36:45 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201510191336.t9JDajOb000126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 19 Oct 2015 13:36:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399670 - branches/2015Q4/www/lighttpd X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 13:36:46 -0000 Author: madpilot Date: Mon Oct 19 13:36:45 2015 New Revision: 399670 URL: https://svnweb.freebsd.org/changeset/ports/399670 Log: MFH: r399619 Update option description as proposed by port maintainer PR: 175775 Submitted by: xaero at xaerolimit.net Approved by: pkubaj at riseup.net (maintainer) Approved by: ports-secteam (feld) Modified: branches/2015Q4/www/lighttpd/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/lighttpd/Makefile ============================================================================== --- branches/2015Q4/www/lighttpd/Makefile Mon Oct 19 13:34:33 2015 (r399669) +++ branches/2015Q4/www/lighttpd/Makefile Mon Oct 19 13:36:45 2015 (r399670) @@ -40,6 +40,7 @@ OPTIONS_DEFAULT= IPV6 OPENSSL BZIP2_DESC= bzip2 support (mod_compress) GDBM_DESC= gdbm storage (mod_trigger_b4_dl) LDAP_DESC= LDAP authentication +LIBEV_DESC= Fast events support via libev (disables kqueue) LUA_DESC= lua support (mod_cml, mod_magnet) MEMCACHE_DESC= memcached storage (mod_trigger_b4_dl) MYSQL_DESC= MySQL support (mod_mysql_vhost) From owner-svn-ports-branches@freebsd.org Mon Oct 19 13:43:08 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 370EAA18065; Mon, 19 Oct 2015 13:43:08 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E0F301A09; Mon, 19 Oct 2015 13:43:07 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JDh6a9003292; Mon, 19 Oct 2015 13:43:06 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JDh6XK003290; Mon, 19 Oct 2015 13:43:06 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191343.t9JDh6XK003290@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 13:43:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399673 - branches/2015Q4/astro/gpstk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 13:43:08 -0000 Author: koobs Date: Mon Oct 19 13:43:06 2015 New Revision: 399673 URL: https://svnweb.freebsd.org/changeset/ports/399673 Log: MFH: r399654 astro/gpstk: Fix distinfo, Mark Unbroken - Update distinfo - Add EXTRACT_AFTER_ARGS - Mark unbroken PR: 201196 Submitted by: John Hein Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D620A18421; Mon, 19 Oct 2015 13:51:36 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC0AE92; Mon, 19 Oct 2015 13:51:35 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JDpYwM006475; Mon, 19 Oct 2015 13:51:34 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JDpYnj006474; Mon, 19 Oct 2015 13:51:34 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191351.t9JDpYnj006474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 13:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399676 - branches/2015Q4/astro/gpstk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 13:51:36 -0000 Author: koobs Date: Mon Oct 19 13:51:34 2015 New Revision: 399676 URL: https://svnweb.freebsd.org/changeset/ports/399676 Log: MFH: r399675 astro/gpstk: Fix fatal portlint(8) error Move EXTRACT_AFTER_ARGS out of the PORTNAME section causing FATAL portlint error. PR: 201196 Approved by: portmgr (feld) Modified: branches/2015Q4/astro/gpstk/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/astro/gpstk/Makefile ============================================================================== --- branches/2015Q4/astro/gpstk/Makefile Mon Oct 19 13:49:16 2015 (r399675) +++ branches/2015Q4/astro/gpstk/Makefile Mon Oct 19 13:51:34 2015 (r399676) @@ -6,7 +6,6 @@ PORTVERSION= 2.5 CATEGORIES= astro devel MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}.src -EXTRACT_AFTER_ARGS= --exclude .git MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit for developing GPS applications @@ -17,6 +16,8 @@ USES= cmake python:run USE_GCC= yes USE_LDCONFIG= yes +EXTRACT_AFTER_ARGS= --exclude .git + WRKSRC= ${WRKDIR}/dev .include From owner-svn-ports-branches@freebsd.org Mon Oct 19 14:03:56 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55A3BA18A90; Mon, 19 Oct 2015 14:03:56 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20EB0D67; Mon, 19 Oct 2015 14:03:56 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JE3tU0009857; Mon, 19 Oct 2015 14:03:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JE3teE009856; Mon, 19 Oct 2015 14:03:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510191403.t9JE3teE009856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 19 Oct 2015 14:03:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399681 - branches/2015Q4/databases/qof X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 14:03:56 -0000 Author: amdmi3 Date: Mon Oct 19 14:03:54 2015 New Revision: 399681 URL: https://svnweb.freebsd.org/changeset/ports/399681 Log: MFH: r399678 - Fix build with disabled NLS Approved by: ports-secteam blanket Modified: branches/2015Q4/databases/qof/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/qof/pkg-plist ============================================================================== --- branches/2015Q4/databases/qof/pkg-plist Mon Oct 19 14:01:13 2015 (r399680) +++ branches/2015Q4/databases/qof/pkg-plist Mon Oct 19 14:03:54 2015 (r399681) @@ -42,18 +42,18 @@ lib/libqofsql.so.1.0.2 lib/qof2/libqof-backend-qsf.a lib/qof2/libqof-backend-qsf.so libdata/pkgconfig/qof.pc -share/locale/cs/LC_MESSAGES/qof.mo -share/locale/de/LC_MESSAGES/qof.mo -share/locale/fr/LC_MESSAGES/qof.mo -share/locale/id/LC_MESSAGES/qof.mo -share/locale/it/LC_MESSAGES/qof.mo -share/locale/pt/LC_MESSAGES/qof.mo -share/locale/pt_BR/LC_MESSAGES/qof.mo -share/locale/ro/LC_MESSAGES/qof.mo -share/locale/ru/LC_MESSAGES/qof.mo -share/locale/sv/LC_MESSAGES/qof.mo -share/locale/vi/LC_MESSAGES/qof.mo -share/locale/zh_CN/LC_MESSAGES/qof.mo +%%NLS%%share/locale/cs/LC_MESSAGES/qof.mo +%%NLS%%share/locale/de/LC_MESSAGES/qof.mo +%%NLS%%share/locale/fr/LC_MESSAGES/qof.mo +%%NLS%%share/locale/id/LC_MESSAGES/qof.mo +%%NLS%%share/locale/it/LC_MESSAGES/qof.mo +%%NLS%%share/locale/pt/LC_MESSAGES/qof.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/qof.mo +%%NLS%%share/locale/ro/LC_MESSAGES/qof.mo +%%NLS%%share/locale/ru/LC_MESSAGES/qof.mo +%%NLS%%share/locale/sv/LC_MESSAGES/qof.mo +%%NLS%%share/locale/vi/LC_MESSAGES/qof.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/qof.mo share/xml/qof/qsf/pilot-qsf-GnuCashInvoice.xml share/xml/qof/qsf/pilot-qsf-gncCustomer.xml share/xml/qof/qsf/qsf-map.xsd.xml From owner-svn-ports-branches@freebsd.org Mon Oct 19 14:22:47 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE509A190E6; Mon, 19 Oct 2015 14:22:47 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D0A21B21; Mon, 19 Oct 2015 14:22:47 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JEMkcj015932; Mon, 19 Oct 2015 14:22:46 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JEMkhP015930; Mon, 19 Oct 2015 14:22:46 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201510191422.t9JEMkhP015930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Mon, 19 Oct 2015 14:22:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399683 - in branches/2015Q4/audio/openal-soft: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 14:22:47 -0000 Author: danilo Date: Mon Oct 19 14:22:46 2015 New Revision: 399683 URL: https://svnweb.freebsd.org/changeset/ports/399683 Log: MFH: r399540 - Add a workaround for a problem caused by clang For some reason clang is breaking the code when openal-soft is built with optimizations. If the file alBuffer.c is built with -O1 the problem don't happens. See https://github.com/kcat/openal-soft/issues/18 The problem seems to happen just on CURRENT due the clang version. PR: 199488, 203818 Tested by: ohartman@zedat.fu-berlin.de Approved by: mva Approved by: ports-secteam (feld) Added: branches/2015Q4/audio/openal-soft/files/patch-OpenAL32_alBuffer.c - copied unchanged from r399540, head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Modified: branches/2015Q4/audio/openal-soft/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/audio/openal-soft/Makefile ============================================================================== --- branches/2015Q4/audio/openal-soft/Makefile Mon Oct 19 14:17:05 2015 (r399682) +++ branches/2015Q4/audio/openal-soft/Makefile Mon Oct 19 14:22:46 2015 (r399683) @@ -2,7 +2,7 @@ PORTNAME= openal-soft PORTVERSION= 1.16.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/openal-releases/ Copied: branches/2015Q4/audio/openal-soft/files/patch-OpenAL32_alBuffer.c (from r399540, head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Mon Oct 19 14:22:46 2015 (r399683, copy of r399540, head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c) @@ -0,0 +1,11 @@ +--- OpenAL32/alBuffer.c.orig 2015-09-21 20:22:13 UTC ++++ OpenAL32/alBuffer.c +@@ -1179,7 +1179,7 @@ static ALboolean DecomposeFormat(ALenum + { AL_7POINT1_16_SOFT, FmtX71, FmtShort }, + { AL_7POINT1_32F_SOFT, FmtX71, FmtFloat }, + }; +- ALuint i; ++ volatile ALuint i; + + for(i = 0;i < COUNTOF(list);i++) + { From owner-svn-ports-branches@freebsd.org Mon Oct 19 14:57:29 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96496A19BF0; Mon, 19 Oct 2015 14:57:29 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67E861AB7; Mon, 19 Oct 2015 14:57:29 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JEvSHa026465; Mon, 19 Oct 2015 14:57:28 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JEvSei026463; Mon, 19 Oct 2015 14:57:28 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510191457.t9JEvSei026463@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 19 Oct 2015 14:57:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399687 - branches/2015Q4/palm/jpilot X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 14:57:29 -0000 Author: amdmi3 Date: Mon Oct 19 14:57:28 2015 New Revision: 399687 URL: https://svnweb.freebsd.org/changeset/ports/399687 Log: MFH: r399686 - Add LICENSE_FILE - Switch to options helpers - Don't install COPYING which is handled by license framework - Fix build with disabled NLS Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2015Q4/palm/jpilot/Makefile branches/2015Q4/palm/jpilot/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/palm/jpilot/Makefile ============================================================================== --- branches/2015Q4/palm/jpilot/Makefile Mon Oct 19 14:56:30 2015 (r399686) +++ branches/2015Q4/palm/jpilot/Makefile Mon Oct 19 14:57:28 2015 (r399687) @@ -14,6 +14,7 @@ MAINTAINER?= samm@os2.kiev.ua COMMENT= Desktop Organizer Software for the Palm Pilot LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpisock.so:${PORTSDIR}/palm/pilot-link @@ -24,19 +25,14 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE} USE_GNOME+= gtk20 intltool -OPTIONS_DEFINE= DOCS NLS INSTALL_TARGET= install-strip -.include +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +NLS_USES_OFF= gettext-tools post-build: cd ${WRKSRC}/docs && ${MAKE_CMD} @@ -53,7 +49,7 @@ post-install: .for ext in html png jpg ${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${STAGEDIR}${DOCSDIR} .endfor -.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO +.for i in AUTHORS BUGS ChangeLog INSTALL README TODO ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/icons/README ${STAGEDIR}${DOCSDIR}/README.icons Modified: branches/2015Q4/palm/jpilot/pkg-plist ============================================================================== --- branches/2015Q4/palm/jpilot/pkg-plist Mon Oct 19 14:56:30 2015 (r399686) +++ branches/2015Q4/palm/jpilot/pkg-plist Mon Oct 19 14:57:28 2015 (r399687) @@ -12,7 +12,6 @@ man/man1/jpilot.1.gz share/applications/jpilot.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README @@ -69,23 +68,23 @@ share/applications/jpilot.desktop %%DATADIR%%/jpilotrc.green %%DATADIR%%/jpilotrc.purple %%DATADIR%%/jpilotrc.steel -share/locale/ca/LC_MESSAGES/jpilot.mo -share/locale/cs/LC_MESSAGES/jpilot.mo -share/locale/da/LC_MESSAGES/jpilot.mo -share/locale/de/LC_MESSAGES/jpilot.mo -share/locale/es/LC_MESSAGES/jpilot.mo -share/locale/fr/LC_MESSAGES/jpilot.mo -share/locale/it/LC_MESSAGES/jpilot.mo -share/locale/ja/LC_MESSAGES/jpilot.mo -share/locale/ko/LC_MESSAGES/jpilot.mo -share/locale/nb/LC_MESSAGES/jpilot.mo -share/locale/nl/LC_MESSAGES/jpilot.mo -share/locale/pt_BR/LC_MESSAGES/jpilot.mo -share/locale/ru/LC_MESSAGES/jpilot.mo -share/locale/rw/LC_MESSAGES/jpilot.mo -share/locale/sv/LC_MESSAGES/jpilot.mo -share/locale/tr/LC_MESSAGES/jpilot.mo -share/locale/uk/LC_MESSAGES/jpilot.mo -share/locale/vi/LC_MESSAGES/jpilot.mo -share/locale/zh_CN/LC_MESSAGES/jpilot.mo -share/locale/zh_TW/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ca/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/cs/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/da/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/de/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/es/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/fr/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/it/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ja/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ko/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/nb/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/nl/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/ru/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/rw/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/sv/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/tr/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/uk/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/vi/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo From owner-svn-ports-branches@freebsd.org Mon Oct 19 16:45:53 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3D65A10D13; Mon, 19 Oct 2015 16:45:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A57277F2; Mon, 19 Oct 2015 16:45:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JGjpfp059056; Mon, 19 Oct 2015 16:45:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JGjpNx059055; Mon, 19 Oct 2015 16:45:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510191645.t9JGjpNx059055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 19 Oct 2015 16:45:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399698 - branches/2015Q4/net/spread-j X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 16:45:53 -0000 Author: amdmi3 Date: Mon Oct 19 16:45:51 2015 New Revision: 399698 URL: https://svnweb.freebsd.org/changeset/ports/399698 Log: MFH: r399695 - Fix staging WITHOUT=DOCS Approved by: ports-secteam blanket Modified: branches/2015Q4/net/spread-j/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/net/spread-j/Makefile ============================================================================== --- branches/2015Q4/net/spread-j/Makefile Mon Oct 19 16:42:58 2015 (r399697) +++ branches/2015Q4/net/spread-j/Makefile Mon Oct 19 16:45:51 2015 (r399698) @@ -18,38 +18,35 @@ USE_JAVA= YES JAVA_VERSION= 1.6+ PKGMESSAGE= ${WRKSRC}/../license.txt -OPTIONS_DEFINE= DOCS EXAMPLES - ANT?= ${LOCALBASE}/bin/ant ANT_PARAMS+= -Dlib.dir=${STAGEDIR}${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/java PLIST_SUB+= PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}" -.include +PORTDOCS= * + +OPTIONS_DEFINE= DOCS EXAMPLES -.if empty(PORT_OPTIONS:MDOCS) -ANT_TARGET= jar -.else -ANT_TARGET= javadocs jar -PORTDOCS+= java -.endif +DOCS_VARS= DOCS_ANT_TARGET=javadocs do-build: (cd ${WRKSRC} && \ - ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} ${ANT_TARGET} ${ANT_PARAMS}) + ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} jar ${DOCS_ANT_TARGET} ${ANT_PARAMS}) do-install: (cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}) - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${EXAMPLESDIR}/java + +do-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/java ${INSTALL_DATA} ${WRKSRC}/recThread.java ${STAGEDIR}${EXAMPLESDIR}/java ${INSTALL_DATA} ${WRKSRC}/Flooder.java ${STAGEDIR}${EXAMPLESDIR}/java ${INSTALL_DATA} ${WRKSRC}/User.java ${STAGEDIR}${EXAMPLESDIR}/java - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java + +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/java ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/java - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java/html - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java/html/spread - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use + ${MKDIR} ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/java/html ${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${STAGEDIR}${DOCSDIR}/java/html ${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${STAGEDIR}${DOCSDIR}/java/html/spread From owner-svn-ports-branches@freebsd.org Mon Oct 19 17:15:55 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7721A18772; Mon, 19 Oct 2015 17:15:55 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D0551ADB; Mon, 19 Oct 2015 17:15:55 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JHFs3A068069; Mon, 19 Oct 2015 17:15:54 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JHFsRs068066; Mon, 19 Oct 2015 17:15:54 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201510191715.t9JHFsRs068066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 19 Oct 2015 17:15:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399702 - branches/2015Q4/devel/git X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 17:15:55 -0000 Author: garga Date: Mon Oct 19 17:15:54 2015 New Revision: 399702 URL: https://svnweb.freebsd.org/changeset/ports/399702 Log: MFH: r398669 Update devel/git to 2.6.1 Approved by: ports-secteam (delphij) Modified: branches/2015Q4/devel/git/Makefile branches/2015Q4/devel/git/distinfo branches/2015Q4/devel/git/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/devel/git/Makefile ============================================================================== --- branches/2015Q4/devel/git/Makefile Mon Oct 19 17:04:33 2015 (r399701) +++ branches/2015Q4/devel/git/Makefile Mon Oct 19 17:15:54 2015 (r399702) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.6.0 +DISTVERSION= 2.6.1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Modified: branches/2015Q4/devel/git/distinfo ============================================================================== --- branches/2015Q4/devel/git/distinfo Mon Oct 19 17:04:33 2015 (r399701) +++ branches/2015Q4/devel/git/distinfo Mon Oct 19 17:15:54 2015 (r399702) @@ -1,6 +1,6 @@ -SHA256 (git-2.6.0.tar.xz) = 211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6 -SIZE (git-2.6.0.tar.xz) = 3808872 -SHA256 (git-manpages-2.6.0.tar.xz) = 94c45cf2353f8e1bbb6b56b6f54289203319db4cc38d94f53fcfb8dc3b669615 -SIZE (git-manpages-2.6.0.tar.xz) = 380940 -SHA256 (git-htmldocs-2.6.0.tar.xz) = 0ba5d5d630e3235b74bcfb4ea2e9bbda8a3e619aaaf9e1f56e12dec5d8dc1d87 -SIZE (git-htmldocs-2.6.0.tar.xz) = 1016192 +SHA256 (git-2.6.1.tar.xz) = fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd +SIZE (git-2.6.1.tar.xz) = 3811268 +SHA256 (git-manpages-2.6.1.tar.xz) = e4cf64edcecd284d9ef4e6ca7fa0e8556d2414b5d9881a9abfe477f95b416391 +SIZE (git-manpages-2.6.1.tar.xz) = 381288 +SHA256 (git-htmldocs-2.6.1.tar.xz) = 791487ebd5a25456d41d8825ef450fdf3214898a328028d01acdb21a668052da +SIZE (git-htmldocs-2.6.1.tar.xz) = 1016516 Modified: branches/2015Q4/devel/git/pkg-plist ============================================================================== --- branches/2015Q4/devel/git/pkg-plist Mon Oct 19 17:04:33 2015 (r399701) +++ branches/2015Q4/devel/git/pkg-plist Mon Oct 19 17:15:54 2015 (r399702) @@ -1233,6 +1233,7 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.7.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.8.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.9.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.10.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.2.txt @@ -1243,11 +1244,14 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.7.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.8.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.9.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.10.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.1.txt %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css From owner-svn-ports-branches@freebsd.org Mon Oct 19 18:07:14 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20738A1947F; Mon, 19 Oct 2015 18:07:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B698419C1; Mon, 19 Oct 2015 18:07:13 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JI7CGL086000; Mon, 19 Oct 2015 18:07:12 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JI798b085959; Mon, 19 Oct 2015 18:07:09 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201510191807.t9JI798b085959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 19 Oct 2015 18:07:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399706 - in branches/2015Q4/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 18:07:14 -0000 Author: rene Date: Mon Oct 19 18:07:09 2015 New Revision: 399706 URL: https://svnweb.freebsd.org/changeset/ports/399706 Log: MFH: r399613 r399621 www/chromium: update to 46.0.2490.71 Submitted by: Christoph Moench-Tegeder Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/38 Security: http://vuxml.freebsd.org/freebsd/8301c04d-71df-11e5-9fcb-00262d5ed8ee.html www/chromium: actually update files in the base directory, this was missing from r399613 Submitted by: Jan Henrik Sylvester (via private mail) Approved by: portmgr (erwin) Added: branches/2015Q4/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp - copied unchanged from r399613, head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h - copied unchanged from r399613, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc - copied unchanged from r399613, head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc - copied unchanged from r399613, head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h - copied unchanged from r399613, head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc - copied unchanged from r399613, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc - copied unchanged from r399613, head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc - copied unchanged from r399613, head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc - copied unchanged from r399613, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc - copied unchanged from r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device.cc branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h - copied unchanged from r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device.h branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc - copied unchanged from r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Deleted: branches/2015Q4/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc branches/2015Q4/www/chromium/files/patch-media__video__capture__fake_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__video__capture__file_video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc branches/2015Q4/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h branches/2015Q4/www/chromium/files/patch-media__video__capture__video_capture_device.cc branches/2015Q4/www/chromium/files/patch-media__video__capture__video_capture_device.h branches/2015Q4/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc branches/2015Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2015Q4/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc Modified: branches/2015Q4/www/chromium/Makefile branches/2015Q4/www/chromium/distinfo branches/2015Q4/www/chromium/files/extra-patch-clang branches/2015Q4/www/chromium/files/extra-patch-gcc branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc branches/2015Q4/www/chromium/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/chromium/Makefile ============================================================================== --- branches/2015Q4/www/chromium/Makefile Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/Makefile Mon Oct 19 18:07:09 2015 (r399706) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 45.0.2454.101 +PORTVERSION= 46.0.2490.71 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -270,6 +270,13 @@ pre-configure: 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ + 'third_party/catapult' \ + 'third_party/catapult/tracing' \ + 'third_party/catapult/tracing/third_party' \ + 'third_party/catapult/tracing/third_party/tvcm' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/beautifulsoup' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ + 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ @@ -294,6 +301,7 @@ pre-configure: 'third_party/libsrtp' \ 'third_party/libvpx' \ 'third_party/libvpx/source/libvpx/third_party/x86inc' \ + 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ 'third_party/libyuv' \ @@ -324,11 +332,6 @@ pre-configure: 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ - 'third_party/trace-viewer' \ - 'third_party/trace-viewer/tracing' \ - 'third_party/trace-viewer/tracing/third_party' \ - 'third_party/trace-viewer/tracing/third_party/tvcm/third_party' \ - 'third_party/trace-viewer/tracing/third_party/tvcm/tvcm' \ 'third_party/usrsctp' \ 'third_party/web-animations-js' \ 'third_party/webdriver' \ @@ -346,6 +349,10 @@ pre-configure: ${GYP_DEFINES:C/^/-D/} || ${FALSE} # allow removal of third_party/adobe ${ECHO_CMD} > ${WRKSRC}/flapper_version.h + # missing file: file is in -testdata only, but configure stage + # will fail if it's not there. do not break TESTS build while + # allowing regular build without pulling in -testdata. + ${TOUCH} ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ Modified: branches/2015Q4/www/chromium/distinfo ============================================================================== --- branches/2015Q4/www/chromium/distinfo Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/distinfo Mon Oct 19 18:07:09 2015 (r399706) @@ -1,4 +1,4 @@ -SHA256 (chromium-45.0.2454.101.tar.xz) = 1b682dcaae9c89b2ebfdb192bb2f73c78c5b30a55103e7198fa3c1e21fed85fb -SIZE (chromium-45.0.2454.101.tar.xz) = 321015580 -SHA256 (chromium-45.0.2454.101-testdata.tar.xz) = 1d20a582d1dbfde75117940a85f9f94a935c6907be7a864e9d52511648c16d31 -SIZE (chromium-45.0.2454.101-testdata.tar.xz) = 115779764 +SHA256 (chromium-46.0.2490.71.tar.xz) = cd4b18249e64ee267236c9d4578effe810bf8f47567e2d43a5a8a7613787dcb6 +SIZE (chromium-46.0.2490.71.tar.xz) = 342402832 +SHA256 (chromium-46.0.2490.71-testdata.tar.xz) = 253cfe3ad27935e75a8ad3bbc9d7e204512e70bc26b6bcfefe63e37c1cc59894 +SIZE (chromium-46.0.2490.71-testdata.tar.xz) = 116966860 Modified: branches/2015Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-clang Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/extra-patch-clang Mon Oct 19 18:07:09 2015 (r399706) @@ -242,14 +242,14 @@ } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { ---- v8/src/runtime/runtime-i18n.cc 2015-04-15 00:32:37.000000000 +0200 -+++ v8/src/runtime/runtime-i18n.cc 2015-04-18 22:06:17.000000000 +0200 -@@ -627,7 +627,7 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 +@@ -358,7 +358,7 @@ + { + RefPtr buffer; - local_object->SetInternalField(0, reinterpret_cast(break_iterator)); - // Make sure that the pointer to adopted text is NULL. -- local_object->SetInternalField(1, reinterpret_cast(NULL)); -+ local_object->SetInternalField(1, static_cast(NULL)); - - Factory* factory = isolate->factory(); - Handle key = factory->NewStringFromStaticChars("breakIterator"); +- SkFontTableTag tag = WTF::bswap32(table); ++ SkFontTableTag tag = bswap32(table); + const size_t tableSize = m_typeface->getTableSize(tag); + if (tableSize) { + Vector tableBuffer(tableSize); Modified: branches/2015Q4/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2015Q4/www/chromium/files/extra-patch-gcc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/extra-patch-gcc Mon Oct 19 18:07:09 2015 (r399706) @@ -135,3 +135,15 @@ const char* suffix, const char* mode); struct AsDOT { +--- v8/src/log-utils.h.orig 2015-10-13 21:04:45.000000000 +0200 ++++ v8/src/log-utils.h 2015-10-17 10:17:35.535561000 +0200 +@@ -5,6 +5,9 @@ + #ifndef V8_LOG_UTILS_H_ + #define V8_LOG_UTILS_H_ + ++#include ++#include ++ + #include "src/allocation.h" + #include "src/base/platform/mutex.h" + #include "src/flags.h" Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,5 +1,5 @@ ---- base/process/process_info_linux.cc.orig 2015-06-20 15:12:38 -+++ base/process/process_info_linux.cc +--- base/process/process_info_linux.cc.orig 2015-10-14 16:18:44.939415000 +0200 ++++ base/process/process_info_linux.cc 2015-10-14 16:22:36.086176000 +0200 @@ -10,10 +10,28 @@ #include "base/process/process_handle.h" #include "base/time/time.h" @@ -12,7 +12,7 @@ + namespace base { - //static + // static const Time CurrentProcessInfo::CreationTime() { +#if defined(__FreeBSD__) || defined(__DragonFly__) + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,11 +1,24 @@ ---- chrome/browser/net/cookie_store_util.cc.orig 2015-07-21 21:42:54.358730000 -0400 -+++ chrome/browser/net/cookie_store_util.cc 2015-07-21 21:43:07.938330000 -0400 -@@ -85,7 +85,7 @@ - new ChromeCookieMonsterDelegate(profile)); - } +--- chrome/browser/net/cookie_store_util.cc.orig 2015-10-14 19:42:28.950909000 +0200 ++++ chrome/browser/net/cookie_store_util.cc 2015-10-14 19:43:32.447326000 +0200 +@@ -15,7 +15,7 @@ + + namespace chrome_browser_net { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) namespace { // Use the operating system's mechanisms to encrypt cookies before writing +@@ -67,10 +67,10 @@ + net::CookieCryptoDelegate* GetCookieCryptoDelegate() { + return g_cookie_crypto_delegate.Pointer(); + } +-#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + net::CookieCryptoDelegate* GetCookieCryptoDelegate() { + return NULL; + } +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace chrome_browser_net Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-04-19 00:04:55.000000000 +0200 -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-04-19 00:05:15.000000000 +0200 -@@ -249,7 +249,7 @@ +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-14 16:37:51.456856000 +0200 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 16:38:21.306588000 +0200 +@@ -273,7 +273,7 @@ #if !defined(OS_ANDROID) || url.host() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - || url.host() == chrome::kChromeUILinuxProxyConfigHost - || url.host() == chrome::kChromeUISandboxHost + || url.host() == chrome::kChromeUILinuxProxyConfigHost || + url.host() == chrome::kChromeUISandboxHost #endif Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon Oct 19 18:07:09 2015 (r399706) @@ -1,6 +1,6 @@ ---- chrome/chrome_browser_ui.gypi.orig 2015-07-15 16:29:59.000000000 -0400 -+++ chrome/chrome_browser_ui.gypi 2015-07-21 22:40:24.997217000 -0400 -@@ -2922,7 +2922,7 @@ +--- chrome/chrome_browser_ui.gypi.orig 2015-10-14 16:42:08.849931000 +0200 ++++ chrome/chrome_browser_ui.gypi 2015-10-14 16:45:35.205417000 +0200 +@@ -2921,7 +2921,7 @@ }], ], }], @@ -9,16 +9,16 @@ 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2930,7 +2930,7 @@ +@@ -2929,7 +2929,7 @@ '../build/linux/system.gyp:gio', ], }], - ['OS=="win" or OS=="mac" or desktop_linux==1', { + ['OS=="win" or OS=="mac" or desktop_linux==1 or os_bsd==1', { - 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], - }], - ['use_aura==1', { -@@ -3083,10 +3083,10 @@ + # A temporary define to make it easier to remove CrOS dependencies on + # avatar button code. TODO(estade): remove. + 'defines': [ 'FRAME_AVATAR_BUTTON=1', ], +@@ -3095,10 +3095,10 @@ }], ], }], Copied: branches/2015Q4/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp (from r399613, head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp) @@ -0,0 +1,11 @@ +--- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-10-14 23:35:23.943296000 +0200 ++++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-10-14 23:36:22.584477000 +0200 +@@ -19,7 +19,7 @@ + 'conditions': [ + ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}], + ['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}], +- ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}], ++ ['(OS!="linux" and OS!="freebsd") or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}], + ['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}], + ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}], + ['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}], Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h ============================================================================== --- branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Mon Oct 19 18:07:09 2015 (r399706) @@ -1,6 +1,15 @@ ---- chrome/common/chrome_paths.h.orig 2014-10-10 08:54:11 UTC -+++ chrome/common/chrome_paths.h -@@ -112,7 +112,7 @@ +--- chrome/common/chrome_paths.h.orig 2015-10-14 23:15:23.226535000 +0200 ++++ chrome/common/chrome_paths.h 2015-10-14 23:18:15.292087000 +0200 +@@ -50,7 +50,7 @@ + DIR_USER_APPLICATIONS, // ~/Applications + DIR_USER_LIBRARY, // ~/Library + #endif +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ ++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions + // on Chrome Mac and Chromium Linux. +@@ -114,7 +114,7 @@ DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx // files to be installed when managed user // session starts. @@ -9,3 +18,16 @@ DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts +@@ -133,10 +133,10 @@ + DIR_GEN_TEST_DATA, // Directory where generated test data resides. + DIR_TEST_DATA, // Directory where unit test data resides. + DIR_TEST_TOOLS, // Directory where unit test tools reside. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + PATH_END + }; Copied: branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h (from r399613, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h) @@ -0,0 +1,14 @@ +--- chrome/common/component_flash_hint_file_linux.h.orig 2015-10-15 10:25:32.927627000 +0200 ++++ chrome/common/component_flash_hint_file_linux.h 2015-10-15 10:25:53.911624000 +0200 +@@ -7,9 +7,9 @@ + + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) + #error "This file only applies to the Linux component update of Flash." +-#endif // !defined(OS_LINUX) ++#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) + + #include + Copied: branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc (from r399613, head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc) @@ -0,0 +1,16 @@ +--- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 16:34:04.903957000 +0200 ++++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 16:34:35.113096000 +0200 +@@ -4,7 +4,13 @@ + + #include "components/metrics/drive_metrics_provider.h" + ++#if defined(OS_BSD) ++#include ++#define MAJOR(dev) major(dev) ++#define MINOR(dev) minor(dev) ++#else + #include // For MAJOR()/MINOR(). ++#endif + #include + #include + Copied: branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc (from r399613, head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc) @@ -0,0 +1,18 @@ +--- content/browser/bluetooth/bluetooth_dispatcher_host.cc.orig 2015-10-14 22:52:01.308600000 +0200 ++++ content/browser/bluetooth/bluetooth_dispatcher_host.cc 2015-10-14 22:57:26.070951000 +0200 +@@ -191,6 +191,7 @@ + set_adapter(scoped_refptr()); + } + ++#if 0 + // Stores information associated with an in-progress requestDevice call. This + // will include the state of the active chooser dialog in a future patch. + struct BluetoothDispatcherHost::RequestDeviceSession { +@@ -201,6 +202,7 @@ + std::vector filters; + std::vector optional_services; + }; ++#endif + + void BluetoothDispatcherHost::set_adapter( + scoped_refptr adapter) { Copied: branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h (from r399613, head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h) @@ -0,0 +1,18 @@ +--- content/browser/bluetooth/bluetooth_dispatcher_host.h.orig 2015-10-14 22:52:05.596671000 +0200 ++++ content/browser/bluetooth/bluetooth_dispatcher_host.h 2015-10-14 22:58:17.694827000 +0200 +@@ -51,7 +51,14 @@ + friend class base::DeleteHelper; + friend struct BrowserThread::DeleteOnThread; + +- struct RequestDeviceSession; ++ struct RequestDeviceSession { ++ RequestDeviceSession(const std::vector& filters, ++ const std::vector& optional_services) ++ : filters(filters), optional_services(optional_services) {} ++ ++ std::vector filters; ++ std::vector optional_services; ++ }; + + // Set |adapter_| to a BluetoothAdapter instance and register observers, + // releasing references to previous |adapter_|. Copied: branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc (from r399613, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc) @@ -0,0 +1,10 @@ +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2015-10-14 23:20:02.027419000 +0200 ++++ content/browser/renderer_host/render_process_host_impl.cc 2015-10-14 23:20:29.597226000 +0200 +@@ -38,6 +38,7 @@ + #include "base/tracked_objects.h" + #include "cc/base/switches.h" + #include "components/tracing/tracing_switches.h" ++#include "content/common/bluetooth/bluetooth_scan_filter.h" + #include "content/browser/appcache/appcache_dispatcher_host.h" + #include "content/browser/appcache/chrome_appcache_service.h" + #include "content/browser/background_sync/background_sync_service_impl.h" Modified: branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,6 +1,6 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2015-07-15 16:30:04.000000000 -0400 -+++ device/serial/serial_io_handler_posix.cc 2015-07-22 07:27:41.841184000 -0400 -@@ -61,7 +61,7 @@ +--- device/serial/serial_io_handler_posix.cc.orig 2015-10-14 16:49:00.395597000 +0200 ++++ device/serial/serial_io_handler_posix.cc 2015-10-14 17:18:20.515698000 +0200 +@@ -59,7 +59,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) @@ -9,21 +9,3 @@ BITRATE_TO_SPEED_CASE(57600) BITRATE_TO_SPEED_CASE(115200) BITRATE_TO_SPEED_CASE(230400) -@@ -99,7 +99,7 @@ - SPEED_TO_BITRATE_CASE(9600) - SPEED_TO_BITRATE_CASE(19200) - SPEED_TO_BITRATE_CASE(38400) --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) - SPEED_TO_BITRATE_CASE(57600) - SPEED_TO_BITRATE_CASE(115200) - SPEED_TO_BITRATE_CASE(230400) -@@ -131,7 +131,7 @@ - return false; - } - return true; --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) - speed_t speed = static_cast(bitrate); - cfsetispeed(config, speed); - cfsetospeed(config, speed); Modified: branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,9 +1,9 @@ ---- device/usb/usb_service_impl.cc.orig 2015-09-01 16:10:43.000000000 -0400 -+++ device/usb/usb_service_impl.cc 2015-09-03 10:41:26.551811000 -0400 -@@ -19,7 +19,11 @@ - #include "components/device_event_log/device_event_log.h" +--- device/usb/usb_service_impl.cc.orig 2015-10-14 17:21:32.323520000 +0200 ++++ device/usb/usb_service_impl.cc 2015-10-14 17:28:13.062771000 +0200 +@@ -20,7 +20,11 @@ #include "device/usb/usb_device_handle.h" #include "device/usb/usb_error.h" + #include "device/usb/webusb_descriptors.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else @@ -12,33 +12,37 @@ #if defined(OS_WIN) #include -@@ -373,6 +377,7 @@ - weak_factory_(this) { - base::MessageLoop::current()->AddDestructionObserver(this); +@@ -541,6 +545,7 @@ + } + context_ = new UsbContext(platform_context); +#if !defined(OS_FREEBSD) - int rv = libusb_hotplug_register_callback( + rv = libusb_hotplug_register_callback( context_->context(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -391,14 +396,17 @@ - device_observer_.Add(device_monitor); +@@ -553,6 +558,8 @@ } - #endif // OS_WIN -+#endif // OS_FREEBSD + + RefreshDevices(); ++#endif // !OS_FREEBSD ++ + #if defined(OS_WIN) + DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); + if (device_monitor) { +@@ -562,10 +569,11 @@ } UsbServiceImpl::~UsbServiceImpl() { - base::MessageLoop::current()->RemoveDestructionObserver(this); - +- +#if !defined(OS_FREEBSD) if (hotplug_enabled_) { libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); } -+#endif // OS_FREEBSD ++#endif // !OS_FREEBSD for (const auto& map_entry : devices_) { map_entry.second->OnDisconnect(); } -@@ -630,6 +638,7 @@ +@@ -803,6 +811,7 @@ device->OnDisconnect(); } @@ -46,11 +50,11 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -667,6 +676,7 @@ +@@ -840,6 +849,7 @@ return 0; } -+#endif // !OS_FREEBSD ++#endif // !OS_FREEBSD void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc (from r399613, head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc) @@ -0,0 +1,11 @@ +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 17:33:35.934406000 +0200 ++++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 17:34:01.687650000 +0200 +@@ -51,7 +51,7 @@ + for (int n = 0; n < number_of_devices_; ++n) { + VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n), + base::StringPrintf("/dev/video%d", n) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + VideoCaptureDevice::Name::V4L2_SINGLE_PLANE + #elif defined(OS_MACOSX) Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc (from r399613, head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc) @@ -0,0 +1,11 @@ +--- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 17:42:06.832425000 +0200 ++++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 17:42:45.561757000 +0200 +@@ -49,7 +49,7 @@ + device_names->push_back(VideoCaptureDevice::Name( + command_line_file_path.value(), kFileVideoCaptureDeviceName, + VideoCaptureDevice::Name::AVFOUNDATION)); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + device_names->push_back(VideoCaptureDevice::Name( + command_line_file_path.value(), kFileVideoCaptureDeviceName, + VideoCaptureDevice::Name::V4L2_SINGLE_PLANE)); Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc (from r399613, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc) @@ -0,0 +1,40 @@ +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-10-14 17:46:45.617486000 +0200 ++++ media/capture/video/linux/video_capture_device_linux.cc 2015-10-14 21:44:58.276861000 +0200 +@@ -43,6 +43,7 @@ + + // Translates Video4Linux pixel formats to Chromium pixel formats. + // static ++#if !defined(OS_FREEBSD) + VideoCapturePixelFormat + VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc) { + return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc); +@@ -54,6 +55,7 @@ + bool favour_mjpeg) { + return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); + } ++#endif // !OS_FREEBSD + + const std::string VideoCaptureDevice::Name::GetModel() const { + // |unique_id| is of the form "/dev/video2". |file_name| is "video2". +@@ -88,6 +90,7 @@ + v4l2_thread_.Stop(); + } + ++#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::AllocateAndStart( + const VideoCaptureParams& params, + scoped_ptr client) { +@@ -130,6 +133,13 @@ + base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); + } + } ++#else // !OS_FREEBSD ++void VideoCaptureDeviceLinux::AllocateAndStart( ++ const VideoCaptureParams& params, ++ scoped_ptr client) {} ++void VideoCaptureDeviceLinux::StopAndDeAllocate() {} ++void VideoCaptureDeviceLinux::SetRotation(int rotation) {} ++#endif // !OS_FREEBSD + + // static + int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) { Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc (from r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device.cc) @@ -0,0 +1,31 @@ +--- media/capture/video/video_capture_device.cc.orig 2015-10-14 17:57:48.996214000 +0200 ++++ media/capture/video/video_capture_device.cc 2015-10-14 18:00:26.654041000 +0200 +@@ -9,6 +9,10 @@ + + namespace media { + ++const std::string VideoCaptureDevice::Name::GetModel() const { ++ return ""; ++} ++ + const std::string VideoCaptureDevice::Name::GetNameAndModel() const { + const std::string model_id = GetModel(); + if (model_id.empty()) +@@ -26,7 +30,7 @@ + : device_name_(name), unique_id_(id) { + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + VideoCaptureDevice::Name::Name(const std::string& name, + const std::string& id, + const CaptureApiType api_type) +@@ -73,7 +77,7 @@ + VideoCaptureDevice::Name::~Name() { + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const { + switch (capture_api_type()) { + case V4L2_SINGLE_PLANE: Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h (from r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device.h) @@ -0,0 +1,38 @@ +--- media/capture/video/video_capture_device.h.orig 2015-10-14 18:04:30.325845000 +0200 ++++ media/capture/video/video_capture_device.h 2015-10-14 18:06:41.271627000 +0200 +@@ -43,7 +43,7 @@ + Name(); + Name(const std::string& name, const std::string& id); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Linux/CrOS targets Capture Api type: it can only be set on construction. + enum CaptureApiType { + V4L2_SINGLE_PLANE, +@@ -75,7 +75,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + Name(const std::string& name, + const std::string& id, + const CaptureApiType api_type); +@@ -112,7 +112,7 @@ + bool operator<(const Name& other) const { return unique_id_ < other.id(); } + + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + CaptureApiType capture_api_type() const { + return capture_api_class_.capture_api_type(); + } +@@ -136,7 +136,7 @@ + std::string device_name_; + std::string unique_id_; + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + // This class wraps the CaptureApiType to give it a by default value if not + // initialized. + class CaptureApiClass { Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc (from r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Mon Oct 19 18:07:09 2015 (r399706, copy of r399613, head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc) @@ -0,0 +1,21 @@ +--- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 18:11:45.655658000 +0200 ++++ media/capture/video/video_capture_device_factory.cc 2015-10-14 18:13:09.785092000 +0200 +@@ -14,6 +14,10 @@ + // static + scoped_ptr VideoCaptureDeviceFactory::CreateFactory( + scoped_refptr ui_task_runner) { ++#if defined(OS_BSD) ++ return scoped_ptr(new ++ media::FakeVideoCaptureDeviceFactory()); ++#else + const base::CommandLine* command_line = + base::CommandLine::ForCurrentProcess(); + // Use a Fake or File Video Device Factory if the command line flags are +@@ -32,6 +36,7 @@ + return scoped_ptr( + CreateVideoCaptureDeviceFactory(ui_task_runner)); + } ++#endif + } + + VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { Modified: branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi ============================================================================== --- branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi Mon Oct 19 18:07:09 2015 (r399706) @@ -1,9 +1,9 @@ ---- skia/skia_chrome.gypi.orig 2015-01-21 20:28:18 UTC -+++ skia/skia_chrome.gypi -@@ -87,6 +87,11 @@ - 'ext/vector_platform_device_skia.h', - ], - 'conditions': [ +--- skia/skia_chrome.gypi.orig 2015-10-14 18:24:42.938769000 +0200 ++++ skia/skia_chrome.gypi 2015-10-14 18:22:24.515306000 +0200 +@@ -60,6 +60,11 @@ + 'ext/platform_canvas.cc', + ], + }], + [ 'use_cairo == 1', { + 'dependencies': [ + '../build/linux/system.gyp:pangocairo', Modified: branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp Mon Oct 19 18:07:09 2015 (r399706) @@ -1,20 +1,20 @@ ---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-10-10 09:15:55 UTC -+++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp -@@ -1052,7 +1052,7 @@ - //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend) - FX_BOOL CJS_PublicMethods::AFNumber_Format(OBJ_METHOD_PARAMS) - { +--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2015-10-14 18:30:46.180316000 +0200 ++++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp 2015-10-14 18:31:44.759135000 +0200 +@@ -910,7 +910,7 @@ + const CJS_Parameters& params, + CJS_Value& vRet, + CFX_WideString& sError) { -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_ - v8::Isolate* isolate = ::GetIsolate(cc); - CJS_Context* pContext = (CJS_Context *)cc; - ASSERT(pContext != NULL); -@@ -1393,7 +1393,7 @@ - //function AFPercent_Format(nDec, sepStyle) - FX_BOOL CJS_PublicMethods::AFPercent_Format(OBJ_METHOD_PARAMS) - { + v8::Isolate* isolate = ::GetIsolate(cc); + CJS_Context* pContext = (CJS_Context*)cc; + ASSERT(pContext != NULL); +@@ -1213,7 +1213,7 @@ + const CJS_Parameters& params, + CJS_Value& vRet, + CFX_WideString& sError) { -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_ - CJS_Context* pContext = (CJS_Context *)cc; - ASSERT(pContext != NULL); - CJS_EventHandler* pEvent = pContext->GetEventHandler(); + CJS_Context* pContext = (CJS_Context*)cc; + ASSERT(pContext != NULL); + CJS_EventHandler* pEvent = pContext->GetEventHandler(); Modified: branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp ============================================================================== --- branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Mon Oct 19 18:07:09 2015 (r399706) @@ -1,28 +1,28 @@ ---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2015-07-15 16:31:51.000000000 -0400 -+++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2015-07-22 18:15:27.210562000 -0400 -@@ -747,11 +747,12 @@ +--- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2015-10-14 18:34:09.173122000 +0200 ++++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2015-10-14 18:36:12.927162000 +0200 +@@ -908,11 +908,12 @@ + // JavaScript time implement begin. - double _getLocalTZA() - { -+ struct tm *lt; - if(!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS)) - return 0; - time_t t = 0; - time(&t); -- localtime(&t); -+ lt = localtime(&t); + double _getLocalTZA() { ++ struct tm *lt; + if (!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS)) + return 0; + time_t t = 0; + time(&t); +- localtime(&t); ++ lt = localtime(&t); #if _MSC_VER >= 1900 // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global // variable declared in time.h. That variable was deprecated and in VS 2015 -@@ -759,7 +760,11 @@ +@@ -920,7 +921,11 @@ long timezone = 0; _get_timezone(&timezone); #endif +#ifdef __FreeBSD__ -+ return (double)(-(lt->tm_gmtoff * 1000)); ++ return (double)(-(lt->tm_gmtoff * 1000)); +#else - return (double)(-(timezone * 1000)); + return (double)(-(timezone * 1000)); +#endif } - int _getDaylightSavingTA(double d) + int _getDaylightSavingTA(double d) { Modified: branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/systeminfo.cc.orig 2015-06-11 20:19:52 UTC -+++ third_party/webrtc/base/systeminfo.cc -@@ -19,8 +19,12 @@ +--- third_party/webrtc/base/systeminfo.cc.orig 2015-10-14 18:48:28.088649000 +0200 ++++ third_party/webrtc/base/systeminfo.cc 2015-10-14 18:57:35.819790000 +0200 +@@ -20,8 +20,12 @@ #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #include #include @@ -14,32 +14,27 @@ #endif #if defined(WEBRTC_MAC) #include -@@ -31,7 +35,7 @@ - #include "webrtc/base/win32.h" - #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) - #include "webrtc/base/macconversion.h" --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRT_BSD) - #include "webrtc/base/linux.h" - #endif - #include "webrtc/base/common.h" -@@ -168,6 +172,19 @@ +@@ -66,7 +70,7 @@ + SYSTEM_INFO si; + GetSystemInfo(&si); + number_of_cores = static_cast(si.dwNumberOfProcessors); +-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) + number_of_cores = static_cast(sysconf(_SC_NPROCESSORS_ONLN)); + #elif defined(WEBRTC_MAC) + int name[] = {CTL_HW, HW_AVAILCPU}; +@@ -174,9 +178,13 @@ + LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed."; } - #elif defined(__native_client__) - // TODO(ryanpetrie): Implement this via PPAPI when it's available. -+#elif defined(OS_FREEBSD) -+ int sysctl_value; -+ size_t length = sizeof(sysctl_value); -+ if (!sysctlbyname("hw.ncpu", &sysctl_value, &length, NULL, 0)) { -+ physical_cpus_ = sysctl_value; -+ } -+#if !defined(__DragonFly__) -+ if (!sysctlbyname("kern.smp.cpus", &sysctl_value, &length, NULL, 0)) { -+ logical_cpus_ = sysctl_value; -+ } -+#endif -+ // L3 / L2 cache size? -+ // CPU family/model/stepping (available in dmesg, kernel only TODO) + +-#elif defined(WEBRTC_MAC) ++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) + size_t len = sizeof(memory); ++ #if defined(WEBRTC_MAC) + int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0); ++ #else ++ int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0); ++ #endif + if (error || memory == 0) + memory = -1; #else // WEBRTC_LINUX - ProcCpuInfo proc_info; - if (proc_info.LoadFromSystem()) { Modified: branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,9 +1,9 @@ ---- ui/gl/gl_surface_glx.cc.orig 2015-04-14 18:31:23.000000000 -0400 -+++ ui/gl/gl_surface_glx.cc 2015-04-28 08:44:08.840888000 -0400 -@@ -57,7 +57,7 @@ +--- ui/gl/gl_surface_glx.cc.orig 2015-10-14 19:05:53.638848000 +0200 ++++ ui/gl/gl_surface_glx.cc 2015-10-14 19:06:56.014680000 +0200 +@@ -48,7 +48,7 @@ bool g_glx_sgi_video_sync_supported = false; - static const base::TimeDelta kGetVSyncParametersMinPeriod = + static const int kGetVSyncParametersMinSeconds = -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // See crbug.com/373489 Modified: branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,24 +1,24 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2015-04-14 18:19:00.000000000 -0400 -+++ ui/gl/sync_control_vsync_provider.cc 2015-04-28 08:42:41.263448000 -0400 -@@ -9,7 +9,7 @@ - #include "base/logging.h" +--- ui/gl/sync_control_vsync_provider.cc.orig 2015-10-14 19:12:40.408387000 +0200 ++++ ui/gl/sync_control_vsync_provider.cc 2015-10-14 19:13:44.335913000 +0200 +@@ -10,7 +10,7 @@ #include "base/time/time.h" + #include "base/trace_event/trace_event.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64 kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -35,7 +35,7 @@ - +@@ -37,7 +37,7 @@ void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { + TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::TimeTicks timebase; // The actual clock used for the system time returned by glXGetSyncValuesOML -@@ -151,7 +151,7 @@ +@@ -153,7 +153,7 @@ last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); Modified: branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd ============================================================================== --- branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd Mon Oct 19 18:07:09 2015 (r399706) @@ -1,9 +1,9 @@ ---- ui/resources/ui_resources.grd.orig 2014-10-10 09:15:32 UTC -+++ ui/resources/ui_resources.grd -@@ -39,7 +39,7 @@ - - - +--- ui/resources/ui_resources.grd.orig 2015-10-14 19:18:12.855975000 +0200 ++++ ui/resources/ui_resources.grd 2015-10-14 19:18:28.057725000 +0200 +@@ -15,7 +15,7 @@ + - + Modified: branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,11 +1,11 @@ ---- ui/views/bubble/bubble_delegate.cc.orig 2015-04-14 18:31:23.000000000 -0400 -+++ ui/views/bubble/bubble_delegate.cc 2015-04-28 08:17:15.923055000 -0400 -@@ -104,7 +104,7 @@ +--- ui/views/bubble/bubble_delegate.cc.orig 2015-10-14 19:28:13.258489000 +0200 ++++ ui/views/bubble/bubble_delegate.cc 2015-10-14 19:28:52.612078000 +0200 +@@ -106,7 +106,7 @@ // the parent frame and let DWM handle compositing. If not, then we don't // want to allow the bubble to extend the frame because it will be clipped. bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) // Linux clips bubble windows that extend outside their parent window bounds. + // Mac never adjusts. bubble_delegate->set_adjust_if_offscreen(false); - #endif Modified: branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc ============================================================================== --- branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc Mon Oct 19 18:07:09 2015 (r399706) @@ -1,15 +1,6 @@ ---- ui/views/controls/button/label_button.cc.orig Thu May 14 00:23:12 2015 -+++ ui/views/controls/button/label_button.cc Wed May 20 08:34:57 2015 -@@ -17,7 +17,7 @@ - #include "ui/views/painter.h" - #include "ui/views/window/dialog_delegate.h" - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -26,7 +26,7 @@ +--- ui/views/controls/button/label_button.cc.orig 2015-10-14 19:31:24.349106000 +0200 ++++ ui/views/controls/button/label_button.cc 2015-10-14 19:35:30.925886000 +0200 +@@ -23,7 +23,7 @@ // The default spacing between the icon and text. const int kSpacing = 5; @@ -18,7 +9,7 @@ // Default text and shadow colors for STYLE_BUTTON. const SkColor kStyleButtonTextColor = SK_ColorBLACK; const SkColor kStyleButtonShadowColor = SK_ColorWHITE; -@@ -406,7 +406,7 @@ +@@ -401,7 +401,7 @@ // confusion. These details should either be pushed into ui::NativeThemeWin // or should be obsoleted by rendering buttons with paint calls instead of // with static assets. http://crbug.com/350498 @@ -27,12 +18,3 @@ constant_text_color = true; colors[STATE_NORMAL] = kStyleButtonTextColor; label_->SetBackgroundColor(theme->GetSystemColor( -@@ -443,7 +443,7 @@ - - scoped_ptr label_button_border = CreateDefaultBorder(); - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - views::LinuxUI* linux_ui = views::LinuxUI::instance(); - if (linux_ui) { - SetBorder(linux_ui->CreateNativeBorder( Modified: branches/2015Q4/www/chromium/pkg-plist ============================================================================== --- branches/2015Q4/www/chromium/pkg-plist Mon Oct 19 18:05:47 2015 (r399705) +++ branches/2015Q4/www/chromium/pkg-plist Mon Oct 19 18:07:09 2015 (r399706) @@ -114,10 +114,10 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png -%%DATADIR%%/resources/inspector/Images/securityStateHttp.png -%%DATADIR%%/resources/inspector/Images/securityStateHttp_2x.png %%DATADIR%%/resources/inspector/Images/securityStateInsecure.png %%DATADIR%%/resources/inspector/Images/securityStateInsecure_2x.png +%%DATADIR%%/resources/inspector/Images/securityStateNeutral.png +%%DATADIR%%/resources/inspector/Images/securityStateNeutral_2x.png %%DATADIR%%/resources/inspector/Images/securityStateSecure.png %%DATADIR%%/resources/inspector/Images/securityStateSecure_2x.png %%DATADIR%%/resources/inspector/Images/securityStateWarning.png @@ -127,7 +127,6 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png %%DATADIR%%/resources/inspector/Images/speech.png -%%DATADIR%%/resources/inspector/Images/spinner.svg %%DATADIR%%/resources/inspector/Images/thumbActiveHoriz.png %%DATADIR%%/resources/inspector/Images/thumbActiveVert.png %%DATADIR%%/resources/inspector/Images/thumbHoriz.png @@ -154,6 +153,18 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/elements_module.js %%DATADIR%%/resources/inspector/emulated_devices_module.js +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-2x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-1x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-2x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-1x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-2x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-1x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-2x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-1x.png +%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-2x.png %%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js %%DATADIR%%/resources/inspector/inspector.css %%DATADIR%%/resources/inspector/inspector.html From owner-svn-ports-branches@freebsd.org Mon Oct 19 18:15:02 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE43BA195E6; Mon, 19 Oct 2015 18:15:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 870531D8C; Mon, 19 Oct 2015 18:15:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JIF1K6089004; Mon, 19 Oct 2015 18:15:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JIF1is089003; Mon, 19 Oct 2015 18:15:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510191815.t9JIF1is089003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 19 Oct 2015 18:15:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399707 - branches/2015Q4/audio/etktab X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 18:15:02 -0000 Author: amdmi3 Date: Mon Oct 19 18:15:01 2015 New Revision: 399707 URL: https://svnweb.freebsd.org/changeset/ports/399707 Log: MFH: r399692 - Fix build WITHOUT=DOCS - Add NO_ARCH Approved by: ports-secteam blanket Modified: branches/2015Q4/audio/etktab/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/audio/etktab/Makefile ============================================================================== --- branches/2015Q4/audio/etktab/Makefile Mon Oct 19 18:07:09 2015 (r399706) +++ branches/2015Q4/audio/etktab/Makefile Mon Oct 19 18:15:01 2015 (r399707) @@ -14,10 +14,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Guitar tablature editor -OPTIONS_DEFINE= DOCS - USES= tk NO_BUILD= yes +NO_ARCH= yes WRKSRC= ${WRKDIR}/eTktab-${PORTVERSION} PLIST_FILES= bin/${PORTNAME} @@ -28,16 +27,19 @@ DOCS_DISTFILES= canada_multi-3.2.etk:key uk-3.2.etk:keyboard \ us-3.2.etk:keyboard +OPTIONS_DEFINE= DOCS + post-patch: ${REINPLACE_CMD} -e 's|wish|${WISH}|g' ${WRKSRC}/eTktab -post-extract: +post-extract-DOCS-on: .for FILE in canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk @${CP} ${DISTDIR}/${DIST_SUBDIR}/${FILE} ${WRKSRC} .endfor do-install: ${INSTALL_SCRIPT} ${WRKSRC}/eTktab ${STAGEDIR}${PREFIX}/bin/etktab + do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in CHANGES.html LICENSE.html README.html eTktab-small.xpm eTktab.xpm \ From owner-svn-ports-branches@freebsd.org Wed Oct 21 03:37:03 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 312F0A19912; Wed, 21 Oct 2015 03:37:03 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D41271EF; Wed, 21 Oct 2015 03:37:02 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9L3b1j8001983; Wed, 21 Oct 2015 03:37:01 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9L3b1d2001981; Wed, 21 Oct 2015 03:37:01 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510210337.t9L3b1d2001981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Wed, 21 Oct 2015 03:37:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399885 - branches/2015Q4/sysutils/filewatcherd X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 03:37:03 -0000 Author: koobs Date: Wed Oct 21 03:37:01 2015 New Revision: 399885 URL: https://svnweb.freebsd.org/changeset/ports/399885 Log: MFH: r399801 sysutils/filewatcherd: Update to 1.0-beta3 - Update PORTVERSION and distinfo checksum - Reset PORTREVISION This update unbreaks use on FreeBSD versions > 10 and adds man pages for filewatcherd(8) and and watchtab(5). While I'm here: - Add LICENSE_FILE PR: 203881 Submitted by: Natacha Porte (maintainer) Approved by: portmgr (bdrewery) Modified: branches/2015Q4/sysutils/filewatcherd/Makefile branches/2015Q4/sysutils/filewatcherd/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/sysutils/filewatcherd/Makefile ============================================================================== --- branches/2015Q4/sysutils/filewatcherd/Makefile Wed Oct 21 00:33:00 2015 (r399884) +++ branches/2015Q4/sysutils/filewatcherd/Makefile Wed Oct 21 03:37:01 2015 (r399885) @@ -2,26 +2,28 @@ # $FreeBSD$ PORTNAME= filewatcherd -PORTVERSION= 1.0b2 -PORTREVISION= 1 +PORTVERSION= 1.0b3 CATEGORIES= sysutils MAINTAINER= natbsd@instinctive.eu COMMENT= Daemon that watches files and runs commands when they change LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= faelys -GH_TAGNAME= 1.0-beta2 +GH_TAGNAME= 1.0-beta3 USE_RC_SUBR= filewatcherd SUB_FILES= pkg-message -PLIST_FILES= sbin/filewatcherd etc/watchtab.sample +PLIST_FILES= sbin/filewatcherd etc/watchtab.sample man/man8/filewatcherd.8.gz man/man5/watchtab.5.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/filewatcherd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/filewatcherd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/watchtab.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 ${INSTALL_DATA} ${FILESDIR}/watchtab.sample ${STAGEDIR}${PREFIX}/etc .include Modified: branches/2015Q4/sysutils/filewatcherd/distinfo ============================================================================== --- branches/2015Q4/sysutils/filewatcherd/distinfo Wed Oct 21 00:33:00 2015 (r399884) +++ branches/2015Q4/sysutils/filewatcherd/distinfo Wed Oct 21 03:37:01 2015 (r399885) @@ -1,2 +1,2 @@ -SHA256 (faelys-filewatcherd-1.0b2-1.0-beta2_GH0.tar.gz) = 3a724d78a1be3edb325e37f5fc5410775b702d732ca7f89f353affdedbe63007 -SIZE (faelys-filewatcherd-1.0b2-1.0-beta2_GH0.tar.gz) = 12911 +SHA256 (faelys-filewatcherd-1.0b3-1.0-beta3_GH0.tar.gz) = c15351b1eabf94b8edd598b2b992ab571a15690f8de11d48209468c4e4008aa5 +SIZE (faelys-filewatcherd-1.0b3-1.0-beta3_GH0.tar.gz) = 14301 From owner-svn-ports-branches@freebsd.org Wed Oct 21 03:54:35 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8BF3A19E87; Wed, 21 Oct 2015 03:54:34 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C08AFBE6; Wed, 21 Oct 2015 03:54:34 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9L3sXTD007824; Wed, 21 Oct 2015 03:54:33 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9L3sXG8007821; Wed, 21 Oct 2015 03:54:33 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510210354.t9L3sXG8007821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Wed, 21 Oct 2015 03:54:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399886 - in branches/2015Q4/editors/sublime3: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 03:54:35 -0000 Author: koobs Date: Wed Oct 21 03:54:33 2015 New Revision: 399886 URL: https://svnweb.freebsd.org/changeset/ports/399886 Log: MFH: r399802 editors/sublime3: Fix opening filepaths with spaces Sublime 3 contains a wrapper script at /usr/local/bin/sublime to ensure that /dev/shm is set up correctly, and it's currently passing arguments to the real binary incorrectly. It currently causes sublime to incorrectly open any file where the path contains a space. - Modify sublime.in to open filepaths with spaces correctly - Bump PORTREVISION While I'm here: - Sort USES - Group USE{S} lines - Pet portlint (make patch `makepatch` compliant) PR: 203783 Submitted by: Miguel (maintainer) Approved by: portmgr (bdrewery) Modified: branches/2015Q4/editors/sublime3/Makefile branches/2015Q4/editors/sublime3/files/patch-sublime_text.desktop branches/2015Q4/editors/sublime3/files/sublime.in Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/editors/sublime3/Makefile ============================================================================== --- branches/2015Q4/editors/sublime3/Makefile Wed Oct 21 03:37:01 2015 (r399885) +++ branches/2015Q4/editors/sublime3/Makefile Wed Oct 21 03:54:33 2015 (r399886) @@ -3,6 +3,7 @@ PORTNAME= sublime PORTVERSION= 3.0.83 +PORTREVISION= 1 CATEGORIES= editors linux MASTER_SITES= http://c758482.r82.cf2.rackcdn.com/ PKGNAMEPREFIX= linux- @@ -11,7 +12,10 @@ DISTNAME= sublime_text_3_build_3083_x32 MAINTAINER= miguelmclara@gmail.com COMMENT= Sophisticated text editor for code, markup and prose -USES= tar:bzip2 desktop-file-utils +USES= desktop-file-utils tar:bzip2 +USE_LINUX= c6 +USE_LINUX_APPS= xorglibs gtk2 + INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/sublime_text_3 @@ -20,9 +24,6 @@ CONFLICTS= linux-sublime-[0-24-9]* NO_BUILD= SUB_FILES= sublime -USE_LINUX= c6 -USE_LINUX_APPS= xorglibs gtk2 - post-patch: ${BRANDELF} -t Linux ${WRKSRC}/sublime_text ${BRANDELF} -t Linux ${WRKSRC}/plugin_host Modified: branches/2015Q4/editors/sublime3/files/patch-sublime_text.desktop ============================================================================== --- branches/2015Q4/editors/sublime3/files/patch-sublime_text.desktop Wed Oct 21 03:37:01 2015 (r399885) +++ branches/2015Q4/editors/sublime3/files/patch-sublime_text.desktop Wed Oct 21 03:54:33 2015 (r399886) @@ -1,6 +1,6 @@ ---- sublime_text.desktop.orig 2014-08-27 -+++ sublime_text.desktop -@@ -4,20 +4,9 @@ +--- sublime_text.desktop.orig 2015-03-26 07:23:04 UTC ++++ sublime_text.desktop +@@ -4,20 +4,9 @@ Type=Application Name=Sublime Text GenericName=Text Editor Comment=Sophisticated text editor for code, markup and prose Modified: branches/2015Q4/editors/sublime3/files/sublime.in ============================================================================== --- branches/2015Q4/editors/sublime3/files/sublime.in Wed Oct 21 03:37:01 2015 (r399885) +++ branches/2015Q4/editors/sublime3/files/sublime.in Wed Oct 21 03:54:33 2015 (r399886) @@ -1,6 +1,6 @@ #!/compat/linux/bin/sh if [ -L "/dev/shm" ];then - %%DATADIR%%/sublime_text $* + %%DATADIR%%/sublime_text "$@" else echo "Some Linux applications use shared memory. From owner-svn-ports-branches@freebsd.org Wed Oct 21 03:56:39 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84C51A19F9E; Wed, 21 Oct 2015 03:56:39 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E2EFE1B; Wed, 21 Oct 2015 03:56:39 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9L3ucPR008052; Wed, 21 Oct 2015 03:56:38 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9L3ucXR008051; Wed, 21 Oct 2015 03:56:38 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510210356.t9L3ucXR008051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Wed, 21 Oct 2015 03:56:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399887 - branches/2015Q4/graphics/zathura-pdf-mupdf X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 03:56:39 -0000 Author: koobs Date: Wed Oct 21 03:56:38 2015 New Revision: 399887 URL: https://svnweb.freebsd.org/changeset/ports/399887 Log: MFH: r399805 graphics/zathura-pdf-mupdf: Add missing LIB_DEPENDS Add missing jbig2dec and openjpeg to LIB_DEPENDS, registering them as run-time dependencies. Without this change, both packages are removed during pkg autoremove, resulting in the inability to open PDF files. PR: 203850 Submitted by: Zsolt Udvari (maintainer) Approved by: portmgr (bdrewery) Modified: branches/2015Q4/graphics/zathura-pdf-mupdf/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/graphics/zathura-pdf-mupdf/Makefile ============================================================================== --- branches/2015Q4/graphics/zathura-pdf-mupdf/Makefile Wed Oct 21 03:54:33 2015 (r399886) +++ branches/2015Q4/graphics/zathura-pdf-mupdf/Makefile Wed Oct 21 03:56:38 2015 (r399887) @@ -3,7 +3,7 @@ PORTNAME= zathura-pdf-mupdf PORTVERSION= 0.2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura-pdf-mupdf/download/ @@ -18,6 +18,8 @@ LICENSE_PERMS= dist-mirror pkg-mirror au BUILD_DEPENDS= zathura:${PORTSDIR}/graphics/zathura \ mupdf>=1.7,1:${PORTSDIR}/graphics/mupdf RUN_DEPENDS= zathura:${PORTSDIR}/graphics/zathura +LIB_DEPENDS= libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ + libopenjp2.so:${PORTSDIR}/graphics/openjpeg PLIST_FILES= lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop From owner-svn-ports-branches@freebsd.org Wed Oct 21 08:32:53 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E54FA1AB43; Wed, 21 Oct 2015 08:32:53 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A34DB64; Wed, 21 Oct 2015 08:32:53 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9L8Wqt6087642; Wed, 21 Oct 2015 08:32:52 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9L8WqrZ087641; Wed, 21 Oct 2015 08:32:52 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201510210832.t9L8WqrZ087641@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Wed, 21 Oct 2015 08:32:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399894 - branches/2015Q4/lang/fpc-units X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 08:32:53 -0000 Author: marino Date: Wed Oct 21 08:32:52 2015 New Revision: 399894 URL: https://svnweb.freebsd.org/changeset/ports/399894 Log: MFH: r399101 lang/fpc-units: Finally fix default build on FreeBSD 9 On FreeBSD9, libEGL is built by GCC which requires binutils as a run depends. fpc-cairo requires libEGL. fpc-libbfd and binutils conflict with each other due to both installing the same header. Thus, on FreeBSD 9, the BFD and CAIRO options cannot coexist. Since both were set on by default, no binary package for fpc-units has built for months. Since there is no mechanism to set options by release, I use bmake's exist() function to check for /usr/include/lwres which only exists on FreeBSD 9. If it's present, the BFD option is disabled by default. This should restore the building of the fpc-units package on FreeBSD 9. Reported by: pkg-fallout (for months) Approved by: ports-secteam (feld) Modified: branches/2015Q4/lang/fpc-units/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/lang/fpc-units/Makefile ============================================================================== --- branches/2015Q4/lang/fpc-units/Makefile Wed Oct 21 08:26:20 2015 (r399893) +++ branches/2015Q4/lang/fpc-units/Makefile Wed Oct 21 08:32:52 2015 (r399894) @@ -96,7 +96,7 @@ X11_DESC= Interface to X windows server XFORMS_DESC= Interface to X-Forms ZLIB_DESC= Interface to the zlib compression library -OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \ +OPTIONS_DEFAULT=A52 ASPELL BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \ FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \ FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPINDEXER \ FPMKUNIT FPPKG FV GDBM GMP GTK2 HERMES ICONVENC \ @@ -105,6 +105,12 @@ OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAI PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \ UTMP UUID X11 XFORMS ZLIB +.if !exists(/usr/include/lwres) # directory only exists on FreeBSD 9 +# On FreeBSD 9, CAIRO is built with GCC which pulls in binutils +# binutils and BFD conflict, so BFD and CAIRO cannot coexist of F9 +OPTIONS_DEFAULT+= BFD +.endif + .include UNITS_SELECTED= # From owner-svn-ports-branches@freebsd.org Wed Oct 21 10:28:20 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86B53A1A693; Wed, 21 Oct 2015 10:28:20 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31FA083E; Wed, 21 Oct 2015 10:28:20 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9LASJ5Y019594; Wed, 21 Oct 2015 10:28:19 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9LASJhf019592; Wed, 21 Oct 2015 10:28:19 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201510211028.t9LASJhf019592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 21 Oct 2015 10:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399898 - branches/2015Q4/www/codeigniter X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 10:28:20 -0000 Author: junovitch Date: Wed Oct 21 10:28:18 2015 New Revision: 399898 URL: https://svnweb.freebsd.org/changeset/ports/399898 Log: MFH: r399799 www/codeigniter: update 2.2.4 -> 2.2.5 - Convert to USE_GITHUB as 2.2.5 was not available at original MASTER_SITES PR: 203403 Approved by: maintainer timeout (21 days) Approved by: portmgr (bdrewery) Security: https://vuxml.FreeBSD.org/freebsd/95602550-76cf-11e5-a2a1-002590263bf5.html Modified: branches/2015Q4/www/codeigniter/Makefile branches/2015Q4/www/codeigniter/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/codeigniter/Makefile ============================================================================== --- branches/2015Q4/www/codeigniter/Makefile Wed Oct 21 09:08:08 2015 (r399897) +++ branches/2015Q4/www/codeigniter/Makefile Wed Oct 21 10:28:18 2015 (r399898) @@ -2,16 +2,15 @@ # $FreeBSD$ PORTNAME= codeigniter -PORTVERSION= 2.2.4 +PORTVERSION= 2.2.5 CATEGORIES= www -MASTER_SITES= http://downloads.codeigniter.com/reactor/ \ - http://www.codeigniter.org.tw/download_files/ -DISTNAME= CodeIgniter_${PORTVERSION} MAINTAINER= appleboy.tw@gmail.com COMMENT= Framework for developing PHP web applications -USES= zip +USES= tar:tgz +USE_GITHUB= yes +GH_ACCOUNT= bcit-ci CONFLICTS= codeigniter-1.[0-9]* Modified: branches/2015Q4/www/codeigniter/distinfo ============================================================================== --- branches/2015Q4/www/codeigniter/distinfo Wed Oct 21 09:08:08 2015 (r399897) +++ branches/2015Q4/www/codeigniter/distinfo Wed Oct 21 10:28:18 2015 (r399898) @@ -1,2 +1,2 @@ -SHA256 (CodeIgniter_2.2.4.zip) = 5363c2f120faaba7f4966f8cef93d935ae86678778f8c98471579ae045a03278 -SIZE (CodeIgniter_2.2.4.zip) = 2341717 +SHA256 (bcit-ci-codeigniter-2.2.5_GH0.tgz) = c529a0016ae982c67ee899475fa5cdf4b27ffed4d18714270f78e3a4554d9de3 +SIZE (bcit-ci-codeigniter-2.2.5_GH0.tgz) = 1970502 From owner-svn-ports-branches@freebsd.org Wed Oct 21 16:41:16 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 860C0A1B0ED; Wed, 21 Oct 2015 16:41:16 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 436A51E13; Wed, 21 Oct 2015 16:41:16 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9LGfFGX031721; Wed, 21 Oct 2015 16:41:15 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9LGfE9H031713; Wed, 21 Oct 2015 16:41:14 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201510211641.t9LGfE9H031713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 21 Oct 2015 16:41:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399926 - in branches/2015Q4/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 16:41:16 -0000 Author: jkim Date: Wed Oct 21 16:41:14 2015 New Revision: 399926 URL: https://svnweb.freebsd.org/changeset/ports/399926 Log: MFH: r399877 Update to 4.3.32. Approved by: ports-secteam (feld) Added: branches/2015Q4/emulators/virtualbox-ose/files/patch-include_iprt_string.h - copied unchanged from r399877, head/emulators/virtualbox-ose/files/patch-include_iprt_string.h Deleted: branches/2015Q4/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp Modified: branches/2015Q4/emulators/virtualbox-ose-additions/Makefile branches/2015Q4/emulators/virtualbox-ose-additions/distinfo branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo branches/2015Q4/emulators/virtualbox-ose/Makefile branches/2015Q4/emulators/virtualbox-ose/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-additions/Makefile Wed Oct 21 16:36:06 2015 (r399925) +++ branches/2015Q4/emulators/virtualbox-ose-additions/Makefile Wed Oct 21 16:41:14 2015 (r399926) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.30 +DISTVERSION= 4.3.32 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2015Q4/emulators/virtualbox-ose-additions/distinfo ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-additions/distinfo Wed Oct 21 16:36:06 2015 (r399925) +++ branches/2015Q4/emulators/virtualbox-ose-additions/distinfo Wed Oct 21 16:41:14 2015 (r399926) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.30.tar.bz2) = ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 -SIZE (VirtualBox-4.3.30.tar.bz2) = 97428942 +SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 +SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101 Modified: branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile Wed Oct 21 16:36:06 2015 (r399925) +++ branches/2015Q4/emulators/virtualbox-ose-kmod/Makefile Wed Oct 21 16:41:14 2015 (r399926) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.30 +DISTVERSION= 4.3.32 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo Wed Oct 21 16:36:06 2015 (r399925) +++ branches/2015Q4/emulators/virtualbox-ose-kmod/distinfo Wed Oct 21 16:41:14 2015 (r399926) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.30.tar.bz2) = ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 -SIZE (VirtualBox-4.3.30.tar.bz2) = 97428942 +SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 +SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101 Modified: branches/2015Q4/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose/Makefile Wed Oct 21 16:36:06 2015 (r399925) +++ branches/2015Q4/emulators/virtualbox-ose/Makefile Wed Oct 21 16:41:14 2015 (r399926) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.30 +DISTVERSION= 4.3.32 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: branches/2015Q4/emulators/virtualbox-ose/distinfo ============================================================================== --- branches/2015Q4/emulators/virtualbox-ose/distinfo Wed Oct 21 16:36:06 2015 (r399925) +++ branches/2015Q4/emulators/virtualbox-ose/distinfo Wed Oct 21 16:41:14 2015 (r399926) @@ -1,4 +1,4 @@ -SHA256 (VirtualBox-4.3.30.tar.bz2) = ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 -SIZE (VirtualBox-4.3.30.tar.bz2) = 97428942 -SHA256 (VBoxGuestAdditions_4.3.30.iso) = 432c2da1d9a939de7ba1d2cfb10595031374af9ce66417a43979d1794beedbb1 -SIZE (VBoxGuestAdditions_4.3.30.iso) = 58257408 +SHA256 (VirtualBox-4.3.32.tar.bz2) = dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 +SIZE (VirtualBox-4.3.32.tar.bz2) = 98168101 +SHA256 (VBoxGuestAdditions_4.3.32.iso) = 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe +SIZE (VBoxGuestAdditions_4.3.32.iso) = 58349568 Copied: branches/2015Q4/emulators/virtualbox-ose/files/patch-include_iprt_string.h (from r399877, head/emulators/virtualbox-ose/files/patch-include_iprt_string.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/emulators/virtualbox-ose/files/patch-include_iprt_string.h Wed Oct 21 16:41:14 2015 (r399926, copy of r399877, head/emulators/virtualbox-ose/files/patch-include_iprt_string.h) @@ -0,0 +1,11 @@ +--- include/iprt/string.h.orig 2015-10-15 11:50:51 UTC ++++ include/iprt/string.h +@@ -107,7 +107,7 @@ char *strpbrk(const char *pszStr, const + RT_C_DECLS_END + #endif + +-#if !defined(RT_OS_LINUX) || !defined(_GNU_SOURCE) ++#if !defined(RT_OS_FREEBSD) && (!defined(RT_OS_LINUX) || !defined(_GNU_SOURCE)) + RT_C_DECLS_BEGIN + void *memrchr(const char *pv, int ch, size_t cb); + RT_C_DECLS_END From owner-svn-ports-branches@freebsd.org Fri Oct 23 13:52:12 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98697A1DFDA; Fri, 23 Oct 2015 13:52:12 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 639C465A; Fri, 23 Oct 2015 13:52:12 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NDqBUW088350; Fri, 23 Oct 2015 13:52:11 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NDqBtm088349; Fri, 23 Oct 2015 13:52:11 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510231352.t9NDqBtm088349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 23 Oct 2015 13:52:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400026 - branches/2015Q4/textproc/rubygem-rdtool X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2015 13:52:12 -0000 Author: amdmi3 Date: Fri Oct 23 13:52:11 2015 New Revision: 400026 URL: https://svnweb.freebsd.org/changeset/ports/400026 Log: MFH: r400025 - Fix shebang fixing by specifying correct old ruby cmd Approved by: portmgr blanket Approved by: ports-secteam blanket Modified: branches/2015Q4/textproc/rubygem-rdtool/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/textproc/rubygem-rdtool/Makefile ============================================================================== --- branches/2015Q4/textproc/rubygem-rdtool/Makefile Fri Oct 23 13:51:10 2015 (r400025) +++ branches/2015Q4/textproc/rubygem-rdtool/Makefile Fri Oct 23 13:52:11 2015 (r400026) @@ -2,7 +2,7 @@ PORTNAME= rdtool PORTVERSION= 0.6.38 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc ruby MASTER_SITES= RG @@ -16,6 +16,7 @@ NO_ARCH= yes USES= shebangfix SHEBANG_FILES= bin/rd2 bin/rdswap.rb +ruby_OLD_CMD= /usr/bin/ruby1.9.1 USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes From owner-svn-ports-branches@freebsd.org Sat Oct 24 04:04:14 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3A37A1BBBA; Sat, 24 Oct 2015 04:04:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F9031812; Sat, 24 Oct 2015 04:04:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9O44DUK044938; Sat, 24 Oct 2015 04:04:13 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9O44DOW044935; Sat, 24 Oct 2015 04:04:13 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201510240404.t9O44DOW044935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sat, 24 Oct 2015 04:04:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400103 - branches/2015Q4/www/drupal7 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 04:04:14 -0000 Author: junovitch Date: Sat Oct 24 04:04:13 2015 New Revision: 400103 URL: https://svnweb.freebsd.org/changeset/ports/400103 Log: MFH: r399526, r400102 r399526 Update to 7.40. PR: ports/203829 Submitted by: Simon Wright (maintainer) r400102 www/drupal7: security update 7.40 -> 7.41 [1] - While here also add NO_ARCH PR: 203977 Submitted by: Simon Wright (maintainer) [1] Security: CVE-2015-7943 Security: https://vuxml.FreeBSD.org/freebsd/75f39413-7a00-11e5-a2a1-002590263bf5.html Approved by: ports-secteam (delphij) Modified: branches/2015Q4/www/drupal7/Makefile branches/2015Q4/www/drupal7/distinfo branches/2015Q4/www/drupal7/pkg-plist Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/www/drupal7/Makefile ============================================================================== --- branches/2015Q4/www/drupal7/Makefile Sat Oct 24 03:57:08 2015 (r400102) +++ branches/2015Q4/www/drupal7/Makefile Sat Oct 24 04:04:13 2015 (r400103) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drupal7 -PORTVERSION= 7.39 +PORTVERSION= 7.41 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} @@ -23,6 +23,7 @@ WANT_PHP_WEB= yes OPTIONS_DEFINE= MYSQL SQLITE3 PGSQL DOCS OPTIONS_DEFAULT= MYSQL +NO_ARCH= yes NO_BUILD= yes DOCS= CHANGELOG.txt INSTALL.mysql.txt INSTALL.sqlite.txt \ LICENSE.txt README.txt COPYRIGHT.txt INSTALL.pgsql.txt \ Modified: branches/2015Q4/www/drupal7/distinfo ============================================================================== --- branches/2015Q4/www/drupal7/distinfo Sat Oct 24 03:57:08 2015 (r400102) +++ branches/2015Q4/www/drupal7/distinfo Sat Oct 24 04:04:13 2015 (r400103) @@ -1,2 +1,2 @@ -SHA256 (drupal/drupal-7.39.tar.gz) = afad72be4389e2a2dfc630fc8582277ed185d884101978890139e0d14e4ddbab -SIZE (drupal/drupal-7.39.tar.gz) = 3249343 +SHA256 (drupal/drupal-7.41.tar.gz) = 49ea620d191e81ffce0e7a96b5e7d12da672b3401c7ce1aff93fc941681eb111 +SIZE (drupal/drupal-7.41.tar.gz) = 3257325 Modified: branches/2015Q4/www/drupal7/pkg-plist ============================================================================== --- branches/2015Q4/www/drupal7/pkg-plist Sat Oct 24 03:57:08 2015 (r400102) +++ branches/2015Q4/www/drupal7/pkg-plist Sat Oct 24 04:04:13 2015 (r400103) @@ -639,6 +639,11 @@ %%DRUPAL_BASE%%/modules/simpletest/tests/batch_test.info %%DRUPAL_BASE%%/modules/simpletest/tests/batch_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/bootstrap.test +%%DRUPAL_BASE%%/modules/simpletest/tests/boot.test +%%DRUPAL_BASE%%/modules/simpletest/tests/boot_test_1.info +%%DRUPAL_BASE%%/modules/simpletest/tests/boot_test_1.module +%%DRUPAL_BASE%%/modules/simpletest/tests/boot_test_2.info +%%DRUPAL_BASE%%/modules/simpletest/tests/boot_test_2.module %%DRUPAL_BASE%%/modules/simpletest/tests/cache.test %%DRUPAL_BASE%%/modules/simpletest/tests/common.test %%DRUPAL_BASE%%/modules/simpletest/tests/common_test.css @@ -656,6 +661,7 @@ %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test_class.inc %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test_interface.inc +%%DRUPAL_BASE%%/modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test_trait.sh %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info @@ -697,6 +703,7 @@ %%DRUPAL_BASE%%/modules/simpletest/tests/menu_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/module.test %%DRUPAL_BASE%%/modules/simpletest/tests/module_test.file.inc +%%DRUPAL_BASE%%/modules/simpletest/tests/module_test.implementations.inc %%DRUPAL_BASE%%/modules/simpletest/tests/module_test.info %%DRUPAL_BASE%%/modules/simpletest/tests/module_test.install %%DRUPAL_BASE%%/modules/simpletest/tests/module_test.module @@ -734,6 +741,8 @@ %%DRUPAL_BASE%%/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/system_incompatible_module_version_test.info %%DRUPAL_BASE%%/modules/simpletest/tests/system_incompatible_module_version_test.module +%%DRUPAL_BASE%%/modules/simpletest/tests/system_project_namespace_test.info +%%DRUPAL_BASE%%/modules/simpletest/tests/system_project_namespace_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/system_test.info %%DRUPAL_BASE%%/modules/simpletest/tests/system_test.module %%DRUPAL_BASE%%/modules/simpletest/tests/tablesort.test @@ -949,6 +958,7 @@ %%DRUPAL_BASE%%/profiles/minimal/minimal.install %%DRUPAL_BASE%%/profiles/minimal/minimal.profile %%DRUPAL_BASE%%/profiles/minimal/translations/README.txt +%%DRUPAL_BASE%%/profiles/README.txt %%DRUPAL_BASE%%/profiles/standard/standard.info %%DRUPAL_BASE%%/profiles/standard/standard.install %%DRUPAL_BASE%%/profiles/standard/standard.profile From owner-svn-ports-branches@freebsd.org Sat Oct 24 09:50:12 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0CF5A1CFEF; Sat, 24 Oct 2015 09:50:12 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A9D8E1D61; Sat, 24 Oct 2015 09:50:12 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9O9oB4M064429; Sat, 24 Oct 2015 09:50:11 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9O9oB1W064427; Sat, 24 Oct 2015 09:50:11 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201510240950.t9O9oB1W064427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 24 Oct 2015 09:50:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400112 - branches/2015Q4/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 09:50:13 -0000 Author: matthew Date: Sat Oct 24 09:50:11 2015 New Revision: 400112 URL: https://svnweb.freebsd.org/changeset/ports/400112 Log: MFH: r400059 Security update to 4.5.1 See https://www.phpmyadmin.net/security/PMASA-2015-5/ Security: 08d11134-79c5-11e5-8987-6805ca0b3d42 Approved by: portmgr (erwin) Modified: branches/2015Q4/databases/phpmyadmin/Makefile branches/2015Q4/databases/phpmyadmin/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/databases/phpmyadmin/Makefile ============================================================================== --- branches/2015Q4/databases/phpmyadmin/Makefile Sat Oct 24 08:40:13 2015 (r400111) +++ branches/2015Q4/databases/phpmyadmin/Makefile Sat Oct 24 09:50:11 2015 (r400112) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.5.0.2 +DISTVERSION= 4.5.1 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2015Q4/databases/phpmyadmin/distinfo ============================================================================== --- branches/2015Q4/databases/phpmyadmin/distinfo Sat Oct 24 08:40:13 2015 (r400111) +++ branches/2015Q4/databases/phpmyadmin/distinfo Sat Oct 24 09:50:11 2015 (r400112) @@ -1,2 +1,2 @@ -SHA256 (phpMyAdmin-4.5.0.2-all-languages.tar.xz) = d2e90ea486d90b4ebe5eb02d7ad349ad2916c12a8981f98553395ef78d22a8ec -SIZE (phpMyAdmin-4.5.0.2-all-languages.tar.xz) = 5732124 +SHA256 (phpMyAdmin-4.5.1-all-languages.tar.xz) = 85147fb514900f03586fb885f843da71b0905c6995d921d80b0bb38bd8833022 +SIZE (phpMyAdmin-4.5.1-all-languages.tar.xz) = 5732856 From owner-svn-ports-branches@freebsd.org Sat Oct 24 09:57:32 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7AA1A1B166; Sat, 24 Oct 2015 09:57:32 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88304B3; Sat, 24 Oct 2015 09:57:32 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9O9vVdM067379; Sat, 24 Oct 2015 09:57:31 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9O9vVgj067376; Sat, 24 Oct 2015 09:57:31 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510240957.t9O9vVgj067376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 24 Oct 2015 09:57:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400113 - in branches/2015Q4/astro/gpstk: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 09:57:32 -0000 Author: koobs Date: Sat Oct 24 09:57:31 2015 New Revision: 400113 URL: https://svnweb.freebsd.org/changeset/ports/400113 Log: MFH: r399952 astro/gpstk: Fix patches and CMake build After the last commit to this port [1], that updated DISTFILES, patch errors were reported on pkg-fallout: patch: **** can't cd to /wrkdirs/usr/ports/astro/gpstk/work/dev: No such file or directory => Patch patch-ext__lib__FileDirProc__FileHunter.cpp failed to apply cleanly. *** Error code 1 This change replaces a WRKSRC override with a CMAKE_SOURCE_PATH variable to declare the source directory and regenerates patchfiles against the default WRKSRC. While I'm here: switch to USES=cmake:outsource to match the build instructions upstream [2] It was also noted during testing that this port builds with the base Clang c++ compiler and does not require USE_GCC. Upstream documentation requires only 'a modern, ANSI compliant C++ compiler' [3] [1] https://svnweb.freebsd.org/changeset/ports/399654 [2] http://www.gpstk.org/bin/view/Documentation/BuildingGPSTkUnderUnix [3] http://www.gpstk.org/bin/view/Documentation/SystemRequirements PR: 201196 Approved by: portmgr (feld) Added: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp - copied unchanged from r399952, head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp - copied unchanged from r399952, head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp Deleted: branches/2015Q4/astro/gpstk/files/patch-ext__lib__FileDirProc__FileHunter.cpp branches/2015Q4/astro/gpstk/files/patch-ext__lib__Utilities__BinUtils.hpp Modified: branches/2015Q4/astro/gpstk/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/astro/gpstk/Makefile ============================================================================== --- branches/2015Q4/astro/gpstk/Makefile Sat Oct 24 09:50:11 2015 (r400112) +++ branches/2015Q4/astro/gpstk/Makefile Sat Oct 24 09:57:31 2015 (r400113) @@ -12,12 +12,12 @@ COMMENT= Toolkit for developing GPS appl LICENSE= LGPL3 -USES= cmake python:run +USES= cmake:outsource python:run USE_GCC= yes USE_LDCONFIG= yes -EXTRACT_AFTER_ARGS= --exclude .git +CMAKE_SOURCE_PATH= ${WRKSRC}/dev -WRKSRC= ${WRKDIR}/dev +EXTRACT_AFTER_ARGS= --exclude .git .include Copied: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp (from r399952, head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp Sat Oct 24 09:57:31 2015 (r400113, copy of r399952, head/astro/gpstk/files/patch-dev_ext_lib_FileDirProc_FileHunter.cpp) @@ -0,0 +1,10 @@ +--- dev/ext/lib/FileDirProc/FileHunter.cpp.orig 2014-10-10 19:46:15 UTC ++++ dev/ext/lib/FileDirProc/FileHunter.cpp +@@ -52,6 +52,7 @@ using namespace gpstk::StringUtils; + #ifndef _WIN32 + #include + #include ++#include + #else + #include + #include Copied: branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp (from r399952, head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp Sat Oct 24 09:57:31 2015 (r400113, copy of r399952, head/astro/gpstk/files/patch-dev_ext_lib_Utilities_BinUtils.hpp) @@ -0,0 +1,10 @@ +--- dev/ext/lib/Utilities/BinUtils.hpp.orig 2014-10-10 19:46:16 UTC ++++ dev/ext/lib/Utilities/BinUtils.hpp +@@ -54,6 +54,7 @@ + + #include "Exception.hpp" + ++#include + #ifndef BYTE_ORDER + #ifdef _MSC_VER + #define LITTLE_ENDIAN 1 From owner-svn-ports-branches@freebsd.org Sat Oct 24 09:59:21 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79C35A1B1F6; Sat, 24 Oct 2015 09:59:21 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AAD0200; Sat, 24 Oct 2015 09:59:21 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9O9xK3N067581; Sat, 24 Oct 2015 09:59:20 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9O9xKEg067580; Sat, 24 Oct 2015 09:59:20 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510240959.t9O9xKEg067580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 24 Oct 2015 09:59:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400114 - branches/2015Q4/Mk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 09:59:21 -0000 Author: koobs Date: Sat Oct 24 09:59:20 2015 New Revision: 400114 URL: https://svnweb.freebsd.org/changeset/ports/400114 Log: MFH: r400105 Mk/bsd.sites.mk: Remove non-PEP449 Python mirrors [Part III] PEP-449 [1] describes the 'Removal of the PyPI Mirror Auto Discovery and Naming Scheme'. The main elements of this (Accepted) proposal are: Removal of [a-z].pypi.python.org DNS CNAMES Replacing individual mirrors with a single Geo-aware CDN service Previous revisions 365159, 347895, 342514 deprecated several individual mirrors and *.pypi.python.org aliases. The following changes (Part III) completes the (PEP-449 compatibility) transition: Remove pypi.crate.io (NXDOMAIN) Remove pypi.python.jp (Outdated, Broken for DISTNAMEs w/ hyphens Switch to TLS (HTTPS) MASTER_SITE by default Leave a non-TLS (HTTP) MASTER_SITE for fallback (proxy environments) This change is also likely to fix PyPI (CHEESESHOP) update detection in Portscout, at least until upcoming changes for the portscout port add a dedicated sitehandler for it (and GitHub). [1] https://www.python.org/dev/peps/pep-0449/ Differential Revision: https://reviews.freebsd.org/D3972 Approved by: portmgr (erwin) Modified: branches/2015Q4/Mk/bsd.sites.mk Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/Mk/bsd.sites.mk ============================================================================== --- branches/2015Q4/Mk/bsd.sites.mk Sat Oct 24 09:57:31 2015 (r400113) +++ branches/2015Q4/Mk/bsd.sites.mk Sat Oct 24 09:59:20 2015 (r400114) @@ -107,10 +107,12 @@ MASTER_SITE_BERLIOS+= \ .endif .if !defined(IGNORE_MASTER_SITE_CHEESESHOP) +# PEP-449 Compatible MASTER_SITES +# Removal of the PyPI Mirror Auto Discovery and Naming Scheme +# Reference: https://www.python.org/dev/peps/pep-0449/ MASTER_SITE_CHEESESHOP+= \ - http://pypi.python.org/packages/%SUBDIR%/ \ - http://pypi.crate.io/packages/%SUBDIR%/ \ - http://pypi.python.jp/${DISTNAME:S/${DISTVERSION}//:S/-//}/ + https://pypi.python.org/packages/%SUBDIR%/ \ + http://pypi.python.org/packages/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_COMP_SOURCES)