From owner-svn-ports-all@freebsd.org Sun Oct 18 03:13:55 2015 Return-Path: Delivered-To: svn-ports-all@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 8ACB8A10A36; Sun, 18 Oct 2015 03:13:55 +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 45545F51; Sun, 18 Oct 2015 03:13:55 +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 t9I3Dsw6094705; Sun, 18 Oct 2015 03:13:54 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I3DsjZ094702; Sun, 18 Oct 2015 03:13:54 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510180313.t9I3DsjZ094702@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sun, 18 Oct 2015 03:13:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399604 - in head/security/py-cryptography: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 03:13:55 -0000 Author: koobs Date: Sun Oct 18 03:13:53 2015 New Revision: 399604 URL: https://svnweb.freebsd.org/changeset/ports/399604 Log: security/py-cryptography: Update to 1.0.2 - Update to 1.0.2 - Strip shared libraries - Add patch to support building with LibreSSL - Remove ALPN patch (upstreamed) Changes: https://github.com/pyca/cryptography/blob/1.0.2/CHANGELOG.rst PR: 203819 Submitted by: Ralf van der Enden Added: head/security/py-cryptography/files/patch-src___cffi__src_openssl_ec.py (contents, props changed) Deleted: head/security/py-cryptography/files/patch-src_cryptography_hazmat_bindings_openssl_ssl.py Modified: head/security/py-cryptography/Makefile head/security/py-cryptography/distinfo Modified: head/security/py-cryptography/Makefile ============================================================================== --- head/security/py-cryptography/Makefile Sat Oct 17 21:37:14 2015 (r399603) +++ head/security/py-cryptography/Makefile Sun Oct 18 03:13:53 2015 (r399604) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cryptography -PORTVERSION= 0.8.2 +PORTVERSION= 1.0.2 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -33,6 +33,9 @@ LDFLAGS+= -L${OPENSSLLIB} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34 .endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so + regression-test: build @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Modified: head/security/py-cryptography/distinfo ============================================================================== --- head/security/py-cryptography/distinfo Sat Oct 17 21:37:14 2015 (r399603) +++ head/security/py-cryptography/distinfo Sun Oct 18 03:13:53 2015 (r399604) @@ -1,2 +1,2 @@ -SHA256 (cryptography-0.8.2.tar.gz) = 1c9a022ab3decaf152093e2ef2d5ee4258c72c7d429446c86bd68ff8c0929db6 -SIZE (cryptography-0.8.2.tar.gz) = 268288 +SHA256 (cryptography-1.0.2.tar.gz) = d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca +SIZE (cryptography-1.0.2.tar.gz) = 332870 Added: head/security/py-cryptography/files/patch-src___cffi__src_openssl_ec.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-cryptography/files/patch-src___cffi__src_openssl_ec.py Sun Oct 18 03:13:53 2015 (r399604) @@ -0,0 +1,12 @@ +--- src/_cffi_src/openssl/ec.py.orig 2015-09-27 13:51:07 UTC ++++ src/_cffi_src/openssl/ec.py +@@ -396,7 +396,8 @@ EC_GROUP *(*EC_GROUP_new_curve_GF2m)( + static const long Cryptography_HAS_EC2M = 1; + #endif + +-#if defined(OPENSSL_NO_EC) || OPENSSL_VERSION_NUMBER < 0x1000200f || \ ++#if defined(OPENSSL_NO_EC) || \ ++ OPENSSL_VERSION_NUMBER < 0x1000200f && !defined(LIBRESSL_VERSION_NUMBER) || \ + defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L + static const long Cryptography_HAS_EC_1_0_2 = 0; + const char *(*EC_curve_nid2nist)(int) = NULL; From owner-svn-ports-all@freebsd.org Sun Oct 18 08:18:27 2015 Return-Path: Delivered-To: svn-ports-all@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 EB414A18E1F; Sun, 18 Oct 2015 08:18:27 +0000 (UTC) (envelope-from truckman@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 7E65A7D4; Sun, 18 Oct 2015 08:18:27 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I8IQtY080759; Sun, 18 Oct 2015 08:18:26 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I8IQfN080757; Sun, 18 Oct 2015 08:18:26 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201510180818.t9I8IQfN080757@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sun, 18 Oct 2015 08:18:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399605 - in head/editors/openoffice-4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 08:18:28 -0000 Author: truckman Date: Sun Oct 18 08:18:26 2015 New Revision: 399605 URL: https://svnweb.freebsd.org/changeset/ports/399605 Log: Patch the source with r1697228, r1697237, r1697247, r1697306, and r1697312 from upstream trunk (with a few tweaks to compensate for some other upstream changes not included here) to unbreak the build with OpenJDK8. Revert r399536 to unmark broken. PR: 199591 (openjdk8 by default exp-run) Added: head/editors/openoffice-4/files/patch-openjdk8 (contents, props changed) Modified: head/editors/openoffice-4/Makefile Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Sun Oct 18 03:13:53 2015 (r399604) +++ head/editors/openoffice-4/Makefile Sun Oct 18 08:18:26 2015 (r399605) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -158,10 +158,6 @@ MMEDIA_USE= GSTREAMER=yes .include -.if ${JAVA_PORT_VERSION:M1.8.*} -BROKEN= Does not build with JDK 1.8 -.endif - .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang Added: head/editors/openoffice-4/files/patch-openjdk8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-4/files/patch-openjdk8 Sun Oct 18 08:18:26 2015 (r399605) @@ -0,0 +1,1808 @@ +--- javaunohelper/com/sun/star/comp/helper/Bootstrap.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java +@@ -97,6 +97,7 @@ public class Bootstrap { + @param context_entries the hash table contains mappings of entry names (type string) to + context entries (type class ComponentContextEntry). + @return a new context. ++ @throws java.lang.Exception + */ + static public XComponentContext createInitialComponentContext( Hashtable context_entries ) + throws Exception +@@ -148,7 +149,8 @@ public class Bootstrap { + * Bootstraps a servicemanager with the jurt base components registered. + *

+ * @return a freshly boostrapped service manager +- * @see com.sun.star.lang.ServiceManager ++ * @see "com.sun.star.lang.ServiceManager" ++ * @throws java.lang.Exception + */ + static public XMultiServiceFactory createSimpleServiceManager() throws Exception + { +@@ -157,10 +159,12 @@ public class Bootstrap { + } + + +- /** Bootstraps the initial component context from a native UNO installation. +- +- @see cppuhelper/defaultBootstrap_InitialComponentContext() +- */ ++ /** ++ * Bootstraps the initial component context from a native UNO installation. ++ *

++ * @return ++ * @see defaultBootstrap_InitialComponentContext() ++ */ + static public final XComponentContext defaultBootstrap_InitialComponentContext() + throws Exception + { +@@ -173,7 +177,7 @@ public class Bootstrap { + @param bootstrap_parameters + bootstrap parameters (maybe null) + +- @see cppuhelper/defaultBootstrap_InitialComponentContext() ++ @see defaultBootstrap_InitialComponentContext() + */ + static public final XComponentContext defaultBootstrap_InitialComponentContext( + String ini_file, Hashtable bootstrap_parameters ) +--- javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java +@@ -29,7 +29,7 @@ package com.sun.star.comp.helper; + The first one is commonly used for singleton objects of the component + context, that are raised on first-time retrieval of the key. + You have to pass a com.sun.star.lang.XSingleComponentFactory +- or string (=> service name) object for this. ++ or string (=> service name) object for this. +

+ */ + public class ComponentContextEntry +--- javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java +@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKe + * The SharedLibraryLoader class provides the functionality of the com.sun.star.loader.SharedLibrary + * service. + *

+- * @see com.sun.star.loader.SharedLibrary ++ * @see "com.sun.star.loader.SharedLibrary" + * @see com.sun.star.comp.servicemanager.ServiceManager +- * @see com.sun.star.lang.ServiceManager ++ * @see "com.sun.star.lang.ServiceManager" + */ + public class SharedLibraryLoader { + /** +@@ -70,9 +70,9 @@ public class SharedLibraryLoader { + * @return the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component. + * @param smgr the ServiceManager + * @param regKey the root registry key +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static XSingleServiceFactory getServiceFactory( + XMultiServiceFactory smgr, +@@ -93,9 +93,9 @@ public class SharedLibraryLoader { + * @param impName the implementation name of the component + * @param smgr the ServiceManager + * @param regKey the root registry key +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static XSingleServiceFactory getServiceFactory( + String libName, +@@ -116,9 +116,9 @@ public class SharedLibraryLoader { + * @return true if the registration was successfull - otherwise false + * @param smgr the ServiceManager + * @param regKey the root key under that the component should be registered +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static boolean writeRegistryServiceInfo( + com.sun.star.lang.XMultiServiceFactory smgr, +@@ -136,9 +136,9 @@ public class SharedLibraryLoader { + * @param libName name of the shared library + * @param smgr the ServiceManager + * @param regKey the root key under that the component should be registered +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static boolean writeRegistryServiceInfo( + String libName, +--- javaunohelper/com/sun/star/lib/uno/helper/Factory.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/Factory.java +@@ -34,7 +34,8 @@ import com.sun.star.uno.UnoRuntime; + /** Factory helper class supporting com.sun.star.lang.XServiceInfo and + com.sun.star.lang.XSingleComponentFactory. + +- @attention ++ Attention: ++
+ This factory implementation does not support lang.XSingleServiceFactory. + */ + public class Factory +--- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +@@ -467,6 +467,8 @@ public class InterfaceContainer implemen + /** The iterator keeps a copy of the list. Changes to InterfaceContainer do not + * affect the data of the iterator. Conversly, changes to the iterator are effect + * InterfaceContainer. ++ * ++ * @param index + */ + synchronized public ListIterator listIterator(int index) + { +--- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +@@ -122,7 +122,7 @@ XMultiPropertySet + * initialization of the inheriting class (i.e. within the contructor) + * @param name The property's name (Property.Name). + * @param handle The property's handle (Property.Handle). +- * @param Type The property's type (Property.Type). ++ * @param type The property's type (Property.Type). + * @param attributes The property's attributes (Property.Attributes). + * @param id Identifies the property's storage. + */ +@@ -140,8 +140,7 @@ XMultiPropertySet + * Registration has to occur during + * initialization of the inheriting class (i.e. within the contructor). + * @param name The property's name (Property.Name). +- * @param handle The property's handle (Property.Handle). +- * @param Type The property's type (Property.Type). ++ * @param type The property's type (Property.Type). + * @param attributes The property's attributes (Property.Attributes). + * @param id Identifies the property's storage. + */ +@@ -563,11 +562,11 @@ XMultiPropertySet + * {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue} + * and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}. + * If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the +- * property value, that was intended to be changed, remains untouched.
This method does not have to deal with property attributes, such as ++ * property value, that was intended to be changed, remains untouched.
This method does not have to deal with property attributes, such as + * PropertyAttribute.READONLY or PropertyAttribute.MAYBEVOID. The processing of these attributes occurs +- * in the calling methods.
++ * in the calling methods.
+ * Only if this method returns successfully further processing, such +- * as listener notification and finally the modifiction of the property's value, will occur.
++ * as listener notification and finally the modifiction of the property's value, will occur.
+ * + * The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} + * which is called subsequent to convertPropertyValue. +@@ -593,10 +592,10 @@ XMultiPropertySet + * Then, no conversion is necessary, since they can hold all possible values. However, if + * the member is an Object and setVal is an Any then the object contained in the any is assigned to + * the member. The extra type information which exists as Type object in the Any will get lost. If this is not +- * intended then use an Any variable rather then an Object.
++ * intended then use an Any variable rather then an Object.
+ * If a member is an Object or Any and the argument setVal is an Object, other than String or array, + * then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param newVal +- * returns the XInterface.
++ * returns the XInterface.
+ * If a member is an UNO interface, then setVal is queried for this interface and the result is returned. + * If setVal is null then newVal will be null too after return. + *

+@@ -793,7 +792,7 @@ XMultiPropertySet + * If a property has the READONLY attribute set, and one of the setter methods, such as setPropertyValue, has been + * called, then this method is not going to be called. + * @param property the property for which the new value is set +- * @param value the new value for the property. ++ * @param newVal the new value for the property. + * @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller, + * occured during the setting of the value. + */ +--- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java +@@ -193,7 +193,7 @@ public final class PropertySetMixin { + @param newValue the property value corresponding to the new + attribute value. This is only used as + com.sun.star.beans.PropertyChangeEvent.NewValue, which is +- rather useless, anyway (see “Using the Observer Pattern&rdquo: in ++ rather useless, anyway (see “Using the Observer Pattern” in + + OpenOffice.org Coding Guidelines), unless the + attribute that is going to be set is constrained. If the attribute +--- ridljar/com/sun/star/uno/IEnvironment.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/IEnvironment.java +@@ -63,7 +63,7 @@ public interface IEnvironment { + * given bridge B2. + *

  • A proxy object, created as a remote object is mapped into this + * environment via a given bridge.
    • +- *

    ++ * + * + *

    The object actually registered may differ from the specified + * object that is passed as an argument. This enables an +--- ridljar/com/sun/star/uno/IMethodDescription.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/IMethodDescription.java +@@ -52,7 +52,7 @@ public interface IMethodDescription exte + boolean isConst(); + + /** +- * Gives any array of ITypeDescription> of ++ * Gives any array of ITypeDescription of + * the [in] parameters. + *

    + * @return the in parameters +@@ -60,7 +60,7 @@ public interface IMethodDescription exte + ITypeDescription[] getInSignature(); + + /** +- * Gives any array of ITypeDescription> of ++ * Gives any array of ITypeDescription of + * the [out] parameters. + *

    + * @return the out parameters +--- ridljar/com/sun/star/uno/ITypeDescription.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/ITypeDescription.java +@@ -103,8 +103,8 @@ public interface ITypeDescription { + /** + * Gets the (UNO) type name. + * +- *

    The following table lists how UNO types map to type names:

    + * ++ * + * + * + * +@@ -119,15 +119,15 @@ public interface ITypeDescription { + * + * + * +- * "hyper" ++ * + * +- * "unsigned hyper" ++ * + * +- * "float" +- * "double" +- * "string" +- * "type" +- * "any" ++ * ++ * ++ * ++ * ++ * + * + * + * +@@ -148,7 +148,7 @@ public interface ITypeDescription { + * + * + * +- * ++ * + *
    The following table lists how UNO types map to type names:
    UNO typetype name
    LONG"long"
    UNSIGNED LONG"unsigned long"
    HYPER
    HYPER"hyper"
    UNSIGNED HYPERUNSIGNED HYPER"unsigned hyper"
    FLOAT
    DOUBLE
    STRING
    TYPE
    ANY
    FLOAT"float"
    DOUBLE"double"
    STRING"string"
    TYPE"type"
    ANY"any"
    sequence type of base type T"[]" followed by type name for Tinterface type named NN (see below)
    + *

    For a UNO type named N, consisting of a sequence of module + * names M1, ..., Mn followed by +--- ridljar/com/sun/star/uno/Type.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/Type.java +@@ -33,7 +33,7 @@ import java.util.HashMap; + * SHORT) do not have a matching Java class. For another, it can be + * necessary to describe a type which is unknown to the Java runtime system + * (for example, for delaying the need of a class, so that it is possible to +- * generate it on the fly.)

    ++ * generate it on the fly.) + * + *

    A Type is uniquely determined by its type class (a + * TypeClass) and its type name (a String); these two +@@ -204,7 +204,7 @@ public class Type { + * + *

    In certain cases, one Java class corresponds to two UNO types (e.g., + * the Java class short[].class corresponds to both a sequence +- * of SHORT and a sequence of UNSIGNED SHORT in ++ * of SHORT and a sequence of UNSIGNED SHORT in + * UNO). In such ambiguous cases, the parameter alternative + * controls which UNO type is chosen:

    + *
      +--- ridljar/com/sun/star/uno/Union.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/Union.java +@@ -27,7 +27,7 @@ package com.sun.star.uno; + * The Union class is the base class for all classes generated + * as java binding for the IDL type union. + *

      +- * Note: The idl type union is currently not fully ++ * Note: The idl type union is currently not fully + * integrated into the UNO framework, so don't use it. + * + * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $ +--- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java +@@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug; + * AportisDoc implementation of DocumentMerger + * for the {@link + * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl +- * PluginFactoryImpl}.

      ++ * PluginFactoryImpl}. + */ + public class DocumentMergerImpl implements DocumentMerger { + +--- xmerge/source/bridge/java/XMergeBridge.java.orig 2014-02-25 08:29:07 UTC ++++ xmerge/source/bridge/java/XMergeBridge.java +@@ -92,7 +92,6 @@ public class XMergeBridge { + + /** This inner class provides the component as a concrete implementation + * of the service description. It implements the needed interfaces. +- * @implements XTypeProvider + */ + static public class _XMergeBridge implements + XImportFilter, +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java +@@ -44,9 +44,6 @@ public class BeginningOfFile implements + + /** + * Constructor that initializes the member values. +- * +- * @param ver Version Number +- * Substream type (workbook = 0x05, worksheet = 0x10) + */ + public BeginningOfFile(boolean global) { + setVersion((short) 271); +@@ -61,6 +58,10 @@ public class BeginningOfFile implements + read(is); + } + ++ /** ++ * ++ * @param version Version Number ++ */ + private void setVersion(short version) { + this.version = EndianConverter.writeShort(version); + } +@@ -79,6 +80,10 @@ public class BeginningOfFile implements + subStream = EndianConverter.writeShort((short) 0x10); + } + ++ /** ++ * ++ * @return Substream type (workbook = 0x05, worksheet = 0x10) ++ */ + int getSubStreamType() { + return EndianConverter.readShort(subStream); + } +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java +@@ -49,8 +49,7 @@ public class BlankCell extends CellValue + * Constructs a BlankCell using specified attributes + * + * @param row row number +- * @param col column number +- * @param cellContents contents of the cell ++ * @param column column number + * @param ixfe font index + */ + public BlankCell(int row, int column, int ixfe) throws IOException { +@@ -83,7 +82,7 @@ public class BlankCell extends CellValue + /** + * Reads a BlankCell InputStream + * +- * @param is InputStream containing a BlankCell. ++ * @param input InputStream containing a BlankCell. + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java +@@ -43,7 +43,7 @@ public class BoolErrCell extends CellVal + * Constructs a BoolErrCell from arguments + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param ixfe font index + * @param bBoolErr Boolean value or error value + * @param fError Boolean error flag +@@ -78,7 +78,7 @@ public class BoolErrCell extends CellVal + /** + * Writes a BoolErrCell to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -95,7 +95,7 @@ public class BoolErrCell extends CellVal + /** + * Reads a BoolErrCell from the InputStream + * +- * @param is InputStream containing a BoolErrCell ++ * @param input InputStream containing a BoolErrCell + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java +@@ -64,7 +64,7 @@ public class BoundSheet implements BIFFR + * Sets the worksheet name. The sheetname length must be doubled as the + * String is stored in unicode format. + * +- * @param sheetname worksheet name ++ * @param sheetName worksheet name + */ + void setSheetName(String sheetName) throws IOException { + this.cch = (byte) sheetName.length(); +@@ -95,7 +95,7 @@ public class BoundSheet implements BIFFR + /** + * Write this particular BIFFRecord to the OutputStream + * +- * @param ouput the OutputStream ++ * @param output the OutputStream + */ + public void write(OutputStream output) throws IOException { + +@@ -111,7 +111,7 @@ public class BoundSheet implements BIFFR + * Reads a BoundSheet from the InputStream The byte array + * must be twice the size of the String as it uses unicode. + * +- * @param is InputStream containing the record data ++ * @param input InputStream containing the record data + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java +@@ -92,7 +92,7 @@ public abstract class CellValue implemen + /** + * Writes basic cell value attributes to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -102,9 +102,9 @@ public abstract class CellValue implemen + } + + /** +- * Writes aLabelCell to the specified Outputstream ++ * Read a LabelCell from the specified InputStream + * +- * @param os the OutputStream to write to ++ * @param input the InputStream to read from + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java +@@ -50,8 +50,8 @@ public class ColInfo implements BIFFReco + * + * @param colFirst the first column this formatting applies to + * @param colLast last column this formatting applies to +- * @param coldx column width +- * @param grbit options flags ++ * @param colDX column width ++ * @param ixfe options flags + */ + public ColInfo(int colFirst, int colLast, int colDX, int ixfe) { + this.colFirst = EndianConverter.writeShort((short)colFirst); +@@ -135,7 +135,7 @@ public class ColInfo implements BIFFReco + /** + * Writes a ColInfo to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java +@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Endian + import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; + + /** +- * Represents a BIFF record defiuning the defualt column width ++ * Represents a BIFF record defining the default column width + */ + public class DefColWidth implements BIFFRecord { + +@@ -40,18 +40,18 @@ public class DefColWidth implements BIFF + private byte[] coldx = new byte[2]; + private byte[] ixfe = new byte[2]; + +-/** +- * Constructs a pocket Excel Document from the +- * InputStream and assigns it the document name passed in +- * +- * @param is InputStream containing a Pocket Excel Data file. +- */ + public DefColWidth() { + grbit = new byte[] {0x00, 0x00}; + coldx = new byte[] {0x00, 0x09}; + ixfe = new byte[] {0x00, 0x00}; + } + ++ /** ++ * Constructs a pocket Excel Document from the ++ * InputStream and assigns it the document name passed in ++ * ++ * @param is InputStream containing a Pocket Excel Data file. ++ */ + public DefColWidth(InputStream is) throws IOException { + read(is); + } +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java +@@ -39,12 +39,6 @@ public class DefRowHeight implements BIF + private byte[] unknown1 = new byte[2]; + private byte[] unknown2 = new byte[2]; + +- /** +- * Constructs a pocket Excel Document from the +- * InputStream and assigns it the document name passed in +- * +- * @param is InputStream containing a Pocket Excel Data file. +- */ + public DefRowHeight() { + unknown1 = new byte[] {(byte)0x00, (byte)0x00}; + unknown2 = new byte[] {(byte)0xFF, (byte)0x00}; +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java +@@ -50,11 +50,6 @@ public class DefinedName implements BIFF + private String definition = new String(""); + private Workbook wb; + +- /** +- * Constructs a Defined Name from the InputStream +- * +- * @param is InputStream containing the record data +- */ + public DefinedName(NameDefinition nd, Workbook wb) throws IOException { + + fh.setWorkbook(wb); +@@ -95,7 +90,7 @@ public class DefinedName implements BIFF + * Reads a Defined Name from the InputStream The byte array + * must be twice the size of the String as it uses unicode. + * +- * @param is InputStream containing the record data ++ * @param input InputStream containing the record data + */ + public int read(InputStream input) throws IOException { + +@@ -126,7 +121,7 @@ public class DefinedName implements BIFF + /** + * Write this particular BIFFRecord to the OutputStream + * +- * @param ouput the OutputStream ++ * @param output the OutputStream + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java +@@ -276,7 +276,7 @@ org.openoffice.xmerge.converter.xml.Offi + /** + * Compare two ExtendedFormat to see if the font index is the same + * +- * @param the ExtendedFormat to be used in the comaprison ++ * @param rhs the ExtendedFormat to be used in the comaprison + * @return boolean if the two are the same otherwise false + */ + public boolean compareTo(ExtendedFormat rhs) { +@@ -352,7 +352,7 @@ org.openoffice.xmerge.converter.xml.Offi + } + + /** +- * Writes the ExtendedFormat to the Outputstream ++ * Writes the ExtendedFormat to the Outputstream + * + * @param output the Outputstreamto write to + */ +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java +@@ -52,7 +52,7 @@ public class FloatNumber extends CellVal + * Constructs a FloatNumber using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index + */ +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java +@@ -56,13 +56,6 @@ public class FontDescription implements + public static final int UNDERLINE = 0x01; + public static final int ITALIC = 0x02; + +- /** +- * Constructs a FontDescription from the bold italic and undelrine attributes +- * +- * @param italic Italic attribute +- * @param bold Bold attribute +- * @param underline Underline attribute +- */ + public FontDescription(Format fmt) throws IOException { + + Debug.log(Debug.TRACE,"Building FontDescriptor based on Format : " + fmt); +@@ -230,7 +223,7 @@ public class FontDescription implements + /** + * Constructs a Font Description from the InputStream + * +- * @param is InputStream containing a FontDescription ++ * @param input InputStream containing a FontDescription + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java +@@ -51,10 +51,9 @@ public class Formula extends CellValue i + * Constructs a Formula using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index +- * @param value the value of the cell + */ + public Formula(int row, int column, String cellContents, int ixfe, Format fmt, Workbook wb) + throws Exception { +@@ -112,7 +111,7 @@ public class Formula extends CellValue i + * Translates a String written in infix which represents a + * formula into a byte[] what can be written to pocket excel file. + * +- * @param formula string ++ * @param inFormula formula string + */ + public void setFormula(String inFormula) throws Exception { + +@@ -171,7 +170,7 @@ public class Formula extends CellValue i + /** + * Writes the Formula record to the OutputStream + * +- * @param the OutputStream being written to ++ * @param output the OutputStream being written to + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java +@@ -44,7 +44,7 @@ public class LabelCell extends CellValue + * Constructs a LabelCell using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index + */ +@@ -69,7 +69,7 @@ public class LabelCell extends CellValue + /** + * Writes a LabelCell to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -126,7 +126,7 @@ public class LabelCell extends CellValue + /** + * Sets the String representing the cells contents + * +- * @return the String representing the cells contents ++ * @param cellContents the String representing the cells contents + */ + private void setLabel(String cellContents) throws IOException { + rgch = cellContents.getBytes("UTF-16LE"); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java +@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord + } + + /** +- * Get the hex code for this particular BIFFRecord ++ * Set the pane number of the active pane ++ * 0 - bottom right, 1 - top right ++ * 2 - bottom left, 3 - top left + * +- * @return the hex code for Pane ++ * @param paneNumber the pane number of the active pane + */ + public void setPaneNumber(int paneNumber) { + pnnAcct = (byte) paneNumber; +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java +@@ -101,7 +101,7 @@ public class Row implements BIFFRecord { + /** + * Reads a Row from an InputStream + * +- * @param is InputStream containing a Pane Record ++ * @param input InputStream containing a Pane Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java +@@ -76,21 +76,11 @@ public class Selection implements BIFFRe + return PocketExcelConstants.CURRENT_SELECTION; + } + +- /** +- * Get the hex code for this particular BIFFRecord +- * +- * @return the hex code for Selection +- */ + public Point getActiveCell() { + Point p = new Point(colActive, EndianConverter.readShort(rwActive)); + return p; + } + +- /** +- * Get the hex code for this particular BIFFRecord +- * +- * @return the hex code for Selection +- */ + public void setActiveCell(Point p) { + + colActive = (byte) p.getX(); +@@ -100,7 +90,7 @@ public class Selection implements BIFFRe + /** + * Reads a Selection Record from the InputStream + * +- * @param is InputStream containing a Pocket Excel Data file. ++ * @param input InputStream containing a Pocket Excel Data file. + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java +@@ -43,9 +43,9 @@ public class StringValue implements BIFF + private byte[] rgch; + + /** +- * Constructs a StringValue Record from an InputStream ++ * Constructs a StringValue Record from a String + * +- * @param is InputStream containing a StringValue Record ++ * @param str + */ + public StringValue(String str) throws IOException { + cch = EndianConverter.writeShort((short) str.length()); +@@ -74,7 +74,7 @@ public class StringValue implements BIFF + /** + * Reads a StringVlaue Record from an InputStream + * +- * @param is InputStream containing a StringValue Record ++ * @param input InputStream containing a StringValue Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java +@@ -87,7 +87,7 @@ public class Window1 implements BIFFReco + /** + * Reads a Window1 Record from an InputStream + * +- * @param is InputStream containing a Window1 Record ++ * @param input InputStream containing a Window1 Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java +@@ -123,7 +123,7 @@ public class Window2 implements BIFFReco + /** + * Reads a Window2 Record from an InputStream + * +- * @param is InputStream containing a Window2 Record ++ * @param input InputStream containing a Window2 Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java +@@ -236,7 +236,7 @@ OfficeConstants { + /** + * Adds a ExtendedFormat record to the workbook + * +- * @param f the font recrod to add ++ * @param fmt the font record to add + */ + public int addExtendedFormat(Format fmt) throws IOException { + +@@ -358,7 +358,7 @@ OfficeConstants { + /** + * Adds a Worksheet to the workbook. + * +- * @return name the name of the Worksheet to be added ++ * @param name the name of the Worksheet to be added + */ + public void addWorksheet(String name) throws IOException { + +@@ -372,7 +372,6 @@ OfficeConstants { + /** + * Adds a cell to the current worksheet. + * +- * @return the name of the Worksheet to be added + */ + public void addCell(int row,int col, Format fmt, String cellContents) + throws IOException { +@@ -466,12 +465,6 @@ OfficeConstants { + } + } + +- /** +- * Will create a number of ColInfo recrods based on the column widths +- * based in. +- * +- * @param an integer list representing the column widths +- */ + public void addNameDefinition(NameDefinition nameDefinition) throws IOException { + + DefinedName dn = new DefinedName(nameDefinition, this); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java +@@ -56,25 +56,18 @@ public class Worksheet { + private BeginningOfFile bof; + private Eof eof; + +- /** +- * Writes the current workbook to the Outputstream +- * +- * @param os The destination outputstream +- */ + public Worksheet(Workbook wb) { + this.wb = wb; + } + + /** + * Default Contructor +- * +- * @param os The destination outputstream + */ + public Worksheet() { + } + + /** +- * Writes the current workbook to the Outputstream ++ * Writes the current workbook to the OutputStream + * + * @param os The destination outputstream + */ +@@ -229,7 +222,7 @@ public class Worksheet { + * Adds a cell to this worksheet. Current valdid celltypes are + * FloatNumber, LabelCell or Formula + * +- * @param f the font recrod to add ++ * @param br + */ + public void addCell(BIFFRecord br) { + cells.add(br); +@@ -239,7 +232,7 @@ public class Worksheet { + * Adds a number of ColInfo Records to the worksheet base on a list of + * clumnwidths passed in + * +- * @param list of column widths ++ * @param r list of column widths + */ + public void addRow(Row r) { + rows.add(r); +@@ -249,16 +242,12 @@ public class Worksheet { + * Adds a number of ColInfo Records to the worksheet base on a list of + * clumnwidths passed in + * +- * @param list of column widths ++ * @param c list of column widths + */ + public void addCol(ColInfo c) { + colInfo.add(c); + } +- /** +- * Returns an Enumeration to the ColInfo's for this worksheet +- * +- * @return an Enumeration to the ColInfo's +- */ ++ + public void addSettings(SheetSettings s) { + + sel.setActiveCell(s.getCursor()); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java +@@ -45,7 +45,7 @@ import org.openoffice.xmerge.util.Debug; + * else if token is close bracket + * pop from stack into result until close bracket or function + * else +- * while stack.top.priority >= token.priority ++ * while stack.top.priority >= token.priority + * add stack.pop to result + * push token onto stack + * +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java +@@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.x + /** + * This Helper class provides a simplified interface to conversion between PocketXL formula representation + * and Calc formula representation.

      +- * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula} ++ * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula} + */ + public class FormulaHelper { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java +@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Debug; + /** + * This is the Formula Parser based on an article written by Jack Crenshaw. It is a + * top down parser with some basic error handling. It handles +- * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions. ++ * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions. + * The BNF notation for this parser is + * 

      +  *	<expression> ::= <unary op> <term> [<addop>|<logop> <term>]
+@@ -110,7 +110,7 @@ public class FormulaParser {
+ 	}
+ 	
+ 	/**
+-	 * Identify <, >, <=, >=, =, <> using the index to find the current character(s)
++	 * Identify <, >, <=, >=, =, <> using the index to find the current character(s)
+ 	 * 
+ 	 * @return A boolean returning the result of the comparison 
+ 	 */
+@@ -131,9 +131,9 @@ public class FormulaParser {
+  	}
+ 
+ 	/**
+-	 * Identify <, >, <=, >=, =, <>
++	 * Identify <, >, <=, >=, =, <>
+ 	 *
+-	 * @param  The String which is to be identified
++	 * @param op The String which is to be identified
+ 	 * @return A boolean returning the result of the comparison 
+ 	 */
+ 	private boolean isLogicalOp(String op) {
+@@ -397,7 +397,7 @@ public class FormulaParser {
+ 	 * Will keep pulling valid logical operators from the formula and return
+ 	 * the resultant String.
+ 	 * 
+-	 * @return a String representing a logical operator
++	 * @return a String representing a logical operator
+ 	 */
+ 	private String getLogicalOperator() throws FormulaParsingException {
+ 		String op = new String();

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-ports-all@freebsd.org  Sun Oct 18 08:20:08 2015
Return-Path: 
Delivered-To: svn-ports-all@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 C37F6A18E6C;
 Sun, 18 Oct 2015 08:20:08 +0000 (UTC)
 (envelope-from truckman@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 681E98DE;
 Sun, 18 Oct 2015 08:20:08 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I8K7Jm080971;
 Sun, 18 Oct 2015 08:20:07 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I8K7FH080969;
 Sun, 18 Oct 2015 08:20:07 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201510180820.t9I8K7FH080969@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis 
Date: Sun, 18 Oct 2015 08:20:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399606 - in head/editors/openoffice-devel: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 08:20:08 -0000

Author: truckman
Date: Sun Oct 18 08:20:07 2015
New Revision: 399606
URL: https://svnweb.freebsd.org/changeset/ports/399606

Log:
  Patch the source with r1697228, r1697237, r1697247, r1697306, and
  r1697312 from upstream trunk (with a few tweaks to compensate for
  some other upstream changes not included here) to unbreak the build
  with OpenJDK8.
  
  Revert r399537 to unmark broken.
  
  PR:		199591 (openjdk8 by default exp-run)

Added:
  head/editors/openoffice-devel/files/patch-openjdk8   (contents, props changed)
Modified:
  head/editors/openoffice-devel/Makefile

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Sun Oct 18 08:18:26 2015	(r399605)
+++ head/editors/openoffice-devel/Makefile	Sun Oct 18 08:20:07 2015	(r399606)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -170,10 +170,6 @@ MMEDIA_USE=			GSTREAMER=yes
 
 .include 
 
-.if ${JAVA_PORT_VERSION:M1.8.*}
-BROKEN=		Does not build with JDK 1.8
-.endif
-
 .include <${FILESDIR}/Makefile.localized>
 
 .if ${COMPILER_TYPE} == clang

Added: head/editors/openoffice-devel/files/patch-openjdk8
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-devel/files/patch-openjdk8	Sun Oct 18 08:20:07 2015	(r399606)
@@ -0,0 +1,1808 @@
+--- javaunohelper/com/sun/star/comp/helper/Bootstrap.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+@@ -97,6 +97,7 @@ public class Bootstrap {
+ 		@param context_entries the hash table contains mappings of entry names (type string) to
+ 		context entries (type class ComponentContextEntry).
+ 		@return a new context.
++		@throws java.lang.Exception
+     */
+ 	static public XComponentContext createInitialComponentContext( Hashtable context_entries )
+         throws Exception
+@@ -148,7 +149,8 @@ public class Bootstrap {
+ 	 * Bootstraps a servicemanager with the jurt base components registered.
+ 	 * 
      
+ 	 * @return     a freshly boostrapped service manager
+-	 * @see        com.sun.star.lang.ServiceManager
++	 * @see        "com.sun.star.lang.ServiceManager"
++	 * @throws      java.lang.Exception
+ 	 */
+ 	static public XMultiServiceFactory createSimpleServiceManager() throws Exception
+     {
+@@ -157,10 +159,12 @@ public class Bootstrap {
+     }
+     
+     
+-    /** Bootstraps the initial component context from a native UNO installation.
+-        
+-        @see cppuhelper/defaultBootstrap_InitialComponentContext()
+-    */
++    /**
++     * Bootstraps the initial component context from a native UNO installation.
++     * 
      
++     * @return
++     * @see defaultBootstrap_InitialComponentContext()
++     */
+     static public final XComponentContext defaultBootstrap_InitialComponentContext()
+         throws Exception
+     {
+@@ -173,7 +177,7 @@ public class Bootstrap {
+         @param bootstrap_parameters
+                bootstrap parameters (maybe null)
+                
+-        @see cppuhelper/defaultBootstrap_InitialComponentContext()
++        @see defaultBootstrap_InitialComponentContext()
+     */
+     static public final XComponentContext defaultBootstrap_InitialComponentContext(
+         String ini_file, Hashtable bootstrap_parameters )
+--- javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+@@ -29,7 +29,7 @@ package com.sun.star.comp.helper;
+     The first one is commonly used for singleton objects of the component
+     context, that are raised on first-time retrieval of the key.
+     You have to pass a com.sun.star.lang.XSingleComponentFactory
+-    or string (=> service name) object for this.
++    or string (=> service name) object for this.
+     
      
+ */
+ public class ComponentContextEntry
+--- javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKe
+  * The SharedLibraryLoader class provides the functionality of the com.sun.star.loader.SharedLibrary
+  * service.
+  * 
      
+- * @see         com.sun.star.loader.SharedLibrary
++ * @see         "com.sun.star.loader.SharedLibrary"
+  * @see         com.sun.star.comp.servicemanager.ServiceManager
+- * @see			com.sun.star.lang.ServiceManager
++ * @see	        "com.sun.star.lang.ServiceManager"
+  */
+ public class SharedLibraryLoader {
+ 	/** 
+@@ -70,9 +70,9 @@ public class SharedLibraryLoader {
+ 	 * @return	the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component.
+ 	 * @param	smgr	the ServiceManager
+ 	 * @param	regKey	the root registry key
+-	 * @see		com.sun.star.loader.SharedLibrary
+-	 * @see		com.sun.star.lang.ServiceManager
+-	 * @see		com.sun.star.registry.RegistryKey
++	 * @see		"com.sun.star.loader.SharedLibrary"
++	 * @see		"com.sun.star.lang.ServiceManager"
++	 * @see		"com.sun.star.registry.RegistryKey"
+ 	 */
+ 	public static XSingleServiceFactory getServiceFactory(
+ 				XMultiServiceFactory smgr, 
+@@ -93,9 +93,9 @@ public class SharedLibraryLoader {
+ 	 * @param	impName	the implementation name of the component
+ 	 * @param	smgr	the ServiceManager
+ 	 * @param	regKey	the root registry key
+-	 * @see		com.sun.star.loader.SharedLibrary
+-	 * @see		com.sun.star.lang.ServiceManager
+-	 * @see		com.sun.star.registry.RegistryKey
++	 * @see		"com.sun.star.loader.SharedLibrary"
++	 * @see		"com.sun.star.lang.ServiceManager"
++	 * @see		"com.sun.star.registry.RegistryKey"
+ 	 */
+ 	public static XSingleServiceFactory getServiceFactory(
+ 				String libName,
+@@ -116,9 +116,9 @@ public class SharedLibraryLoader {
+ 	 * @return	true if the registration was successfull - otherwise false
+ 	 * @param	smgr	the ServiceManager
+ 	 * @param	regKey	the root key under that the component should be registered
+-	 * @see		com.sun.star.loader.SharedLibrary
+-	 * @see		com.sun.star.lang.ServiceManager
+-	 * @see		com.sun.star.registry.RegistryKey
++	 * @see		"com.sun.star.loader.SharedLibrary"
++	 * @see		"com.sun.star.lang.ServiceManager"
++	 * @see		"com.sun.star.registry.RegistryKey"
+ 	 */
+ 	public static boolean writeRegistryServiceInfo(
+ 				com.sun.star.lang.XMultiServiceFactory smgr, 
+@@ -136,9 +136,9 @@ public class SharedLibraryLoader {
+ 	 * @param	libName	name of the shared library
+ 	 * @param	smgr	the ServiceManager
+ 	 * @param	regKey	the root key under that the component should be registered
+-	 * @see		com.sun.star.loader.SharedLibrary
+-	 * @see		com.sun.star.lang.ServiceManager
+-	 * @see		com.sun.star.registry.RegistryKey
++	 * @see		"com.sun.star.loader.SharedLibrary"
++	 * @see		"com.sun.star.lang.ServiceManager"
++	 * @see		"com.sun.star.registry.RegistryKey"
+ 	 */
+ 	public static boolean writeRegistryServiceInfo(
+ 				String libName,
+--- javaunohelper/com/sun/star/lib/uno/helper/Factory.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+@@ -34,7 +34,8 @@ import com.sun.star.uno.UnoRuntime;
+ /** Factory helper class supporting com.sun.star.lang.XServiceInfo and
+     com.sun.star.lang.XSingleComponentFactory.
+     
+-    @attention
++    Attention:
++    
      
+     This factory implementation does not support lang.XSingleServiceFactory.
+ */
+ public class Factory
+--- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+@@ -467,6 +467,8 @@ public class InterfaceContainer implemen
+     /** The iterator keeps a copy of the list. Changes to InterfaceContainer do not
+      *  affect the data of the iterator. Conversly, changes to the iterator are effect
+      *  InterfaceContainer.
++     *
++     * @param index
+      */
+     synchronized public ListIterator listIterator(int index)
+     {
+--- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+@@ -122,7 +122,7 @@ XMultiPropertySet
+      *  initialization of the inheriting class (i.e. within the contructor)
+      *  @param name The property's name (Property.Name).
+      *  @param handle The property's handle (Property.Handle).
+-     *  @param Type The property's type (Property.Type).
++     *  @param type The property's type (Property.Type).
+      *  @param attributes The property's attributes (Property.Attributes).
+      *  @param id Identifies the property's storage.
+      */
+@@ -140,8 +140,7 @@ XMultiPropertySet
+      *  Registration has to occur during
+      *  initialization of the inheriting class (i.e. within the contructor).
+      *  @param name The property's name (Property.Name).
+-     *  @param handle The property's handle (Property.Handle).
+-     *  @param Type The property's type (Property.Type).
++     *  @param type The property's type (Property.Type).
+      *  @param attributes The property's attributes (Property.Attributes).
+      *  @param id Identifies the property's storage.
+      */
+@@ -563,11 +562,11 @@ XMultiPropertySet
+      *  {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue}
+      *  and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}. 
+      *  If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the 
+-     *  property value, that was intended to be changed, remains untouched.
       This method does not have to deal with property attributes, such as
++     *  property value, that was intended to be changed, remains untouched.
       This method does not have to deal with property attributes, such as
+      *  PropertyAttribute.READONLY or PropertyAttribute.MAYBEVOID. The processing of these attributes occurs
+-     *  in the calling methods.
      
++     *  in the calling methods.
      
+      *  Only if this method returns successfully further processing, such 
+-     *  as listener notification and finally the modifiction of the property's value, will occur.
      
++     *  as listener notification and finally the modifiction of the property's value, will occur.
      
+      *
+      *  The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} 
+      *  which is called subsequent to convertPropertyValue. 
+@@ -593,10 +592,10 @@ XMultiPropertySet
+      *  Then, no conversion is necessary, since they can hold all possible values. However, if 
+      *  the member is an Object and setVal is an Any then the object contained in the any is assigned to
+      *  the member. The extra type information which exists as Type object in the Any will get lost. If this is not 
+-     *  intended then use an Any variable rather then an Object.
      
++     *  intended then use an Any variable rather then an Object.
      
+      *  If a member is an Object or Any and the argument setVal is an Object, other than String or array, 
+      *  then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param newVal
+-     *  returns the XInterface.
      
++     *  returns the XInterface.
      
+      *  If a member is an UNO interface, then setVal is queried for this interface and the result is returned.
+      *  If setVal is null then newVal will be null too after return.
+      *  
      
+@@ -793,7 +792,7 @@ XMultiPropertySet
+      *  If a property has the READONLY attribute set, and one of the setter methods, such as setPropertyValue, has been
+      *  called, then this method is not going to be called.
+      *  @param property the property for which the new value is set
+-     *  @param value the new value for the property.
++     *  @param newVal the new value for the property.
+      *  @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller,
+      *  occured during the setting of the value.
+      */
+--- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java.orig	2014-02-25 08:30:16 UTC
++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java
+@@ -193,7 +193,7 @@ public final class PropertySetMixin {
+        @param newValue the property value corresponding to the new
+        attribute value.  This is only used as
+        com.sun.star.beans.PropertyChangeEvent.NewValue, which is
+-       rather useless, anyway (see “Using the Observer Pattern&rdquo: in
++       rather useless, anyway (see “Using the Observer Pattern” in
+        
+        OpenOffice.org Coding Guidelines), unless the
+        attribute that is going to be set is constrained.  If the attribute
+--- ridljar/com/sun/star/uno/IEnvironment.java.orig	2014-02-25 08:33:14 UTC
++++ ridljar/com/sun/star/uno/IEnvironment.java
+@@ -63,7 +63,7 @@ public interface IEnvironment {
+      *     given bridge B2.
+      * 
    • A proxy object, created as a remote object is mapped into this
+      *     environment via a given bridge.
      • 
+-     *

    ++ * + * + *

    The object actually registered may differ from the specified + * object that is passed as an argument. This enables an +--- ridljar/com/sun/star/uno/IMethodDescription.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/IMethodDescription.java +@@ -52,7 +52,7 @@ public interface IMethodDescription exte + boolean isConst(); + + /** +- * Gives any array of ITypeDescription> of ++ * Gives any array of ITypeDescription of + * the [in] parameters. + *

    + * @return the in parameters +@@ -60,7 +60,7 @@ public interface IMethodDescription exte + ITypeDescription[] getInSignature(); + + /** +- * Gives any array of ITypeDescription> of ++ * Gives any array of ITypeDescription of + * the [out] parameters. + *

    + * @return the out parameters +--- ridljar/com/sun/star/uno/ITypeDescription.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/ITypeDescription.java +@@ -103,8 +103,8 @@ public interface ITypeDescription { + /** + * Gets the (UNO) type name. + * +- *

    The following table lists how UNO types map to type names:

    + * ++ * + * + * + * +@@ -119,15 +119,15 @@ public interface ITypeDescription { + * + * + * +- * "hyper" ++ * + * +- * "unsigned hyper" ++ * + * +- * "float" +- * "double" +- * "string" +- * "type" +- * "any" ++ * ++ * ++ * ++ * ++ * + * + * + * +@@ -148,7 +148,7 @@ public interface ITypeDescription { + * + * + * +- * ++ * + *
    The following table lists how UNO types map to type names:
    UNO typetype name
    LONG"long"
    UNSIGNED LONG"unsigned long"
    HYPER
    HYPER"hyper"
    UNSIGNED HYPERUNSIGNED HYPER"unsigned hyper"
    FLOAT
    DOUBLE
    STRING
    TYPE
    ANY
    FLOAT"float"
    DOUBLE"double"
    STRING"string"
    TYPE"type"
    ANY"any"
    sequence type of base type T"[]" followed by type name for Tinterface type named NN (see below)
    + *

    For a UNO type named N, consisting of a sequence of module + * names M1, ..., Mn followed by +--- ridljar/com/sun/star/uno/Type.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/Type.java +@@ -33,7 +33,7 @@ import java.util.HashMap; + * SHORT) do not have a matching Java class. For another, it can be + * necessary to describe a type which is unknown to the Java runtime system + * (for example, for delaying the need of a class, so that it is possible to +- * generate it on the fly.)

    ++ * generate it on the fly.) + * + *

    A Type is uniquely determined by its type class (a + * TypeClass) and its type name (a String); these two +@@ -204,7 +204,7 @@ public class Type { + * + *

    In certain cases, one Java class corresponds to two UNO types (e.g., + * the Java class short[].class corresponds to both a sequence +- * of SHORT and a sequence of UNSIGNED SHORT in ++ * of SHORT and a sequence of UNSIGNED SHORT in + * UNO). In such ambiguous cases, the parameter alternative + * controls which UNO type is chosen:

    + *
      +--- ridljar/com/sun/star/uno/Union.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/Union.java +@@ -27,7 +27,7 @@ package com.sun.star.uno; + * The Union class is the base class for all classes generated + * as java binding for the IDL type union. + *

      +- * Note: The idl type union is currently not fully ++ * Note: The idl type union is currently not fully + * integrated into the UNO framework, so don't use it. + * + * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $ +--- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java +@@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug; + * AportisDoc implementation of DocumentMerger + * for the {@link + * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl +- * PluginFactoryImpl}.

      ++ * PluginFactoryImpl}. + */ + public class DocumentMergerImpl implements DocumentMerger { + +--- xmerge/source/bridge/java/XMergeBridge.java.orig 2014-02-25 08:29:07 UTC ++++ xmerge/source/bridge/java/XMergeBridge.java +@@ -92,7 +92,6 @@ public class XMergeBridge { + + /** This inner class provides the component as a concrete implementation + * of the service description. It implements the needed interfaces. +- * @implements XTypeProvider + */ + static public class _XMergeBridge implements + XImportFilter, +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java +@@ -44,9 +44,6 @@ public class BeginningOfFile implements + + /** + * Constructor that initializes the member values. +- * +- * @param ver Version Number +- * Substream type (workbook = 0x05, worksheet = 0x10) + */ + public BeginningOfFile(boolean global) { + setVersion((short) 271); +@@ -61,6 +58,10 @@ public class BeginningOfFile implements + read(is); + } + ++ /** ++ * ++ * @param version Version Number ++ */ + private void setVersion(short version) { + this.version = EndianConverter.writeShort(version); + } +@@ -79,6 +80,10 @@ public class BeginningOfFile implements + subStream = EndianConverter.writeShort((short) 0x10); + } + ++ /** ++ * ++ * @return Substream type (workbook = 0x05, worksheet = 0x10) ++ */ + int getSubStreamType() { + return EndianConverter.readShort(subStream); + } +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java +@@ -49,8 +49,7 @@ public class BlankCell extends CellValue + * Constructs a BlankCell using specified attributes + * + * @param row row number +- * @param col column number +- * @param cellContents contents of the cell ++ * @param column column number + * @param ixfe font index + */ + public BlankCell(int row, int column, int ixfe) throws IOException { +@@ -83,7 +82,7 @@ public class BlankCell extends CellValue + /** + * Reads a BlankCell InputStream + * +- * @param is InputStream containing a BlankCell. ++ * @param input InputStream containing a BlankCell. + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java +@@ -43,7 +43,7 @@ public class BoolErrCell extends CellVal + * Constructs a BoolErrCell from arguments + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param ixfe font index + * @param bBoolErr Boolean value or error value + * @param fError Boolean error flag +@@ -78,7 +78,7 @@ public class BoolErrCell extends CellVal + /** + * Writes a BoolErrCell to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -95,7 +95,7 @@ public class BoolErrCell extends CellVal + /** + * Reads a BoolErrCell from the InputStream + * +- * @param is InputStream containing a BoolErrCell ++ * @param input InputStream containing a BoolErrCell + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java +@@ -64,7 +64,7 @@ public class BoundSheet implements BIFFR + * Sets the worksheet name. The sheetname length must be doubled as the + * String is stored in unicode format. + * +- * @param sheetname worksheet name ++ * @param sheetName worksheet name + */ + void setSheetName(String sheetName) throws IOException { + this.cch = (byte) sheetName.length(); +@@ -95,7 +95,7 @@ public class BoundSheet implements BIFFR + /** + * Write this particular BIFFRecord to the OutputStream + * +- * @param ouput the OutputStream ++ * @param output the OutputStream + */ + public void write(OutputStream output) throws IOException { + +@@ -111,7 +111,7 @@ public class BoundSheet implements BIFFR + * Reads a BoundSheet from the InputStream The byte array + * must be twice the size of the String as it uses unicode. + * +- * @param is InputStream containing the record data ++ * @param input InputStream containing the record data + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java +@@ -92,7 +92,7 @@ public abstract class CellValue implemen + /** + * Writes basic cell value attributes to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -102,9 +102,9 @@ public abstract class CellValue implemen + } + + /** +- * Writes aLabelCell to the specified Outputstream ++ * Read a LabelCell from the specified InputStream + * +- * @param os the OutputStream to write to ++ * @param input the InputStream to read from + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java +@@ -50,8 +50,8 @@ public class ColInfo implements BIFFReco + * + * @param colFirst the first column this formatting applies to + * @param colLast last column this formatting applies to +- * @param coldx column width +- * @param grbit options flags ++ * @param colDX column width ++ * @param ixfe options flags + */ + public ColInfo(int colFirst, int colLast, int colDX, int ixfe) { + this.colFirst = EndianConverter.writeShort((short)colFirst); +@@ -135,7 +135,7 @@ public class ColInfo implements BIFFReco + /** + * Writes a ColInfo to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java +@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Endian + import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; + + /** +- * Represents a BIFF record defiuning the defualt column width ++ * Represents a BIFF record defining the default column width + */ + public class DefColWidth implements BIFFRecord { + +@@ -40,18 +40,18 @@ public class DefColWidth implements BIFF + private byte[] coldx = new byte[2]; + private byte[] ixfe = new byte[2]; + +-/** +- * Constructs a pocket Excel Document from the +- * InputStream and assigns it the document name passed in +- * +- * @param is InputStream containing a Pocket Excel Data file. +- */ + public DefColWidth() { + grbit = new byte[] {0x00, 0x00}; + coldx = new byte[] {0x00, 0x09}; + ixfe = new byte[] {0x00, 0x00}; + } + ++ /** ++ * Constructs a pocket Excel Document from the ++ * InputStream and assigns it the document name passed in ++ * ++ * @param is InputStream containing a Pocket Excel Data file. ++ */ + public DefColWidth(InputStream is) throws IOException { + read(is); + } +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java +@@ -39,12 +39,6 @@ public class DefRowHeight implements BIF + private byte[] unknown1 = new byte[2]; + private byte[] unknown2 = new byte[2]; + +- /** +- * Constructs a pocket Excel Document from the +- * InputStream and assigns it the document name passed in +- * +- * @param is InputStream containing a Pocket Excel Data file. +- */ + public DefRowHeight() { + unknown1 = new byte[] {(byte)0x00, (byte)0x00}; + unknown2 = new byte[] {(byte)0xFF, (byte)0x00}; +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java +@@ -50,11 +50,6 @@ public class DefinedName implements BIFF + private String definition = new String(""); + private Workbook wb; + +- /** +- * Constructs a Defined Name from the InputStream +- * +- * @param is InputStream containing the record data +- */ + public DefinedName(NameDefinition nd, Workbook wb) throws IOException { + + fh.setWorkbook(wb); +@@ -95,7 +90,7 @@ public class DefinedName implements BIFF + * Reads a Defined Name from the InputStream The byte array + * must be twice the size of the String as it uses unicode. + * +- * @param is InputStream containing the record data ++ * @param input InputStream containing the record data + */ + public int read(InputStream input) throws IOException { + +@@ -126,7 +121,7 @@ public class DefinedName implements BIFF + /** + * Write this particular BIFFRecord to the OutputStream + * +- * @param ouput the OutputStream ++ * @param output the OutputStream + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java +@@ -276,7 +276,7 @@ org.openoffice.xmerge.converter.xml.Offi + /** + * Compare two ExtendedFormat to see if the font index is the same + * +- * @param the ExtendedFormat to be used in the comaprison ++ * @param rhs the ExtendedFormat to be used in the comaprison + * @return boolean if the two are the same otherwise false + */ + public boolean compareTo(ExtendedFormat rhs) { +@@ -352,7 +352,7 @@ org.openoffice.xmerge.converter.xml.Offi + } + + /** +- * Writes the ExtendedFormat to the Outputstream ++ * Writes the ExtendedFormat to the Outputstream + * + * @param output the Outputstreamto write to + */ +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java +@@ -52,7 +52,7 @@ public class FloatNumber extends CellVal + * Constructs a FloatNumber using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index + */ +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java +@@ -56,13 +56,6 @@ public class FontDescription implements + public static final int UNDERLINE = 0x01; + public static final int ITALIC = 0x02; + +- /** +- * Constructs a FontDescription from the bold italic and undelrine attributes +- * +- * @param italic Italic attribute +- * @param bold Bold attribute +- * @param underline Underline attribute +- */ + public FontDescription(Format fmt) throws IOException { + + Debug.log(Debug.TRACE,"Building FontDescriptor based on Format : " + fmt); +@@ -230,7 +223,7 @@ public class FontDescription implements + /** + * Constructs a Font Description from the InputStream + * +- * @param is InputStream containing a FontDescription ++ * @param input InputStream containing a FontDescription + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java +@@ -51,10 +51,9 @@ public class Formula extends CellValue i + * Constructs a Formula using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index +- * @param value the value of the cell + */ + public Formula(int row, int column, String cellContents, int ixfe, Format fmt, Workbook wb) + throws Exception { +@@ -112,7 +111,7 @@ public class Formula extends CellValue i + * Translates a String written in infix which represents a + * formula into a byte[] what can be written to pocket excel file. + * +- * @param formula string ++ * @param inFormula formula string + */ + public void setFormula(String inFormula) throws Exception { + +@@ -171,7 +170,7 @@ public class Formula extends CellValue i + /** + * Writes the Formula record to the OutputStream + * +- * @param the OutputStream being written to ++ * @param output the OutputStream being written to + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java +@@ -44,7 +44,7 @@ public class LabelCell extends CellValue + * Constructs a LabelCell using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index + */ +@@ -69,7 +69,7 @@ public class LabelCell extends CellValue + /** + * Writes a LabelCell to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -126,7 +126,7 @@ public class LabelCell extends CellValue + /** + * Sets the String representing the cells contents + * +- * @return the String representing the cells contents ++ * @param cellContents the String representing the cells contents + */ + private void setLabel(String cellContents) throws IOException { + rgch = cellContents.getBytes("UTF-16LE"); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java +@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord + } + + /** +- * Get the hex code for this particular BIFFRecord ++ * Set the pane number of the active pane ++ * 0 - bottom right, 1 - top right ++ * 2 - bottom left, 3 - top left + * +- * @return the hex code for Pane ++ * @param paneNumber the pane number of the active pane + */ + public void setPaneNumber(int paneNumber) { + pnnAcct = (byte) paneNumber; +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java +@@ -101,7 +101,7 @@ public class Row implements BIFFRecord { + /** + * Reads a Row from an InputStream + * +- * @param is InputStream containing a Pane Record ++ * @param input InputStream containing a Pane Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java +@@ -76,21 +76,11 @@ public class Selection implements BIFFRe + return PocketExcelConstants.CURRENT_SELECTION; + } + +- /** +- * Get the hex code for this particular BIFFRecord +- * +- * @return the hex code for Selection +- */ + public Point getActiveCell() { + Point p = new Point(colActive, EndianConverter.readShort(rwActive)); + return p; + } + +- /** +- * Get the hex code for this particular BIFFRecord +- * +- * @return the hex code for Selection +- */ + public void setActiveCell(Point p) { + + colActive = (byte) p.getX(); +@@ -100,7 +90,7 @@ public class Selection implements BIFFRe + /** + * Reads a Selection Record from the InputStream + * +- * @param is InputStream containing a Pocket Excel Data file. ++ * @param input InputStream containing a Pocket Excel Data file. + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java +@@ -43,9 +43,9 @@ public class StringValue implements BIFF + private byte[] rgch; + + /** +- * Constructs a StringValue Record from an InputStream ++ * Constructs a StringValue Record from a String + * +- * @param is InputStream containing a StringValue Record ++ * @param str + */ + public StringValue(String str) throws IOException { + cch = EndianConverter.writeShort((short) str.length()); +@@ -74,7 +74,7 @@ public class StringValue implements BIFF + /** + * Reads a StringVlaue Record from an InputStream + * +- * @param is InputStream containing a StringValue Record ++ * @param input InputStream containing a StringValue Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java +@@ -87,7 +87,7 @@ public class Window1 implements BIFFReco + /** + * Reads a Window1 Record from an InputStream + * +- * @param is InputStream containing a Window1 Record ++ * @param input InputStream containing a Window1 Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java +@@ -123,7 +123,7 @@ public class Window2 implements BIFFReco + /** + * Reads a Window2 Record from an InputStream + * +- * @param is InputStream containing a Window2 Record ++ * @param input InputStream containing a Window2 Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java +@@ -236,7 +236,7 @@ OfficeConstants { + /** + * Adds a ExtendedFormat record to the workbook + * +- * @param f the font recrod to add ++ * @param fmt the font record to add + */ + public int addExtendedFormat(Format fmt) throws IOException { + +@@ -358,7 +358,7 @@ OfficeConstants { + /** + * Adds a Worksheet to the workbook. + * +- * @return name the name of the Worksheet to be added ++ * @param name the name of the Worksheet to be added + */ + public void addWorksheet(String name) throws IOException { + +@@ -372,7 +372,6 @@ OfficeConstants { + /** + * Adds a cell to the current worksheet. + * +- * @return the name of the Worksheet to be added + */ + public void addCell(int row,int col, Format fmt, String cellContents) + throws IOException { +@@ -466,12 +465,6 @@ OfficeConstants { + } + } + +- /** +- * Will create a number of ColInfo recrods based on the column widths +- * based in. +- * +- * @param an integer list representing the column widths +- */ + public void addNameDefinition(NameDefinition nameDefinition) throws IOException { + + DefinedName dn = new DefinedName(nameDefinition, this); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java +@@ -56,25 +56,18 @@ public class Worksheet { + private BeginningOfFile bof; + private Eof eof; + +- /** +- * Writes the current workbook to the Outputstream +- * +- * @param os The destination outputstream +- */ + public Worksheet(Workbook wb) { + this.wb = wb; + } + + /** + * Default Contructor +- * +- * @param os The destination outputstream + */ + public Worksheet() { + } + + /** +- * Writes the current workbook to the Outputstream ++ * Writes the current workbook to the OutputStream + * + * @param os The destination outputstream + */ +@@ -229,7 +222,7 @@ public class Worksheet { + * Adds a cell to this worksheet. Current valdid celltypes are + * FloatNumber, LabelCell or Formula + * +- * @param f the font recrod to add ++ * @param br + */ + public void addCell(BIFFRecord br) { + cells.add(br); +@@ -239,7 +232,7 @@ public class Worksheet { + * Adds a number of ColInfo Records to the worksheet base on a list of + * clumnwidths passed in + * +- * @param list of column widths ++ * @param r list of column widths + */ + public void addRow(Row r) { + rows.add(r); +@@ -249,16 +242,12 @@ public class Worksheet { + * Adds a number of ColInfo Records to the worksheet base on a list of + * clumnwidths passed in + * +- * @param list of column widths ++ * @param c list of column widths + */ + public void addCol(ColInfo c) { + colInfo.add(c); + } +- /** +- * Returns an Enumeration to the ColInfo's for this worksheet +- * +- * @return an Enumeration to the ColInfo's +- */ ++ + public void addSettings(SheetSettings s) { + + sel.setActiveCell(s.getCursor()); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java +@@ -45,7 +45,7 @@ import org.openoffice.xmerge.util.Debug; + * else if token is close bracket + * pop from stack into result until close bracket or function + * else +- * while stack.top.priority >= token.priority ++ * while stack.top.priority >= token.priority + * add stack.pop to result + * push token onto stack + * +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java +@@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.x + /** + * This Helper class provides a simplified interface to conversion between PocketXL formula representation + * and Calc formula representation.

      +- * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula} ++ * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula} + */ + public class FormulaHelper { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java +@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Debug; + /** + * This is the Formula Parser based on an article written by Jack Crenshaw. It is a + * top down parser with some basic error handling. It handles +- * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions. ++ * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions. + * The BNF notation for this parser is + * 

      +  *	<expression> ::= <unary op> <term> [<addop>|<logop> <term>]
+@@ -110,7 +110,7 @@ public class FormulaParser {
+ 	}
+ 	
+ 	/**
+-	 * Identify <, >, <=, >=, =, <> using the index to find the current character(s)
++	 * Identify <, >, <=, >=, =, <> using the index to find the current character(s)
+ 	 * 
+ 	 * @return A boolean returning the result of the comparison 
+ 	 */
+@@ -131,9 +131,9 @@ public class FormulaParser {
+  	}
+ 
+ 	/**
+-	 * Identify <, >, <=, >=, =, <>
++	 * Identify <, >, <=, >=, =, <>
+ 	 *
+-	 * @param  The String which is to be identified
++	 * @param op The String which is to be identified
+ 	 * @return A boolean returning the result of the comparison 
+ 	 */
+ 	private boolean isLogicalOp(String op) {
+@@ -397,7 +397,7 @@ public class FormulaParser {
+ 	 * Will keep pulling valid logical operators from the formula and return
+ 	 * the resultant String.
+ 	 * 
+-	 * @return a String representing a logical operator
++	 * @return a String representing a logical operator
+ 	 */
+ 	private String getLogicalOperator() throws FormulaParsingException {
+ 		String op = new String();

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-ports-all@freebsd.org  Sun Oct 18 08:49:59 2015
Return-Path: 
Delivered-To: svn-ports-all@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 DBF06A18451;
 Sun, 18 Oct 2015 08:49:59 +0000 (UTC) (envelope-from pi@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 A25763EE;
 Sun, 18 Oct 2015 08:49:59 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I8nwOJ089759;
 Sun, 18 Oct 2015 08:49:58 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I8nwJZ089756;
 Sun, 18 Oct 2015 08:49:58 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201510180849.t9I8nwJZ089756@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger 
Date: Sun, 18 Oct 2015 08:49:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399607 - in head/sysutils/fusefs-ntfs: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 08:50:00 -0000

Author: pi
Date: Sun Oct 18 08:49:58 2015
New Revision: 399607
URL: https://svnweb.freebsd.org/changeset/ports/399607

Log:
  sysutils/fusefs-ntfs: patch mkntfs to not check for block devices
  
  PR:		197301
  Submitted by:	darius@dons.net.au

Added:
  head/sysutils/fusefs-ntfs/files/patch-ntfsprogs_mkntfs.c   (contents, props changed)
Modified:
  head/sysutils/fusefs-ntfs/Makefile

Modified: head/sysutils/fusefs-ntfs/Makefile
==============================================================================
--- head/sysutils/fusefs-ntfs/Makefile	Sun Oct 18 08:20:07 2015	(r399606)
+++ head/sysutils/fusefs-ntfs/Makefile	Sun Oct 18 08:49:58 2015	(r399607)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntfs
 PORTVERSION=	2015.3.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://tuxera.com/opensource/
 PKGNAMEPREFIX=	fusefs-

Added: head/sysutils/fusefs-ntfs/files/patch-ntfsprogs_mkntfs.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/fusefs-ntfs/files/patch-ntfsprogs_mkntfs.c	Sun Oct 18 08:49:58 2015	(r399607)
@@ -0,0 +1,18 @@
+--- ntfsprogs/mkntfs.c.orig	2015-03-14 14:10:12 UTC
++++ ntfsprogs/mkntfs.c
+@@ -3488,6 +3488,7 @@ static BOOL mkntfs_open_partition(ntfs_v
+ 		goto done;
+ 	}
+ 
++#ifndef __FreeBSD__
+ 	if (!S_ISBLK(sbuf.st_mode)) {
+ 		ntfs_log_error("%s is not a block device.\n", vol->dev->d_name);
+ 		if (!opts.force) {
+@@ -3526,6 +3527,7 @@ static BOOL mkntfs_open_partition(ntfs_v
+ 		ntfs_log_warning("mkntfs forced anyway.\n");
+ #endif
+ 	}
++#endif
+ 	/* Make sure the file system is not mounted. */
+ 	if (ntfs_check_if_mounted(vol->dev->d_name, &mnt_flags)) {
+ 		ntfs_log_perror("Failed to determine whether %s is mounted", vol->dev->d_name);

From owner-svn-ports-all@freebsd.org  Sun Oct 18 08:58:26 2015
Return-Path: 
Delivered-To: svn-ports-all@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 BFE44A18667;
 Sun, 18 Oct 2015 08:58:26 +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 8A1E1A46;
 Sun, 18 Oct 2015 08:58:26 +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 t9I8wPuX092677;
 Sun, 18 Oct 2015 08:58:25 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I8wPCi092676;
 Sun, 18 Oct 2015 08:58:25 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201510180858.t9I8wPCi092676@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino 
Date: Sun, 18 Oct 2015 08:58:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399608 - head/net/isc-dhcp43-server
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 08:58:26 -0000

Author: marino
Date: Sun Oct 18 08:58:25 2015
New Revision: 399608
URL: https://svnweb.freebsd.org/changeset/ports/399608

Log:
  isc-dhcp43-(client|relay): These are now jobs unsafe too
  
  With version 4.3.2, only the -server master port was jobs unsafe. Now
  the slave ports can't build under multijob either.

Modified:
  head/net/isc-dhcp43-server/Makefile

Modified: head/net/isc-dhcp43-server/Makefile
==============================================================================
--- head/net/isc-dhcp43-server/Makefile	Sun Oct 18 08:49:58 2015	(r399607)
+++ head/net/isc-dhcp43-server/Makefile	Sun Oct 18 08:58:25 2015	(r399608)
@@ -46,8 +46,8 @@ DHCP_PORTREVISION=	${PORTREVISION_RELAY}
 .else
 CONFLICTS=	isc-dhcp3?-server-[0-9]* isc-dhcp4[12]-server-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_SERVER}
-MAKE_JOBS_UNSAFE=	yes
 .endif
+MAKE_JOBS_UNSAFE=	yes
 
 .if ${SUBSYS} == server
 USERS=		dhcpd

From owner-svn-ports-all@freebsd.org  Sun Oct 18 09:49:23 2015
Return-Path: 
Delivered-To: svn-ports-all@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 5EF29A163CA;
 Sun, 18 Oct 2015 09:49:23 +0000 (UTC)
 (envelope-from romain@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 2A7B7242;
 Sun, 18 Oct 2015 09:49:23 +0000 (UTC)
 (envelope-from romain@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I9nM95007911;
 Sun, 18 Oct 2015 09:49:22 GMT (envelope-from romain@FreeBSD.org)
Received: (from romain@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I9nMeV007908;
 Sun, 18 Oct 2015 09:49:22 GMT (envelope-from romain@FreeBSD.org)
Message-Id: <201510180949.t9I9nMeV007908@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: romain set sender to
 romain@FreeBSD.org using -f
From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= 
Date: Sun, 18 Oct 2015 09:49:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399609 - head/devel/lcov
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 09:49:23 -0000

Author: romain
Date: Sun Oct 18 09:49:21 2015
New Revision: 399609
URL: https://svnweb.freebsd.org/changeset/ports/399609

Log:
  Update to 1.12.
  
  Pet portlint.

Modified:
  head/devel/lcov/Makefile
  head/devel/lcov/distinfo
  head/devel/lcov/pkg-descr

Modified: head/devel/lcov/Makefile
==============================================================================
--- head/devel/lcov/Makefile	Sun Oct 18 08:58:25 2015	(r399608)
+++ head/devel/lcov/Makefile	Sun Oct 18 09:49:21 2015	(r399609)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	lcov
-PORTVERSION=	1.10
+PORTVERSION=	1.12
 CATEGORIES=	devel
 MASTER_SITES=	SF/ltp/Coverage%20Analysis/LCOV-${PORTVERSION}
 
 MAINTAINER=	romain@FreeBSD.org
-COMMENT=	The Linux Test Project GCOV extension
+COMMENT=	Linux Test Project GCOV extension
 
 LICENSE=	GPLv1
 

Modified: head/devel/lcov/distinfo
==============================================================================
--- head/devel/lcov/distinfo	Sun Oct 18 08:58:25 2015	(r399608)
+++ head/devel/lcov/distinfo	Sun Oct 18 09:49:21 2015	(r399609)
@@ -1,2 +1,2 @@
-SHA256 (lcov-1.10.tar.gz) = 8a4661becc95fafad7875786672f7f29b080437825c3ff31d55a49492c15b88f
-SIZE (lcov-1.10.tar.gz) = 150174
+SHA256 (lcov-1.12.tar.gz) = b474e49c6c962754063b3be97a757a2ba9e7a455f0aea612863bf67e9b8b8ea7
+SIZE (lcov-1.12.tar.gz) = 153009

Modified: head/devel/lcov/pkg-descr
==============================================================================
--- head/devel/lcov/pkg-descr	Sun Oct 18 08:58:25 2015	(r399608)
+++ head/devel/lcov/pkg-descr	Sun Oct 18 09:49:21 2015	(r399609)
@@ -3,4 +3,4 @@ gcov data for multiple source files and 
 source code annotated with coverage information.  It also adds overview pages
 for easy navigation within the file structure.
 
-WWW:	http://ltp.sourceforge.net/coverage/lcov.php
+WWW: http://ltp.sourceforge.net/coverage/lcov.php

From owner-svn-ports-all@freebsd.org  Sun Oct 18 09:50:39 2015
Return-Path: 
Delivered-To: svn-ports-all@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 EC632A1642C;
 Sun, 18 Oct 2015 09:50:39 +0000 (UTC)
 (envelope-from danfe@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 B8C6F637;
 Sun, 18 Oct 2015 09:50:39 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I9ocSm008075;
 Sun, 18 Oct 2015 09:50:38 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I9ocbF008074;
 Sun, 18 Oct 2015 09:50:38 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201510180950.t9I9ocbF008074@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev 
Date: Sun, 18 Oct 2015 09:50:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399610 - head/arabic/arabtex
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 09:50:40 -0000

Author: danfe
Date: Sun Oct 18 09:50:38 2015
New Revision: 399610
URL: https://svnweb.freebsd.org/changeset/ports/399610

Log:
  Employ option helpers (for DOCS_VARS) and put the knobs in their logical
  order (first USE_*, then build-related, then miscellaneous/custom ones).

Modified:
  head/arabic/arabtex/Makefile

Modified: head/arabic/arabtex/Makefile
==============================================================================
--- head/arabic/arabtex/Makefile	Sun Oct 18 09:49:21 2015	(r399609)
+++ head/arabic/arabtex/Makefile	Sun Oct 18 09:50:38 2015	(r399610)
@@ -14,22 +14,19 @@ COMMENT=	TeX/LaTeX package to generate A
 
 LICENSE=	LPPL10
 
-ARABTEXDIRS=	fonts tex
-
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+USE_TEX=	base texmf
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS
-.include 
-.if ${PORT_OPTIONS:MDOCS}
-ARABTEXDIRS+=	doc
-.endif
+ARABTEXDIRS=	fonts tex
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR}
 
-USE_TEX=	base texmf
+OPTIONS_DEFINE=	DOCS
+
+DOCS_VARS=	ARABTEXDIRS+=doc
 
 do-install:
 .for dir in ${ARABTEXDIRS}

From owner-svn-ports-all@freebsd.org  Sun Oct 18 09:50:42 2015
Return-Path: 
Delivered-To: svn-ports-all@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 06771A1644D;
 Sun, 18 Oct 2015 09:50:42 +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 B862063F;
 Sun, 18 Oct 2015 09:50:41 +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 t9I9oeFK008306;
 Sun, 18 Oct 2015 09:50:40 GMT (envelope-from koobs@FreeBSD.org)
Received: (from koobs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I9odYV008297;
 Sun, 18 Oct 2015 09:50:39 GMT (envelope-from koobs@FreeBSD.org)
Message-Id: <201510180950.t9I9odYV008297@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: koobs set sender to
 koobs@FreeBSD.org using -f
From: Kubilay Kocak 
Date: Sun, 18 Oct 2015 09:50:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399611 - in head/lang: python27 python27/files python32
 python32/files python33 python33/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 09:50:42 -0000

Author: koobs
Date: Sun Oct 18 09:50:39 2015
New Revision: 399611
URL: https://svnweb.freebsd.org/changeset/ports/399611

Log:
  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
  MFH:		2015Q4

Added:
  head/lang/python27/files/patch-Misc_python-config.in   (contents, props changed)
  head/lang/python32/files/patch-Misc_python-config.in   (contents, props changed)
  head/lang/python33/files/patch-Misc_python-config.in   (contents, props changed)
Modified:
  head/lang/python27/Makefile
  head/lang/python27/pkg-message
  head/lang/python32/Makefile
  head/lang/python32/pkg-message
  head/lang/python33/Makefile
  head/lang/python33/pkg-message

Modified: head/lang/python27/Makefile
==============================================================================
--- head/lang/python27/Makefile	Sun Oct 18 09:50:38 2015	(r399610)
+++ head/lang/python27/Makefile	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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}

Added: head/lang/python27/files/patch-Misc_python-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/python27/files/patch-Misc_python-config.in	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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: head/lang/python27/pkg-message
==============================================================================
--- head/lang/python27/pkg-message	Sun Oct 18 09:50:38 2015	(r399610)
+++ head/lang/python27/pkg-message	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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: head/lang/python32/Makefile
==============================================================================
--- head/lang/python32/Makefile	Sun Oct 18 09:50:38 2015	(r399610)
+++ head/lang/python32/Makefile	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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}

Added: head/lang/python32/files/patch-Misc_python-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/python32/files/patch-Misc_python-config.in	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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: head/lang/python32/pkg-message
==============================================================================
--- head/lang/python32/pkg-message	Sun Oct 18 09:50:38 2015	(r399610)
+++ head/lang/python32/pkg-message	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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: head/lang/python33/Makefile
==============================================================================
--- head/lang/python33/Makefile	Sun Oct 18 09:50:38 2015	(r399610)
+++ head/lang/python33/Makefile	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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}

Added: head/lang/python33/files/patch-Misc_python-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/python33/files/patch-Misc_python-config.in	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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: head/lang/python33/pkg-message
==============================================================================
--- head/lang/python33/pkg-message	Sun Oct 18 09:50:38 2015	(r399610)
+++ head/lang/python33/pkg-message	Sun Oct 18 09:50:39 2015	(r399611)
@@ -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-all@freebsd.org  Sun Oct 18 09:55:57 2015
Return-Path: 
Delivered-To: svn-ports-all@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 2A108A16672;
 Sun, 18 Oct 2015 09:55:57 +0000 (UTC)
 (envelope-from romain@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 EAE2CA5C;
 Sun, 18 Oct 2015 09:55:56 +0000 (UTC)
 (envelope-from romain@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I9tuVQ011140;
 Sun, 18 Oct 2015 09:55:56 GMT (envelope-from romain@FreeBSD.org)
Received: (from romain@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I9ttga011138;
 Sun, 18 Oct 2015 09:55:55 GMT (envelope-from romain@FreeBSD.org)
Message-Id: <201510180955.t9I9ttga011138@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: romain set sender to
 romain@FreeBSD.org using -f
From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= 
Date: Sun, 18 Oct 2015 09:55:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399612 - in head: . security/yubikey-personalization
 security/yubikey-personalization-gui
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 09:55:57 -0000

Author: romain
Date: Sun Oct 18 09:55:55 2015
New Revision: 399612
URL: https://svnweb.freebsd.org/changeset/ports/399612

Log:
  Remove security/yubikey-personalization (duplicate of security/ykpers)
  
  PR:		203835
  Submitted by:	cmt@burggraben.net

Deleted:
  head/security/yubikey-personalization/
Modified:
  head/MOVED
  head/security/yubikey-personalization-gui/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Oct 18 09:50:39 2015	(r399611)
+++ head/MOVED	Sun Oct 18 09:55:55 2015	(r399612)
@@ -7894,3 +7894,4 @@ graphics/epeg|devel/efl|2015-10-11|Has e
 x11-drivers/xf86-video-ati-ums||2015-10-13|Not supported by xorg-server 1.17
 x11/nvidia-driver-173||2015-10-13|Does not support xorg-server 1.15 and higher
 net-mgmt/bsnmptools||2015-10-16|Has expired: client tools (including SNMPv3 support) are part of the base system
+security/yubikey-personalization|security/ykpers|2015-10-18|Port duplicate with security/ykpers

Modified: head/security/yubikey-personalization-gui/Makefile
==============================================================================
--- head/security/yubikey-personalization-gui/Makefile	Sun Oct 18 09:50:39 2015	(r399611)
+++ head/security/yubikey-personalization-gui/Makefile	Sun Oct 18 09:55:55 2015	(r399612)
@@ -9,7 +9,7 @@ COMMENT=	Graphical YubiKey personalizati
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libykpers-1.so:${PORTSDIR}/security/yubikey-personalization
+LIB_DEPENDS=	libykpers-1.so:${PORTSDIR}/security/ykpers
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yubico

From owner-svn-ports-all@freebsd.org  Sun Oct 18 10:36:11 2015
Return-Path: 
Delivered-To: svn-ports-all@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 1FD89A16FFD;
 Sun, 18 Oct 2015 10:36:11 +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 C7F959FE;
 Sun, 18 Oct 2015 10:36:10 +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 t9IAa9G5023174;
 Sun, 18 Oct 2015 10:36:09 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IAa6Y1023142;
 Sun, 18 Oct 2015 10:36:06 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201510181036.t9IAa6Y1023142@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan 
Date: Sun, 18 Oct 2015 10:36:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399613 - head/www/chromium/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 10:36:11 -0000

Author: rene
Date: Sun Oct 18 10:36:06 2015
New Revision: 399613
URL: https://svnweb.freebsd.org/changeset/ports/399613

Log:
  www/chromium: update to 46.0.2490.71
  
  Submitted by: Christoph Moench-Tegeder
  Obtained from:	https://github.com/gliaskos/freebsd-chromium/pull/38
  MFH:		2015Q4
  Security:	http://vuxml.freebsd.org/freebsd/8301c04d-71df-11e5-9fcb-00262d5ed8ee.html

Added:
  head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp   (contents, props changed)
  head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h   (contents, props changed)
  head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc   (contents, props changed)
  head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc   (contents, props changed)
  head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h   (contents, props changed)
  head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc   (contents, props changed)
  head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc   (contents, props changed)
  head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc   (contents, props changed)
  head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc   (contents, props changed)
  head/www/chromium/files/patch-media__capture__video__video_capture_device.cc   (contents, props changed)
  head/www/chromium/files/patch-media__capture__video__video_capture_device.h   (contents, props changed)
  head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc   (contents, props changed)
Deleted:
  head/www/chromium/files/patch-base__test__expectations__expectation.cc
  head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc
  head/www/chromium/files/patch-media__video__capture__fake_video_capture_device_factory.cc
  head/www/chromium/files/patch-media__video__capture__file_video_capture_device_factory.cc
  head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc
  head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h
  head/www/chromium/files/patch-media__video__capture__video_capture_device.cc
  head/www/chromium/files/patch-media__video__capture__video_capture_device.h
  head/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
  head/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc
  head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
  head/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc
Modified:
  head/www/chromium/files/extra-patch-clang
  head/www/chromium/files/extra-patch-gcc
  head/www/chromium/files/patch-base__process__process_info_linux.cc
  head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
  head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
  head/www/chromium/files/patch-chrome__common__chrome_paths.h
  head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
  head/www/chromium/files/patch-device__usb__usb_service_impl.cc
  head/www/chromium/files/patch-skia__skia_chrome.gypi
  head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
  head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
  head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
  head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
  head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
  head/www/chromium/files/patch-ui__resources__ui_resources.grd
  head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
  head/www/chromium/files/patch-ui__views__controls__button__label_button.cc

Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/extra-patch-clang	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/extra-patch-gcc
==============================================================================
--- head/www/chromium/files/extra-patch-gcc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/extra-patch-gcc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-base__process__process_info_linux.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__process_info_linux.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-base__process__process_info_linux.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
==============================================================================
--- head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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 @@
              }],
            ],
          }],

Added: head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-chrome__common__chrome_paths.h
==============================================================================
--- head/www/chromium/files/patch-chrome__common__chrome_paths.h	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-chrome__common__chrome_paths.h	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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
+ };

Added: 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)
+++ head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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 
+ 

Added: head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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 
+ 

Added: head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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) {

Added: head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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_|.

Added: 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)
+++ head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
==============================================================================
--- head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-device__usb__usb_service_impl.cc
==============================================================================
--- head/www/chromium/files/patch-device__usb__usb_service_impl.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-device__usb__usb_service_impl.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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());

Added: 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)
+++ head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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)

Added: 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)
+++ head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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));

Added: 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)
+++ head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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) {

Added: head/www/chromium/files/patch-media__capture__video__video_capture_device.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__video_capture_device.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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:

Added: head/www/chromium/files/patch-media__capture__video__video_capture_device.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__video_capture_device.h	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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 {

Added: 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)
+++ head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-skia__skia_chrome.gypi
==============================================================================
--- head/www/chromium/files/patch-skia__skia_chrome.gypi	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-skia__skia_chrome.gypi	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
==============================================================================
--- head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
==============================================================================
--- head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
==============================================================================
--- head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
==============================================================================
--- head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
==============================================================================
--- head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-ui__resources__ui_resources.grd
==============================================================================
--- head/www/chromium/files/patch-ui__resources__ui_resources.grd	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-ui__resources__ui_resources.grd	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
==============================================================================
--- head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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: head/www/chromium/files/patch-ui__views__controls__button__label_button.cc
==============================================================================
--- head/www/chromium/files/patch-ui__views__controls__button__label_button.cc	Sun Oct 18 09:55:55 2015	(r399612)
+++ head/www/chromium/files/patch-ui__views__controls__button__label_button.cc	Sun Oct 18 10:36:06 2015	(r399613)
@@ -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(

From owner-svn-ports-all@freebsd.org  Sun Oct 18 11:55:41 2015
Return-Path: 
Delivered-To: svn-ports-all@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 F3368A1138D;
 Sun, 18 Oct 2015 11:55:41 +0000 (UTC)
 (envelope-from danfe@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 A538EEA8;
 Sun, 18 Oct 2015 11:55:41 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IBteRp046376;
 Sun, 18 Oct 2015 11:55:40 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IBteEq046374;
 Sun, 18 Oct 2015 11:55:40 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201510181155.t9IBteEq046374@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev 
Date: Sun, 18 Oct 2015 11:55:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399614 - in head/x11/bmpanel2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 11:55:42 -0000

Author: danfe
Date: Sun Oct 18 11:55:40 2015
New Revision: 399614
URL: https://svnweb.freebsd.org/changeset/ports/399614

Log:
  - Unbreak the build on -CURRENT by explicitly linking against libm as a
    remedy to the following error:
  
      [100%] Linking C executable bmpanel2
      /usr/bin/ld: undefined reference to symbol `truncf@@FBSD_1.0' (try
      adding -lm)
      //lib/libm.so.5: could not read symbols: Bad value
  
  - While here fix long standing issue of -L${LOCALBASE}/lib being required
    in LDFLAGS while USES=pkgconfig due to missing LINK_DIRECTORIES() call
    in the top-level `CMakeLists.txt'

Added:
  head/x11/bmpanel2/files/
  head/x11/bmpanel2/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/x11/bmpanel2/Makefile

Modified: head/x11/bmpanel2/Makefile
==============================================================================
--- head/x11/bmpanel2/Makefile	Sun Oct 18 10:36:06 2015	(r399613)
+++ head/x11/bmpanel2/Makefile	Sun Oct 18 11:55:40 2015	(r399614)
@@ -18,8 +18,6 @@ USES=		cmake pkgconfig
 USE_GNOME=	pango
 USE_XORG=	x11 xext
 
-LDFLAGS+=	-L${LOCALBASE}/lib		# XXX should not be needed
-
 OPTIONS_DEFINE=	OPACITY TEMPERATURE
 OPACITY_DESC=		Opacity setting with compositing window managers
 TEMPERATURE_DESC=	Build with temperature widget (for CPU, etc.)

Added: head/x11/bmpanel2/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/bmpanel2/files/patch-CMakeLists.txt	Sun Oct 18 11:55:40 2015	(r399614)
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig	2009-11-01 05:50:26 UTC
++++ CMakeLists.txt
+@@ -50,9 +50,11 @@ PKG_CHECK_MODULES(GTHREAD REQUIRED gthre
+ 
+ INCLUDE_DIRECTORIES(${X11_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
+ 	${GLIB_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})
++LINK_DIRECTORIES(${X11_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}
++	${GLIB_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${PANGO_LIBRARY_DIRS})
+ 	
+ ADD_EXECUTABLE(${BMPANEL_EXECUTABLE_NAME} ${SOURCES})
+-TARGET_LINK_LIBRARIES(${BMPANEL_EXECUTABLE_NAME} ${X11_LIBRARIES}
++TARGET_LINK_LIBRARIES(${BMPANEL_EXECUTABLE_NAME} -lm ${X11_LIBRARIES}
+ 	${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES} ${PANGO_LIBRARIES})
+ 
+ # OPTIONS

From owner-svn-ports-all@freebsd.org  Sun Oct 18 12:29:01 2015
Return-Path: 
Delivered-To: svn-ports-all@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 CF07DA1032E;
 Sun, 18 Oct 2015 12:29:01 +0000 (UTC)
 (envelope-from novel@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 A3CC71DF0;
 Sun, 18 Oct 2015 12:29:01 +0000 (UTC)
 (envelope-from novel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ICT05E055209;
 Sun, 18 Oct 2015 12:29:00 GMT (envelope-from novel@FreeBSD.org)
Received: (from novel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ICT0ml055207;
 Sun, 18 Oct 2015 12:29:00 GMT (envelope-from novel@FreeBSD.org)
Message-Id: <201510181229.t9ICT0ml055207@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: novel set sender to
 novel@FreeBSD.org using -f
From: Roman Bogorodskiy 
Date: Sun, 18 Oct 2015 12:29:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399615 - head/audio/deadbeef
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 12:29:01 -0000

Author: novel
Date: Sun Oct 18 12:29:00 2015
New Revision: 399615
URL: https://svnweb.freebsd.org/changeset/ports/399615

Log:
  audio/deadbeef: add GTK3 option support
  
  This new option allows to choose between GTK2 and GTK3 for GUI.
  GTK2 remains default.
  
  PR:		202822
  Submitted by:	novel
  Approved by:	maintainer timeout (more than 2 weeks)

Modified:
  head/audio/deadbeef/Makefile
  head/audio/deadbeef/pkg-plist

Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile	Sun Oct 18 11:55:40 2015	(r399614)
+++ head/audio/deadbeef/Makefile	Sun Oct 18 12:29:00 2015	(r399615)
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 USES=		desktop-file-utils execinfo gettext gmake iconv libtool \
 		pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-alsa --disable-nullout --disable-gtk3 --disable-static
+CONFIGURE_ARGS=	--disable-alsa --disable-nullout --disable-static
 CPPFLAGS+=	-I../dumb/dumb-kode54/include -I../../plugins/libmp4ff \
 		-I../../plugins/gme/game-music-emu-0.6pre \
 		-I${LOCALBASE}/include
@@ -32,13 +32,13 @@ OPTIONS_DEFINE=	MAD PULSEAUDIO GUI VFS L
 		MUSEPACK WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC NLS M3U \
 		PSF ADPLUG DSP MONO2STEREO CONVERTER VFS_ZIP ALAC PLTBROWSER \
 		WMA
-OPTIONS_DEFAULT=	MAD GUI VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \
+OPTIONS_DEFAULT=	MAD GTK2 VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \
 		OGG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY MUSEPACK \
 		WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC M3U PSF ADPLUG DSP \
 		MONO2STEREO CONVERTER VFS_ZIP HOTKEYS ALAC PLTBROWSER WMA
 
 PULSEAUDIO_DESC=	PulseAudio output plugin (unsupported)
-GUI_DESC=		Standard GTK+2 user interface plugin
+GUI_DESC=		Standard GUI plugin
 VFS_DESC=		HTTP streaming VFS plugin
 LASTFM_DESC=		Last.fm/Libre.fm scrobbler plugin
 ART_DESC=		Cover artwork loader plugin
@@ -63,7 +63,10 @@ CONVERTER_DESC=		Plugin for converting f
 VFS_ZIP_DESC=		Play files directly from ZIP archives
 PLTBROWSER_DESC=	Playlist browser GUI plugin
 
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
+OPTIONS_RADIO+=		GUI
+OPTIONS_RADIO_GUI=	GTK2 GTK3
+GUI_IMPLIES=		CONVERTER
 
 MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 MAD_CONFIGURE_OFF=	--disable-mad
@@ -71,9 +74,19 @@ MAD_CONFIGURE_OFF=	--disable-mad
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
-GUI_USE=	gnome=gtk20,glib20
-GUI_CONFIGURE_OFF=	--disable-gtkui --disable-gtk3
-GUI_IMPLIES=		CONVERTER
+GTK2_USE=		gnome=gtk20,glib20
+GTK2_CONFIGURE_OFF=	--disable-gtk2
+GTK2_CONFIGURE_ON=	--enable-gtk2
+GTK2_VARS=		GTK_VER=2
+
+GTK3_USE=		gnome=gtk30
+GTK3_CONFIGURE_OFF=	--disable-gtk3
+GTK3_CONFIGURE_ON=	--enable-gtk3
+GTK3_VARS=		GTK_VER=3
+
+PLIST_SUB+=		GTK_VER=${GTK_VER}
+
+GUI_CONFIGURE_OFF=	--disable-gtk2 --disable-gtk3
 
 VFS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 VFS_CONFIGURE_OFF=	--disable-vfs-curl

Modified: head/audio/deadbeef/pkg-plist
==============================================================================
--- head/audio/deadbeef/pkg-plist	Sun Oct 18 11:55:40 2015	(r399614)
+++ head/audio/deadbeef/pkg-plist	Sun Oct 18 12:29:00 2015	(r399615)
@@ -23,7 +23,7 @@ lib/deadbeef/oss.so
 %%MMS%%lib/deadbeef/mms.so
 %%SHN%%lib/deadbeef/ddb_shn.so
 %%SHELLEXEC%%lib/deadbeef/shellexec.so
-%%SHELLEXEC%%lib/deadbeef/shellexecui_gtk2.so
+%%SHELLEXEC%%lib/deadbeef/shellexecui_gtk%%GTK_VER%%.so
 %%LASTFM%%lib/deadbeef/lastfm.so
 %%ART%%lib/deadbeef/artwork.so
 %%SID%%lib/deadbeef/sid.so
@@ -44,13 +44,13 @@ share/applications/deadbeef.desktop
 %%DOCSDIR%%/translators.txt
 %%DOCSDIR%%/help.ru.txt
 %%DOCSDIR%%/help.pt_BR.txt
-%%GUI%%lib/deadbeef/ddb_gui_GTK2.so
+%%GUI%%lib/deadbeef/ddb_gui_GTK%%GTK_VER%%.so
 %%DSP%%lib/deadbeef/dsp_libsrc.so
 %%MONO2STEREO%%lib/deadbeef/ddb_mono2stereo.so
 %%M3U%%lib/deadbeef/m3u.so
 %%PSF%%lib/deadbeef/ddb_ao.so
 %%CONVERTER%%lib/deadbeef/converter.so
-%%CONVERTER%%lib/deadbeef/converter_gtk2.so
+%%CONVERTER%%lib/deadbeef/converter_gtk%%GTK_VER%%.so
 %%CONVERTER%%lib/deadbeef/convpresets/AAC_(Nero_FAAC).txt
 %%CONVERTER%%lib/deadbeef/convpresets/ALAC.txt
 %%CONVERTER%%lib/deadbeef/convpresets/FLAC_(compression_level_5).txt
@@ -65,7 +65,7 @@ share/applications/deadbeef.desktop
 %%CONVERTER%%lib/deadbeef/convpresets/WavPack.txt
 %%VFS_ZIP%%lib/deadbeef/vfs_zip.so
 %%ALAC%%lib/deadbeef/alac.so
-%%PLTBROWSER%%lib/deadbeef/pltbrowser_gtk2.so
+%%PLTBROWSER%%lib/deadbeef/pltbrowser_gtk%%GTK_VER%%.so
 %%WMA%%lib/deadbeef/wma.so
 %%NLS%%share/locale/be/LC_MESSAGES/deadbeef.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/deadbeef.mo

From owner-svn-ports-all@freebsd.org  Sun Oct 18 12:52:31 2015
Return-Path: 
Delivered-To: svn-ports-all@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 3FD31A1089C;
 Sun, 18 Oct 2015 12:52:31 +0000 (UTC)
 (envelope-from danfe@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 0A9AC916;
 Sun, 18 Oct 2015 12:52:30 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ICqUiD063637;
 Sun, 18 Oct 2015 12:52:30 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ICqUIr063636;
 Sun, 18 Oct 2015 12:52:30 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201510181252.t9ICqUIr063636@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev 
Date: Sun, 18 Oct 2015 12:52:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399616 - head/graphics/luxrender14
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 12:52:31 -0000

Author: danfe
Date: Sun Oct 18 12:52:29 2015
New Revision: 399616
URL: https://svnweb.freebsd.org/changeset/ports/399616

Log:
  Remove hyphen from PKGNAMESUFFIX: originally Makefile was copied from an
  `x11/nvidia-driver' slave port where it makes sense because dashed number
  is actually a major version.  Here this suffix is "dedotted" full version
  and used purely to give the package unique name.  This logic follows our
  existing `multimedia/ffmpeg0' and `devel/subversion*' ports, for example.

Modified:
  head/graphics/luxrender14/Makefile

Modified: head/graphics/luxrender14/Makefile
==============================================================================
--- head/graphics/luxrender14/Makefile	Sun Oct 18 12:29:00 2015	(r399615)
+++ head/graphics/luxrender14/Makefile	Sun Oct 18 12:52:29 2015	(r399616)
@@ -7,7 +7,7 @@ LUX_REV=	dfd211d6faa0
 LUXRAYS_REV=	7c7127ee1fa4
 
 MASTERDIR=	${.CURDIR}/../luxrender
-PKGNAMESUFFIX=	-14
+PKGNAMESUFFIX=	14
 
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files

From owner-svn-ports-all@freebsd.org  Sun Oct 18 13:21:18 2015
Return-Path: 
Delivered-To: svn-ports-all@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 8B1EAA1602B;
 Sun, 18 Oct 2015 13:21:18 +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 5642C262;
 Sun, 18 Oct 2015 13:21:18 +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 t9IDLHk6072459;
 Sun, 18 Oct 2015 13:21:17 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IDLHFu072457;
 Sun, 18 Oct 2015 13:21:17 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201510181321.t9IDLHFu072457@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: matthew set sender to
 matthew@FreeBSD.org using -f
From: Matthew Seaman 
Date: Sun, 18 Oct 2015 13:21:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399617 - head/ports-mgmt/p5-FreeBSD-Portindex
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 13:21:18 -0000

Author: matthew
Date: Sun Oct 18 13:21:17 2015
New Revision: 399617
URL: https://svnweb.freebsd.org/changeset/ports/399617

Log:
  Update to 3.6
  
    - Cope with FOO_DEPENDS values that don't mention $(PORTSDIR)
      explicitly
    - Move the main repo to GitHub: https://github.com/infracaninophile/portindex

Modified:
  head/ports-mgmt/p5-FreeBSD-Portindex/Makefile
  head/ports-mgmt/p5-FreeBSD-Portindex/distinfo

Modified: head/ports-mgmt/p5-FreeBSD-Portindex/Makefile
==============================================================================
--- head/ports-mgmt/p5-FreeBSD-Portindex/Makefile	Sun Oct 18 12:52:29 2015	(r399616)
+++ head/ports-mgmt/p5-FreeBSD-Portindex/Makefile	Sun Oct 18 13:21:17 2015	(r399617)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	FreeBSD-Portindex
-PORTVERSION=	3.5
+PORTVERSION=	3.6
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	http://www.infracaninophile.co.uk/portindex/
 PKGNAMEPREFIX=	p5-

Modified: head/ports-mgmt/p5-FreeBSD-Portindex/distinfo
==============================================================================
--- head/ports-mgmt/p5-FreeBSD-Portindex/distinfo	Sun Oct 18 12:52:29 2015	(r399616)
+++ head/ports-mgmt/p5-FreeBSD-Portindex/distinfo	Sun Oct 18 13:21:17 2015	(r399617)
@@ -1,2 +1,2 @@
-SHA256 (FreeBSD-Portindex-3.5.tar.xz) = d31d7a0e608295dcf3c56befb75a542e5254af5668eaa3816386bd6711c61cdb
-SIZE (FreeBSD-Portindex-3.5.tar.xz) = 56572
+SHA256 (FreeBSD-Portindex-3.6.tar.xz) = 190be99a098c2f9c99d5f464a0dd34fc764e68619ee98d98911a41dac086e52e
+SIZE (FreeBSD-Portindex-3.6.tar.xz) = 56224

From owner-svn-ports-all@freebsd.org  Sun Oct 18 13:41:17 2015
Return-Path: 
Delivered-To: svn-ports-all@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 1573CA16444;
 Sun, 18 Oct 2015 13:41:17 +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 E0EB1DAD;
 Sun, 18 Oct 2015 13:41:16 +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 t9IDfFQO077761;
 Sun, 18 Oct 2015 13:41:15 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IDfFF9077757;
 Sun, 18 Oct 2015 13:41:15 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201510181341.t9IDfFF9077757@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi 
Date: Sun, 18 Oct 2015 13:41:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399618 - in head/security/xca: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 13:41:17 -0000

Author: madpilot
Date: Sun Oct 18 13:41:15 2015
New Revision: 399618
URL: https://svnweb.freebsd.org/changeset/ports/399618

Log:
  - Update to 1.3.2
  - Add QT4 and QT5 options, to choose toolkit.
  
  PR:		203804
  Submitted by:	Ports Fury

Deleted:
  head/security/xca/files/
Modified:
  head/security/xca/Makefile
  head/security/xca/distinfo
  head/security/xca/pkg-descr
  head/security/xca/pkg-plist

Modified: head/security/xca/Makefile
==============================================================================
--- head/security/xca/Makefile	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/Makefile	Sun Oct 18 13:41:15 2015	(r399618)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xca
-PORTVERSION=	0.9.3
-PORTREVISION=	3
+PORTVERSION=	1.3.2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -15,41 +14,35 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
+USES=		desktop-file-utils gmake localbase pkgconfig shared-mime-info
 USE_OPENSSL=	yes
-USE_QT4=	gui moc_build uic_build qmake_build rcc_build linguist_build
-USES=		desktop-file-utils gmake shared-mime-info
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-openssl=${OPENSSLDIR} \
+		--with-qt=${QT_PREFIX}
+MAKE_ARGS=	DOCTOOL="${TRUE}"
 DESTDIRNAME=	destdir
 
-.include 
-
-BROKEN_sparc64=	fails to link
-
-.if ${OSVERSION} >= 1000054
-LD_CXX_LIB=	-lc++
-.endif
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_DEFAULT=	QT4
+
+QT4_USE=		qt4=gui,linguist_build,moc_build,qmake_build \
+			qt4=rcc_build,uic_build
+QT5_USE=		qt5=widgets,buildtools_build,linguist_build
+TOOLKIT_DESC=		Qt toolkit
 
 post-patch:
-	@echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak
-	@echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak
-	@echo "LDFLAGS= ${LDFLAGS}" >> ${WRKSRC}/Local.mak
-	@echo "LIBS= ${LIBS} -L${QT_LIBDIR} -L${LOCALBASE}/lib -lQtCore -lQtGui -lpthread -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak
-	@echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak
-	@echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak
-	@echo "RCC=${LOCALBASE}/bin/rcc"  >> ${WRKSRC}/Local.mak
-	@echo "LRELEASE=${LOCALBASE}/bin/lrelease-qt4" >> ${WRKSRC}/Local.mak
-	@echo "CC=${CC}" >> ${WRKSRC}/Local.mak
-	@echo "LD=${LD}" >> ${WRKSRC}/Local.mak
-	@echo "STRIP=${STRIP_CMD}" >> ${WRKSRC}/Local.mak
-	@echo "prefix=${PREFIX}" >> ${WRKSRC}/Local.mak
-	@echo "etc=${PREFIX}/etc/xca" >> ${WRKSRC}/Local.mak
-	@echo "basedir=" >> ${WRKSRC}/Local.mak
-	@echo "docdir=${DOCSDIR}" >> ${WRKSRC}/Local.mak
-	@echo "#define PREFIX \"${PREFIX}\"" > ${WRKSRC}/local.h
-	@echo "#define ETC \"${PREFIX}/etc/xca\"" >> ${WRKSRC}/local.h
-	@echo "#define VER \"${PORTVERSION}\"" >> ${WRKSRC}/local.h
-	@echo "#define DOCDIR \"${DOCSDIR}\"" >> ${WRKSRC}/local.h
-	@${REINPLACE_CMD} -e "/rR/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e "/VPATH/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/misc/Makefile
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-O2||' ${WRKSRC}/Local.mak.in
+	@${REINPLACE_CMD} -e \
+		'/install/s|-D|-c|' ${WRKSRC}/img/Makefile
+
+post-patch-QT5-off:
+	@${REINPLACE_CMD} -e \
+		's|Qt5|Qt0|g' ${WRKSRC}/configure
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xca*
 
-.include 
+.include 

Modified: head/security/xca/distinfo
==============================================================================
--- head/security/xca/distinfo	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/distinfo	Sun Oct 18 13:41:15 2015	(r399618)
@@ -1,2 +1,2 @@
-SHA256 (xca-0.9.3.tar.gz) = 6842b50c8b4478070d8af743cb72aee1f53a2c4ff2b8285fcec5f856119cc6ba
-SIZE (xca-0.9.3.tar.gz) = 755165
+SHA256 (xca-1.3.2.tar.gz) = 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4
+SIZE (xca-1.3.2.tar.gz) = 897947

Modified: head/security/xca/pkg-descr
==============================================================================
--- head/security/xca/pkg-descr	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/pkg-descr	Sun Oct 18 13:41:15 2015	(r399618)
@@ -1,8 +1,8 @@
-Graphical certification authority is an interface for managing
-RSA keys and certificates, and the creation and signing of PKCS#10 requests.
-It uses the OpenSSL library and a Berkeley DB for key and certificate storage.
-It supports importing and exporting keys and PEM DER PKCS8 certificates,
-signing and revoking of PEM DER PKCS12, and selection of x509v3 extensions.
-A tree view of certificates is presented.
+Graphical certification authority is an interface for managing RSA keys
+and certificates, and the creation and signing of PKCS#10 requests. It
+uses the OpenSSL library and a Berkeley DB for key and certificate
+storage. It supports importing and exporting keys and PEM DER PKCS8
+certificates, signing and revoking of PEM DER PKCS12, and selection of
+x509v3 extensions. A tree view of certificates is presented.
 
-WWW: http://www.hohnstaedt.de/xca.html
+WWW: http://xca.hohnstaedt.de/

Modified: head/security/xca/pkg-plist
==============================================================================
--- head/security/xca/pkg-plist	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/pkg-plist	Sun Oct 18 13:41:15 2015	(r399618)
@@ -1,4 +1,26 @@
 bin/xca
+bin/xca_db_stat
+man/man1/xca.1.gz
+man/man1/xca_db_stat.1.gz
+share/applications/xca.desktop
+%%PORTDOCS%%%%DOCSDIR%%/xca-1.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-10.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-11.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-12.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-13.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-14.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-15.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-2.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-3.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-4.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-5.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-6.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-7.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-8.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-9.html
+%%PORTDOCS%%%%DOCSDIR%%/xca.html
+share/mime/packages/xca.xml
+share/pixmaps/xca-32x32.xpm
 %%DATADIR%%/CA.xca
 %%DATADIR%%/HTTPS_client.xca
 %%DATADIR%%/HTTPS_server.xca
@@ -10,10 +32,6 @@ bin/xca
 %%DATADIR%%/xca_de.qm
 %%DATADIR%%/xca_es.qm
 %%DATADIR%%/xca_fr.qm
+%%DATADIR%%/xca_hr.qm
 %%DATADIR%%/xca_ru.qm
 %%DATADIR%%/xca_tr.qm
-%%DOCSDIR%%/xca.html
-man/man1/xca.1.gz
-share/applications/xca.desktop
-share/mime/packages/xca.xml
-share/pixmaps/xca-32x32.xpm

From owner-svn-ports-all@freebsd.org  Sun Oct 18 13:49:39 2015
Return-Path: 
Delivered-To: svn-ports-all@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 73A2DA16691;
 Sun, 18 Oct 2015 13:49:39 +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 40357107C;
 Sun, 18 Oct 2015 13:49:39 +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 t9IDncKg078746;
 Sun, 18 Oct 2015 13:49:38 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IDncrs078745;
 Sun, 18 Oct 2015 13:49:38 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201510181349.t9IDncrs078745@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi 
Date: Sun, 18 Oct 2015 13:49:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399619 - head/www/lighttpd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 13:49:39 -0000

Author: madpilot
Date: Sun Oct 18 13:49:38 2015
New Revision: 399619
URL: https://svnweb.freebsd.org/changeset/ports/399619

Log:
  Update option description as proposed by port maintainer
  
  PR:		175775
  Submitted by:	xaero at xaerolimit.net
  Approved by:	pkubaj at riseup.net (maintainer)

Modified:
  head/www/lighttpd/Makefile

Modified: head/www/lighttpd/Makefile
==============================================================================
--- head/www/lighttpd/Makefile	Sun Oct 18 13:41:15 2015	(r399618)
+++ head/www/lighttpd/Makefile	Sun Oct 18 13:49:38 2015	(r399619)
@@ -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-all@freebsd.org  Sun Oct 18 15:23:02 2015
Return-Path: 
Delivered-To: svn-ports-all@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 56590A182A7;
 Sun, 18 Oct 2015 15:23:02 +0000 (UTC)
 (envelope-from martymac@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 1508E1485;
 Sun, 18 Oct 2015 15:23:02 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IFN1NG008841;
 Sun, 18 Oct 2015 15:23:01 GMT (envelope-from martymac@FreeBSD.org)
Received: (from martymac@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IFN0CB008826;
 Sun, 18 Oct 2015 15:23:00 GMT (envelope-from martymac@FreeBSD.org)
Message-Id: <201510181523.t9IFN0CB008826@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: martymac set sender to
 martymac@FreeBSD.org using -f
From: Ganael LAPLANCHE 
Date: Sun, 18 Oct 2015 15:23:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399620 - in head/emulators/dolphin-emu: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 15:23:02 -0000

Author: martymac
Date: Sun Oct 18 15:22:59 2015
New Revision: 399620
URL: https://svnweb.freebsd.org/changeset/ports/399620

Log:
  Update to 5.0-rc

Added:
  head/emulators/dolphin-emu/files/patch-8c5744b.txt   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-CMakeTests-FindPolarSSL.cmake   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-EXI_DeviceMic.cpp   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_DeviceAMBaseboard.cpp   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp   (contents, props changed)
  head/emulators/dolphin-emu/files/patch-Source-Core-InputCommon-ControllerInterface-Xlib-XInput2.cpp   (contents, props changed)
Deleted:
  head/emulators/dolphin-emu/files/patch-CMakeTests-FindGLEW.cmake
  head/emulators/dolphin-emu/files/patch-Externals-SFML-CMakeLists.txt
  head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-CommonFuncs.h
  head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-MemArena.cpp
  head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-MemoryUtil.cpp
  head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-Thread.cpp
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-HW-BBA-TAP-TAP_Unix.cpp
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_hid.h
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_IPC_HLE_Device_net.cpp
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-Src-IPC_HLE-WII_Socket.cpp
  head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-Src-NetWindow.cpp
  head/emulators/dolphin-emu/files/patch-Source-Plugins-Plugin_VideoOGL-Src-Render.cpp
  head/emulators/dolphin-emu/files/patch-git_148ce85b
  head/emulators/dolphin-emu/files/patch-git_8c5744bc
Modified:
  head/emulators/dolphin-emu/Makefile
  head/emulators/dolphin-emu/distinfo
  head/emulators/dolphin-emu/files/patch-CMakeLists.txt
  head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake
  head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt
  head/emulators/dolphin-emu/pkg-plist

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu/Makefile	Sun Oct 18 13:49:38 2015	(r399619)
+++ head/emulators/dolphin-emu/Makefile	Sun Oct 18 15:22:59 2015	(r399620)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dolphin-emu
-PORTVERSION=	4.0.2
-PORTREVISION=	4
+DISTVERSION=	5.0-rc
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
@@ -12,34 +11,45 @@ COMMENT=	Gamecube and Wii Emulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
+# Notes on dependencies:
+# - keep enet from externals as Dolphin's version diverges
+# - xxhash and SOIL are not (yet) in ports
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
+		libpng.so:${PORTSDIR}/graphics/png \
 		libSoundTouch.so:${PORTSDIR}/audio/soundtouch \
-		libpolarssl.so.5:${PORTSDIR}/security/polarssl
+		libmbedtls.so.9:${PORTSDIR}/security/polarssl13 \
+		libsfml-system.so:${PORTSDIR}/devel/sfml
 
 USE_GITHUB=	yes
 GH_PROJECT=	dolphin
 
-USE_SDL=	sdl
-USE_XORG=	ice xext x11 xrandr xi
+USE_SDL=	sdl2
+USE_XORG=	ice x11 xext xi xrandr
 USE_WX=		3.0+
-WX_UNICODE=	yes
 USE_GL=		gl glew glu
 
-USES=		dos2unix cmake iconv openal pkgconfig tar:tgz compiler:c++11-lib
+USES=		cmake compiler:c++11-lib dos2unix iconv openal pkgconfig tar:tgz
 DOS2UNIX_REGEX=	.*\.(h|c|cpp)
 
-NOT_FOR_ARCHS=	armv6
-
 # Disable ALSA (emulated) and ao (buggy)
-CMAKE_ARGS+=	-DOPENMP:BOOL=OFF \
+CMAKE_ARGS+=	-DTRY_X11:BOOL=ON \
+		-DDISABLE_WX:BOOL=OFF \
+		-DENABLE_QT:BOOL=OFF \
+		-DENABLE_PCH:BOOL=OFF \
+		-DENABLE_SDL:BOOL=ON \
 		-DDISABLE_ALSA:BOOL=ON \
 		-DDISABLE_AO:BOOL=ON \
 		-DDISABLE_BLUEZ:BOOL=ON \
-		-DUSE_X11:BOOL=ON \
+		-DDISABLE_OPENAL:BOOL=OFF \
+		-DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \
+		-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
 
+# XXX Bypass git check (and set a dummy -unused- revision)
+CMAKE_ARGS+=	-DDOLPHIN_WC_BRANCH:STRING="stable" \
+		-DDOLPHIN_WC_REVISION:STRING="1"
+
 OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS
 OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP NLS
 OPTIONS_SUB=	yes
@@ -69,15 +79,20 @@ NLS_CMAKE_OFF=	-DDISABLE_NLS:BOOL=ON
 
 .include 
 
-# XXX Temporary workaround for ports/184540
-.if ${PORT_OPTIONS:MDEBUG}
-INSTALL_TARGET=	install
+# JIT-enabled binaries are amd64 only
+.if ${ARCH} != "amd64"
+CMAKE_ARGS+=	-DENABLE_GENERIC:BOOL=ON
 .endif
 
-.if !empty(ICONV_LIB)
-CMAKE_ARGS+=	-DICONV_LINK:BOOL=ON
-.else
-CMAKE_ARGS+=	-DICONV_LINK:BOOL=OFF
+# When building with Gcc, needs Gcc 4.9+
+.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 49
+USE_GCC=	4.9+
+# Enable std::stoul()
+CXXFLAGS+=	-D_GLIBCXX_USE_C99
+# Enable log2f(), exp2f() and roundf()
+CXXFLAGS+=	-D_GLIBCXX_USE_C99_MATH_TR1
+# Turn on extra long double versions of math functions, needed for cmath
+CXXFLAGS+=	-D__ISO_C_VISIBLE=1999 -D_DECLARE_C99_LDBL_MATH
 .endif
 
 .include 

Modified: head/emulators/dolphin-emu/distinfo
==============================================================================
--- head/emulators/dolphin-emu/distinfo	Sun Oct 18 13:49:38 2015	(r399619)
+++ head/emulators/dolphin-emu/distinfo	Sun Oct 18 15:22:59 2015	(r399620)
@@ -1,2 +1,2 @@
-SHA256 (dolphin-emu-dolphin-4.0.2_GH0.tgz) = 09f10f73abe0a7b5d10a51b3b56dc0044331bb12d6a18fe969c9bbd83a9b1129
-SIZE (dolphin-emu-dolphin-4.0.2_GH0.tgz) = 25121744
+SHA256 (dolphin-emu-dolphin-5.0-rc_GH0.tgz) = 8f4a6e715e9687eb0d1d52f35c3ea65ee80950121d514bb78365c51db3af41a7
+SIZE (dolphin-emu-dolphin-5.0-rc_GH0.tgz) = 25083408

Added: head/emulators/dolphin-emu/files/patch-8c5744b.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-8c5744b.txt	Sun Oct 18 15:22:59 2015	(r399620)
@@ -0,0 +1,124 @@
+commit 8c5744bca705a0895bd51c966a30171ee2bab43a
+Author: Marisa Kirisame 
+Date:   Tue Sep 29 23:10:31 2015 +0200
+
+    miniupnpc API version 14 changed the upnpDiscover functions, adding an argument for TTL (should default to 2)
+    this enables support for that should the build system have that specific version installed, the miniupnpc bundled in the project is unchanged
+
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -690,9 +690,12 @@ if(USE_UPNP)
+ 	if(NOT APPLE AND NOT ANDROID)
+ 		include(FindMiniupnpc)
+ 	endif()
+-	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
++	if(MINIUPNP_FOUND AND (MINIUPNPC_VERSION_1_7_OR_HIGHER OR MINIUPNPC_VERSION_API14_OR_HIGHER))
+ 		message("Using shared miniupnpc")
+ 		include_directories(${MINIUPNP_INCLUDE_DIR})
++		if (MINIUPNPC_VERSION_API14_OR_HIGHER)
++			add_definitions(-DUPNPDISCOVER_HAS_TTL)
++		endif()
+ 	else()
+ 		message("Using static miniupnpc from Externals")
+ 		add_subdirectory(Externals/miniupnpc)
+--- CMakeTests/FindMiniupnpc.cmake.orig
++++ CMakeTests/FindMiniupnpc.cmake
+@@ -58,6 +58,30 @@ if (MINIUPNP_FOUND)
+ 	#include 
+ 	int main()
+ 	{
++	struct UPNPDev *devlist = NULL;
++	int upnp_delay = 5000;
++	const char *upnp_multicastif = NULL;
++	const char *upnp_minissdpdsock = NULL;
++	int upnp_sameport = 0;
++	int upnp_ipv6 = 0;
++	unsigned char upnp_ttl = 2;
++	int upnp_error = 0;
++	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
++
++	return 0;
++	}"
++	MINIUPNPC_VERSION_API14_OR_HIGHER)
++
++IF (NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
++	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
++	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
++	check_cxx_source_runs("
++	#include 
++	#include 
++	#include 
++	#include 
++	int main()
++	{
+ 	static struct UPNPUrls urls;
+ 	static struct IGDdatas data;
+ 
+@@ -66,8 +90,9 @@ if (MINIUPNP_FOUND)
+ 	return 0;
+ 	}"
+ 	MINIUPNPC_VERSION_1_7_OR_HIGHER)
++   ENDIF()
+ 
+-IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
++IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
+ 	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+ 	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+ 	check_cxx_source_runs("
+@@ -91,7 +116,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+ 	MINIUPNPC_VERSION_PRE1_7)
+    ENDIF()
+ 
+-   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
++   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
+ 	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+ 	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+ 	   check_cxx_source_runs("
+@@ -116,7 +141,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+ 
+    ENDIF()
+ 
+-   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
++   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
+ 	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+ 	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+ 	   check_cxx_source_runs("
+@@ -136,7 +161,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+ 	   MINIUPNPC_VERSION_1_5_OR_HIGHER)
+ 	ENDIF()
+ 
+-	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
++	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
+ 		set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+ 		set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+ 		check_cxx_source_runs("
+@@ -167,10 +192,14 @@ IF(MINIUPNPC_VERSION_PRE1_7)
+ 	message(STATUS "Found miniupnpc version is pre v1.7")
+ ENDIF()
+ 
+-IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
++IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
+ 	message(STATUS "Found miniupnpc version is v1.7 or higher")
+ ENDIF()
+ 
++IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
++	message(STATUS "Found miniupnpc version is v1.9 API version 14 or higher")
++ENDIF()
++
+ else ()
+ 	message (STATUS "Could not find miniupnp")
+ endif ()
+--- Source/Core/Core/NetPlayServer.cpp.orig
++++ Source/Core/Core/NetPlayServer.cpp
+@@ -904,7 +904,11 @@ bool NetPlayServer::initUPnP()
+ 	memset(&m_upnp_data, 0, sizeof(IGDdatas));
+ 
+ 	// Find all UPnP devices
++#ifdef UPNPDISCOVER_HAS_TTL
++	UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &upnperror);
++#else
+ 	UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror);
++#endif
+ 	if (!devlist)
+ 	{
+ 		WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");

Modified: head/emulators/dolphin-emu/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu/files/patch-CMakeLists.txt	Sun Oct 18 13:49:38 2015	(r399619)
+++ head/emulators/dolphin-emu/files/patch-CMakeLists.txt	Sun Oct 18 15:22:59 2015	(r399620)
@@ -1,14 +1,28 @@
---- CMakeLists.txt.orig	2013-09-23 16:15:52.000000000 +0400
-+++ CMakeLists.txt	2014-08-20 17:37:42.000000000 +0400
-@@ -351,51 +351,81 @@
- 		message("OpenMP parallelization disabled")
- 	endif()
+Add switches to handle more options
+
+--- CMakeLists.txt.orig	2015-07-31 10:04:05.000000000 +0000
++++ CMakeLists.txt	2015-10-09 20:18:35.617017157 +0000
+@@ -8,6 +8,12 @@
+ option(TRY_X11 "Enables X11 Support" ON)
+ option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
+ option(USE_UPNP "Enables UPnP port mapping support" ON)
++option(DISABLE_ALSA "Disable ALSA sound backend" OFF)
++option(DISABLE_AO "Disable ao sound backend" OFF)
++option(DISABLE_BLUEZ "Disable bluez (bluetooth) support" OFF)
++option(DISABLE_PULSEAUDIO "Disable PulseAudio sound backend" OFF)
++option(DISABLE_OPENAL "Disable OpenAL sound backend" OFF)
++option(DISABLE_PORTAUDIO "Disable PortAudio sound backend" OFF)
+ option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
+ option(ENABLE_QT "Enable Qt (use the experimental Qt interface)" OFF)
+ option(ENABLE_PCH "Use PCH to speed up compilation" ON)
+@@ -391,51 +397,76 @@
+ 	include(FindOpenGL)
+ 	include_directories(${OPENGL_INCLUDE_DIR})
  
 -	include(FindALSA OPTIONAL)
 -	if(ALSA_FOUND)
 -		add_definitions(-DHAVE_ALSA=1)
 -		message("ALSA found, enabling ALSA sound backend")
-+	option(DISABLE_ALSA "Disable ALSA sound backend" OFF)
 +	if(NOT DISABLE_ALSA)
 +		include(FindALSA OPTIONAL)
 +		if(ALSA_FOUND)
@@ -25,13 +39,12 @@
 +		message("ALSA sound backend disabled")
 +	endif()
  
--	check_lib(AO ao QUIET)
+-	check_lib(AO ao ao QUIET)
 -	if(AO_FOUND)
 -		add_definitions(-DHAVE_AO=1)
 -		message("ao found, enabling ao sound backend")
-+	option(DISABLE_AO "Disable ao sound backend" OFF)
 +	if(NOT DISABLE_AO)
-+		check_lib(AO ao QUIET)
++		check_lib(AO ao ao QUIET)
 +		if(AO_FOUND)
 +			add_definitions(-DHAVE_AO=1)
 +			message("ao found, enabling ao sound backend")
@@ -46,13 +59,12 @@
 +		message("ao sound backend disabled")
 +	endif()
  
--	check_lib(BLUEZ bluez QUIET)
+-	check_lib(BLUEZ bluez bluez QUIET)
 -	if(BLUEZ_FOUND)
 -		add_definitions(-DHAVE_BLUEZ=1)
 -		message("bluez found, enabling bluetooth support")
-+	option(DISABLE_BLUEZ "Disable bluez (bluetooth) support" OFF)
 +	if(NOT DISABLE_BLUEZ)
-+		check_lib(BLUEZ bluez QUIET)
++		check_lib(BLUEZ bluez bluez QUIET)
 +		if(BLUEZ_FOUND)
 +			add_definitions(-DHAVE_BLUEZ=1)
 +			message("bluez found, enabling bluetooth support")
@@ -67,13 +79,12 @@
 +		message("bluez (bluetooth) support disabled")
 +	endif()
  
--	check_lib(PULSEAUDIO libpulse-simple QUIET)
+-	check_lib(PULSEAUDIO libpulse pulse QUIET)
 -	if(PULSEAUDIO_FOUND)
 -		add_definitions(-DHAVE_PULSEAUDIO=1)
 -		message("PulseAudio found, enabling PulseAudio sound backend")
-+	option(DISABLE_PULSEAUDIO "Disable PulseAudio sound backend" OFF)
 +	if(NOT DISABLE_PULSEAUDIO)
-+		check_lib(PULSEAUDIO libpulse-simple QUIET)
++		check_lib(PULSEAUDIO libpulse pulse QUIET)
 +		if(PULSEAUDIO_FOUND)
 +			add_definitions(-DHAVE_PULSEAUDIO=1)
 +			message("PulseAudio found, enabling PulseAudio sound backend")
@@ -93,7 +104,6 @@
 -		add_definitions(-DHAVE_OPENAL=1)
 -		include_directories(${OPENAL_INCLUDE_DIR})
 -		message("OpenAL found, enabling OpenAL sound backend")
-+	option(DISABLE_OPENAL "Disable OpenAL sound backend" OFF)
 +	if(NOT DISABLE_OPENAL)
 +		include(FindOpenAL OPTIONAL)
 +		if(OPENAL_FOUND)
@@ -111,22 +121,47 @@
 +		message("OpenAL sound backend disabled")
 +	endif()
  
- 	if(UNIX AND NOT APPLE)
- 		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
-@@ -577,14 +618,14 @@
- set(SFML_FIND_VERSION_MAJOR 1)
- set(SFML_FIND_VERSION_MINOR 5)
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
--	include(FindSFML OPTIONAL)
-+	#include(FindSFML OPTIONAL)
- endif()
- if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
- 	message("Using shared SFML")
- else()
- 	message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
- 	add_subdirectory(Externals/SFML)
--	include_directories(Externals/SFML/include)
-+	include_directories(BEFORE Externals/SFML/include)
- endif()
+ 	include(FindLLVM OPTIONAL)
+ 	if (LLVM_FOUND)
+@@ -494,22 +525,28 @@
+ 
+ 	endif()
+ 
+-	set(CMAKE_REQUIRED_LIBRARIES portaudio)
+-	CHECK_CXX_SOURCE_RUNS(
+-		"#include 
+-		int main(int argc, char **argv)
+-		{ if(Pa_GetVersion() >= 1890) return 0; else return 1; }"
+-		PORTAUDIO)
+-	unset(CMAKE_REQUIRED_LIBRARIES)
+-	if(PORTAUDIO)
+-		message("PortAudio found, enabling mic support")
+-		add_definitions(-DHAVE_PORTAUDIO=1)
+-		set(PORTAUDIO_FOUND TRUE)
++	if(NOT DISABLE_PORTAUDIO)
++		set(CMAKE_REQUIRED_LIBRARIES portaudio)
++		CHECK_CXX_SOURCE_RUNS(
++			"#include 
++			int main(int argc, char **argv)
++			{ if(Pa_GetVersion() >= 1890) return 0; else return 1; }"
++			PORTAUDIO)
++		unset(CMAKE_REQUIRED_LIBRARIES)
++		if(PORTAUDIO)
++			message("PortAudio found, enabling mic support")
++			add_definitions(-DHAVE_PORTAUDIO=1)
++			set(PORTAUDIO_FOUND TRUE)
++		else()
++			message("PortAudio not found, disabling mic support")
++			add_definitions(-DHAVE_PORTAUDIO=0)
++			set(PORTAUDIO_FOUND FALSE)
++		endif(PORTAUDIO)
+ 	else()
+-		message("PortAudio not found, disabling mic support")
++		message("PortAudio disabled")
+ 		add_definitions(-DHAVE_PORTAUDIO=0)
+ 		set(PORTAUDIO_FOUND FALSE)
+-	endif(PORTAUDIO)
++	endif()
  
- if(USE_UPNP)
+ 	if(OPROFILING)
+ 		check_lib(OPROFILE "(no .pc for opagent)" opagent opagent.h)

Modified: head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake
==============================================================================
--- head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake	Sun Oct 18 13:49:38 2015	(r399619)
+++ head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake	Sun Oct 18 15:22:59 2015	(r399620)
@@ -1,11 +1,19 @@
---- CMakeTests/FindLibUSB.cmake.orig	2013-09-17 08:41:32.000000000 +0200
-+++ CMakeTests/FindLibUSB.cmake	2013-09-17 08:41:41.000000000 +0200
-@@ -23,7 +23,7 @@
+Adapt libusb name for FreeBSD
+
+--- CMakeTests/FindLibUSB.cmake.orig	2015-10-09 20:30:03.218968702 +0000
++++ CMakeTests/FindLibUSB.cmake	2015-10-09 20:36:02.787944507 +0000
+@@ -23,7 +23,13 @@
         /usr/local/include
      )
  
 -    find_library(LIBUSB_LIBRARIES NAMES usb-1.0
-+    find_library(LIBUSB_LIBRARIES NAMES usb
++    if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++        set(LIBUSB_LIBRARY "usb")
++    else()
++        set(LIBUSB_LIBRARY "usb-1.0")
++    endif()
++
++    find_library(LIBUSB_LIBRARIES NAMES ${LIBUSB_LIBRARY}
         PATHS
         ${LIBUSB_PKG_LIBRARY_DIRS}
         /usr/lib

Added: head/emulators/dolphin-emu/files/patch-CMakeTests-FindPolarSSL.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-CMakeTests-FindPolarSSL.cmake	Sun Oct 18 15:22:59 2015	(r399620)
@@ -0,0 +1,13 @@
+Add missing header for strlen()
+
+--- CMakeTests/FindPolarSSL.cmake.orig	2015-10-05 20:23:44.048812679 +0000
++++ CMakeTests/FindPolarSSL.cmake	2015-10-05 20:26:09.643030106 +0000
+@@ -34,6 +34,8 @@
+ 	set(CMAKE_REQUIRED_LIBRARIES ${POLARSSL_LIBRARY})
+ 	unset(POLARSSL_WORKS CACHE)
+ 	check_cxx_source_compiles("
++	#include 
++
+ 	#include 
+ 	#include 
+ 	#include 

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-EXI_DeviceMic.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-EXI_DeviceMic.cpp	Sun Oct 18 15:22:59 2015	(r399620)
@@ -0,0 +1,14 @@
+Add missing headers for EXPANSIONINTERFACE definition + memset()/memcpy() functions
+
+--- Source/Core/Core/HW/EXI_DeviceMic.cpp.orig	2015-10-10 12:33:01.119987304 +0000
++++ Source/Core/Core/HW/EXI_DeviceMic.cpp	2015-10-10 12:36:08.152135888 +0000
+@@ -12,7 +12,9 @@
+ #include "Core/HW/EXI_DeviceMic.h"
+ #include "Core/HW/GCPad.h"
+ #include "Core/HW/SystemTimers.h"
++#include "Logging/Log.h"
+ 
++#include 
+ #include 
+ 
+ void CEXIMic::StreamLog(const char *msg)

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_DeviceAMBaseboard.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_DeviceAMBaseboard.cpp	Sun Oct 18 15:22:59 2015	(r399620)
@@ -0,0 +1,12 @@
+Add missing header for sprintf()
+
+--- Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp.orig	2015-10-10 13:10:03.586833708 +0000
++++ Source/Core/Core/HW/SI_DeviceAMBaseboard.cpp	2015-10-10 13:10:33.293832071 +0000
+@@ -2,6 +2,7 @@
+ // Licensed under GPLv2+
+ // Refer to the license.txt file included.
+ 
++#include 
+ #include 
+ 
+ #include "Common/MsgHandler.h"

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp	Sun Oct 18 15:22:59 2015	(r399620)
@@ -0,0 +1,56 @@
+Disable hotplug support for FreeBSD
+
+--- Source/Core/Core/HW/SI_GCAdapter.cpp.orig	2015-10-09 20:50:29.920884454 +0000
++++ Source/Core/Core/HW/SI_GCAdapter.cpp	2015-10-09 20:53:25.933872616 +0000
+@@ -49,7 +49,9 @@
+ static bool s_libusb_driver_not_supported = false;
+ static libusb_context* s_libusb_context = nullptr;
+ static bool s_libusb_hotplug_enabled = false;
++#if !defined(__FreeBSD__)
+ static libusb_hotplug_callback_handle s_hotplug_handle;
++#endif
+ 
+ static u8 s_endpoint_in = 0;
+ static u8 s_endpoint_out = 0;
+@@ -71,6 +73,7 @@
+ 	}
+ }
+ 
++#if !defined(__FreeBSD__)
+ static int HotplugCallback(libusb_context* ctx, libusb_device* dev, libusb_hotplug_event event, void* user_data)
+ {
+ 	if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED)
+@@ -85,12 +88,14 @@
+ 	}
+ 	return 0;
+ }
++#endif
+ 
+ static void ScanThreadFunc()
+ {
+ 	Common::SetCurrentThreadName("GC Adapter Scanning Thread");
+ 	NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread started");
+ 
++#if !defined(__FreeBSD__)
+ 	s_libusb_hotplug_enabled = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0;
+ 	if (s_libusb_hotplug_enabled)
+ 	{
+@@ -99,6 +104,7 @@
+ 		if (s_libusb_hotplug_enabled)
+ 			NOTICE_LOG(SERIALINTERFACE, "Using libUSB hotplug detection");
+ 	}
++#endif
+ 
+ 	while (s_adapter_detect_thread_running.IsSet())
+ 	{
+@@ -298,8 +304,10 @@
+ void Shutdown()
+ {
+ 	StopScanThread();
++#if !defined(__FreeBSD__)
+ 	if (s_libusb_hotplug_enabled)
+ 		libusb_hotplug_deregister_callback(s_libusb_context, s_hotplug_handle);
++#endif
+ 	Reset();
+ 
+ 	if (s_libusb_context)

Modified: head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt	Sun Oct 18 13:49:38 2015	(r399619)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt	Sun Oct 18 15:22:59 2015	(r399620)
@@ -1,31 +1,10 @@
---- Source/Core/DolphinWX/CMakeLists.txt.orig	2013-09-17 07:16:04.000000000 +0200
-+++ Source/Core/DolphinWX/CMakeLists.txt	2013-09-25 05:06:25.000000000 +0200
-@@ -3,6 +3,7 @@
- endif()
- 
- set(LIBS	core
-+			execinfo
- 			${LZO}
- 			discio
- 			bdisasm
-@@ -39,7 +40,13 @@
- 		endif()
- 	endif()
- else()
--	set(LIBS ${LIBS} png iconv)
-+	set(LIBS ${LIBS} png)
-+	set(ICONV_LINK True)
-+endif()
-+
-+if(ICONV_LINK)
-+	message( "-- Linking to libiconv")
-+	set(LIBS ${LIBS} iconv)
- endif()
+Add DISABLE_NLS option
+
+--- Source/Core/DolphinWX/CMakeLists.txt.orig	2015-10-06 20:47:47.480759056 +0000
++++ Source/Core/DolphinWX/CMakeLists.txt	2015-10-06 20:49:16.636752942 +0000
+@@ -101,11 +101,14 @@
  
- if(LIBAV_FOUND)
-@@ -174,11 +181,14 @@
-   set(LIBS  ${LIBS} miniupnpc)
- endif()
+ set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
  
 -include(FindGettext)
 -if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)

Added: head/emulators/dolphin-emu/files/patch-Source-Core-InputCommon-ControllerInterface-Xlib-XInput2.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-InputCommon-ControllerInterface-Xlib-XInput2.cpp	Sun Oct 18 15:22:59 2015	(r399620)
@@ -0,0 +1,12 @@
+Add missing header for free()
+
+--- Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp.orig	2015-10-06 19:54:17.411980007 +0000
++++ Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp	2015-10-06 19:54:39.087291205 +0000
+@@ -4,6 +4,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "InputCommon/ControllerInterface/Xlib/XInput2.h"

Modified: head/emulators/dolphin-emu/pkg-plist
==============================================================================
--- head/emulators/dolphin-emu/pkg-plist	Sun Oct 18 13:49:38 2015	(r399619)
+++ head/emulators/dolphin-emu/pkg-plist	Sun Oct 18 15:22:59 2015	(r399620)
@@ -1,4 +1,5 @@
 bin/dolphin-emu
+bin/dolphin-emu-nogui
 %%NLS%%share/locale/ar/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/dolphin-emu.mo
@@ -24,1701 +25,1648 @@ bin/dolphin-emu
 %%NLS%%share/locale/tr/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/dolphin-emu.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dolphin-emu.mo
-%%DATADIR%%/sys/codehandler.bin
-%%DATADIR%%/sys/totaldb.dsy
 %%DATADIR%%/sys/GC/dsp_coef.bin
 %%DATADIR%%/sys/GC/dsp_rom.bin
-%%DATADIR%%/sys/GC/font_sjis.bin
+%%DATADIR%%/sys/GC/font-licenses.txt
 %%DATADIR%%/sys/GC/font_ansi.bin
+%%DATADIR%%/sys/GC/font_sjis.bin
+%%DATADIR%%/sys/GameSettings/010.ini
+%%DATADIR%%/sys/GameSettings/301.ini
+%%DATADIR%%/sys/GameSettings/C94.ini
+%%DATADIR%%/sys/GameSettings/C96.ini
+%%DATADIR%%/sys/GameSettings/C97.ini
+%%DATADIR%%/sys/GameSettings/C9M.ini
+%%DATADIR%%/sys/GameSettings/C9X.ini
+%%DATADIR%%/sys/GameSettings/D43.ini
+%%DATADIR%%/sys/GameSettings/D43E01.ini
+%%DATADIR%%/sys/GameSettings/D43J01.ini
+%%DATADIR%%/sys/GameSettings/D85.ini
+%%DATADIR%%/sys/GameSettings/DD2.ini
+%%DATADIR%%/sys/GameSettings/DLS.ini
+%%DATADIR%%/sys/GameSettings/DTL.ini
+%%DATADIR%%/sys/GameSettings/FA6.ini
+%%DATADIR%%/sys/GameSettings/FA7.ini
+%%DATADIR%%/sys/GameSettings/FA8.ini
+%%DATADIR%%/sys/GameSettings/FA9.ini
+%%DATADIR%%/sys/GameSettings/FAA.ini
+%%DATADIR%%/sys/GameSettings/FAB.ini
+%%DATADIR%%/sys/GameSettings/FAG.ini
+%%DATADIR%%/sys/GameSettings/FAH.ini
+%%DATADIR%%/sys/GameSettings/FAK.ini
+%%DATADIR%%/sys/GameSettings/FAL.ini
+%%DATADIR%%/sys/GameSettings/FAN.ini
+%%DATADIR%%/sys/GameSettings/FAO.ini
+%%DATADIR%%/sys/GameSettings/FAP.ini
+%%DATADIR%%/sys/GameSettings/FAQ.ini
+%%DATADIR%%/sys/GameSettings/FAS.ini
+%%DATADIR%%/sys/GameSettings/FAT.ini
+%%DATADIR%%/sys/GameSettings/FAV.ini
+%%DATADIR%%/sys/GameSettings/FAW.ini
+%%DATADIR%%/sys/GameSettings/FAX.ini
+%%DATADIR%%/sys/GameSettings/FB4.ini
+%%DATADIR%%/sys/GameSettings/FB5.ini
+%%DATADIR%%/sys/GameSettings/FBB.ini
+%%DATADIR%%/sys/GameSettings/FBC.ini
+%%DATADIR%%/sys/GameSettings/FBD.ini
+%%DATADIR%%/sys/GameSettings/FBE.ini
+%%DATADIR%%/sys/GameSettings/FBH.ini
+%%DATADIR%%/sys/GameSettings/FBI.ini
+%%DATADIR%%/sys/GameSettings/FBJ.ini
+%%DATADIR%%/sys/GameSettings/FBL.ini
+%%DATADIR%%/sys/GameSettings/FBN.ini
+%%DATADIR%%/sys/GameSettings/FBR.ini
+%%DATADIR%%/sys/GameSettings/FBS.ini
+%%DATADIR%%/sys/GameSettings/FBU.ini
+%%DATADIR%%/sys/GameSettings/FBY.ini
+%%DATADIR%%/sys/GameSettings/FBZ.ini
+%%DATADIR%%/sys/GameSettings/FC3.ini
+%%DATADIR%%/sys/GameSettings/FC6.ini
+%%DATADIR%%/sys/GameSettings/FC7.ini
+%%DATADIR%%/sys/GameSettings/FC8.ini
+%%DATADIR%%/sys/GameSettings/FCA.ini
+%%DATADIR%%/sys/GameSettings/FCP.ini
+%%DATADIR%%/sys/GameSettings/FCQ.ini
+%%DATADIR%%/sys/GameSettings/FCR.ini
+%%DATADIR%%/sys/GameSettings/FCS.ini
+%%DATADIR%%/sys/GameSettings/FCT.ini
+%%DATADIR%%/sys/GameSettings/FCU.ini
+%%DATADIR%%/sys/GameSettings/FCV.ini
+%%DATADIR%%/sys/GameSettings/FCW.ini
+%%DATADIR%%/sys/GameSettings/FCY.ini
+%%DATADIR%%/sys/GameSettings/FCZ.ini
+%%DATADIR%%/sys/GameSettings/FD2.ini
+%%DATADIR%%/sys/GameSettings/FD6.ini
+%%DATADIR%%/sys/GameSettings/FD7.ini
+%%DATADIR%%/sys/GameSettings/FDA.ini
+%%DATADIR%%/sys/GameSettings/FDF.ini
+%%DATADIR%%/sys/GameSettings/FDG.ini
+%%DATADIR%%/sys/GameSettings/FDL.ini
+%%DATADIR%%/sys/GameSettings/FDN.ini
+%%DATADIR%%/sys/GameSettings/FDO.ini
+%%DATADIR%%/sys/GameSettings/FDP.ini
+%%DATADIR%%/sys/GameSettings/FDQ.ini
+%%DATADIR%%/sys/GameSettings/FDT.ini
+%%DATADIR%%/sys/GameSettings/FDU.ini
+%%DATADIR%%/sys/GameSettings/FDV.ini
+%%DATADIR%%/sys/GameSettings/FEC.ini
+%%DATADIR%%/sys/GameSettings/FED.ini
+%%DATADIR%%/sys/GameSettings/FEI.ini
+%%DATADIR%%/sys/GameSettings/FEM.ini
+%%DATADIR%%/sys/GameSettings/FEN.ini
+%%DATADIR%%/sys/GameSettings/FEQ.ini
+%%DATADIR%%/sys/GameSettings/FER.ini
+%%DATADIR%%/sys/GameSettings/FES.ini
+%%DATADIR%%/sys/GameSettings/FEU.ini
+%%DATADIR%%/sys/GameSettings/FFA.ini
+%%DATADIR%%/sys/GameSettings/FFD.ini
+%%DATADIR%%/sys/GameSettings/FFE.ini
+%%DATADIR%%/sys/GameSettings/FFL.ini
+%%DATADIR%%/sys/GameSettings/FFM.ini
+%%DATADIR%%/sys/GameSettings/FFN.ini
+%%DATADIR%%/sys/GameSettings/FFQ.ini
+%%DATADIR%%/sys/GameSettings/G2B.ini
+%%DATADIR%%/sys/GameSettings/G2C.ini
+%%DATADIR%%/sys/GameSettings/G2F.ini
+%%DATADIR%%/sys/GameSettings/G2FE78.ini
+%%DATADIR%%/sys/GameSettings/G2G.ini
+%%DATADIR%%/sys/GameSettings/G2M.ini
+%%DATADIR%%/sys/GameSettings/G2ME01.ini
+%%DATADIR%%/sys/GameSettings/G2MEAB.ini
+%%DATADIR%%/sys/GameSettings/G2MP01.ini
+%%DATADIR%%/sys/GameSettings/G2O.ini
+%%DATADIR%%/sys/GameSettings/G2R.ini
+%%DATADIR%%/sys/GameSettings/G2T.ini
+%%DATADIR%%/sys/GameSettings/G2V.ini
+%%DATADIR%%/sys/GameSettings/G2X.ini
+%%DATADIR%%/sys/GameSettings/G3A.ini
+%%DATADIR%%/sys/GameSettings/G3B.ini
+%%DATADIR%%/sys/GameSettings/G3D.ini
+%%DATADIR%%/sys/GameSettings/G3E.ini
+%%DATADIR%%/sys/GameSettings/G3F.ini
+%%DATADIR%%/sys/GameSettings/G3J.ini
+%%DATADIR%%/sys/GameSettings/G3L.ini
+%%DATADIR%%/sys/GameSettings/G3N.ini
+%%DATADIR%%/sys/GameSettings/G3Q.ini
+%%DATADIR%%/sys/GameSettings/G3R.ini
+%%DATADIR%%/sys/GameSettings/G3S.ini
+%%DATADIR%%/sys/GameSettings/G3V.ini
+%%DATADIR%%/sys/GameSettings/G3X.ini
+%%DATADIR%%/sys/GameSettings/G4A.ini
+%%DATADIR%%/sys/GameSettings/G4B.ini
+%%DATADIR%%/sys/GameSettings/G4C.ini
+%%DATADIR%%/sys/GameSettings/G4F.ini
+%%DATADIR%%/sys/GameSettings/G4G.ini
+%%DATADIR%%/sys/GameSettings/G4GEE9.ini
+%%DATADIR%%/sys/GameSettings/G4M.ini
+%%DATADIR%%/sys/GameSettings/G4N.ini
+%%DATADIR%%/sys/GameSettings/G4NJDA.ini
+%%DATADIR%%/sys/GameSettings/G4O.ini
+%%DATADIR%%/sys/GameSettings/G4Q.ini
+%%DATADIR%%/sys/GameSettings/G4QE01.ini
+%%DATADIR%%/sys/GameSettings/G4S.ini
+%%DATADIR%%/sys/GameSettings/G4SP01.ini
+%%DATADIR%%/sys/GameSettings/G4Z.ini
+%%DATADIR%%/sys/GameSettings/G5D.ini
+%%DATADIR%%/sys/GameSettings/G5N.ini
+%%DATADIR%%/sys/GameSettings/G5S.ini
+%%DATADIR%%/sys/GameSettings/G5T.ini
+%%DATADIR%%/sys/GameSettings/G63.ini
+%%DATADIR%%/sys/GameSettings/G6F.ini
+%%DATADIR%%/sys/GameSettings/G6M.ini
+%%DATADIR%%/sys/GameSettings/G6N.ini
+%%DATADIR%%/sys/GameSettings/G6Q.ini
+%%DATADIR%%/sys/GameSettings/G6T.ini
+%%DATADIR%%/sys/GameSettings/G6W.ini
+%%DATADIR%%/sys/GameSettings/G89.ini
+%%DATADIR%%/sys/GameSettings/G8F.ini
+%%DATADIR%%/sys/GameSettings/G8M.ini
+%%DATADIR%%/sys/GameSettings/G8ME01.ini
+%%DATADIR%%/sys/GameSettings/G8O.ini
+%%DATADIR%%/sys/GameSettings/G8S.ini
+%%DATADIR%%/sys/GameSettings/G8W.ini
+%%DATADIR%%/sys/GameSettings/G8WP01.ini
+%%DATADIR%%/sys/GameSettings/G9B.ini
+%%DATADIR%%/sys/GameSettings/G9R.ini
+%%DATADIR%%/sys/GameSettings/G9S.ini
+%%DATADIR%%/sys/GameSettings/G9T.ini
+%%DATADIR%%/sys/GameSettings/GA2.ini
+%%DATADIR%%/sys/GameSettings/GA3.ini
+%%DATADIR%%/sys/GameSettings/GA4.ini
+%%DATADIR%%/sys/GameSettings/GA7.ini
+%%DATADIR%%/sys/GameSettings/GAB.ini
+%%DATADIR%%/sys/GameSettings/GAC.ini
+%%DATADIR%%/sys/GameSettings/GAF.ini
+%%DATADIR%%/sys/GameSettings/GAFE01.ini
+%%DATADIR%%/sys/GameSettings/GAG.ini
+%%DATADIR%%/sys/GameSettings/GAH.ini
+%%DATADIR%%/sys/GameSettings/GAK.ini
+%%DATADIR%%/sys/GameSettings/GAL.ini
+%%DATADIR%%/sys/GameSettings/GALE01r0.ini
+%%DATADIR%%/sys/GameSettings/GALE01r1.ini
+%%DATADIR%%/sys/GameSettings/GALE01r2.ini
+%%DATADIR%%/sys/GameSettings/GALP01.ini
+%%DATADIR%%/sys/GameSettings/GAM.ini
+%%DATADIR%%/sys/GameSettings/GAN.ini
+%%DATADIR%%/sys/GameSettings/GAP.ini
+%%DATADIR%%/sys/GameSettings/GAQ.ini
+%%DATADIR%%/sys/GameSettings/GAR.ini
+%%DATADIR%%/sys/GameSettings/GAT.ini
+%%DATADIR%%/sys/GameSettings/GAU.ini
+%%DATADIR%%/sys/GameSettings/GAUE08.ini
+%%DATADIR%%/sys/GameSettings/GAV.ini
+%%DATADIR%%/sys/GameSettings/GAX.ini
+%%DATADIR%%/sys/GameSettings/GAY.ini
+%%DATADIR%%/sys/GameSettings/GAZ.ini
+%%DATADIR%%/sys/GameSettings/GB3.ini
+%%DATADIR%%/sys/GameSettings/GB4.ini
+%%DATADIR%%/sys/GameSettings/GB4E51.ini
+%%DATADIR%%/sys/GameSettings/GBD.ini
+%%DATADIR%%/sys/GameSettings/GBF.ini
+%%DATADIR%%/sys/GameSettings/GBG.ini
+%%DATADIR%%/sys/GameSettings/GBH.ini
+%%DATADIR%%/sys/GameSettings/GBHEC8.ini
+%%DATADIR%%/sys/GameSettings/GBI.ini
+%%DATADIR%%/sys/GameSettings/GBK.ini
+%%DATADIR%%/sys/GameSettings/GBL.ini
+%%DATADIR%%/sys/GameSettings/GBLPGL.ini
+%%DATADIR%%/sys/GameSettings/GBM.ini
+%%DATADIR%%/sys/GameSettings/GBO.ini
+%%DATADIR%%/sys/GameSettings/GBOP51.ini
+%%DATADIR%%/sys/GameSettings/GBQ.ini
+%%DATADIR%%/sys/GameSettings/GBS.ini
+%%DATADIR%%/sys/GameSettings/GBT.ini
+%%DATADIR%%/sys/GameSettings/GBV.ini
+%%DATADIR%%/sys/GameSettings/GBW.ini
+%%DATADIR%%/sys/GameSettings/GBX.ini
+%%DATADIR%%/sys/GameSettings/GBY.ini
+%%DATADIR%%/sys/GameSettings/GBZ.ini
+%%DATADIR%%/sys/GameSettings/GBZP08.ini
+%%DATADIR%%/sys/GameSettings/GC2.ini
+%%DATADIR%%/sys/GameSettings/GC3.ini
+%%DATADIR%%/sys/GameSettings/GC4.ini
+%%DATADIR%%/sys/GameSettings/GC5.ini
+%%DATADIR%%/sys/GameSettings/GC6.ini
+%%DATADIR%%/sys/GameSettings/GC7.ini
+%%DATADIR%%/sys/GameSettings/GC9.ini
+%%DATADIR%%/sys/GameSettings/GCA.ini
+%%DATADIR%%/sys/GameSettings/GCB.ini
+%%DATADIR%%/sys/GameSettings/GCC.ini
+%%DATADIR%%/sys/GameSettings/GCCE01.ini
+%%DATADIR%%/sys/GameSettings/GCD.ini
+%%DATADIR%%/sys/GameSettings/GCE.ini
+%%DATADIR%%/sys/GameSettings/GCF.ini
+%%DATADIR%%/sys/GameSettings/GCG.ini
+%%DATADIR%%/sys/GameSettings/GCH.ini
+%%DATADIR%%/sys/GameSettings/GCI.ini
+%%DATADIR%%/sys/GameSettings/GCJ.ini
+%%DATADIR%%/sys/GameSettings/GCL.ini
+%%DATADIR%%/sys/GameSettings/GCN.ini
+%%DATADIR%%/sys/GameSettings/GCO.ini
+%%DATADIR%%/sys/GameSettings/GCOPDV.ini
+%%DATADIR%%/sys/GameSettings/GCP.ini
+%%DATADIR%%/sys/GameSettings/GCQ.ini
+%%DATADIR%%/sys/GameSettings/GCS.ini
+%%DATADIR%%/sys/GameSettings/GCT.ini
+%%DATADIR%%/sys/GameSettings/GCV.ini
+%%DATADIR%%/sys/GameSettings/GCVEEB.ini
+%%DATADIR%%/sys/GameSettings/GCZ.ini
+%%DATADIR%%/sys/GameSettings/GD4.ini
+%%DATADIR%%/sys/GameSettings/GD6.ini
+%%DATADIR%%/sys/GameSettings/GD7.ini
+%%DATADIR%%/sys/GameSettings/GD9.ini
+%%DATADIR%%/sys/GameSettings/GDD.ini
+%%DATADIR%%/sys/GameSettings/GDDE41.ini
+%%DATADIR%%/sys/GameSettings/GDE.ini
+%%DATADIR%%/sys/GameSettings/GDEE71.ini
+%%DATADIR%%/sys/GameSettings/GDF.ini
+%%DATADIR%%/sys/GameSettings/GDG.ini
+%%DATADIR%%/sys/GameSettings/GDI.ini
+%%DATADIR%%/sys/GameSettings/GDJ.ini
+%%DATADIR%%/sys/GameSettings/GDJEB2.ini
+%%DATADIR%%/sys/GameSettings/GDK.ini
+%%DATADIR%%/sys/GameSettings/GDL.ini
+%%DATADIR%%/sys/GameSettings/GDM.ini
+%%DATADIR%%/sys/GameSettings/GDQ.ini
+%%DATADIR%%/sys/GameSettings/GDR.ini
+%%DATADIR%%/sys/GameSettings/GDS.ini
+%%DATADIR%%/sys/GameSettings/GDT.ini
+%%DATADIR%%/sys/GameSettings/GDTE69.ini
+%%DATADIR%%/sys/GameSettings/GDV.ini
+%%DATADIR%%/sys/GameSettings/GDW.ini
+%%DATADIR%%/sys/GameSettings/GDX.ini
+%%DATADIR%%/sys/GameSettings/GE3.ini
+%%DATADIR%%/sys/GameSettings/GE4.ini
+%%DATADIR%%/sys/GameSettings/GE5.ini
+%%DATADIR%%/sys/GameSettings/GE5EA4.ini
+%%DATADIR%%/sys/GameSettings/GE9.ini
+%%DATADIR%%/sys/GameSettings/GEA.ini
+%%DATADIR%%/sys/GameSettings/GEB.ini
+%%DATADIR%%/sys/GameSettings/GED.ini
+%%DATADIR%%/sys/GameSettings/GEM.ini
+%%DATADIR%%/sys/GameSettings/GEN.ini
+%%DATADIR%%/sys/GameSettings/GEO.ini
+%%DATADIR%%/sys/GameSettings/GES.ini
+%%DATADIR%%/sys/GameSettings/GEW.ini
+%%DATADIR%%/sys/GameSettings/GEX.ini
+%%DATADIR%%/sys/GameSettings/GEY.ini
+%%DATADIR%%/sys/GameSettings/GEZ.ini
+%%DATADIR%%/sys/GameSettings/GF2.ini
+%%DATADIR%%/sys/GameSettings/GF4.ini
+%%DATADIR%%/sys/GameSettings/GF5.ini
+%%DATADIR%%/sys/GameSettings/GF6.ini
+%%DATADIR%%/sys/GameSettings/GF7.ini
+%%DATADIR%%/sys/GameSettings/GF7E01.ini
+%%DATADIR%%/sys/GameSettings/GF7P01.ini
+%%DATADIR%%/sys/GameSettings/GF8.ini
+%%DATADIR%%/sys/GameSettings/GF8E69.ini
+%%DATADIR%%/sys/GameSettings/GFA.ini
+%%DATADIR%%/sys/GameSettings/GFB.ini
+%%DATADIR%%/sys/GameSettings/GFC.ini
+%%DATADIR%%/sys/GameSettings/GFD.ini
+%%DATADIR%%/sys/GameSettings/GFE.ini
+%%DATADIR%%/sys/GameSettings/GFEE01.ini
+%%DATADIR%%/sys/GameSettings/GFEJ01.ini
+%%DATADIR%%/sys/GameSettings/GFF.ini
+%%DATADIR%%/sys/GameSettings/GFG.ini
+%%DATADIR%%/sys/GameSettings/GFH.ini
+%%DATADIR%%/sys/GameSettings/GFK.ini
+%%DATADIR%%/sys/GameSettings/GFO.ini
+%%DATADIR%%/sys/GameSettings/GFP.ini
+%%DATADIR%%/sys/GameSettings/GFQ.ini
+%%DATADIR%%/sys/GameSettings/GFT.ini
+%%DATADIR%%/sys/GameSettings/GFU.ini
+%%DATADIR%%/sys/GameSettings/GFX.ini
+%%DATADIR%%/sys/GameSettings/GFY.ini
+%%DATADIR%%/sys/GameSettings/GFYE69.ini
+%%DATADIR%%/sys/GameSettings/GFZ.ini
+%%DATADIR%%/sys/GameSettings/GFZE01.ini
+%%DATADIR%%/sys/GameSettings/GFZJ01.ini
+%%DATADIR%%/sys/GameSettings/GFZJ8P.ini
+%%DATADIR%%/sys/GameSettings/GFZP01.ini
+%%DATADIR%%/sys/GameSettings/GG4.ini
+%%DATADIR%%/sys/GameSettings/GG4P08.ini
+%%DATADIR%%/sys/GameSettings/GG5.ini
+%%DATADIR%%/sys/GameSettings/GGA.ini
+%%DATADIR%%/sys/GameSettings/GGC.ini
+%%DATADIR%%/sys/GameSettings/GGCOSD.ini
+%%DATADIR%%/sys/GameSettings/GGE.ini
+%%DATADIR%%/sys/GameSettings/GGM.ini
+%%DATADIR%%/sys/GameSettings/GGN.ini
+%%DATADIR%%/sys/GameSettings/GGP.ini
+%%DATADIR%%/sys/GameSettings/GGPE01.ini
+%%DATADIR%%/sys/GameSettings/GGPE02.ini
+%%DATADIR%%/sys/GameSettings/GGR.ini
+%%DATADIR%%/sys/GameSettings/GGS.ini
+%%DATADIR%%/sys/GameSettings/GGSEA4.ini
+%%DATADIR%%/sys/GameSettings/GGSPA4.ini
+%%DATADIR%%/sys/GameSettings/GGT.ini
+%%DATADIR%%/sys/GameSettings/GGTE01.ini
+%%DATADIR%%/sys/GameSettings/GGV.ini
+%%DATADIR%%/sys/GameSettings/GGY.ini
+%%DATADIR%%/sys/GameSettings/GGZ.ini
+%%DATADIR%%/sys/GameSettings/GH2.ini
+%%DATADIR%%/sys/GameSettings/GH4.ini
+%%DATADIR%%/sys/GameSettings/GH5.ini
+%%DATADIR%%/sys/GameSettings/GH6.ini
+%%DATADIR%%/sys/GameSettings/GH7.ini
+%%DATADIR%%/sys/GameSettings/GHA.ini
+%%DATADIR%%/sys/GameSettings/GHB.ini
+%%DATADIR%%/sys/GameSettings/GHC.ini
+%%DATADIR%%/sys/GameSettings/GHG.ini
+%%DATADIR%%/sys/GameSettings/GHK.ini
+%%DATADIR%%/sys/GameSettings/GHL.ini
+%%DATADIR%%/sys/GameSettings/GHM.ini
+%%DATADIR%%/sys/GameSettings/GHME4F.ini
+%%DATADIR%%/sys/GameSettings/GHN.ini
+%%DATADIR%%/sys/GameSettings/GHQ.ini
+%%DATADIR%%/sys/GameSettings/GHR.ini
+%%DATADIR%%/sys/GameSettings/GHRE78.ini
+%%DATADIR%%/sys/GameSettings/GHS.ini
+%%DATADIR%%/sys/GameSettings/GHU.ini
+%%DATADIR%%/sys/GameSettings/GHV.ini
+%%DATADIR%%/sys/GameSettings/GHW.ini
+%%DATADIR%%/sys/GameSettings/GHY.ini
+%%DATADIR%%/sys/GameSettings/GHZ.ini
+%%DATADIR%%/sys/GameSettings/GIA.ini
+%%DATADIR%%/sys/GameSettings/GIB.ini
+%%DATADIR%%/sys/GameSettings/GIC.ini
+%%DATADIR%%/sys/GameSettings/GICE78.ini
+%%DATADIR%%/sys/GameSettings/GIG.ini
+%%DATADIR%%/sys/GameSettings/GIGJ8P.ini
+%%DATADIR%%/sys/GameSettings/GIK.ini
+%%DATADIR%%/sys/GameSettings/GIL.ini
+%%DATADIR%%/sys/GameSettings/GIN.ini
+%%DATADIR%%/sys/GameSettings/GINE69.ini
+%%DATADIR%%/sys/GameSettings/GIP.ini
+%%DATADIR%%/sys/GameSettings/GIQ.ini
+%%DATADIR%%/sys/GameSettings/GIQE78.ini
+%%DATADIR%%/sys/GameSettings/GIS.ini
+%%DATADIR%%/sys/GameSettings/GIT.ini
+%%DATADIR%%/sys/GameSettings/GIV.ini
+%%DATADIR%%/sys/GameSettings/GIZ.ini
+%%DATADIR%%/sys/GameSettings/GJ3.ini
+%%DATADIR%%/sys/GameSettings/GJB.ini
+%%DATADIR%%/sys/GameSettings/GJC.ini
+%%DATADIR%%/sys/GameSettings/GJCE8P.ini
+%%DATADIR%%/sys/GameSettings/GJD.ini
+%%DATADIR%%/sys/GameSettings/GJK.ini
+%%DATADIR%%/sys/GameSettings/GJN.ini
+%%DATADIR%%/sys/GameSettings/GJS.ini
+%%DATADIR%%/sys/GameSettings/GJU.ini
+%%DATADIR%%/sys/GameSettings/GJUE78.ini
+%%DATADIR%%/sys/GameSettings/GJW.ini
+%%DATADIR%%/sys/GameSettings/GJWE78.ini
+%%DATADIR%%/sys/GameSettings/GJX.ini
+%%DATADIR%%/sys/GameSettings/GJZ.ini
+%%DATADIR%%/sys/GameSettings/GK2.ini
+%%DATADIR%%/sys/GameSettings/GK4.ini
+%%DATADIR%%/sys/GameSettings/GK4E01.ini
+%%DATADIR%%/sys/GameSettings/GK5.ini
+%%DATADIR%%/sys/GameSettings/GK6.ini
+%%DATADIR%%/sys/GameSettings/GK7.ini
+%%DATADIR%%/sys/GameSettings/GK9.ini
+%%DATADIR%%/sys/GameSettings/GKA.ini
+%%DATADIR%%/sys/GameSettings/GKB.ini
+%%DATADIR%%/sys/GameSettings/GKD.ini
+%%DATADIR%%/sys/GameSettings/GKF.ini
+%%DATADIR%%/sys/GameSettings/GKG.ini
+%%DATADIR%%/sys/GameSettings/GKH.ini
+%%DATADIR%%/sys/GameSettings/GKJ.ini

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-ports-all@freebsd.org  Sun Oct 18 16:41:10 2015
Return-Path: 
Delivered-To: svn-ports-all@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 C02CEA180C9;
 Sun, 18 Oct 2015 16:41:10 +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 992F1119;
 Sun, 18 Oct 2015 16:41:10 +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 t9IGf9lq029159;
 Sun, 18 Oct 2015 16:41:09 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IGf9Bq029156;
 Sun, 18 Oct 2015 16:41:09 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201510181641.t9IGf9Bq029156@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
 rene@FreeBSD.org using -f
From: Rene Ladan 
Date: Sun, 18 Oct 2015 16:41:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399621 - head/www/chromium
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 16:41:11 -0000

Author: rene
Date: Sun Oct 18 16:41:09 2015
New Revision: 399621
URL: https://svnweb.freebsd.org/changeset/ports/399621

Log:
  www/chromium: actually update files in the base directory, this was missing
  from r399613
  
  Submitted by:	Jan Henrik Sylvester (via private mail)
  MFH:		2015Q4

Modified:
  head/www/chromium/Makefile
  head/www/chromium/distinfo
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Sun Oct 18 15:22:59 2015	(r399620)
+++ head/www/chromium/Makefile	Sun Oct 18 16:41:09 2015	(r399621)
@@ -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: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo	Sun Oct 18 15:22:59 2015	(r399620)
+++ head/www/chromium/distinfo	Sun Oct 18 16:41:09 2015	(r399621)
@@ -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: head/www/chromium/pkg-plist
==============================================================================
--- head/www/chromium/pkg-plist	Sun Oct 18 15:22:59 2015	(r399620)
+++ head/www/chromium/pkg-plist	Sun Oct 18 16:41:09 2015	(r399621)
@@ -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-all@freebsd.org  Sun Oct 18 17:12:15 2015
Return-Path: 
Delivered-To: svn-ports-all@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 446E6A18A27;
 Sun, 18 Oct 2015 17:12:15 +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 124CF1236;
 Sun, 18 Oct 2015 17:12:15 +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 t9IHCEtE040364;
 Sun, 18 Oct 2015 17:12:14 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IHCE8s040362;
 Sun, 18 Oct 2015 17:12:14 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201510181712.t9IHCE8s040362@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov 
Date: Sun, 18 Oct 2015 17:12:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399622 - head/games/instead
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 17:12:15 -0000

Author: amdmi3
Date: Sun Oct 18 17:12:13 2015
New Revision: 399622
URL: https://svnweb.freebsd.org/changeset/ports/399622

Log:
  - Update to 2.3.0

Modified:
  head/games/instead/Makefile
  head/games/instead/distinfo

Modified: head/games/instead/Makefile
==============================================================================
--- head/games/instead/Makefile	Sun Oct 18 16:41:09 2015	(r399621)
+++ head/games/instead/Makefile	Sun Oct 18 17:12:13 2015	(r399622)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	instead
-PORTVERSION=	2.2.7
+PORTVERSION=	2.3.0
 CATEGORIES=	games
 MASTER_SITES=	SF/instead/instead/${PORTVERSION}/
 DISTNAME=	instead_${PORTVERSION}

Modified: head/games/instead/distinfo
==============================================================================
--- head/games/instead/distinfo	Sun Oct 18 16:41:09 2015	(r399621)
+++ head/games/instead/distinfo	Sun Oct 18 17:12:13 2015	(r399622)
@@ -1,2 +1,2 @@
-SHA256 (instead_2.2.7.tar.gz) = 4ba8dac60d97ad076a0048af67eeb466ed0da03e5742dcf8a6cf828079a7b11a
-SIZE (instead_2.2.7.tar.gz) = 5074312
+SHA256 (instead_2.3.0.tar.gz) = 48d7fcb0a75c92880e851d0ecb5cca8b47a7036b4534bdc9aef6b25aa7d4b1d1
+SIZE (instead_2.3.0.tar.gz) = 5075715

From owner-svn-ports-all@freebsd.org  Sun Oct 18 17:31:18 2015
Return-Path: 
Delivered-To: svn-ports-all@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 A4422A18DC1;
 Sun, 18 Oct 2015 17:31:18 +0000 (UTC)
 (envelope-from tijl@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 6DF6D1D18;
 Sun, 18 Oct 2015 17:31:18 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IHVHNS044270;
 Sun, 18 Oct 2015 17:31:17 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IHVHJA044268;
 Sun, 18 Oct 2015 17:31:17 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201510181731.t9IHVHJA044268@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans 
Date: Sun, 18 Oct 2015 17:31:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399623 - in head/devel/gdb: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 17:31:18 -0000

Author: tijl
Date: Sun Oct 18 17:31:17 2015
New Revision: 399623
URL: https://svnweb.freebsd.org/changeset/ports/399623

Log:
  Fix a regression when debugging a threaded process that forks.
  
  PR:		203661
  Submitted by:	luca.pizzamiglio@gmail.com (maintainer)

Modified:
  head/devel/gdb/Makefile
  head/devel/gdb/files/fbsd-threads.c

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Sun Oct 18 17:12:13 2015	(r399622)
+++ head/devel/gdb/Makefile	Sun Oct 18 17:31:17 2015	(r399623)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	7.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 

Modified: head/devel/gdb/files/fbsd-threads.c
==============================================================================
--- head/devel/gdb/files/fbsd-threads.c	Sun Oct 18 17:12:13 2015	(r399622)
+++ head/devel/gdb/files/fbsd-threads.c	Sun Oct 18 17:31:17 2015	(r399623)
@@ -764,7 +764,9 @@ fbsd_thread_wait (struct target_ops *ops
   td_thrinfo_t ti;
 
   ret = beneath->to_wait (beneath, ptid, ourstatus, options);
-  if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED)
+  if (GET_PID(ret) >= 0 &&
+    ( ourstatus->kind == TARGET_WAITKIND_STOPPED ||
+      ourstatus->kind == TARGET_WAITKIND_FORKED ) )
     {
       lwp = get_current_lwp (GET_PID(ret));
       ret = thread_from_lwp (BUILD_LWP(lwp, GET_PID(ret)),

From owner-svn-ports-all@freebsd.org  Sun Oct 18 17:33:22 2015
Return-Path: 
Delivered-To: svn-ports-all@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 978A9A18F08;
 Sun, 18 Oct 2015 17:33:22 +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 6AA141FCD;
 Sun, 18 Oct 2015 17:33:22 +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 t9IHXLto046395;
 Sun, 18 Oct 2015 17:33:21 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IHXLd6046392;
 Sun, 18 Oct 2015 17:33:21 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201510181733.t9IHXLd6046392@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov 
Date: Sun, 18 Oct 2015 17:33:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399624 - in head/devel/drpython: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 17:33:22 -0000

Author: amdmi3
Date: Sun Oct 18 17:33:20 2015
New Revision: 399624
URL: https://svnweb.freebsd.org/changeset/ports/399624

Log:
  - Simplify wrapper script creation
  - Fix shebang
  - Add build conflict with itself

Added:
  head/devel/drpython/files/patch-drpython.lin   (contents, props changed)
Modified:
  head/devel/drpython/Makefile
  head/devel/drpython/files/patch-drToolBarDialog.py

Modified: head/devel/drpython/Makefile
==============================================================================
--- head/devel/drpython/Makefile	Sun Oct 18 17:31:17 2015	(r399623)
+++ head/devel/drpython/Makefile	Sun Oct 18 17:33:20 2015	(r399624)
@@ -3,7 +3,7 @@
 
 PORTNAME=	drpython
 PORTVERSION=	3.11.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/DrPython%20%283.x%29/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -14,6 +14,9 @@ COMMENT=	Highly customizable cross-platf
 
 LICENSE=	GPLv2
 
+# fails to build in presence if installed self
+CONFLICTS_BUILD=	${PORTNAME}${PYTHON_PKGNAMESUFFIX}-[0-9]*
+
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
@@ -21,7 +24,7 @@ NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		compiler:c++11-lib python zip
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist distutils
 USE_WX=		3.0+
 WX_COMPS=	python:lib
 
@@ -43,6 +46,7 @@ post-patch:
 	@${RM} ${WRKSRC}/setup.cfg
 	@${REINPLACE_CMD} -e \
 		's|firefox|xdg-open|' ${WRKSRC}/drPreferences.py
+	@${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|' ${WRKSRC}/drpython.lin
 
 pre-build:
 	@(cd ${WRKSRC}/docsrc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html)
@@ -50,24 +54,15 @@ pre-build:
 		${WRKSRC}/documentation)
 
 post-build:
-	@${MKDIR} ${WRKDIR}/wrappers
-	@${ECHO_CMD} -n \
-		>> ${WRKDIR}/wrappers/drpython
-	@${ECHO_CMD} '#!/bin/sh' \
-		>> ${WRKDIR}/wrappers/drpython
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/drpython.sh
 .if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc
 	@${ECHO_CMD} 'LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH"' \
-		>> ${WRKDIR}/wrappers/drpython
-	@${ECHO_CMD} 'export LD_LIBRARY_PATH' \
-		>> ${WRKDIR}/wrappers/drpython
-	@${ECHO_CMD} \
-		>> ${WRKDIR}/wrappers/drpython
+		>> ${WRKDIR}/drpython.sh
+	@${ECHO_CMD} 'export LD_LIBRARY_PATH' >> ${WRKDIR}/drpython.sh
 .endif
-	@${ECHO_CMD} 'exec ${PYTHON_CMD} -m drpython.drpython' \
-		>> ${WRKDIR}/wrappers/drpython
+	@${ECHO_CMD} 'exec ${PYTHON_CMD} -m drpython.drpython' >> ${WRKDIR}/drpython.sh
 
 post-install:
-	(cd ${WRKDIR}/wrappers && ${INSTALL_SCRIPT} drpython \
-		${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_SCRIPT} ${WRKDIR}/drpython.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include 

Modified: head/devel/drpython/files/patch-drToolBarDialog.py
==============================================================================
--- head/devel/drpython/files/patch-drToolBarDialog.py	Sun Oct 18 17:31:17 2015	(r399623)
+++ head/devel/drpython/files/patch-drToolBarDialog.py	Sun Oct 18 17:33:20 2015	(r399624)
@@ -1,6 +1,6 @@
---- drToolBarDialog.py.orig
+--- drToolBarDialog.py.orig	2014-04-20 17:50:40 UTC
 +++ drToolBarDialog.py
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ def GetToolBarLabels(filename, frame):
          text = f.read()
          f.close()
      except:

Added: head/devel/drpython/files/patch-drpython.lin
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/drpython/files/patch-drpython.lin	Sun Oct 18 17:33:20 2015	(r399624)
@@ -0,0 +1,7 @@
+--- drpython.lin.orig	2014-04-20 17:50:40 UTC
++++ drpython.lin
+@@ -1,2 +1,2 @@
+-#!/bin/bash
+-python ${0%/*}/drpython.pyw
++#!/bin/sh
++%%PYTHON%% ${0%/*}/drpython.pyw

From owner-svn-ports-all@freebsd.org  Sun Oct 18 18:31:56 2015
Return-Path: 
Delivered-To: svn-ports-all@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 9F1A89D1DCE;
 Sun, 18 Oct 2015 18:31:56 +0000 (UTC) (envelope-from kwm@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 765D7E1B;
 Sun, 18 Oct 2015 18:31:56 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IIVtEN063718;
 Sun, 18 Oct 2015 18:31:55 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IIVt1f063716;
 Sun, 18 Oct 2015 18:31:55 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201510181831.t9IIVt1f063716@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast 
Date: Sun, 18 Oct 2015 18:31:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399625 - in head/graphics: dri libGL
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 18:31:56 -0000

Author: kwm
Date: Sun Oct 18 18:31:55 2015
New Revision: 399625
URL: https://svnweb.freebsd.org/changeset/ports/399625

Log:
  * Don't hardcode the Gallium drivers instead set the wanted drivers per
    arch, like is done for the dri drivers. This fixes Mesa build on arm. [1]
  * Explicitly disable libva support. This resolves a build issue if libva
    is installed. [2]
  * remove the gallium-intel configure flag, it is gone.
  
  PR:		197548 [2]
  Reported by:	sbruno@ [1]
  Reported by:	rozhuk.im@gmail.com [2]
  Tested by:	sbruno@ on arm [1]

Modified:
  head/graphics/dri/pkg-plist
  head/graphics/libGL/Makefile.common

Modified: head/graphics/dri/pkg-plist
==============================================================================
--- head/graphics/dri/pkg-plist	Sun Oct 18 17:33:20 2015	(r399624)
+++ head/graphics/dri/pkg-plist	Sun Oct 18 18:31:55 2015	(r399625)
@@ -26,14 +26,14 @@ include/GL/internal/dri_interface.h
 @comment include/gbm.h
 %%I915_DRIVER%%lib/dri/i915_dri.so
 %%I965_DRIVER%%lib/dri/i965_dri.so
-lib/dri/kms_swrast_dri.so
+%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
-lib/dri/r300_dri.so
-lib/dri/r600_dri.so
+%%R300_GDRIVER%%lib/dri/r300_dri.so
+%%R600_GDRIVER%%lib/dri/r600_dri.so
 %%RADEON_DRIVER%%lib/dri/radeon_dri.so
-lib/dri/radeonsi_dri.so
+%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
 %%SWRAST_DRIVER%%lib/dri/swrast_dri.so
-lib/dri/vmwgfx_dri.so
+%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
 @comment lib/gallium-pipe/pipe_r300.so
 @comment lib/gallium-pipe/pipe_r600.so
 @comment lib/gallium-pipe/pipe_radeonsi.so
@@ -54,10 +54,10 @@ lib/dri/vmwgfx_dri.so
 @comment lib/libOSMesa.so
 @comment lib/libOSMesa.so.8
 @comment lib/libOSMesa.so.8.0.0
-lib/libXvMCr600.so
-lib/libXvMCr600.so.1
-lib/libXvMCr600.so.1.0
-lib/libXvMCr600.so.1.0.0
+%%R600_GDRIVER%%lib/libXvMCr600.so
+%%R600_GDRIVER%%lib/libXvMCr600.so.1
+%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
+%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
 @comment lib/libgbm.so
 @comment lib/libgbm.so.1
 @comment lib/libgbm.so.1.0.0

Modified: head/graphics/libGL/Makefile.common
==============================================================================
--- head/graphics/libGL/Makefile.common	Sun Oct 18 17:33:20 2015	(r399624)
+++ head/graphics/libGL/Makefile.common	Sun Oct 18 18:31:55 2015	(r399625)
@@ -109,17 +109,12 @@ RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=0:
 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
 
 CONFIGURE_ARGS+=--enable-gallium-llvm \
-                --enable-xvmc \
-                --with-gallium-drivers=r300,r600,radeonsi,svga,swrast
+                --enable-xvmc
 
 .if ${PORT_OPTIONS:MTEXTURE}
 CONFIGURE_ARGS+=--enable-texture-float
 .endif
 
-.if !(${ARCH} == amd64 || ${ARCH} == i386)
-CONFIGURE_ARGS+=--disable-gallium-intel
-.endif
-
 # this is disabled because our kernel driver is too old
 # merge this and the one below when support does land.
 .if 0 #${PORT_OPTIONS:MVDPAU}
@@ -141,21 +136,30 @@ CONFIGURE_ARGS+=--disable-vdpau
 CONFIGURE_ARGS+=--enable-vdpau
 .endif
 
+# VAAPI support?
+CONFIGURE_ARGS+=--disable-va
+
 ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
+ALL_GALLIUM_DRIVERS=R300 R600 RADEONSI SVGA SWRAST
 
 .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64
 DRI_DRIVERS=	${ALL_DRI_DRIVERS}
+GALLIUM_DRIVERS=	${ALL_GALLIUM_DRIVERS}
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS=	RADEON SWRAST
+GALLIUM_DRIVERS=	RADEON SWRAST
 .endif
+
 .if ${ARCH} == sparc64 || ${ARCH} == armv6
 DRI_DRIVERS=	SWRAST
+GALLIUM_DRIVERS=	SWRAST
 .endif
 
 # empty for unsupported arches
 DRI_DRIVERS+=
+GALLIUM_DRIVERS+=
 
 .for _d in ${ALL_DRI_DRIVERS}
 . if ${DRI_DRIVERS:M${_d}}
@@ -167,3 +171,13 @@ PLIST_SUB+=	${_d}_DRIVER="@comment "
 
 CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
 
+.for _gd in ${ALL_GALLIUM_DRIVERS}
+. if ${GALLIUM_DRIVERS:M${_gd}}
+PLIST_SUB+=	${_gd}_GDRIVER=""
+. else
+PLIST_SUB+=	${_gd}_GDRIVER="@comment "
+. endif
+.endfor
+
+CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
+

From owner-svn-ports-all@freebsd.org  Sun Oct 18 19:06:30 2015
Return-Path: 
Delivered-To: svn-ports-all@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 AEF60A186E7;
 Sun, 18 Oct 2015 19:06:30 +0000 (UTC) (envelope-from lev@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 60C2C881;
 Sun, 18 Oct 2015 19:06:30 +0000 (UTC) (envelope-from lev@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IJ6TuC072570;
 Sun, 18 Oct 2015 19:06:29 GMT (envelope-from lev@FreeBSD.org)
Received: (from lev@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IJ6Td4072569;
 Sun, 18 Oct 2015 19:06:29 GMT (envelope-from lev@FreeBSD.org)
Message-Id: <201510181906.t9IJ6Td4072569@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lev set sender to lev@FreeBSD.org
 using -f
From: "Lev A. Serebryakov" 
Date: Sun, 18 Oct 2015 19:06:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399626 - head/devel/subversion
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 19:06:30 -0000

Author: lev
Date: Sun Oct 18 19:06:29 2015
New Revision: 399626
URL: https://svnweb.freebsd.org/changeset/ports/399626

Log:
   Fix pkg-plist in case of disabled SERF.
   As SERF is enabled by default, no version bump.
  
  PR:		203845
  Submitted by:	oleksii.tsai@gmail.com

Modified:
  head/devel/subversion/pkg-plist

Modified: head/devel/subversion/pkg-plist
==============================================================================
--- head/devel/subversion/pkg-plist	Sun Oct 18 18:31:55 2015	(r399625)
+++ head/devel/subversion/pkg-plist	Sun Oct 18 19:06:29 2015	(r399626)
@@ -156,7 +156,7 @@ share/pkgconfig/libsvn_fs_util.pc
 share/pkgconfig/libsvn_fs_x.pc
 share/pkgconfig/libsvn_ra.pc
 share/pkgconfig/libsvn_ra_local.pc
-share/pkgconfig/libsvn_ra_serf.pc
+%%SERF%%share/pkgconfig/libsvn_ra_serf.pc
 share/pkgconfig/libsvn_ra_svn.pc
 share/pkgconfig/libsvn_repos.pc
 share/pkgconfig/libsvn_subr.pc
@@ -189,10 +189,10 @@ share/pkgconfig/libsvn_wc.pc
 %%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-centos/svnclean.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-centos/svnlog.sh
-%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
-%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
-%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
-%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
+%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
+%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
+%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
+%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh

From owner-svn-ports-all@freebsd.org  Sun Oct 18 19:33:04 2015
Return-Path: 
Delivered-To: svn-ports-all@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 CA53EA18D78;
 Sun, 18 Oct 2015 19:33:04 +0000 (UTC) (envelope-from pi@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 9DAE92ED;
 Sun, 18 Oct 2015 19:33:04 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IJX3OG081172;
 Sun, 18 Oct 2015 19:33:03 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IJX3Lt081168;
 Sun, 18 Oct 2015 19:33:03 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201510181933.t9IJX3Lt081168@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger 
Date: Sun, 18 Oct 2015 19:33:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399627 - in head/devel/mongo-c-driver: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sun, 18 Oct 2015 19:33:04 -0000

Author: pi
Date: Sun Oct 18 19:33:03 2015
New Revision: 399627
URL: https://svnweb.freebsd.org/changeset/ports/399627

Log:
  devel/mongo-c-driver: 0.7.1 -> 1.1.9
  
  Changes:
    https://github.com/mongodb/mongo-c-driver/releases
  
  PR:		200338
  Submitted by:	Tom Pusateri 
  Approved by:	maintainer timeout

Added:
  head/devel/mongo-c-driver/pkg-plist   (contents, props changed)
Deleted:
  head/devel/mongo-c-driver/files/
Modified:
  head/devel/mongo-c-driver/Makefile
  head/devel/mongo-c-driver/distinfo
  head/devel/mongo-c-driver/pkg-descr

Modified: head/devel/mongo-c-driver/Makefile
==============================================================================
--- head/devel/mongo-c-driver/Makefile	Sun Oct 18 19:06:29 2015	(r399626)
+++ head/devel/mongo-c-driver/Makefile	Sun Oct 18 19:33:03 2015	(r399627)
@@ -2,30 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	mongo-c-driver
-PORTVERSION=	0.7.1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	1.1.9
 CATEGORIES=	devel
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	waitman@waitman.net
 COMMENT=	C Driver for MongoDB
 
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libbson-1.0.so:${PORTSDIR}/devel/libbson
+LIB_DEPENDS+=	libsasl2.so:$