From owner-svn-ports-branches@FreeBSD.ORG  Sun Jan 12 15:46:07 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 01D1BA2B;
 Sun, 12 Jan 2014 15:46:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF2BE1ACF;
 Sun, 12 Jan 2014 15:46:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CFk6Vv085888;
 Sun, 12 Jan 2014 15:46:06 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CFjl5l085758;
 Sun, 12 Jan 2014 15:45:47 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201401121545.s0CFjl5l085758@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sun, 12 Jan 2014 15:45:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339517 - in branches/2014Q1: archivers/hs-tar
 archivers/hs-zip-archive archivers/hs-zlib archivers/hs-zlib-bindings
 archivers/hs-zlib-conduit archivers/hs-zlib-enum audio/hs-ALUT audio...
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jan 2014 15:46:07 -0000

Author: pgj
Date: Sun Jan 12 15:45:46 2014
New Revision: 339517
URL: http://svnweb.freebsd.org/changeset/ports/339517

Log:
  MFH: r339285
  
  - Fix a run-time problem with lang/ghc on FreeBSD 10.0 and later, caused by
    the iconv changes (basically GHCi was rendered unusable)
  - Fix build for x11-toolkits/hs-wxc, while here
  - Bump port revision for all Haskell Cabal ports as they have to be rebuilt
  
  PR:		ports/184806
  Reported by:	many
  Obtained from:	FreeBSD Haskell
  Approved by:	portmgr-lurkers (antoine)

Added:
  branches/2014Q1/lang/ghc/files/patch-libraries__base__cbits__iconv.c
     - copied unchanged from r339285, head/lang/ghc/files/patch-libraries__base__cbits__iconv.c
  branches/2014Q1/x11-toolkits/hs-wxc/files/patch-wxc.cabal
     - copied unchanged from r339285, head/x11-toolkits/hs-wxc/files/patch-wxc.cabal
Modified:
  branches/2014Q1/archivers/hs-tar/Makefile
  branches/2014Q1/archivers/hs-zip-archive/Makefile
  branches/2014Q1/archivers/hs-zlib-bindings/Makefile
  branches/2014Q1/archivers/hs-zlib-conduit/Makefile
  branches/2014Q1/archivers/hs-zlib-enum/Makefile
  branches/2014Q1/archivers/hs-zlib/Makefile
  branches/2014Q1/audio/hs-ALUT/Makefile
  branches/2014Q1/audio/hs-OpenAL/Makefile
  branches/2014Q1/audio/hs-libmpd/Makefile
  branches/2014Q1/benchmarks/hs-criterion/Makefile
  branches/2014Q1/converters/hs-aeson/Makefile
  branches/2014Q1/converters/hs-dataenc/Makefile
  branches/2014Q1/converters/hs-json/Makefile
  branches/2014Q1/databases/hs-mysql/Makefile
  branches/2014Q1/databases/hs-persistent-sqlite/Makefile
  branches/2014Q1/databases/hs-persistent-template/Makefile
  branches/2014Q1/databases/hs-persistent/Makefile
  branches/2014Q1/devel/hs-BNFC/Makefile
  branches/2014Q1/devel/hs-Boolean/Makefile
  branches/2014Q1/devel/hs-ConfigFile/Makefile
  branches/2014Q1/devel/hs-HUnit/Makefile
  branches/2014Q1/devel/hs-IORefCAS/Makefile
  branches/2014Q1/devel/hs-IfElse/Makefile
  branches/2014Q1/devel/hs-List/Makefile
  branches/2014Q1/devel/hs-MaybeT/Makefile
  branches/2014Q1/devel/hs-MemoTrie/Makefile
  branches/2014Q1/devel/hs-MissingH/Makefile
  branches/2014Q1/devel/hs-MonadCatchIO-mtl/Makefile
  branches/2014Q1/devel/hs-MonadCatchIO-transformers/Makefile
  branches/2014Q1/devel/hs-MonadRandom/Makefile
  branches/2014Q1/devel/hs-ObjectName/Makefile
  branches/2014Q1/devel/hs-PSQueue/Makefile
  branches/2014Q1/devel/hs-QuickCheck/Makefile
  branches/2014Q1/devel/hs-ReadArgs/Makefile
  branches/2014Q1/devel/hs-SafeSemaphore/Makefile
  branches/2014Q1/devel/hs-StateVar/Makefile
  branches/2014Q1/devel/hs-Stream/Makefile
  branches/2014Q1/devel/hs-Tensor/Makefile
  branches/2014Q1/devel/hs-TypeCompose/Makefile
  branches/2014Q1/devel/hs-abstract-deque/Makefile
  branches/2014Q1/devel/hs-abstract-par/Makefile
  branches/2014Q1/devel/hs-activehs-base/Makefile
  branches/2014Q1/devel/hs-alex/Makefile
  branches/2014Q1/devel/hs-ansi-terminal/Makefile
  branches/2014Q1/devel/hs-ansi-wl-pprint/Makefile
  branches/2014Q1/devel/hs-arrows/Makefile
  branches/2014Q1/devel/hs-asn1-data/Makefile
  branches/2014Q1/devel/hs-asn1-types/Makefile
  branches/2014Q1/devel/hs-async/Makefile
  branches/2014Q1/devel/hs-attempt/Makefile
  branches/2014Q1/devel/hs-base-unicode-symbols/Makefile
  branches/2014Q1/devel/hs-base16-bytestring/Makefile
  branches/2014Q1/devel/hs-base64-bytestring/Makefile
  branches/2014Q1/devel/hs-base64-conduit/Makefile
  branches/2014Q1/devel/hs-basic-prelude/Makefile
  branches/2014Q1/devel/hs-bifunctors/Makefile
  branches/2014Q1/devel/hs-bits-atomic/Makefile
  branches/2014Q1/devel/hs-blaze-builder-conduit/Makefile
  branches/2014Q1/devel/hs-blaze-builder-enumerator/Makefile
  branches/2014Q1/devel/hs-blaze-builder/Makefile
  branches/2014Q1/devel/hs-blaze-textual/Makefile
  branches/2014Q1/devel/hs-bloomfilter/Makefile
  branches/2014Q1/devel/hs-bsd-sysctl/Makefile
  branches/2014Q1/devel/hs-byteorder/Makefile
  branches/2014Q1/devel/hs-bytestring-nums/Makefile
  branches/2014Q1/devel/hs-bytestring-show/Makefile
  branches/2014Q1/devel/hs-c2hs/Makefile
  branches/2014Q1/devel/hs-cabal-install/Makefile
  branches/2014Q1/devel/hs-cereal/Makefile
  branches/2014Q1/devel/hs-checkers/Makefile
  branches/2014Q1/devel/hs-classy-prelude-conduit/Makefile
  branches/2014Q1/devel/hs-classy-prelude/Makefile
  branches/2014Q1/devel/hs-cmdargs/Makefile
  branches/2014Q1/devel/hs-conduit/Makefile
  branches/2014Q1/devel/hs-configurator/Makefile
  branches/2014Q1/devel/hs-convertible/Makefile
  branches/2014Q1/devel/hs-cpphs/Makefile
  branches/2014Q1/devel/hs-darcs/Makefile
  branches/2014Q1/devel/hs-data-default-class/Makefile
  branches/2014Q1/devel/hs-data-default-instances-base/Makefile
  branches/2014Q1/devel/hs-data-default-instances-containers/Makefile
  branches/2014Q1/devel/hs-data-default-instances-dlist/Makefile
  branches/2014Q1/devel/hs-data-default-instances-old-locale/Makefile
  branches/2014Q1/devel/hs-data-default/Makefile
  branches/2014Q1/devel/hs-data-pprint/Makefile
  branches/2014Q1/devel/hs-date-cache/Makefile
  branches/2014Q1/devel/hs-datetime/Makefile
  branches/2014Q1/devel/hs-directory-tree/Makefile
  branches/2014Q1/devel/hs-dlist/Makefile
  branches/2014Q1/devel/hs-edit-distance/Makefile
  branches/2014Q1/devel/hs-either/Makefile
  branches/2014Q1/devel/hs-enumerator/Makefile
  branches/2014Q1/devel/hs-errors/Makefile
  branches/2014Q1/devel/hs-extensible-exceptions/Makefile
  branches/2014Q1/devel/hs-failure/Makefile
  branches/2014Q1/devel/hs-fast-logger/Makefile
  branches/2014Q1/devel/hs-fgl/Makefile
  branches/2014Q1/devel/hs-file-embed/Makefile
  branches/2014Q1/devel/hs-filemanip/Makefile
  branches/2014Q1/devel/hs-filestore/Makefile
  branches/2014Q1/devel/hs-filesystem-conduit/Makefile
  branches/2014Q1/devel/hs-fsnotify/Makefile
  branches/2014Q1/devel/hs-gconf/Makefile
  branches/2014Q1/devel/hs-generic-deriving/Makefile
  branches/2014Q1/devel/hs-geniplate/Makefile
  branches/2014Q1/devel/hs-ghc-events/Makefile
  branches/2014Q1/devel/hs-ghc-mtl/Makefile
  branches/2014Q1/devel/hs-ghc-paths/Makefile
  branches/2014Q1/devel/hs-gio/Makefile
  branches/2014Q1/devel/hs-git-annex/Makefile
  branches/2014Q1/devel/hs-glade/Makefile
  branches/2014Q1/devel/hs-glib/Makefile
  branches/2014Q1/devel/hs-gtk2hs-buildtools/Makefile
  branches/2014Q1/devel/hs-haddock/Makefile
  branches/2014Q1/devel/hs-happy/Makefile
  branches/2014Q1/devel/hs-hashable/Makefile
  branches/2014Q1/devel/hs-hashed-storage/Makefile
  branches/2014Q1/devel/hs-hashtables/Makefile
  branches/2014Q1/devel/hs-haskeline/Makefile
  branches/2014Q1/devel/hs-haskell-platform/Makefile
  branches/2014Q1/devel/hs-haskell-src-exts/Makefile
  branches/2014Q1/devel/hs-haskell-src/Makefile
  branches/2014Q1/devel/hs-hasktags/Makefile
  branches/2014Q1/devel/hs-hastache/Makefile
  branches/2014Q1/devel/hs-hinotify/Makefile
  branches/2014Q1/devel/hs-hint/Makefile
  branches/2014Q1/devel/hs-hlibev/Makefile
  branches/2014Q1/devel/hs-hlint/Makefile
  branches/2014Q1/devel/hs-hoogle/Makefile
  branches/2014Q1/devel/hs-hslogger/Makefile
  branches/2014Q1/devel/hs-hspec-expectations/Makefile
  branches/2014Q1/devel/hs-hspec/Makefile
  branches/2014Q1/devel/hs-kqueue/Makefile
  branches/2014Q1/devel/hs-language-c/Makefile
  branches/2014Q1/devel/hs-language-javascript/Makefile
  branches/2014Q1/devel/hs-largeword/Makefile
  branches/2014Q1/devel/hs-lazysmallcheck/Makefile
  branches/2014Q1/devel/hs-lens/Makefile
  branches/2014Q1/devel/hs-lifted-base/Makefile
  branches/2014Q1/devel/hs-logict/Makefile
  branches/2014Q1/devel/hs-mmap/Makefile
  branches/2014Q1/devel/hs-mmorph/Makefile
  branches/2014Q1/devel/hs-monad-control/Makefile
  branches/2014Q1/devel/hs-monad-logger/Makefile
  branches/2014Q1/devel/hs-monad-par-extras/Makefile
  branches/2014Q1/devel/hs-monad-par/Makefile
  branches/2014Q1/devel/hs-mtl/Makefile
  branches/2014Q1/devel/hs-mueval/Makefile
  branches/2014Q1/devel/hs-murmur-hash/Makefile
  branches/2014Q1/devel/hs-optparse-applicative/Makefile
  branches/2014Q1/devel/hs-parallel/Makefile
  branches/2014Q1/devel/hs-pcre-light/Makefile
  branches/2014Q1/devel/hs-pool-conduit/Makefile
  branches/2014Q1/devel/hs-primitive/Makefile
  branches/2014Q1/devel/hs-profunctor-extras/Makefile
  branches/2014Q1/devel/hs-profunctors/Makefile
  branches/2014Q1/devel/hs-project-template/Makefile
  branches/2014Q1/devel/hs-quickcheck-io/Makefile
  branches/2014Q1/devel/hs-random/Makefile
  branches/2014Q1/devel/hs-ranges/Makefile
  branches/2014Q1/devel/hs-readline/Makefile
  branches/2014Q1/devel/hs-reflection/Makefile
  branches/2014Q1/devel/hs-resource-pool/Makefile
  branches/2014Q1/devel/hs-resourcet/Makefile
  branches/2014Q1/devel/hs-safe/Makefile
  branches/2014Q1/devel/hs-setenv/Makefile
  branches/2014Q1/devel/hs-show/Makefile
  branches/2014Q1/devel/hs-silently/Makefile
  branches/2014Q1/devel/hs-simple-reflect/Makefile
  branches/2014Q1/devel/hs-smallcheck/Makefile
  branches/2014Q1/devel/hs-split/Makefile
  branches/2014Q1/devel/hs-stm/Makefile
  branches/2014Q1/devel/hs-strict/Makefile
  branches/2014Q1/devel/hs-syb-with-class-instances-text/Makefile
  branches/2014Q1/devel/hs-syb-with-class/Makefile
  branches/2014Q1/devel/hs-syb/Makefile
  branches/2014Q1/devel/hs-system-fileio/Makefile
  branches/2014Q1/devel/hs-system-filepath/Makefile
  branches/2014Q1/devel/hs-tagged/Makefile
  branches/2014Q1/devel/hs-temporary/Makefile
  branches/2014Q1/devel/hs-terminfo/Makefile
  branches/2014Q1/devel/hs-test-framework-hunit/Makefile
  branches/2014Q1/devel/hs-test-framework-quickcheck2/Makefile
  branches/2014Q1/devel/hs-test-framework/Makefile
  branches/2014Q1/devel/hs-testpack/Makefile
  branches/2014Q1/devel/hs-text/Makefile
  branches/2014Q1/devel/hs-threads/Makefile
  branches/2014Q1/devel/hs-threadscope/Makefile
  branches/2014Q1/devel/hs-time-compat/Makefile
  branches/2014Q1/devel/hs-timezone-olson/Makefile
  branches/2014Q1/devel/hs-timezone-series/Makefile
  branches/2014Q1/devel/hs-transformers-base/Makefile
  branches/2014Q1/devel/hs-transformers/Makefile
  branches/2014Q1/devel/hs-unamb/Makefile
  branches/2014Q1/devel/hs-uniplate/Makefile
  branches/2014Q1/devel/hs-unix-compat/Makefile
  branches/2014Q1/devel/hs-unix-time/Makefile
  branches/2014Q1/devel/hs-unordered-containers/Makefile
  branches/2014Q1/devel/hs-utf8-light/Makefile
  branches/2014Q1/devel/hs-utf8-string/Makefile
  branches/2014Q1/devel/hs-utility-ht/Makefile
  branches/2014Q1/devel/hs-uuagc-bootstrap/Makefile
  branches/2014Q1/devel/hs-uuagc-cabal/Makefile
  branches/2014Q1/devel/hs-uuagc/Makefile
  branches/2014Q1/devel/hs-uuid/Makefile
  branches/2014Q1/devel/hs-uulib/Makefile
  branches/2014Q1/devel/hs-vault/Makefile
  branches/2014Q1/devel/hs-vector-algorithms/Makefile
  branches/2014Q1/devel/hs-vector/Makefile
  branches/2014Q1/devel/hs-void/Makefile
  branches/2014Q1/devel/hs-word8/Makefile
  branches/2014Q1/ftp/hs-curl/Makefile
  branches/2014Q1/graphics/hs-HGL/Makefile
  branches/2014Q1/graphics/hs-cairo/Makefile
  branches/2014Q1/graphics/hs-dia-base/Makefile
  branches/2014Q1/graphics/hs-dia-functions/Makefile
  branches/2014Q1/graphics/hs-soegtk/Makefile
  branches/2014Q1/graphics/hs-svgcairo/Makefile
  branches/2014Q1/lang/ghc/Makefile
  branches/2014Q1/lang/hs-brainfuck/Makefile
  branches/2014Q1/lang/hs-epic/Makefile
  branches/2014Q1/lang/hs-unlambda/Makefile
  branches/2014Q1/mail/hs-email-validate/Makefile
  branches/2014Q1/mail/hs-mime-mail/Makefile
  branches/2014Q1/mail/hs-mime-types/Makefile
  branches/2014Q1/mail/hs-mime/Makefile
  branches/2014Q1/math/hs-Agda/Makefile
  branches/2014Q1/math/hs-NumInstances/Makefile
  branches/2014Q1/math/hs-categories/Makefile
  branches/2014Q1/math/hs-comonad-transformers/Makefile
  branches/2014Q1/math/hs-comonad/Makefile
  branches/2014Q1/math/hs-comonads-fd/Makefile
  branches/2014Q1/math/hs-contravariant/Makefile
  branches/2014Q1/math/hs-data-lens-template/Makefile
  branches/2014Q1/math/hs-data-lens/Makefile
  branches/2014Q1/math/hs-distributive/Makefile
  branches/2014Q1/math/hs-erf/Makefile
  branches/2014Q1/math/hs-groupoids/Makefile
  branches/2014Q1/math/hs-ieee754/Makefile
  branches/2014Q1/math/hs-math-functions/Makefile
  branches/2014Q1/math/hs-mwc-random/Makefile
  branches/2014Q1/math/hs-nats/Makefile
  branches/2014Q1/math/hs-pointed/Makefile
  branches/2014Q1/math/hs-probability/Makefile
  branches/2014Q1/math/hs-semigroupoid-extras/Makefile
  branches/2014Q1/math/hs-semigroupoids/Makefile
  branches/2014Q1/math/hs-semigroups/Makefile
  branches/2014Q1/math/hs-statistics/Makefile
  branches/2014Q1/math/hs-vector-space/Makefile
  branches/2014Q1/multimedia/hs-gstreamer/Makefile
  branches/2014Q1/net/hs-hostname/Makefile
  branches/2014Q1/net/hs-maccatcher/Makefile
  branches/2014Q1/net/hs-network-conduit/Makefile
  branches/2014Q1/net/hs-network-info/Makefile
  branches/2014Q1/net/hs-network-multicast/Makefile
  branches/2014Q1/net/hs-network/Makefile
  branches/2014Q1/net/hs-pcap/Makefile
  branches/2014Q1/net/hs-publicsuffixlist/Makefile
  branches/2014Q1/net/hs-sendfile/Makefile
  branches/2014Q1/net/hs-simple-sendfile/Makefile
  branches/2014Q1/net/hs-socks/Makefile
  branches/2014Q1/ports-mgmt/hs-porte/Makefile
  branches/2014Q1/print/hs-hscolour/Makefile
  branches/2014Q1/science/hs-bio/Makefile
  branches/2014Q1/security/hs-Crypto/Makefile
  branches/2014Q1/security/hs-HsOpenSSL/Makefile
  branches/2014Q1/security/hs-RSA/Makefile
  branches/2014Q1/security/hs-SHA/Makefile
  branches/2014Q1/security/hs-certificate/Makefile
  branches/2014Q1/security/hs-cipher-aes/Makefile
  branches/2014Q1/security/hs-cipher-rc4/Makefile
  branches/2014Q1/security/hs-clientsession/Makefile
  branches/2014Q1/security/hs-cprng-aes/Makefile
  branches/2014Q1/security/hs-crypto-api/Makefile
  branches/2014Q1/security/hs-crypto-conduit/Makefile
  branches/2014Q1/security/hs-crypto-numbers/Makefile
  branches/2014Q1/security/hs-crypto-pubkey-types/Makefile
  branches/2014Q1/security/hs-crypto-pubkey/Makefile
  branches/2014Q1/security/hs-crypto-random-api/Makefile
  branches/2014Q1/security/hs-cryptocipher/Makefile
  branches/2014Q1/security/hs-cryptohash/Makefile
  branches/2014Q1/security/hs-digest/Makefile
  branches/2014Q1/security/hs-entropy/Makefile
  branches/2014Q1/security/hs-monadcryptorandom/Makefile
  branches/2014Q1/security/hs-pem/Makefile
  branches/2014Q1/security/hs-pureMD5/Makefile
  branches/2014Q1/security/hs-pwstore-fast/Makefile
  branches/2014Q1/security/hs-skein/Makefile
  branches/2014Q1/security/hs-tls-extra/Makefile
  branches/2014Q1/security/hs-tls/Makefile
  branches/2014Q1/sysutils/hs-angel/Makefile
  branches/2014Q1/sysutils/hs-cpu/Makefile
  branches/2014Q1/textproc/hs-Diff/Makefile
  branches/2014Q1/textproc/hs-HStringTemplate/Makefile
  branches/2014Q1/textproc/hs-HaXml/Makefile
  branches/2014Q1/textproc/hs-attoparsec-conduit/Makefile
  branches/2014Q1/textproc/hs-attoparsec-enumerator/Makefile
  branches/2014Q1/textproc/hs-attoparsec/Makefile
  branches/2014Q1/textproc/hs-blaze-html/Makefile
  branches/2014Q1/textproc/hs-blaze-markup/Makefile
  branches/2014Q1/textproc/hs-bytestring-csv/Makefile
  branches/2014Q1/textproc/hs-case-insensitive/Makefile
  branches/2014Q1/textproc/hs-citeproc-hs/Makefile
  branches/2014Q1/textproc/hs-csv/Makefile
  branches/2014Q1/textproc/hs-double-conversion/Makefile
  branches/2014Q1/textproc/hs-feed/Makefile
  branches/2014Q1/textproc/hs-hexpat/Makefile
  branches/2014Q1/textproc/hs-highlighting-kate/Makefile
  branches/2014Q1/textproc/hs-hs-bibutils/Makefile
  branches/2014Q1/textproc/hs-html-conduit/Makefile
  branches/2014Q1/textproc/hs-html/Makefile
  branches/2014Q1/textproc/hs-hxt-charproperties/Makefile
  branches/2014Q1/textproc/hs-hxt-regex-xmlschema/Makefile
  branches/2014Q1/textproc/hs-hxt-unicode/Makefile
  branches/2014Q1/textproc/hs-hxt/Makefile
  branches/2014Q1/textproc/hs-lhs2tex/Makefile
  branches/2014Q1/textproc/hs-libxml/Makefile
  branches/2014Q1/textproc/hs-pandoc-types/Makefile
  branches/2014Q1/textproc/hs-pandoc/Makefile
  branches/2014Q1/textproc/hs-parsec/Makefile
  branches/2014Q1/textproc/hs-polyparse/Makefile
  branches/2014Q1/textproc/hs-regex-base/Makefile
  branches/2014Q1/textproc/hs-regex-compat/Makefile
  branches/2014Q1/textproc/hs-regex-pcre-builtin/Makefile
  branches/2014Q1/textproc/hs-regex-posix/Makefile
  branches/2014Q1/textproc/hs-regex-tdfa/Makefile
  branches/2014Q1/textproc/hs-stringsearch/Makefile
  branches/2014Q1/textproc/hs-tagsoup/Makefile
  branches/2014Q1/textproc/hs-tagstream-conduit/Makefile
  branches/2014Q1/textproc/hs-texmath/Makefile
  branches/2014Q1/textproc/hs-xhtml/Makefile
  branches/2014Q1/textproc/hs-xml-conduit/Makefile
  branches/2014Q1/textproc/hs-xml-types/Makefile
  branches/2014Q1/textproc/hs-xml/Makefile
  branches/2014Q1/textproc/hs-xmlhtml/Makefile
  branches/2014Q1/textproc/hs-yaml/Makefile
  branches/2014Q1/www/hs-HTTP/Makefile
  branches/2014Q1/www/hs-activehs/Makefile
  branches/2014Q1/www/hs-authenticate/Makefile
  branches/2014Q1/www/hs-cgi/Makefile
  branches/2014Q1/www/hs-cookie/Makefile
  branches/2014Q1/www/hs-css-text/Makefile
  branches/2014Q1/www/hs-fastcgi/Makefile
  branches/2014Q1/www/hs-gitit/Makefile
  branches/2014Q1/www/hs-hS3/Makefile
  branches/2014Q1/www/hs-hamlet/Makefile
  branches/2014Q1/www/hs-happstack-server/Makefile
  branches/2014Q1/www/hs-happstack/Makefile
  branches/2014Q1/www/hs-heist/Makefile
  branches/2014Q1/www/hs-hjsmin/Makefile
  branches/2014Q1/www/hs-http-conduit/Makefile
  branches/2014Q1/www/hs-http-date/Makefile
  branches/2014Q1/www/hs-http-reverse-proxy/Makefile
  branches/2014Q1/www/hs-http-server/Makefile
  branches/2014Q1/www/hs-http-types/Makefile
  branches/2014Q1/www/hs-oeis/Makefile
  branches/2014Q1/www/hs-path-pieces/Makefile
  branches/2014Q1/www/hs-recaptcha/Makefile
  branches/2014Q1/www/hs-scgi/Makefile
  branches/2014Q1/www/hs-shakespeare-css/Makefile
  branches/2014Q1/www/hs-shakespeare-i18n/Makefile
  branches/2014Q1/www/hs-shakespeare-js/Makefile
  branches/2014Q1/www/hs-shakespeare-text/Makefile
  branches/2014Q1/www/hs-shakespeare/Makefile
  branches/2014Q1/www/hs-snap-core/Makefile
  branches/2014Q1/www/hs-snap-server/Makefile
  branches/2014Q1/www/hs-snap/Makefile
  branches/2014Q1/www/hs-url/Makefile
  branches/2014Q1/www/hs-wai-app-static/Makefile
  branches/2014Q1/www/hs-wai-extra/Makefile
  branches/2014Q1/www/hs-wai-logger/Makefile
  branches/2014Q1/www/hs-wai-test/Makefile
  branches/2014Q1/www/hs-wai/Makefile
  branches/2014Q1/www/hs-warp/Makefile
  branches/2014Q1/www/hs-webkit/Makefile
  branches/2014Q1/www/hs-xss-sanitize/Makefile
  branches/2014Q1/www/hs-yesod-auth/Makefile
  branches/2014Q1/www/hs-yesod-core/Makefile
  branches/2014Q1/www/hs-yesod-form/Makefile
  branches/2014Q1/www/hs-yesod-persistent/Makefile
  branches/2014Q1/www/hs-yesod-platform/Makefile
  branches/2014Q1/www/hs-yesod-routes/Makefile
  branches/2014Q1/www/hs-yesod-static/Makefile
  branches/2014Q1/www/hs-yesod-test/Makefile
  branches/2014Q1/www/hs-yesod/Makefile
  branches/2014Q1/x11-toolkits/hs-GLURaw/Makefile
  branches/2014Q1/x11-toolkits/hs-GLUT/Makefile
  branches/2014Q1/x11-toolkits/hs-OpenGL/Makefile
  branches/2014Q1/x11-toolkits/hs-OpenGLRaw/Makefile
  branches/2014Q1/x11-toolkits/hs-gtk/Makefile
  branches/2014Q1/x11-toolkits/hs-gtk2hs/Makefile
  branches/2014Q1/x11-toolkits/hs-gtkglext/Makefile
  branches/2014Q1/x11-toolkits/hs-gtksourceview2/Makefile
  branches/2014Q1/x11-toolkits/hs-pango/Makefile
  branches/2014Q1/x11-toolkits/hs-vte/Makefile
  branches/2014Q1/x11-toolkits/hs-wx/Makefile
  branches/2014Q1/x11-toolkits/hs-wxc/Makefile
  branches/2014Q1/x11-toolkits/hs-wxcore/Makefile
  branches/2014Q1/x11-toolkits/hs-wxdirect/Makefile
  branches/2014Q1/x11-wm/hs-xmonad-contrib/Makefile
  branches/2014Q1/x11-wm/hs-xmonad/Makefile
  branches/2014Q1/x11/hs-X11-xft/Makefile
  branches/2014Q1/x11/hs-X11/Makefile
  branches/2014Q1/x11/hs-xmobar/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/archivers/hs-tar/Makefile
==============================================================================
--- branches/2014Q1/archivers/hs-tar/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/archivers/hs-tar/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	tar
 PORTVERSION=	0.4.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/archivers/hs-zip-archive/Makefile
==============================================================================
--- branches/2014Q1/archivers/hs-zip-archive/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/archivers/hs-zip-archive/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	zip-archive
 PORTVERSION=	0.1.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/archivers/hs-zlib-bindings/Makefile
==============================================================================
--- branches/2014Q1/archivers/hs-zlib-bindings/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/archivers/hs-zlib-bindings/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	zlib-bindings
 PORTVERSION=	0.1.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/archivers/hs-zlib-conduit/Makefile
==============================================================================
--- branches/2014Q1/archivers/hs-zlib-conduit/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/archivers/hs-zlib-conduit/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	zlib-conduit
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/archivers/hs-zlib-enum/Makefile
==============================================================================
--- branches/2014Q1/archivers/hs-zlib-enum/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/archivers/hs-zlib-enum/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	zlib-enum
 PORTVERSION=	0.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/archivers/hs-zlib/Makefile
==============================================================================
--- branches/2014Q1/archivers/hs-zlib/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/archivers/hs-zlib/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zlib
 PORTVERSION=	0.5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/audio/hs-ALUT/Makefile
==============================================================================
--- branches/2014Q1/audio/hs-ALUT/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/audio/hs-ALUT/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ALUT
 PORTVERSION=	2.2.0.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/audio/hs-OpenAL/Makefile
==============================================================================
--- branches/2014Q1/audio/hs-OpenAL/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/audio/hs-OpenAL/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	OpenAL
 PORTVERSION=	1.4.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/audio/hs-libmpd/Makefile
==============================================================================
--- branches/2014Q1/audio/hs-libmpd/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/audio/hs-libmpd/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libmpd
 PORTVERSION=	0.8.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/benchmarks/hs-criterion/Makefile
==============================================================================
--- branches/2014Q1/benchmarks/hs-criterion/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/benchmarks/hs-criterion/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	criterion
 PORTVERSION=	0.6.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	benchmarks haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/converters/hs-aeson/Makefile
==============================================================================
--- branches/2014Q1/converters/hs-aeson/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/converters/hs-aeson/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	aeson
 PORTVERSION=	0.6.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/converters/hs-dataenc/Makefile
==============================================================================
--- branches/2014Q1/converters/hs-dataenc/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/converters/hs-dataenc/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	dataenc
 PORTVERSION=	0.14.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/converters/hs-json/Makefile
==============================================================================
--- branches/2014Q1/converters/hs-json/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/converters/hs-json/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	json
 PORTVERSION=	0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	converters haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/databases/hs-mysql/Makefile
==============================================================================
--- branches/2014Q1/databases/hs-mysql/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/databases/hs-mysql/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mysql
 PORTVERSION=	0.1.1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/databases/hs-persistent-sqlite/Makefile
==============================================================================
--- branches/2014Q1/databases/hs-persistent-sqlite/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/databases/hs-persistent-sqlite/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	persistent-sqlite
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/databases/hs-persistent-template/Makefile
==============================================================================
--- branches/2014Q1/databases/hs-persistent-template/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/databases/hs-persistent-template/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	persistent-template
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/databases/hs-persistent/Makefile
==============================================================================
--- branches/2014Q1/databases/hs-persistent/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/databases/hs-persistent/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	persistent
 PORTVERSION=	1.2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-BNFC/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-BNFC/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-BNFC/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	BNFC
 PORTVERSION=	2.6.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-Boolean/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-Boolean/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-Boolean/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	Boolean
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-ConfigFile/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-ConfigFile/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-ConfigFile/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ConfigFile
 PORTVERSION=	1.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-HUnit/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-HUnit/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-HUnit/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	HUnit
 PORTVERSION=	1.2.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-IORefCAS/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-IORefCAS/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-IORefCAS/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	IORefCAS
 PORTVERSION=	0.2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-IfElse/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-IfElse/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-IfElse/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	IfElse
 PORTVERSION=	0.85
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-List/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-List/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-List/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	List
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-MaybeT/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-MaybeT/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-MaybeT/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	MaybeT
 PORTVERSION=	0.1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-MemoTrie/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-MemoTrie/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-MemoTrie/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	MemoTrie
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-MissingH/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-MissingH/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-MissingH/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	MissingH
 PORTVERSION=	1.2.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-MonadCatchIO-mtl/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-MonadCatchIO-mtl/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-MonadCatchIO-mtl/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	MonadCatchIO-mtl
 PORTVERSION=	0.3.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-MonadCatchIO-transformers/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-MonadCatchIO-transformers/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-MonadCatchIO-transformers/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	MonadCatchIO-transformers
 PORTVERSION=	0.3.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-MonadRandom/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-MonadRandom/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-MonadRandom/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	MonadRandom
 PORTVERSION=	0.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-ObjectName/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-ObjectName/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-ObjectName/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ObjectName
 PORTVERSION=	1.0.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-PSQueue/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-PSQueue/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-PSQueue/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	PSQueue
 PORTVERSION=	1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-QuickCheck/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-QuickCheck/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-QuickCheck/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	QuickCheck
 PORTVERSION=	2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-ReadArgs/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-ReadArgs/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-ReadArgs/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ReadArgs
 PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-SafeSemaphore/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-SafeSemaphore/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-SafeSemaphore/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	SafeSemaphore
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-StateVar/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-StateVar/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-StateVar/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	StateVar
 PORTVERSION=	1.0.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-Stream/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-Stream/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-Stream/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Stream
 PORTVERSION=	0.4.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-Tensor/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-Tensor/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-Tensor/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tensor
 PORTVERSION=	1.0.0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-TypeCompose/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-TypeCompose/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-TypeCompose/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	TypeCompose
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-abstract-deque/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-abstract-deque/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-abstract-deque/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	abstract-deque
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-abstract-par/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-abstract-par/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-abstract-par/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	abstract-par
 PORTVERSION=	0.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-activehs-base/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-activehs-base/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-activehs-base/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	activehs-base
 PORTVERSION=	0.3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-alex/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-alex/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-alex/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	alex
 PORTVERSION=	3.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-ansi-terminal/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-ansi-terminal/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-ansi-terminal/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ansi-terminal
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-ansi-wl-pprint/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-ansi-wl-pprint/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-ansi-wl-pprint/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ansi-wl-pprint
 PORTVERSION=	0.6.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-arrows/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-arrows/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-arrows/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	arrows
 PORTVERSION=	0.4.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-asn1-data/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-asn1-data/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-asn1-data/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	asn1-data
 PORTVERSION=	0.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-asn1-types/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-asn1-types/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-asn1-types/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	asn1-types
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-async/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-async/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-async/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	async
 PORTVERSION=	2.0.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-attempt/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-attempt/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-attempt/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	attempt
 PORTVERSION=	0.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-base-unicode-symbols/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-base-unicode-symbols/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-base-unicode-symbols/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	base-unicode-symbols
 PORTVERSION=	0.2.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-base16-bytestring/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-base16-bytestring/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-base16-bytestring/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	base16-bytestring
 PORTVERSION=	0.1.1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-base64-bytestring/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-base64-bytestring/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-base64-bytestring/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	base64-bytestring
 PORTVERSION=	1.0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-base64-conduit/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-base64-conduit/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-base64-conduit/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	base64-conduit
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-basic-prelude/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-basic-prelude/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-basic-prelude/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	basic-prelude
 PORTVERSION=	0.3.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-bifunctors/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-bifunctors/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-bifunctors/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bifunctors
 PORTVERSION=	3.2.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-bits-atomic/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-bits-atomic/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-bits-atomic/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bits-atomic
 PORTVERSION=	0.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-blaze-builder-conduit/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-blaze-builder-conduit/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-blaze-builder-conduit/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	blaze-builder-conduit
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-blaze-builder-enumerator/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-blaze-builder-enumerator/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-blaze-builder-enumerator/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	blaze-builder-enumerator
 PORTVERSION=	0.2.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-blaze-builder/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-blaze-builder/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-blaze-builder/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	blaze-builder
 PORTVERSION=	0.3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-blaze-textual/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-blaze-textual/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-blaze-textual/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	blaze-textual
 PORTVERSION=	0.2.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-bloomfilter/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-bloomfilter/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-bloomfilter/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bloomfilter
 PORTVERSION=	1.2.6.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-bsd-sysctl/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-bsd-sysctl/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-bsd-sysctl/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bsd-sysctl
 PORTVERSION=	1.0.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-byteorder/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-byteorder/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-byteorder/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	byteorder
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-bytestring-nums/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-bytestring-nums/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-bytestring-nums/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bytestring-nums
 PORTVERSION=	0.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-bytestring-show/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-bytestring-show/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-bytestring-show/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bytestring-show
 PORTVERSION=	0.3.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-c2hs/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-c2hs/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-c2hs/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	c2hs
 PORTVERSION=	0.16.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-cabal-install/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-cabal-install/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-cabal-install/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cabal-install
 PORTVERSION=	1.16.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-cereal/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-cereal/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-cereal/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cereal
 PORTVERSION=	0.3.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-checkers/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-checkers/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-checkers/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	checkers
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-classy-prelude-conduit/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-classy-prelude-conduit/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-classy-prelude-conduit/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	classy-prelude-conduit
 PORTVERSION=	0.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-classy-prelude/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-classy-prelude/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-classy-prelude/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	classy-prelude
 PORTVERSION=	0.5.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-cmdargs/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-cmdargs/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-cmdargs/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cmdargs
 PORTVERSION=	0.10.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-conduit/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-conduit/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-conduit/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	conduit
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-configurator/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-configurator/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-configurator/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	configurator
 PORTVERSION=	0.2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-convertible/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-convertible/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-convertible/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	convertible
 PORTVERSION=	1.0.11.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-cpphs/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-cpphs/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-cpphs/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cpphs
 PORTVERSION=	1.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-darcs/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-darcs/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-darcs/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	darcs
 PORTVERSION=	2.8.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-default-class/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-default-class/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-default-class/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-class
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-default-instances-base/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-default-instances-base/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-default-instances-base/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-base
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-default-instances-containers/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-default-instances-containers/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-default-instances-containers/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-containers
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-default-instances-dlist/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-default-instances-dlist/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-default-instances-dlist/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-dlist
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-default-instances-old-locale/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-default-instances-old-locale/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-default-instances-old-locale/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default-instances-old-locale
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-default/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-default/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-default/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-default
 PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-data-pprint/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-data-pprint/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-data-pprint/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	data-pprint
 PORTVERSION=	0.2.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-date-cache/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-date-cache/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-date-cache/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	date-cache
 PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-datetime/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-datetime/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-datetime/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	datetime
 PORTVERSION=	0.2.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-directory-tree/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-directory-tree/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-directory-tree/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	directory-tree
 PORTVERSION=	0.11.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-dlist/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-dlist/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-dlist/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dlist
 PORTVERSION=	0.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-edit-distance/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-edit-distance/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-edit-distance/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	edit-distance
 PORTVERSION=	0.2.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org

Modified: branches/2014Q1/devel/hs-either/Makefile
==============================================================================
--- branches/2014Q1/devel/hs-either/Makefile	Sun Jan 12 15:20:47 2014	(r339516)
+++ branches/2014Q1/devel/hs-either/Makefile	Sun Jan 12 15:45:46 2014	(r339517)
@@ -2,7 +2,7 @@
 
 PORTNAME=	either
 PORTVERSION=	3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 

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

From owner-svn-ports-branches@FreeBSD.ORG  Mon Jan 13 11:41:00 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 586C3531;
 Mon, 13 Jan 2014 11:41:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 442F3159D;
 Mon, 13 Jan 2014 11:41:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DBf0HX044988;
 Mon, 13 Jan 2014 11:41:00 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DBexBs044983;
 Mon, 13 Jan 2014 11:40:59 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201401131140.s0DBexBs044983@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 13 Jan 2014 11:40:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339585 - in branches/2014Q1/textproc/tclExpat: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 11:41:00 -0000

Author: gahr
Date: Mon Jan 13 11:40:59 2014
New Revision: 339585
URL: http://svnweb.freebsd.org/changeset/ports/339585

Log:
  MFH: r339582
  
  - Convert to USES=tcl
  - STAGE-clean
  - Respect PREFIX
  
  Approved by:    portmgr

Modified:
  branches/2014Q1/textproc/tclExpat/Makefile   (contents, props changed)
  branches/2014Q1/textproc/tclExpat/distinfo   (contents, props changed)
  branches/2014Q1/textproc/tclExpat/files/Makefile   (contents, props changed)
  branches/2014Q1/textproc/tclExpat/pkg-plist   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/tclExpat/Makefile
==============================================================================
--- branches/2014Q1/textproc/tclExpat/Makefile	Mon Jan 13 11:36:40 2014	(r339584)
+++ branches/2014Q1/textproc/tclExpat/Makefile	Mon Jan 13 11:40:59 2014	(r339585)
@@ -8,19 +8,18 @@ CATEGORIES=	textproc tcl
 MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
 
 MAINTAINER=	mi@aldan.algebra.com
-COMMENT=	The TCL interface to Expat library
+COMMENT=	Tcl interface to Expat library
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 USE_LDCONFIG=	yes
 
-USE_TCL=	84+
+USES=		tcl
 PLIST_SUB+=	TCL_VERSION=${TCL_VER}
 
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV+=	TCL_VERSION=${TCL_VER}
 
-NO_STAGE=	yes
 # Remove the old version of expat bundled with the package:
 post-extract:
 	${RM} -rf ${WRKSRC}/expat
@@ -32,12 +31,10 @@ post-build test:
 	cd ${WRKSRC} && ${TCLSH} test-error.tcl
 
 post-install:
-	${MKDIR} ${LOCALBASE}/lib/tcl${TCL_VER}/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${SED} 's|PREFIX|${PREFIX}|' < ${FILESDIR}/pkgIndex.tcl.in > \
-		${LOCALBASE}/lib/tcl${TCL_VER}/${PORTNAME}/pkgIndex.tcl
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${LOCALBASE}/share/doc/${PORTNAME}/
-.endif
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/textproc/tclExpat/distinfo
==============================================================================
--- branches/2014Q1/textproc/tclExpat/distinfo	Mon Jan 13 11:36:40 2014	(r339584)
+++ branches/2014Q1/textproc/tclExpat/distinfo	Mon Jan 13 11:40:59 2014	(r339585)
@@ -1,2 +1,2 @@
-SHA256 (TclExpat-1.1.tar.gz) = 3403e26a6cd3e84946a805d4482e7cf241af76c12bd2ec851b7f442bff3572a8
-SIZE (TclExpat-1.1.tar.gz) = 268538
+SHA256 (TclExpat-1.1.tar.gz) = c8bc32b2d38faebba98098e5047a932900a2b08d9f378182324f3c8b87731e40
+SIZE (TclExpat-1.1.tar.gz) = 269845

Modified: branches/2014Q1/textproc/tclExpat/files/Makefile
==============================================================================
--- branches/2014Q1/textproc/tclExpat/files/Makefile	Mon Jan 13 11:36:40 2014	(r339584)
+++ branches/2014Q1/textproc/tclExpat/files/Makefile	Mon Jan 13 11:40:59 2014	(r339585)
@@ -4,7 +4,7 @@
 SRCS=	tclexpat.c
 
 SHLIB_NAME=	libtclexpat.so.1
-LIBDIR=	${LOCALBASE}/lib
+LIBDIR=	${PREFIX}/lib
 
 TCL_VERSION?=	8.4
 TCL_DVER?=	${TCL_VERSION:S/.//}

Modified: branches/2014Q1/textproc/tclExpat/pkg-plist
==============================================================================
--- branches/2014Q1/textproc/tclExpat/pkg-plist	Mon Jan 13 11:36:40 2014	(r339584)
+++ branches/2014Q1/textproc/tclExpat/pkg-plist	Mon Jan 13 11:40:59 2014	(r339585)
@@ -1,5 +1,5 @@
-lib/tcl%%TCL_VERSION%%/TclExpat/pkgIndex.tcl
-@dirrm lib/tcl%%TCL_VERSION%%/TclExpat
+lib/TclExpat/pkgIndex.tcl
+@dirrm lib/TclExpat
 lib/libtclexpat.so.1
 lib/libtclexpat.so
 %%PORTDOCS%%%%DOCSDIR%%/README

From owner-svn-ports-branches@FreeBSD.ORG  Mon Jan 13 11:42:03 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1D60561B;
 Mon, 13 Jan 2014 11:42:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0974815AB;
 Mon, 13 Jan 2014 11:42:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DBg22G047734;
 Mon, 13 Jan 2014 11:42:02 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DBg2fN047732;
 Mon, 13 Jan 2014 11:42:02 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201401131142.s0DBg2fN047732@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 13 Jan 2014 11:42:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339586 - branches/2014Q1/textproc/tclExpat
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 11:42:03 -0000

Author: gahr
Date: Mon Jan 13 11:42:02 2014
New Revision: 339586
URL: http://svnweb.freebsd.org/changeset/ports/339586

Log:
  MFH: r339584
  
  - Fix MASTER_SITES (http://T32.TecNik93.com doesn't exist anymore)
  - Fix distinfo
  
  Approved by:    portmgr

Modified:
  branches/2014Q1/textproc/tclExpat/Makefile
  branches/2014Q1/textproc/tclExpat/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/tclExpat/Makefile
==============================================================================
--- branches/2014Q1/textproc/tclExpat/Makefile	Mon Jan 13 11:40:59 2014	(r339585)
+++ branches/2014Q1/textproc/tclExpat/Makefile	Mon Jan 13 11:42:02 2014	(r339586)
@@ -5,7 +5,7 @@ PORTNAME=	TclExpat
 PORTVERSION=	1.1
 PORTREVISION=	6
 CATEGORIES=	textproc tcl
-MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
+#MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tcl interface to Expat library

Modified: branches/2014Q1/textproc/tclExpat/distinfo
==============================================================================
--- branches/2014Q1/textproc/tclExpat/distinfo	Mon Jan 13 11:40:59 2014	(r339585)
+++ branches/2014Q1/textproc/tclExpat/distinfo	Mon Jan 13 11:42:02 2014	(r339586)
@@ -1,2 +1,2 @@
-SHA256 (TclExpat-1.1.tar.gz) = c8bc32b2d38faebba98098e5047a932900a2b08d9f378182324f3c8b87731e40
-SIZE (TclExpat-1.1.tar.gz) = 269845
+SHA256 (TclExpat-1.1.tar.gz) = 3403e26a6cd3e84946a805d4482e7cf241af76c12bd2ec851b7f442bff3572a8
+SIZE (TclExpat-1.1.tar.gz) = 268538

From owner-svn-ports-branches@FreeBSD.ORG  Mon Jan 13 16:19:54 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 77821FD5;
 Mon, 13 Jan 2014 16:19:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6295A1E74;
 Mon, 13 Jan 2014 16:19:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DGJs1V052725;
 Mon, 13 Jan 2014 16:19:54 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DGJrd3052723;
 Mon, 13 Jan 2014 16:19:53 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201401131619.s0DGJrd3052723@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 13 Jan 2014 16:19:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339607 - in branches/2014Q1/irc/inspircd: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 16:19:54 -0000

Author: feld
Date: Mon Jan 13 16:19:53 2014
New Revision: 339607
URL: http://svnweb.freebsd.org/changeset/ports/339607

Log:
  MFH: r339606
  
  Fix creation of directories in rc script
  
  Submitted by:	gizd
  Approved by:	portmgr-lurkers (mat)

Modified:
  branches/2014Q1/irc/inspircd/Makefile
  branches/2014Q1/irc/inspircd/files/inspircd.in
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/irc/inspircd/Makefile
==============================================================================
--- branches/2014Q1/irc/inspircd/Makefile	Mon Jan 13 16:13:33 2014	(r339606)
+++ branches/2014Q1/irc/inspircd/Makefile	Mon Jan 13 16:19:53 2014	(r339607)
@@ -3,6 +3,7 @@
 
 PORTNAME=	inspircd
 PORTVERSION=	2.0.14
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	feld@FreeBSD.org

Modified: branches/2014Q1/irc/inspircd/files/inspircd.in
==============================================================================
--- branches/2014Q1/irc/inspircd/files/inspircd.in	Mon Jan 13 16:13:33 2014	(r339606)
+++ branches/2014Q1/irc/inspircd/files/inspircd.in	Mon Jan 13 16:19:53 2014	(r339607)
@@ -47,11 +47,11 @@ inspircd_prestart()
 {
 	piddir=$(dirname ${inspircd_pidfile})
 	if [ ! -d ${piddir} ]; then
-		install -m 755 -o ${inspircd_user} -g ${inspircd_group} ${piddir}
+		install -d -m 755 -o ${inspircd_user} -g ${inspircd_group} ${piddir}
 	fi
 	logdir=$(dirname ${inspircd_logfile})
 	if [ ! -d ${logdir} ]; then
-		install -m 755 -o ${inspircd_user} -g ${inspircd_group} ${logdir}
+		install -d -m 755 -o ${inspircd_user} -g ${inspircd_group} ${logdir}
 	fi
 }
 

From owner-svn-ports-branches@FreeBSD.ORG  Mon Jan 13 17:54:06 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EBC5DBB9;
 Mon, 13 Jan 2014 17:54:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6DE016E6;
 Mon, 13 Jan 2014 17:54:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DHs6NQ091688;
 Mon, 13 Jan 2014 17:54:06 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DHs5vF091675;
 Mon, 13 Jan 2014 17:54:05 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201401131754.s0DHs5vF091675@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 13 Jan 2014 17:54:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339614 - in branches/2014Q1: dns/bind96 dns/bind98
 dns/bind99 security/vuxml
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 17:54:07 -0000

Author: mat
Date: Mon Jan 13 17:54:04 2014
New Revision: 339614
URL: http://svnweb.freebsd.org/changeset/ports/339614

Log:
  MFH: r339612
  
  Security update to fix CVE-2014-0591 as reported at
  https://kb.isc.org/article/AA-01078/74/
  
  9.9.4 -> 9.9.4-P2
  9.8.6 -> 9.8.6-P2
  9.6-ESV-R10 -> 9.6-ESV-R10-P2
  
  Security:	CVE-2014-0591 Remote DOS
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/dns/bind96/Makefile
  branches/2014Q1/dns/bind96/distinfo
  branches/2014Q1/dns/bind98/Makefile
  branches/2014Q1/dns/bind98/distinfo
  branches/2014Q1/dns/bind99/Makefile
  branches/2014Q1/dns/bind99/distinfo
  branches/2014Q1/security/vuxml/vuln.xml
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/dns/bind96/Makefile
==============================================================================
--- branches/2014Q1/dns/bind96/Makefile	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/dns/bind96/Makefile	Mon Jan 13 17:54:04 2014	(r339614)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bind96
-PORTVERSION=	9.6.3.2.ESV.R10
-PORTREVISION=	2
+PORTVERSION=	9.6.3.2.ESV.R10.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -14,7 +13,7 @@ COMMENT=	BIND DNS suite with updated DNS
 LICENSE=	ISCL
 
 # ISC releases things like 9.4.0b3, which our versioning doesn't like
-ISCVERSION=	9.6-ESV-R10
+ISCVERSION=	9.6-ESV-R10-P2
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: branches/2014Q1/dns/bind96/distinfo
==============================================================================
--- branches/2014Q1/dns/bind96/distinfo	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/dns/bind96/distinfo	Mon Jan 13 17:54:04 2014	(r339614)
@@ -1,2 +1,2 @@
-SHA256 (bind-9.6-ESV-R10.tar.gz) = f34e24a7d4bd41eedd7b781fbca3f8dc29e6f677be3b9f418f8581debbc4a66c
-SIZE (bind-9.6-ESV-R10.tar.gz) = 6420776
+SHA256 (bind-9.6-ESV-R10-P2.tar.gz) = 1b131ef3a3b27a7916815ec5f4a87f0d9f5ac0669df21c7ec75ba18a13238eda
+SIZE (bind-9.6-ESV-R10-P2.tar.gz) = 6421474

Modified: branches/2014Q1/dns/bind98/Makefile
==============================================================================
--- branches/2014Q1/dns/bind98/Makefile	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/dns/bind98/Makefile	Mon Jan 13 17:54:04 2014	(r339614)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bind98
-PORTVERSION=	9.8.6
-PORTREVISION=	2
+PORTVERSION=	9.8.6.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -14,7 +13,7 @@ COMMENT=	BIND DNS suite with updated DNS
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.8.6
+ISCVERSION=	9.8.6-P2
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: branches/2014Q1/dns/bind98/distinfo
==============================================================================
--- branches/2014Q1/dns/bind98/distinfo	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/dns/bind98/distinfo	Mon Jan 13 17:54:04 2014	(r339614)
@@ -1,4 +1,4 @@
-SHA256 (bind-9.8.6.tar.gz) = 01cc3a0105b47833b99e61b69acd824be4eeefd6557fffa26eced8e03f1249cd
-SIZE (bind-9.8.6.tar.gz) = 7275769
+SHA256 (bind-9.8.6-P2.tar.gz) = e5c87bdf102ac5b2563955393a2f4805e7574dc7addd03d18152c2f70befedeb
+SIZE (bind-9.8.6-P2.tar.gz) = 7275835
 SHA256 (rpz2+rl-9.8.6.patch) = 76b988205ce17034ff6c03cff943d0e579a5a46dbc47e1fac83704c88fb96d79
 SIZE (rpz2+rl-9.8.6.patch) = 348361

Modified: branches/2014Q1/dns/bind99/Makefile
==============================================================================
--- branches/2014Q1/dns/bind99/Makefile	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/dns/bind99/Makefile	Mon Jan 13 17:54:04 2014	(r339614)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	bind99
-PORTVERSION=	9.9.4
-PORTREVISION?=	2
+PORTVERSION=	9.9.4.2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -14,7 +13,7 @@ COMMENT=	BIND DNS suite with updated DNS
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.9.4
+ISCVERSION=	9.9.4-P2
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: branches/2014Q1/dns/bind99/distinfo
==============================================================================
--- branches/2014Q1/dns/bind99/distinfo	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/dns/bind99/distinfo	Mon Jan 13 17:54:04 2014	(r339614)
@@ -1,2 +1,2 @@
-SHA256 (bind-9.9.4.tar.gz) = fe0f16653382e428b10282ce9850722d19589d66f2b45a528e98be3153f654c8
-SIZE (bind-9.9.4.tar.gz) = 7513017
+SHA256 (bind-9.9.4-P2.tar.gz) = 50f3c6431e26d3f322b69092a49c92e163e73029fe4a1933ce532dc97ec40a89
+SIZE (bind-9.9.4-P2.tar.gz) = 7513077

Modified: branches/2014Q1/security/vuxml/vuln.xml
==============================================================================
--- branches/2014Q1/security/vuxml/vuln.xml	Mon Jan 13 17:41:08 2014	(r339613)
+++ branches/2014Q1/security/vuxml/vuln.xml	Mon Jan 13 17:54:04 2014	(r339614)
@@ -51,6 +51,48 @@ Note:  Please add new entries to the beg
 
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+  <vuln vid="cb252f01-7c43-11e3-b0a6-005056a37f68">
+    <topic>bind -- denial of service vulnerability</topic>
+    <affects>
+      <package>
+	<name>bind99</name>
+	<name>bind99-base</name>
+	<range><lt>9.9.4.2</lt></range>
+      </package>
+      <package>
+	<name>bind98</name>
+	<name>bind98-base</name>
+	<range><lt>9.8.6.2</lt></range>
+      </package>
+      <package>
+	<name>bind96</name>
+	<name>bind96-base</name>
+	<range><lt>9.6.3.2.ESV.R10.2</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>ISC reports:</p>
+	<blockquote cite="https://kb.isc.org/article/AA-01078/74/">
+	  <p>Because of a defect in handling queries for NSEC3-signed zones,
+	    BIND can crash with an "INSIST" failure in name.c when processing
+	    queries possessing certain properties. By exploiting this defect
+	    an attacker deliberately constructing a query with the right
+	    properties could achieve denial of service against an authoritative
+	    nameserver serving NSEC3-signed zones.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2014-0591</cvename>
+      <url>https://kb.isc.org/article/AA-01078/74/</url>
+    </references>
+    <dates>
+      <discovery>2014-01-08</discovery>
+      <entry>2014-01-13</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="28c575fa-784e-11e3-8249-001cc0380077">
     <topic>libXfont -- Stack buffer overflow in parsing of BDF font files in libXfont</topic>
     <affects>

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 11:18:31 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B1356D9;
 Tue, 14 Jan 2014 11:18:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1707019D1;
 Tue, 14 Jan 2014 11:18:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EBIUM2022351;
 Tue, 14 Jan 2014 11:18:30 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EBIUbM022350;
 Tue, 14 Jan 2014 11:18:30 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201401141118.s0EBIUbM022350@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 14 Jan 2014 11:18:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339678 - branches/2014Q1/textproc/igor
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 11:18:31 -0000

Author: gjb
Date: Tue Jan 14 11:18:30 2014
New Revision: 339678
URL: http://svnweb.freebsd.org/changeset/ports/339678

Log:
  MFH r339418:
    Temporarily fix fetch problem via https.
  
  Approved by:	wblock (maintainer, implicit)
  Approved by:	portmgr (erwin)
  Sponsored by:	The FreeBSD Foundation

Modified:
  branches/2014Q1/textproc/igor/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/igor/Makefile
==============================================================================
--- branches/2014Q1/textproc/igor/Makefile	Tue Jan 14 10:52:23 2014	(r339677)
+++ branches/2014Q1/textproc/igor/Makefile	Tue Jan 14 11:18:30 2014	(r339678)
@@ -3,7 +3,7 @@
 PORTNAME=	igor
 PORTVERSION=	1.397
 CATEGORIES=	textproc
-MASTER_SITES=	https://docscripts.glenbarber.us/tags/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	http://docscripts.glenbarber.us/tags/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	wblock@FreeBSD.org
 COMMENT=	FreeBSD Documentation Project sanity check script

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 15:11:39 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7B98DF02;
 Tue, 14 Jan 2014 15:11:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 65B971F6C;
 Tue, 14 Jan 2014 15:11:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EFBd2d014329;
 Tue, 14 Jan 2014 15:11:39 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EFBcBP014325;
 Tue, 14 Jan 2014 15:11:38 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201401141511.s0EFBcBP014325@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 14 Jan 2014 15:11:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339690 - in branches/2014Q1: net-mgmt/nagios
 net-mgmt/nagios/files security/vuxml
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 15:11:39 -0000

Author: mat
Date: Tue Jan 14 15:11:38 2014
New Revision: 339690
URL: http://svnweb.freebsd.org/changeset/ports/339690

Log:
  MFH: r339686, r339689
  
  * Add a patch from upstream fixing a cgi vulnerability
  
  Poked by:	ohauer
  Security:	CVE-2013-7108 CVE-2013-7205

Added:
  branches/2014Q1/net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866
     - copied unchanged from r339689, head/net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866
Modified:
  branches/2014Q1/net-mgmt/nagios/Makefile
  branches/2014Q1/security/vuxml/vuln.xml
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net-mgmt/nagios/Makefile
==============================================================================
--- branches/2014Q1/net-mgmt/nagios/Makefile	Tue Jan 14 14:23:36 2014	(r339689)
+++ branches/2014Q1/net-mgmt/nagios/Makefile	Tue Jan 14 15:11:38 2014	(r339690)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	3.5.1
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
 
@@ -97,7 +98,7 @@ post-extract:
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in`
+	@${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d;/^COMMAND_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in`
 .if ${PORT_OPTIONS:MUNHANDLED_HACK}
 	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
 		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php

Copied: branches/2014Q1/net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866 (from r339689, head/net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866	Tue Jan 14 15:11:38 2014	(r339690, copy of r339689, head/net-mgmt/nagios/files/patch-d97e03f32741a7d851826b03ed73ff4c9612a866)
@@ -0,0 +1,175 @@
+commit d97e03f32741a7d851826b03ed73ff4c9612a866
+Author: Eric Stanley <estanley@nagios.com>
+Date:   2013-12-20 13:14:30 -0600
+
+    CGIs: Fixed minor vulnerability where a custom query could crash the CGI.
+    
+    Most CGIs previously incremented the input variable counter twice when
+    it encountered a long key value. This could cause the CGI to read past
+    the end of the list of CGI variables. This commit removes the second
+    increment, removing the possibility of reading past the end of the list
+    of CGI variables.
+
+diff --git ./cgi/avail.c ./cgi/avail.c
+index 76afd86..64eaadc 100644
+--- ./cgi/avail.c
++++ ./cgi/avail.c
+@@ -1096,7 +1096,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/cmd.c ./cgi/cmd.c
+index fa6cf5a..50504eb 100644
+--- ./cgi/cmd.c
++++ ./cgi/cmd.c
+@@ -311,7 +311,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/config.c ./cgi/config.c
+index f061b0f..3360e70 100644
+--- ./cgi/config.c
++++ ./cgi/config.c
+@@ -344,7 +344,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/extinfo.c ./cgi/extinfo.c
+index 62a1b18..5113df4 100644
+--- ./cgi/extinfo.c
++++ ./cgi/extinfo.c
+@@ -591,7 +591,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/histogram.c ./cgi/histogram.c
+index 4616541..f6934d0 100644
+--- ./cgi/histogram.c
++++ ./cgi/histogram.c
+@@ -1060,7 +1060,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/notifications.c ./cgi/notifications.c
+index 8ba11c1..461ae84 100644
+--- ./cgi/notifications.c
++++ ./cgi/notifications.c
+@@ -327,7 +327,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/outages.c ./cgi/outages.c
+index 426ede6..cb58dee 100644
+--- ./cgi/outages.c
++++ ./cgi/outages.c
+@@ -225,7 +225,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/status.c ./cgi/status.c
+index 3253340..4ec1c92 100644
+--- ./cgi/status.c
++++ ./cgi/status.c
+@@ -567,7 +567,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/statusmap.c ./cgi/statusmap.c
+index ea48368..2580ae5 100644
+--- ./cgi/statusmap.c
++++ ./cgi/statusmap.c
+@@ -400,7 +400,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/statuswml.c ./cgi/statuswml.c
+index bd8cea2..d25abef 100644
+--- ./cgi/statuswml.c
++++ ./cgi/statuswml.c
+@@ -226,8 +226,13 @@ int process_cgivars(void) {
+ 
+ 	for(x = 0; variables[x] != NULL; x++) {
+ 
++		/* do some basic length checking on the variable identifier to prevent buffer overflows */
++		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
++			continue;
++			}
++
+ 		/* we found the hostgroup argument */
+-		if(!strcmp(variables[x], "hostgroup")) {
++		else if(!strcmp(variables[x], "hostgroup")) {
+ 			display_type = DISPLAY_HOSTGROUP;
+ 			x++;
+ 			if(variables[x] == NULL) {
+diff --git ./cgi/summary.c ./cgi/summary.c
+index 126ce5e..749a02c 100644
+--- ./cgi/summary.c
++++ ./cgi/summary.c
+@@ -725,7 +725,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./cgi/trends.c ./cgi/trends.c
+index b35c18e..895db01 100644
+--- ./cgi/trends.c
++++ ./cgi/trends.c
+@@ -1263,7 +1263,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
+diff --git ./contrib/daemonchk.c ./contrib/daemonchk.c
+index 78716e5..9bb6c4b 100644
+--- ./contrib/daemonchk.c
++++ ./contrib/daemonchk.c
+@@ -174,7 +174,6 @@ static int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 		}

Modified: branches/2014Q1/security/vuxml/vuln.xml
==============================================================================
--- branches/2014Q1/security/vuxml/vuln.xml	Tue Jan 14 14:23:36 2014	(r339689)
+++ branches/2014Q1/security/vuxml/vuln.xml	Tue Jan 14 15:11:38 2014	(r339690)
@@ -51,6 +51,36 @@ Note:  Please add new entries to the beg
 
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+  <vuln vid="ba04a373-7d20-11e3-8992-00132034b086">
+    <topic>nagios -- denial of service vulnerability</topic>
+    <affects>
+      <package>
+	<name>nagios</name>
+	<range><lt>3.5.1_3</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Eric Stanley reports:</p>
+	<blockquote cite="http://sourceforge.net/p/nagios/nagioscore/ci/d97e03f32741a7d851826b03ed73ff4c9612a866/">
+	  <p>Most CGIs previously incremented the input variable counter twice
+	    when it encountered a long key value. This could cause the CGI to
+	    read past the end of the list of CGI variables.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2013-7108</cvename>
+      <cvename>CVE-2013-7205</cvename>
+      <url>http://sourceforge.net/p/nagios/nagioscore/ci/d97e03f32741a7d851826b03ed73ff4c9612a866/</url>
+      <url>https://bugzilla.redhat.com/show_bug.cgi?id=1046113</url>
+    </references>
+    <dates>
+      <discovery>2013-12-20</discovery>
+      <entry>2014-01-14</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="cb252f01-7c43-11e3-b0a6-005056a37f68">
     <topic>bind -- denial of service vulnerability</topic>
     <affects>

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 16:08:57 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B7A6353A;
 Tue, 14 Jan 2014 16:08:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 97DBA14C8;
 Tue, 14 Jan 2014 16:08:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EG8vvr034648;
 Tue, 14 Jan 2014 16:08:57 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EG8usb034642;
 Tue, 14 Jan 2014 16:08:56 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201401141608.s0EG8usb034642@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 14 Jan 2014 16:08:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339694 - in branches/2014Q1/net/nss_ldap: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 16:08:57 -0000

Author: des
Date: Tue Jan 14 16:08:56 2014
New Revision: 339694
URL: http://svnweb.freebsd.org/changeset/ports/339694
QAT: https://qat.redports.org/buildarchive/r339694/

Log:
  MFH: r339687
  
  Functional changes:
  
    - Add a SASL port option
  
    - Fix the KERBEROS ports option - it was a no-op, setting a
      configure flag which modifies how Kerberos was used without
      setting the flag that actually enables it.
  
    - Use GSSAPI instead of $ENV{KRB5CCNAME} to set the credential
      cache.  The latter pollutes the unsuspecting application's
      environment and does not always work (for instance, it breaks when
      nss_ldap is invoked from OpenSSH, although I haven't quite
      determined why)
  
    - Add patches to support Heimdal in addition to MIT Kerberos.  Note
      that I tried to ensure that the code is unchanged in the
      non-Heimdal case, but that I have no way of testing with MIT
      Kerberos.
  
    With the above changes, I have successfully configured a FreeBSD 9.2
    server to authenticate users against a Microsoft Windows 2012 Active
    Directory server.
  
  Non-functional changes:
  
    - Modernize and stagify
  
    - Remove text in pkg-message about a change that was made ten years ago
  
    - Take maintainership as current maintainer has been AWOL for 2+ years
  
    - Bump PORTREVISION
  
  Approved by:	maintainer hasn't been heard of for 2+ years
  Approved by:	portmgr (mat)

Added:
  branches/2014Q1/net/nss_ldap/files/patch-ldap-init-krb5-cache.c
     - copied unchanged from r339687, head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c
  branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.h
     - copied unchanged from r339687, head/net/nss_ldap/files/patch-ldap-nss.h
Modified:
  branches/2014Q1/net/nss_ldap/Makefile
  branches/2014Q1/net/nss_ldap/files/patch-configure.in
  branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.c
  branches/2014Q1/net/nss_ldap/files/pkg-message.in
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/nss_ldap/Makefile
==============================================================================
--- branches/2014Q1/net/nss_ldap/Makefile	Tue Jan 14 16:03:10 2014	(r339693)
+++ branches/2014Q1/net/nss_ldap/Makefile	Tue Jan 14 16:08:56 2014	(r339694)
@@ -3,13 +3,13 @@
 
 PORTNAME=	nss_ldap
 PORTVERSION=	1.${NSS_LDAP_VERSION}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	http://www.padl.com/download/ \
 		LOCAL/martymac
 DISTNAME=	${PORTNAME}-${NSS_LDAP_VERSION}
 
-MAINTAINER=	mikeg@bsd-box.net
+MAINTAINER=	des@FreeBSD.org
 COMMENT=	RFC 2307 NSS module
 
 LICENSE=	GPLv2
@@ -24,11 +24,13 @@ AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 
-OPTIONS_DEFINE=	LCLASS KERBEROS
+OPTIONS_DEFINE=	LCLASS KERBEROS SASL
 OPTIONS_DEFAULT=LCLASS KERBEROS
 
 LCLASS_DESC=	Enable login classes via the loginClass attribute
 
+SASL_DESC=	Use the SASL-enabled version of OpenLDAP
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
 
@@ -41,17 +43,21 @@ MAN5=	nss_ldap.5
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKERBEROS}
-CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-env
+CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-gssapi \
+		--enable-configurable-krb5-keytab
 .endif
 
 .if ${PORT_OPTIONS:MLCLASS}
 CFLAGS+="-DHAVE_LOGIN_CLASSES"
 .endif
 
+.if ${PORT_OPTIONS:MSASL}
+WANT_OPENLDAP_SASL	 = YES
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}
 
@@ -73,16 +79,8 @@ post-configure:
 	@${ECHO} "#define HAVE_RESOLV_H 1" >> ${WRKSRC}/config.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nss_ldap.so ${PREFIX}/lib/nss_ldap.so.1
-	${INSTALL_DATA} ${WRKSRC}/ldap.conf ${PREFIX}/etc/nss_ldap.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/${MAN5} ${MAN5PREFIX}/man/man5
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/nss_ldap.conf ]; then \
-		${CP} -pv ${PREFIX}/etc/nss_ldap.conf.sample ${PREFIX}/etc/nss_ldap.conf ; \
-	fi
-.if !defined(PACKAGE_BUILDING)
-	@${CAT} ${PKGMESSAGE}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/nss_ldap.so ${STAGEDIR}/${PREFIX}/lib/nss_ldap.so.1
+	${INSTALL_DATA} ${WRKSRC}/ldap.conf ${STAGEDIR}/${PREFIX}/etc/nss_ldap.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/${MAN5} ${STAGEDIR}/${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/net/nss_ldap/files/patch-configure.in
==============================================================================
--- branches/2014Q1/net/nss_ldap/files/patch-configure.in	Tue Jan 14 16:03:10 2014	(r339693)
+++ branches/2014Q1/net/nss_ldap/files/patch-configure.in	Tue Jan 14 16:08:56 2014	(r339694)
@@ -1,6 +1,6 @@
---- configure.in.orig	2007-10-29 06:30:12.000000000 -0700
-+++ configure.in	2008-09-26 20:38:20.000000000 -0700
-@@ -96,11 +96,15 @@
+--- configure.in.orig
++++ configure.in
+@@ -97,11 +97,15 @@
  linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;;
  *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;;
  esac
@@ -16,7 +16,7 @@
  
  AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD")
  
-@@ -152,7 +156,6 @@
+@@ -153,7 +157,6 @@
    aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;;
    hpux*) AC_CHECK_HEADERS(nsswitch.h) ;;
    *) AC_CHECK_HEADERS(nss.h)
@@ -24,7 +24,21 @@
       AC_CHECK_HEADERS(irs.h) ;;
  esac
  AC_CHECK_HEADERS(thread.h)
-@@ -227,7 +230,6 @@
+@@ -188,6 +191,13 @@
+ AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)
+ AC_CHECK_HEADERS(krb5.h)
+ 
++AC_MSG_CHECKING([if Kerberos is Heimdal])
++AC_TRY_LINK([#include <krb5.h>],
++	    [const char hv = heimdal_version;],
++	    [AC_MSG_RESULT(yes)
++	     AC_DEFINE(HEIMDAL,1,[Define if Kerberos is Heimdal])],
++	    [AC_MSG_RESULT(no)])
++
+ AC_CHECK_LIB(resolv, main)
+ AC_CHECK_LIB(nsl, main)
+ AC_CHECK_LIB(socket, main)
+@@ -230,7 +240,6 @@
  AC_CHECK_FUNCS(gethostbyname)
  AC_CHECK_FUNCS(nsdispatch)
  AC_CHECK_LIB(pthread_nonshared, main)

Copied: branches/2014Q1/net/nss_ldap/files/patch-ldap-init-krb5-cache.c (from r339687, head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/net/nss_ldap/files/patch-ldap-init-krb5-cache.c	Tue Jan 14 16:08:56 2014	(r339694, copy of r339687, head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c)
@@ -0,0 +1,62 @@
+--- ldap-init-krb5-cache.c.orig
++++ ldap-init-krb5-cache.c
+@@ -109,6 +109,10 @@
+ #include <gssapi/gssapi.h>
+ #include <gssapi/gssapi_krb5.h>
+ 
++#ifndef HOST_NAME_MAX
++#define HOST_NAME_MAX 1024
++#endif
++
+ #define MAX_RENEW_TIME "365d"
+ 
+ #define KT_PATH_MAX 256
+@@ -213,14 +217,25 @@
+ {
+   krb5_error_code code = 0;
+   krb5_keytab __keytab;
++#ifdef HEIMDAL
++  char kttypebuf[KRB5_KT_PREFIX_MAX_LEN];
++  size_t kttypesize = sizeof kttypebuf;
++#endif
++  char *kttype;
+ 
+   debug ("==> krb5_cache_kt_is_accessible: ktname %s", __ktname);
+   assert (context != NULL);
+   if (!(code = krb5_kt_resolve (context, __ktname, &__keytab)))
+     {
++#ifdef HEIMDAL
++      krb5_kt_get_type (context, __keytab, kttypebuf, kttypesize);
++      kttype = kttypebuf;
++#else
++      kttype = krb5_kt_get_type (context, __keytab);
++#endif
+       debug ("==> krb5_cache_kt_is_accessible: resolved ktname %s - %s",
+-	     __ktname, krb5_kt_get_type (context, __keytab));
+-      if (strcmp ("FILE", krb5_kt_get_type (context, __keytab)) == 0)
++	     __ktname, kttype);
++      if (strcmp ("FILE", kttype) == 0)
+ 	{
+ 	  debug ("==> krb5_cache_kt_is_accessible: kt type = FILE");
+ 	  uid_t ruid = getuid ();
+@@ -542,7 +557,7 @@
+     }
+   profile_release (profile);
+ #else
+-  skew = context->max_skew;
++  /* skew = context->max_skew; */
+ #endif
+   ccname = krb5_cache_get_ccname (config);
+   debug ("==> krb5_cache_setup: credential cache name %s",
+@@ -671,7 +686,11 @@
+ 		     ccname ? ccname : "NULL");
+ 		}
+ 	    }
++#ifdef HEIMDAL
++	  free (principal_name);
++#else
+ 	  krb5_free_unparsed_name (context, principal_name);
++#endif
+ 	}
+     }
+ 

Modified: branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.c
==============================================================================
--- branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.c	Tue Jan 14 16:03:10 2014	(r339693)
+++ branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.c	Tue Jan 14 16:08:56 2014	(r339694)
@@ -1,5 +1,5 @@
---- ldap-nss.c.orig	Sat May 27 16:23:40 2006
-+++ ldap-nss.c	Sat May 27 16:23:52 2006
+--- ldap-nss.c.orig
++++ ldap-nss.c
 @@ -69,7 +69,7 @@
  #endif
  
@@ -9,3 +9,18 @@
  #include <sasl/sasl.h>
  #elif defined(HAVE_SASL_H)
  #include <sasl.h>
+@@ -78,11 +78,11 @@
+ #ifndef HAVE_SNPRINTF
+ #include "snprintf.h"
+ #endif
+-#ifdef HAVE_GSSAPI_H
+-#include <gssapi.h>
+-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
++#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+ #include <gssapi/gssapi.h>
+ #include <gssapi/gssapi_krb5.h>
++#elif defined(HAVE_GSSAPI_H)
++#include <gssapi.h>
+ #endif
+ #ifdef CONFIGURE_KRB5_CCNAME
+ #include <krb5.h>

Copied: branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.h (from r339687, head/net/nss_ldap/files/patch-ldap-nss.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/net/nss_ldap/files/patch-ldap-nss.h	Tue Jan 14 16:08:56 2014	(r339694, copy of r339687, head/net/nss_ldap/files/patch-ldap-nss.h)
@@ -0,0 +1,12 @@
+--- ldap-nss.h.orig
++++ ldap-nss.h
+@@ -923,6 +923,8 @@
+ int _nss_ldap_get_ld_errno (char **m, char **s);
+ 
+ #ifdef CONFIGURE_KRB5_KEYTAB
+-int do_init_krb5_cache(ldap_config_t *config);
++int do_init_krb5_cache (ldap_config_t *config);
++int do_select_krb5_cache (ldap_config_t * config);
++int do_restore_krb5_cache (ldap_config_t * config);
+ #endif /* CONFIGURE_KRB5_KEYTAB */
+ #endif /* _LDAP_NSS_LDAP_LDAP_NSS_H */

Modified: branches/2014Q1/net/nss_ldap/files/pkg-message.in
==============================================================================
--- branches/2014Q1/net/nss_ldap/files/pkg-message.in	Tue Jan 14 16:03:10 2014	(r339693)
+++ branches/2014Q1/net/nss_ldap/files/pkg-message.in	Tue Jan 14 16:08:56 2014	(r339694)
@@ -4,12 +4,4 @@ following paths:
 
 LDAP configuration:     %%PREFIX%%/etc/nss_ldap.conf
 LDAP secret (optional): %%PREFIX%%/etc/nss_ldap.secret
-
-
-WARNING: For users of previous versions of this port:
-WARNING:
-WARNING: Previous versions of this port expected configuration files
-WARNING: to be located at /etc/ldap.conf and /etc/ldap.secret.  You
-WARNING: may need to move these configuration files to their new
-WARNING: location specified above.
 =====================================================================

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 16:36:56 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 339574D4;
 Tue, 14 Jan 2014 16:36:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0585E1779;
 Tue, 14 Jan 2014 16:36:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EGatdi046289;
 Tue, 14 Jan 2014 16:36:55 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EGat4j046288;
 Tue, 14 Jan 2014 16:36:55 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201401141636.s0EGat4j046288@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 14 Jan 2014 16:36:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339699 - branches/2014Q1/net/tcpillust
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 16:36:56 -0000

Author: gahr
Date: Tue Jan 14 16:36:55 2014
New Revision: 339699
URL: http://svnweb.freebsd.org/changeset/ports/339699
QAT: https://qat.redports.org/buildarchive/r339699/

Log:
  MFH: r339688
  
  - Convert to USES=tk
  - STAGE-clean
  - Fix build
  
  Approved by:    portmgr

Modified:
  branches/2014Q1/net/tcpillust/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/tcpillust/Makefile
==============================================================================
--- branches/2014Q1/net/tcpillust/Makefile	Tue Jan 14 16:27:08 2014	(r339698)
+++ branches/2014Q1/net/tcpillust/Makefile	Tue Jan 14 16:36:55 2014	(r339699)
@@ -11,15 +11,13 @@ MASTER_SITES=	http://www.jp.nishida.org/
 MAINTAINER=	nishida@sfc.wide.ad.jp
 COMMENT=	Graphical TCP connection analysis tool
 
-USES=		motif
-USE_TCL=	yes
-USE_TK=		yes
+USES=		motif tk
 USE_XORG=	xt
 
-MAN1=		tcpillust.1
 PORTDOCS=	tcpclient.log tcpserver.log
 PLIST_DIRS=	share/tcpillust
 PLIST_FILES=	bin/tcpillust \
+		man/man1/tcpillust.1.gz \
 		share/tcpillust/tcpillust.tcl \
 		share/tcpillust/back.xbm \
 		share/tcpillust/forward.xbm \
@@ -28,24 +26,21 @@ PLIST_FILES=	bin/tcpillust \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 do-build:
 .for file in binread.c button.c draw.c parser.c tcpillust.c tcpdump/print-tcp.c
-	${CC} ${CFLAGS} -I/usr/include -I/usr/include/pcap -I${LOCALBASE}/include/ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
+	${CC} ${CFLAGS} -DHAVE_BPF_DUMP -I/usr/include -I/usr/include/pcap -I${LOCALBASE}/include/ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
 	-I${LOCALBASE}/include -DILTDIR=\"${DATADIR}\" -c ${WRKSRC}/${file} -o ${WRKSRC}/${file:S/.c/.o/}
 .endfor
 	${CC} ${CFLAGS} -L/lib -L/usr/lib -L${TCL_LIBDIR} -L${TK_LIBDIR} -L${LOCALBASE}/lib \
 	-lm -ltcl${TCL_VER:S/.//} -ltk${TK_VER:S/.//} ${WRKSRC}/*.o ${WRKSRC}/tcpdump/*.o -o ${WRKSRC}/tcpillust -lpcap -lX11
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpillust ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/tcpillust.tcl ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/*.xbm ${DATADIR}/
-	${INSTALL_MAN} ${WRKSRC}/tcpillust.man ${PREFIX}/man/man1/tcpillust.1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/tcpillust ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tcpillust.tcl ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/*.xbm ${STAGEDIR}${DATADIR}/
+	${INSTALL_MAN} ${WRKSRC}/tcpillust.man ${STAGEDIR}${PREFIX}/man/man1/tcpillust.1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 19:52:43 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 64656A41;
 Tue, 14 Jan 2014 19:52:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FD2E18FA;
 Tue, 14 Jan 2014 19:52:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EJqhYV027414;
 Tue, 14 Jan 2014 19:52:43 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EJqhYT027413;
 Tue, 14 Jan 2014 19:52:43 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401141952.s0EJqhYT027413@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 14 Jan 2014 19:52:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339711 - in branches/2014Q1/net/sobby: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 19:52:43 -0000

Author: antoine
Date: Tue Jan 14 19:52:42 2014
New Revision: 339711
URL: http://svnweb.freebsd.org/changeset/ports/339711
QAT: https://qat.redports.org/buildarchive/r339711/

Log:
  MFH: r339710
  
  - Fix build with clang
  - Stage support
  
  PR:		ports/185691
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/net/sobby/files/
     - copied from r339710, head/net/sobby/files/
Modified:
  branches/2014Q1/net/sobby/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/sobby/Makefile
==============================================================================
--- branches/2014Q1/net/sobby/Makefile	Tue Jan 14 19:50:57 2014	(r339710)
+++ branches/2014Q1/net/sobby/Makefile	Tue Jan 14 19:52:42 2014	(r339711)
@@ -7,30 +7,23 @@ CATEGORIES=	net
 MASTER_SITES=	http://releases.0x539.de/sobby/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A standalone obby server
+COMMENT=	Standalone obby server
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		obby-0.4.1:${PORTSDIR}/devel/obby \
-		net6-1.3.0:${PORTSDIR}/net/net6 \
-		xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \
-		glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libobby-0.4.so:${PORTSDIR}/devel/obby \
+		libnet6-1.3.so:${PORTSDIR}/net/net6 \
+		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
 
 USES=		pkgconfig
+USE_GNOME=	glibmm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-zeroconf
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 20:25:39 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A07E0D7E;
 Tue, 14 Jan 2014 20:25:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 806321563;
 Tue, 14 Jan 2014 20:25:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EKPdNo048001;
 Tue, 14 Jan 2014 20:25:39 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EKPchK047993;
 Tue, 14 Jan 2014 20:25:38 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401142025.s0EKPchK047993@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 14 Jan 2014 20:25:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339713 - in branches/2014Q1/misc/kcd: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 20:25:39 -0000

Author: antoine
Date: Tue Jan 14 20:25:38 2014
New Revision: 339713
URL: http://svnweb.freebsd.org/changeset/ports/339713
QAT: https://qat.redports.org/buildarchive/r339713/

Log:
  MFH: r339712
  
  - Fix build with clang
  - Stage support
  
  PR:		ports/185692
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/misc/kcd/files/patch-gentree.cc
     - copied unchanged from r339712, head/misc/kcd/files/patch-gentree.cc
  branches/2014Q1/misc/kcd/files/patch-scandir.cc
     - copied unchanged from r339712, head/misc/kcd/files/patch-scandir.cc
Modified:
  branches/2014Q1/misc/kcd/Makefile
  branches/2014Q1/misc/kcd/files/patch-dirtree.cc
  branches/2014Q1/misc/kcd/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/misc/kcd/Makefile
==============================================================================
--- branches/2014Q1/misc/kcd/Makefile	Tue Jan 14 20:23:34 2014	(r339712)
+++ branches/2014Q1/misc/kcd/Makefile	Tue Jan 14 20:25:38 2014	(r339713)
@@ -12,33 +12,29 @@ COMMENT=	Change directory in full-screen
 
 LICENSE=	GPLv2
 
-USES=		gettext perl5
+USES=		gettext ncurses perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-MAN1=		kcd.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${MANPREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/kcd.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .for i in en_GB en_GB.UTF-8 en_US.UTF-8
-	@${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
-		${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo
+		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/misc/kcd/files/patch-dirtree.cc
==============================================================================
--- branches/2014Q1/misc/kcd/files/patch-dirtree.cc	Tue Jan 14 20:23:34 2014	(r339712)
+++ branches/2014Q1/misc/kcd/files/patch-dirtree.cc	Tue Jan 14 20:25:38 2014	(r339713)
@@ -1,6 +1,17 @@
 --- dirtree.cc.orig	2009-02-18 13:01:05.000000000 +0100
 +++ dirtree.cc	2013-05-27 18:11:32.183060000 +0200
-@@ -170,12 +170,12 @@
+@@ -25,6 +25,10 @@
+ #include "cstrlib.h"
+ #include "gentree.h"
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ sptr_list<DirectoryEntry> dirTree;
+ 
+ const char	uniqueTag[] = "<KCDID#9>";	// File ID
+@@ -170,12 +174,12 @@
  			ReadSaveFile(dirTree, filegz);
  		}
  		catch(ErrorBadFileFormat &) {

Copied: branches/2014Q1/misc/kcd/files/patch-gentree.cc (from r339712, head/misc/kcd/files/patch-gentree.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/misc/kcd/files/patch-gentree.cc	Tue Jan 14 20:25:38 2014	(r339713, copy of r339712, head/misc/kcd/files/patch-gentree.cc)
@@ -0,0 +1,13 @@
+--- gentree.cc.orig
++++ gentree.cc
+@@ -29,6 +29,10 @@
+ #include "cstrlib.h"
+ #include "scandir.h"
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ //#define DUMP_HTML	
+ #ifdef DUMP_HTML
+ # include <fcntl.h>

Copied: branches/2014Q1/misc/kcd/files/patch-scandir.cc (from r339712, head/misc/kcd/files/patch-scandir.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/misc/kcd/files/patch-scandir.cc	Tue Jan 14 20:25:38 2014	(r339713, copy of r339712, head/misc/kcd/files/patch-scandir.cc)
@@ -0,0 +1,13 @@
+--- scandir.cc.orig
++++ scandir.cc
+@@ -32,6 +32,10 @@
+ #include "cstrlib.h"
+ #include "dirtree.h"
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ /*************************************************************************
+ 	Log scan results to command line output
+ *************************************************************************/

Modified: branches/2014Q1/misc/kcd/pkg-plist
==============================================================================
--- branches/2014Q1/misc/kcd/pkg-plist	Tue Jan 14 20:23:34 2014	(r339712)
+++ branches/2014Q1/misc/kcd/pkg-plist	Tue Jan 14 20:25:38 2014	(r339713)
@@ -1,15 +1,16 @@
 bin/kcd-inst
 bin/kcdmain
 bin/kcdscr
+man/man1/kcd.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kcd.csh.init
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kcd.sh.init
 share/locale/en_GB/LC_MESSAGES/kcd.mo
 share/locale/en_GB.UTF-8/LC_MESSAGES/kcd.mo
 share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.csh.init
-%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
-@dirrmtry share/locale/en_GB.UTF-8
 @dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
 @dirrmtry share/locale/en_US.UTF-8
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_GB.UTF-8
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 21:11:26 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 12ADCF1D;
 Tue, 14 Jan 2014 21:11:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F231C199F;
 Tue, 14 Jan 2014 21:11:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ELBPLC067357;
 Tue, 14 Jan 2014 21:11:25 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ELBPsV067354;
 Tue, 14 Jan 2014 21:11:25 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401142111.s0ELBPsV067354@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 14 Jan 2014 21:11:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339719 - in branches/2014Q1/net/libsocketcpp: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 21:11:26 -0000

Author: antoine
Date: Tue Jan 14 21:11:25 2014
New Revision: 339719
URL: http://svnweb.freebsd.org/changeset/ports/339719
QAT: https://qat.redports.org/buildarchive/r339719/

Log:
  MFH: r339718
  
  - Fix build with clang
  - Add LICENSE
  
  PR:		ports/185697
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/net/libsocketcpp/Makefile
  branches/2014Q1/net/libsocketcpp/files/patch-src::tcpservertest.cpp
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/libsocketcpp/Makefile
==============================================================================
--- branches/2014Q1/net/libsocketcpp/Makefile	Tue Jan 14 21:09:27 2014	(r339718)
+++ branches/2014Q1/net/libsocketcpp/Makefile	Tue Jan 14 21:11:25 2014	(r339719)
@@ -7,10 +7,11 @@ CATEGORIES=	net
 MASTER_SITES=	SF/libsocket/${PORTNAME}-stable/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A C++ wrapper library to the sockets
+COMMENT=	C++ wrapper library to the sockets
+
+LICENSE=	LGPL21 # (or later)
 
 USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/net/libsocketcpp/files/patch-src::tcpservertest.cpp
==============================================================================
--- branches/2014Q1/net/libsocketcpp/files/patch-src::tcpservertest.cpp	Tue Jan 14 21:09:27 2014	(r339718)
+++ branches/2014Q1/net/libsocketcpp/files/patch-src::tcpservertest.cpp	Tue Jan 14 21:11:25 2014	(r339719)
@@ -1,5 +1,14 @@
 --- src/tcpservertest.cpp.orig	2012-12-03 14:28:35.000000000 +0100
 +++ src/tcpservertest.cpp	2012-12-03 14:28:46.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
 @@ -30,6 +30,7 @@
  
  #include "tcpsocket.h"

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 21:27:01 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 210BE525;
 Tue, 14 Jan 2014 21:27:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D0001ABB;
 Tue, 14 Jan 2014 21:27:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ELR0ba072318;
 Tue, 14 Jan 2014 21:27:00 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ELR0PR072317;
 Tue, 14 Jan 2014 21:27:00 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401142127.s0ELR0PR072317@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 14 Jan 2014 21:27:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339722 - branches/2014Q1/Mk
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 21:27:01 -0000

Author: bapt
Date: Tue Jan 14 21:27:00 2014
New Revision: 339722
URL: http://svnweb.freebsd.org/changeset/ports/339722
QAT: https://qat.redports.org/buildarchive/r339722/

Log:
  Backout r339122
  
  Direct commit as the equivalent on head was a mess

Modified:
  branches/2014Q1/Mk/bsd.pkgng.mk

Modified: branches/2014Q1/Mk/bsd.pkgng.mk
==============================================================================
--- branches/2014Q1/Mk/bsd.pkgng.mk	Tue Jan 14 21:15:10 2014	(r339721)
+++ branches/2014Q1/Mk/bsd.pkgng.mk	Tue Jan 14 21:27:00 2014	(r339722)
@@ -42,7 +42,7 @@ create-manifest:
 	@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF}
 	@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF}
 	@${ECHO_CMD} "comment: |" >> ${MANIFESTF}
-	@${ECHO_CMD} "  "${COMMENT:Q} | ${AWK} -f ${SCRIPTSDIR}/pkgencode.awk >> ${MANIFESTF}
+	@${ECHO_CMD} "  "${COMMENT:Q} >> ${MANIFESTF}
 	@${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF}
 	@${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}
 #.if defined(NO_ARCH)

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 21:28:36 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 022DA60D;
 Tue, 14 Jan 2014 21:28:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7BCF1AC7;
 Tue, 14 Jan 2014 21:28:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ELSZOC072673;
 Tue, 14 Jan 2014 21:28:35 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ELSZMA072669;
 Tue, 14 Jan 2014 21:28:35 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401142128.s0ELSZMA072669@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 14 Jan 2014 21:28:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339723 - in branches/2014Q1/ports-mgmt: pkg pkg-devel
 pkg-devel/files pkg/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 21:28:36 -0000

Author: bapt
Date: Tue Jan 14 21:28:34 2014
New Revision: 339723
URL: http://svnweb.freebsd.org/changeset/ports/339723
QAT: https://qat.redports.org/buildarchive/r339723/

Log:
  MFH: r339595
  
  Update to 1.2.5:
  - Manpage improvements
  - fix $auditfile in pkg audit periodic script
  - Fix repo-*.sqlite being corrupted when pkg update is interrupted by the user
  - pkg add now tells the version of the package missing
  - Strop decoding/encoding all fields, only scripts and description are now encoded/decoded

Deleted:
  branches/2014Q1/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config
  branches/2014Q1/ports-mgmt/pkg/files/patch-libpkg_pkg_config
Modified:
  branches/2014Q1/ports-mgmt/pkg-devel/Makefile
  branches/2014Q1/ports-mgmt/pkg-devel/distinfo
  branches/2014Q1/ports-mgmt/pkg/Makefile
  branches/2014Q1/ports-mgmt/pkg/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- branches/2014Q1/ports-mgmt/pkg-devel/Makefile	Tue Jan 14 21:27:00 2014	(r339722)
+++ branches/2014Q1/ports-mgmt/pkg-devel/Makefile	Tue Jan 14 21:28:34 2014	(r339723)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.2.4
-PORTREVISION=	1
+DISTVERSION=	1.2.5
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://files.etoilebsd.net/pkg/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Modified: branches/2014Q1/ports-mgmt/pkg-devel/distinfo
==============================================================================
--- branches/2014Q1/ports-mgmt/pkg-devel/distinfo	Tue Jan 14 21:27:00 2014	(r339722)
+++ branches/2014Q1/ports-mgmt/pkg-devel/distinfo	Tue Jan 14 21:28:34 2014	(r339723)
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.2.4.tar.xz) = d6f838f94912893be9ea6e61d72515b7c7e63d5cd4a3084bfe7cbc2e909876cb
-SIZE (pkg-1.2.4.tar.xz) = 1808120
+SHA256 (pkg-1.2.5.tar.xz) = ea6f1c95b8fcc1a017979949fc8f06f218f4412c5ec1ddcc4858d0b751759d6c
+SIZE (pkg-1.2.5.tar.xz) = 1808040

Modified: branches/2014Q1/ports-mgmt/pkg/Makefile
==============================================================================
--- branches/2014Q1/ports-mgmt/pkg/Makefile	Tue Jan 14 21:27:00 2014	(r339722)
+++ branches/2014Q1/ports-mgmt/pkg/Makefile	Tue Jan 14 21:28:34 2014	(r339723)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.2.4
-PORTREVISION=	1
+DISTVERSION=	1.2.5
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://files.etoilebsd.net/pkg/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Modified: branches/2014Q1/ports-mgmt/pkg/distinfo
==============================================================================
--- branches/2014Q1/ports-mgmt/pkg/distinfo	Tue Jan 14 21:27:00 2014	(r339722)
+++ branches/2014Q1/ports-mgmt/pkg/distinfo	Tue Jan 14 21:28:34 2014	(r339723)
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.2.4.tar.xz) = d6f838f94912893be9ea6e61d72515b7c7e63d5cd4a3084bfe7cbc2e909876cb
-SIZE (pkg-1.2.4.tar.xz) = 1808120
+SHA256 (pkg-1.2.5.tar.xz) = ea6f1c95b8fcc1a017979949fc8f06f218f4412c5ec1ddcc4858d0b751759d6c
+SIZE (pkg-1.2.5.tar.xz) = 1808040

From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 22:32:38 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0EC86957;
 Tue, 14 Jan 2014 22:32:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE511114C;
 Tue, 14 Jan 2014 22:32:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EMWbCM099654;
 Tue, 14 Jan 2014 22:32:37 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EMWbl5099652;
 Tue, 14 Jan 2014 22:32:37 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201401142232.s0EMWbl5099652@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 14 Jan 2014 22:32:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339729 - in branches/2014Q1/www/squidguard: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 22:32:38 -0000

Author: madpilot
Date: Tue Jan 14 22:32:37 2014
New Revision: 339729
URL: http://svnweb.freebsd.org/changeset/ports/339729
QAT: https://qat.redports.org/buildarchive/r339729/

Log:
  MFH: r339702
  
  Fix when compiled with BerkeleyDB 6.
  
  PR:		ports/185737
  Submitted by:	Leonid Nevecherya <nlv@imbera.ru>
  
  Approved by:	portmgr (mat)

Modified:
  branches/2014Q1/www/squidguard/Makefile
  branches/2014Q1/www/squidguard/files/patch-src_sgDB.c   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/squidguard/Makefile
==============================================================================
--- branches/2014Q1/www/squidguard/Makefile	Tue Jan 14 22:04:12 2014	(r339728)
+++ branches/2014Q1/www/squidguard/Makefile	Tue Jan 14 22:32:37 2014	(r339729)
@@ -2,7 +2,7 @@
 
 PORTNAME=	squidGuard
 PORTVERSION=	1.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/:a \
 		http://www.squidguard.org/Downloads/Contrib/:b

Modified: branches/2014Q1/www/squidguard/files/patch-src_sgDB.c
==============================================================================
--- branches/2014Q1/www/squidguard/files/patch-src_sgDB.c	Tue Jan 14 22:04:12 2014	(r339728)
+++ branches/2014Q1/www/squidguard/files/patch-src_sgDB.c	Tue Jan 14 22:32:37 2014	(r339729)
@@ -1,5 +1,5 @@
 --- src/sgDb.c.orig	2008-07-14 20:29:41.000000000 +0200
-+++ src/sgDb.c	2011-11-15 12:00:23.744601663 +0100
++++ src/sgDb.c	2014-01-14 11:53:55.712138134 +0100
 @@ -119,14 +119,39 @@
      flag = DB_CREATE;
      if(createdb)
@@ -24,7 +24,7 @@
 +    }
 +  }
 +#endif
-+#if DB_VERSION_MAJOR == 5
++#if DB_VERSION_MAJOR >= 5
 +  if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
 +    flag = DB_CREATE;
 +    if(createdb)

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 15:16:25 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 600A5BE8;
 Wed, 15 Jan 2014 15:16:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C3301D24;
 Wed, 15 Jan 2014 15:16:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FFGP9h088563;
 Wed, 15 Jan 2014 15:16:25 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FFGOVg088561;
 Wed, 15 Jan 2014 15:16:24 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401151516.s0FFGOVg088561@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 15 Jan 2014 15:16:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339782 - in branches/2014Q1: games/tornado
 x11-toolkits/p5-Tk-FileDialog
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 15:16:25 -0000

Author: swills
Date: Wed Jan 15 15:16:24 2014
New Revision: 339782
URL: http://svnweb.freebsd.org/changeset/ports/339782
QAT: https://qat.redports.org/buildarchive/r339782/

Log:
  MFH: r337024
  
  - Drop maintainership at maintainer request
  
  PR:		ports/185029
  Submitted by:	"H. Wade Minter" <minter@lunenburg.org> (maintainer)
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/games/tornado/Makefile
  branches/2014Q1/x11-toolkits/p5-Tk-FileDialog/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/tornado/Makefile
==============================================================================
--- branches/2014Q1/games/tornado/Makefile	Wed Jan 15 15:10:52 2014	(r339781)
+++ branches/2014Q1/games/tornado/Makefile	Wed Jan 15 15:16:24 2014	(r339782)
@@ -1,4 +1,4 @@
-# Created by: minter
+# Created by: minter@lunenburg.org
 # $FreeBSD$
 
 PORTNAME=	tornado
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://kiza.kcore.de/media/software/${PORTNAME}/
 
-MAINTAINER=	minter@lunenburg.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A curses-based game of weather destruction
 
 MAN6=		tornado.6

Modified: branches/2014Q1/x11-toolkits/p5-Tk-FileDialog/Makefile
==============================================================================
--- branches/2014Q1/x11-toolkits/p5-Tk-FileDialog/Makefile	Wed Jan 15 15:10:52 2014	(r339781)
+++ branches/2014Q1/x11-toolkits/p5-Tk-FileDialog/Makefile	Wed Jan 15 15:16:24 2014	(r339782)
@@ -1,4 +1,4 @@
-# Created by: minter
+# Created by: minter@lunenburg.org
 # $FreeBSD$
 
 PORTNAME=	Tk-FileDialog
@@ -8,7 +8,7 @@ CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	minter@lunenburg.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk::FileDialog - A file selector dialog for perl/Tk
 
 BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 16:44:15 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4EB7A8C8;
 Wed, 15 Jan 2014 16:44:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A4B31856;
 Wed, 15 Jan 2014 16:44:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FGiFmU023270;
 Wed, 15 Jan 2014 16:44:15 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FGiFpR023269;
 Wed, 15 Jan 2014 16:44:15 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201401151644.s0FGiFpR023269@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 15 Jan 2014 16:44:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339792 - branches/2014Q1/print/pdftk
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 16:44:15 -0000

Author: mat
Date: Wed Jan 15 16:44:14 2014
New Revision: 339792
URL: http://svnweb.freebsd.org/changeset/ports/339792
QAT: https://qat.redports.org/buildarchive/r339792/

Log:
  MFH: r338644
  
  Another iteration on the path of finding the right fix.
  Take maintainership.

Modified:
  branches/2014Q1/print/pdftk/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/print/pdftk/Makefile
==============================================================================
--- branches/2014Q1/print/pdftk/Makefile	Wed Jan 15 16:36:14 2014	(r339791)
+++ branches/2014Q1/print/pdftk/Makefile	Wed Jan 15 16:44:14 2014	(r339792)
@@ -3,22 +3,23 @@
 
 PORTNAME=	pdftk
 PORTVERSION=	2.02
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Simple tool for doing everyday things with PDF documents
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgcj.so:${PORTSDIR}/lang/gcc${CSUFF} \
-		libstdc++.so:${PORTSDIR}/lang/gcc${CSUFF} \
-		libgcc_s.so:${PORTSDIR}/lang/gcc${CSUFF}
-
-BUILD_DEPENDS=	gcj${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \
-		gcjh${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \
-		cpp${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF}
+LIB_DEPENDS=	libgcj.so:${PORTSDIR}/lang/${_GCC_PORT} \
+		libstdc++.so:${PORTSDIR}/lang/${_GCC_PORT} \
+		libgcc_s.so:${PORTSDIR}/lang/${_GCC_PORT}
+
+BUILD_DEPENDS=	gcj${CSUFF}:${PORTSDIR}/lang/${_GCC_PORT} \
+		gcjh${CSUFF}:${PORTSDIR}/lang/${_GCC_PORT} \
+		cpp${CSUFF}:${PORTSDIR}/lang/${_GCC_PORT}
 
 USE_ZIP=	yes
 

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 19:43:26 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 92D5E32F;
 Wed, 15 Jan 2014 19:43:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6603B1F08;
 Wed, 15 Jan 2014 19:43:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FJhQPi093479;
 Wed, 15 Jan 2014 19:43:26 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FJhQQs093478;
 Wed, 15 Jan 2014 19:43:26 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401151943.s0FJhQQs093478@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 15 Jan 2014 19:43:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339810 - in branches/2014Q1/textproc/amberfish: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 19:43:26 -0000

Author: antoine
Date: Wed Jan 15 19:43:25 2014
New Revision: 339810
URL: http://svnweb.freebsd.org/changeset/ports/339810
QAT: https://qat.redports.org/buildarchive/r339810/

Log:
  MFH: r339809
  
  - Fix build on 10/head
  - Respect CFLAGS, STRIP
  - Stage support
  
  PR:		ports/184865
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Deleted:
  branches/2014Q1/textproc/amberfish/files/patch-Makefile.in
  branches/2014Q1/textproc/amberfish/pkg-plist
Modified:
  branches/2014Q1/textproc/amberfish/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/amberfish/Makefile
==============================================================================
--- branches/2014Q1/textproc/amberfish/Makefile	Wed Jan 15 19:36:26 2014	(r339809)
+++ branches/2014Q1/textproc/amberfish/Makefile	Wed Jan 15 19:43:25 2014	(r339810)
@@ -7,29 +7,36 @@ CATEGORIES=	textproc databases
 MASTER_SITES=	SF/${PORTNAME}/Amberfish%20source%20-%20stable/${PORTVERSION}	\
 		http://etymon.com/software/amberfish/stable/
 
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose text retrieval Software
 
-LIB_DEPENDS=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2
+LIB_DEPENDS=	libxerces-c.so.27:${PORTSDIR}/textproc/xerces-c2
 
+USES=		gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+ALL_TARGET=	all html
+
+PLIST_FILES=	bin/af man/man1/af.1.gz
+PORTDOCS=	*
 
-MAN1=	af.1
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-extract:
 	${INSTALL_DATA} ${FILESDIR}/porter.cc ${WRKSRC}/src
 
-.if !defined(NOPORTDOCS)
-post-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} html)
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${MAKEFLAGS} ||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|cp |$${BSD_INSTALL_MAN} |' ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-O3 |@CFLAGS@ | ; \
+		s|make strip|| ; \
+		s|cp |$${BSD_INSTALL_PROGRAM} |' ${WRKSRC}/src/Makefile.in
 
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/amberfish.png ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/html/*.html ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/amberfish.png ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 20:47:33 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 844C3980;
 Wed, 15 Jan 2014 20:47:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 568A313CF;
 Wed, 15 Jan 2014 20:47:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FKlXpo017891;
 Wed, 15 Jan 2014 20:47:33 GMT (envelope-from brix@svn.freebsd.org)
Received: (from brix@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FKlWkm017889;
 Wed, 15 Jan 2014 20:47:32 GMT (envelope-from brix@svn.freebsd.org)
Message-Id: <201401152047.s0FKlWkm017889@svn.freebsd.org>
From: Henrik Brix Andersen <brix@FreeBSD.org>
Date: Wed, 15 Jan 2014 20:47:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339818 - branches/2014Q1/net-mgmt/spectools
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 20:47:33 -0000

Author: brix
Date: Wed Jan 15 20:47:32 2014
New Revision: 339818
URL: http://svnweb.freebsd.org/changeset/ports/339818
QAT: https://qat.redports.org/buildarchive/r339818/

Log:
  MFH: r339534
  
  - Update to v2011-08-R1
  - Add staging support
  
  Approved by: portmgr

Modified:
  branches/2014Q1/net-mgmt/spectools/Makefile
  branches/2014Q1/net-mgmt/spectools/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net-mgmt/spectools/Makefile
==============================================================================
--- branches/2014Q1/net-mgmt/spectools/Makefile	Wed Jan 15 20:45:52 2014	(r339817)
+++ branches/2014Q1/net-mgmt/spectools/Makefile	Wed Jan 15 20:47:32 2014	(r339818)
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	spectools
-PORTVERSION=	201004.r1
-PORTREVISION=	1
+PORTVERSION=	201108.r1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brix
-DISTNAME=	spectools-2010-04-R1
+DISTNAME=	spectools-2011-08-R1
 
 MAINTAINER=	brix@FreeBSD.org
 COMMENT=	Tools for the Wi-Spy spectrum analyzers from MetaGeek LLC
@@ -27,7 +26,6 @@ OPTIONS_DEFAULT=	GTK2 NCURSES
 
 ALL_TARGET=	spectool_net spectool_raw
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
@@ -52,19 +50,19 @@ BROKEN=		Does not build: duplicate defin
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/spectool_net ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/spectool_raw ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_net ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_raw ${STAGEDIR}/${PREFIX}/bin
 .if ${PORT_OPTIONS:MGTK2}
-	${INSTALL_PROGRAM} ${WRKSRC}/spectool_gtk ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_gtk ${STAGEDIR}/${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MNCURSES}
-	${INSTALL_PROGRAM} ${WRKSRC}/spectool_curses ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spectool_curses ${STAGEDIR}/${PREFIX}/bin
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}/${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: branches/2014Q1/net-mgmt/spectools/distinfo
==============================================================================
--- branches/2014Q1/net-mgmt/spectools/distinfo	Wed Jan 15 20:45:52 2014	(r339817)
+++ branches/2014Q1/net-mgmt/spectools/distinfo	Wed Jan 15 20:47:32 2014	(r339818)
@@ -1,2 +1,2 @@
-SHA256 (spectools-2010-04-R1.tar.gz) = be37b808f652c994d3bc55214bb0896f66e5727d86374606bae203216ec10e13
-SIZE (spectools-2010-04-R1.tar.gz) = 186445
+SHA256 (spectools-2011-08-R1.tar.gz) = ce981cd2b86c6246dc7cb9c0166b85e586e5f5835d3ed147e8901ef18f00220e
+SIZE (spectools-2011-08-R1.tar.gz) = 196001

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 20:51:02 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E27BEADC;
 Wed, 15 Jan 2014 20:51:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE3B714A1;
 Wed, 15 Jan 2014 20:51:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FKp2qW018799;
 Wed, 15 Jan 2014 20:51:02 GMT (envelope-from brix@svn.freebsd.org)
Received: (from brix@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FKp2JS018798;
 Wed, 15 Jan 2014 20:51:02 GMT (envelope-from brix@svn.freebsd.org)
Message-Id: <201401152051.s0FKp2JS018798@svn.freebsd.org>
From: Henrik Brix Andersen <brix@FreeBSD.org>
Date: Wed, 15 Jan 2014 20:51:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339819 - in branches/2014Q1/net-mgmt/spectools: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 20:51:03 -0000

Author: brix
Date: Wed Jan 15 20:51:02 2014
New Revision: 339819
URL: http://svnweb.freebsd.org/changeset/ports/339819
QAT: https://qat.redports.org/buildarchive/r339819/

Log:
  MFH: r339536
  
  - Add needed patches
  - Bump PORTREVISION
  
  Approved by: portmgr

Added:
  branches/2014Q1/net-mgmt/spectools/files/
     - copied from r339536, head/net-mgmt/spectools/files/
Modified:
  branches/2014Q1/net-mgmt/spectools/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net-mgmt/spectools/Makefile
==============================================================================
--- branches/2014Q1/net-mgmt/spectools/Makefile	Wed Jan 15 20:47:32 2014	(r339818)
+++ branches/2014Q1/net-mgmt/spectools/Makefile	Wed Jan 15 20:51:02 2014	(r339819)
@@ -3,6 +3,7 @@
 
 PORTNAME=	spectools
 PORTVERSION=	201108.r1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/ \
 		${MASTER_SITE_LOCAL}

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 21:32:22 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 645F16B6;
 Wed, 15 Jan 2014 21:32:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E4D31786;
 Wed, 15 Jan 2014 21:32:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FLWMmK036797;
 Wed, 15 Jan 2014 21:32:22 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FLWKdx036781;
 Wed, 15 Jan 2014 21:32:20 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401152132.s0FLWKdx036781@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 15 Jan 2014 21:32:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339824 - in branches/2014Q1/games/xconq: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 21:32:22 -0000

Author: antoine
Date: Wed Jan 15 21:32:19 2014
New Revision: 339824
URL: http://svnweb.freebsd.org/changeset/ports/339824
QAT: https://qat.redports.org/buildarchive/r339824/

Log:
  MFH: r339823
  
  - Unbreak
  - Stage support
  
  PR:		ports/185695
  Submitted by:	KATO Tsuguru
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/games/xconq/files/patch-Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-Makefile.in
  branches/2014Q1/games/xconq/files/patch-curses__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-curses__Makefile.in
  branches/2014Q1/games/xconq/files/patch-doc__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-doc__Makefile.in
  branches/2014Q1/games/xconq/files/patch-images__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-images__Makefile.in
  branches/2014Q1/games/xconq/files/patch-lib__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-lib__Makefile.in
  branches/2014Q1/games/xconq/files/patch-sdl__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-sdl__Makefile.in
  branches/2014Q1/games/xconq/files/patch-tcltk__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-tcltk__Makefile.in
  branches/2014Q1/games/xconq/files/patch-x11__Makefile.in
     - copied unchanged from r339823, head/games/xconq/files/patch-x11__Makefile.in
Modified:
  branches/2014Q1/games/xconq/Makefile
  branches/2014Q1/games/xconq/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/xconq/Makefile
==============================================================================
--- branches/2014Q1/games/xconq/Makefile	Wed Jan 15 21:19:24 2014	(r339823)
+++ branches/2014Q1/games/xconq/Makefile	Wed Jan 15 21:32:19 2014	(r339824)
@@ -13,22 +13,18 @@ LICENSE=	GPLv2 # (or later)
 
 OPTIONS_DEFINE=	SDL
 
-BROKEN=		Does not build
-
 USE_BZIP2=	yes
+USES=		compiler gmake
 USE_XORG=	x11
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CFLAGS+=	-Wno-deprecated-writable-strings
 CONFIGURE_ARGS=	--enable-alternate-scoresdir=${SCOREDIR} \
 		--enable-alternate-gameuser=root \
 		--enable-alternate-gamegroup=games
-MAKE_ARGS=	GAMEPERM=2755 DIRPERM=775 FILEPERM=664
+MAKE_ARGS=	GAMEPERM=755 DIRPERM=775 FILEPERM=664
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB=	SCOREDIR="${SCOREDIR}"
 
-MAN6=		xconq.6
 INFO=		xconq
 
 DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" \
@@ -36,7 +32,6 @@ DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT
 
 SCOREDIR?=	/var/games/xconq
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSDL}
@@ -44,14 +39,21 @@ USE_SDL=	sdl
 CONFIGURE_ARGS+=--enable-default-ui=sdl
 PLIST_SUB+=	NOSDL="@comment "
 .else
+USES+=		tk
 USE_XORG+=	xext xmu xt xaw
-USE_TK_BUILD=	yes
-USE_TK=		yes
 CONFIGURE_ARGS+=--with-tclconfig=${TCL_LIBDIR} \
 		--with-tkconfig=${TK_LIBDIR}
 PLIST_SUB+=	NOSDL=""
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == clang
+CFLAGS+=	-Wno-deprecated-writable-strings
+.else
+CFLAGS+=	-Wno-write-strings
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^HFLAGS/s| $${debugging}||' ${WRKSRC}/configure
@@ -63,13 +65,14 @@ post-build:
 	(cd ${WRKSRC}/doc && makeinfo xconq.texi)
 
 post-install:
-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xconq.info ${PREFIX}/${INFO_PATH})
-	${STRIP_CMD} ${PREFIX}/bin/xconq
+	${INSTALL_DATA} ${WRKSRC}/doc/xconq.info \
+		${STAGEDIR}${PREFIX}/${INFO_PATH}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xconq
 .if empty(PORT_OPTIONS:MSDL)
 .for i in imf2x imfapp x2imf
-	${STRIP_CMD} ${PREFIX}/bin/${i}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 .endif
-	@${FIND} ${DATADIR} -empty -delete
+	@${FIND} ${STAGEDIR}${DATADIR} -empty -delete
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Copied: branches/2014Q1/games/xconq/files/patch-Makefile.in (from r339823, head/games/xconq/files/patch-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-Makefile.in)
@@ -0,0 +1,46 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -274,20 +274,19 @@
+ 	fi
+ 
+ MAKEDIRS= \
+-	$(prefix) \
+-	$(exec_prefix) \
+-	$(bindir) \
+-	$(datadir) \
+-	$(gamelibdir) \
+-	$(imagesdir) \
+-	$(scoresdir) \
+-	$(mandir) \
+-	$(man6dir) \
+-	$(infodir) \
+-	$(tcltkdir) \
+-	$(BWidgetdir) \
+-	$(BWidgetimagesdir) \
+-	$(BWidgetlangdir)
++	$(DESTDIR)$(prefix) \
++	$(DESTDIR)$(exec_prefix) \
++	$(DESTDIR)$(bindir) \
++	$(DESTDIR)$(datadir) \
++	$(DESTDIR)$(gamelibdir) \
++	$(DESTDIR)$(imagesdir) \
++	$(DESTDIR)$(mandir) \
++	$(DESTDIR)$(man6dir) \
++	$(DESTDIR)$(infodir) \
++	$(DESTDIR)$(tcltkdir) \
++	$(DESTDIR)$(BWidgetdir) \
++	$(DESTDIR)$(BWidgetimagesdir) \
++	$(DESTDIR)$(BWidgetlangdir)
+ 
+ .PHONY: install-dirs
+ install-dirs:
+@@ -305,9 +304,6 @@
+ 			true ; \
+ 		fi ; \
+ 	done
+-	chown $(GAMEUID) $(scoresdir)
+-	chgrp $(GAMEGRP) $(scoresdir)
+-	chmod $(DIRPERM) $(scoresdir)
+ 
+ # Build a source distribution.
+ DIST_VERSION=@XCONQ_VERSION_FULL@

Copied: branches/2014Q1/games/xconq/files/patch-curses__Makefile.in (from r339823, head/games/xconq/files/patch-curses__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-curses__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-curses__Makefile.in)
@@ -0,0 +1,17 @@
+--- ./curses/Makefile.in.orig	2004-11-21 02:59:19.000000000 +0000
++++ ./curses/Makefile.in	2014-01-15 20:22:15.000000000 +0000
+@@ -132,11 +132,9 @@
+ 	else \
+ 		progname="$(CCONQ_EXEC_NAME)" ; \
+ 	fi; \
+-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
+-	chown $(GAMEUID) $(bindir)/$${progname}; \
+-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
+-	chmod $(GAMEPERM) $(bindir)/$${progname}; \
+-	$(INSTALL_DATA) cconq.6 $(man6dir)
++	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
++	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname}; \
++	$(INSTALL_DATA) cconq.6 $(DESTDIR)$(man6dir)
+ 
+ # Cleanliness support.
+ 

Copied: branches/2014Q1/games/xconq/files/patch-doc__Makefile.in (from r339823, head/games/xconq/files/patch-doc__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-doc__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-doc__Makefile.in)
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -95,7 +95,7 @@
+ 
+ install-info: info
+ 	for i in *.info* ; do \
+-		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
+ 	done
+ 
+ # Generation of DVI files.

Copied: branches/2014Q1/games/xconq/files/patch-images__Makefile.in (from r339823, head/games/xconq/files/patch-images__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-images__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-images__Makefile.in)
@@ -0,0 +1,23 @@
+--- ./images/Makefile.in.orig	2004-11-21 02:59:21.000000000 +0000
++++ ./images/Makefile.in	2014-01-15 20:22:48.000000000 +0000
+@@ -51,16 +51,14 @@
+ install-only:
+ 	for i in `ls $(srcdir)/*.gif `; do \
+ 		echo $$i; \
+-		$(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
++		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
+ 	done
+ 	for i in `ls $(srcdir)/*.bmp `; do \
+ 		echo $$i; \
+-		$(INSTALL_DATA) $(srcdir)/$$i $(imagesdir); \
++		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(imagesdir); \
+ 	done
+-	chown $(GAMEUID) $(imagesdir) $(imagesdir)/*
+-	chgrp $(GAMEGRP) $(imagesdir) $(imagesdir)/*
+-	chmod $(DIRPERM) $(imagesdir)
+-	chmod $(FILEPERM) $(imagesdir)/*
++	chmod $(DIRPERM) $(DESTDIR)$(imagesdir)
++	chmod $(FILEPERM) $(DESTDIR)$(imagesdir)/*
+ 
+ clean:
+ 

Copied: branches/2014Q1/games/xconq/files/patch-lib__Makefile.in (from r339823, head/games/xconq/files/patch-lib__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-lib__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-lib__Makefile.in)
@@ -0,0 +1,18 @@
+--- ./lib/Makefile.in.orig	2004-11-21 03:01:29.000000000 +0000
++++ ./lib/Makefile.in	2014-01-15 20:23:04.000000000 +0000
+@@ -51,12 +51,10 @@
+ install-only:
+ 	for i in `ls $(srcdir)/*.dir $(srcdir)/*.g $(srcdir)/*.imf $(srcdir)/news.txt`; do \
+ 		echo $$i; \
+-		$(INSTALL_DATA) $(srcdir)/$$i $(gamelibdir); \
++		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(gamelibdir); \
+ 	done
+-	chown $(GAMEUID) $(gamelibdir) $(gamelibdir)/*
+-	chgrp $(GAMEGRP) $(gamelibdir) $(gamelibdir)/*
+-	chmod $(DIRPERM) $(gamelibdir)
+-	chmod $(FILEPERM) $(gamelibdir)/*
++	chmod $(DIRPERM) $(DESTDIR)$(gamelibdir)
++	chmod $(FILEPERM) $(DESTDIR)$(gamelibdir)/*
+ 
+ clean:
+ 

Copied: branches/2014Q1/games/xconq/files/patch-sdl__Makefile.in (from r339823, head/games/xconq/files/patch-sdl__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-sdl__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-sdl__Makefile.in)
@@ -0,0 +1,15 @@
+--- ./sdl/Makefile.in.orig	2005-05-01 01:47:14.000000000 +0000
++++ ./sdl/Makefile.in	2014-01-15 20:23:15.000000000 +0000
+@@ -244,10 +244,8 @@
+ 	else \
+ 		progname="$(SDLCONQ_EXEC_NAME)" ; \
+ 	fi; \
+-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
+-	chown $(GAMEUID) $(bindir)/$${progname}; \
+-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
+-	chmod $(GAMEPERM) $(bindir)/$${progname};
++	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
++	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname};
+ 
+ install-manpages-only:
+ 	(cd $(x11srcdir) && $(MAKE) $(FLAGS_TO_PASS) install-manpages-only)

Copied: branches/2014Q1/games/xconq/files/patch-tcltk__Makefile.in (from r339823, head/games/xconq/files/patch-tcltk__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-tcltk__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-tcltk__Makefile.in)
@@ -0,0 +1,53 @@
+--- ./tcltk/Makefile.in.orig	2005-06-06 03:03:56.000000000 +0000
++++ ./tcltk/Makefile.in	2014-01-15 20:23:28.000000000 +0000
+@@ -286,17 +286,13 @@
+ install-xconq: $(PLATFORM_INSTALL_TARGETS)
+ 
+ install-libs-only:
+-	$(INSTALL_DATA) $(srcdir)/tkconq.tcl $(tcltkdir)
+-	$(INSTALL_DATA) $(srcdir)/imfapp.tcl $(tcltkdir)
+-	$(INSTALL_DATA) $(srcdir)/BWidget/*.* $(BWidgetdir)
+-	$(INSTALL_DATA) $(srcdir)/BWidget/images/*.* $(BWidgetimagesdir)
+-	$(INSTALL_DATA) $(srcdir)/BWidget/lang/*.* $(BWidgetlangdir)
+-	chown $(GAMEUID) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir) \
+-				     $(tcltkdir)/*.* $(BWidgetdir)/*.* $(BWidgetimagesdir)/*.* $(BWidgetlangdir)/*.*
+-	chgrp $(GAMEGRP) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir) \
+-				     $(tcltkdir)/*.* $(BWidgetdir)/*.* $(BWidgetimagesdir)/*.* $(BWidgetlangdir)/*.*
+-	chmod $(DIRPERM) $(tcltkdir) $(BWidgetdir) $(BWidgetimagesdir) $(BWidgetlangdir)
+-	chmod $(FILEPERM) $(tcltkdir)/*.* $(BWidgetdir)/*.* $(BWidgetimagesdir)/*.* $(BWidgetlangdir)/*.*
++	$(INSTALL_DATA) $(srcdir)/tkconq.tcl $(DESTDIR)$(tcltkdir)
++	$(INSTALL_DATA) $(srcdir)/imfapp.tcl $(DESTDIR)$(tcltkdir)
++	$(INSTALL_DATA) $(srcdir)/BWidget/*.* $(DESTDIR)$(BWidgetdir)
++	$(INSTALL_DATA) $(srcdir)/BWidget/images/*.* $(DESTDIR)$(BWidgetimagesdir)
++	$(INSTALL_DATA) $(srcdir)/BWidget/lang/*.* $(DESTDIR)$(BWidgetlangdir)
++	chmod $(DIRPERM) $(DESTDIR)$(tcltkdir) $(DESTDIR)$(BWidgetdir) $(DESTDIR)$(BWidgetimagesdir) $(DESTDIR)$(BWidgetlangdir)
++	chmod $(FILEPERM) $(DESTDIR)$(tcltkdir)/*.* $(DESTDIR)$(BWidgetdir)/*.* $(DESTDIR)$(BWidgetimagesdir)/*.* $(DESTDIR)$(BWidgetlangdir)/*.*
+ 
+ install-xconq-only: $(TKCONQ_EXEC_NAME)
+ 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
+@@ -305,10 +301,8 @@
+ 	else \
+ 		progname="$(TKCONQ_EXEC_NAME)" ; \
+ 	fi; \
+-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
+-	chown $(GAMEUID) $(bindir)/$${progname}; \
+-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
+-	chmod $(GAMEPERM) $(bindir)/$${progname}; 
++	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
++	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/$${progname}; 
+ 
+ install-imfapp-only: imfapp
+ 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
+@@ -317,10 +311,8 @@
+ 	else \
+ 		progname="imfapp" ; \
+ 	fi; \
+-	$(INSTALL_PROGRAM) $${progname} $(bindir); \
+-	chown $(GAMEUID) $(bindir)/$${progname}; \
+-	chgrp $(GAMEGRP) $(bindir)/$${progname}; \
+-	chmod $(IAPPPERM) $(bindir)/$${progname};
++	$(INSTALL_PROGRAM) $${progname} $(DESTDIR)$(bindir); \
++	chmod $(IAPPPERM) $(DESTDIR)$(bindir)/$${progname};
+ 
+ install-ximfconvs-only: x2imf imf2x
+ 	(cd ../x11 && $(MAKE) $(FLAGS_TO_PASS) install-ximfconvs-only)

Copied: branches/2014Q1/games/xconq/files/patch-x11__Makefile.in (from r339823, head/games/xconq/files/patch-x11__Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/xconq/files/patch-x11__Makefile.in	Wed Jan 15 21:32:19 2014	(r339824, copy of r339823, head/games/xconq/files/patch-x11__Makefile.in)
@@ -0,0 +1,51 @@
+--- ./x11/Makefile.in.orig	2004-11-21 03:02:57.000000000 +0000
++++ ./x11/Makefile.in	2014-01-15 20:23:38.000000000 +0000
+@@ -213,35 +213,29 @@
+ 
+ install-xtconq: install-ximfconvs-only 
+ 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
+-	$(INSTALL_PROGRAM) $(XTCONQ_EXEC_NAME) $(bindir); \
+-	chown $(GAMEUID) $(bindir)/xtconq; \
+-	chgrp $(GAMEGRP) $(bindir)/xtconq; \
+-	chmod $(GAMEPERM) $(bindir)/xtconq; \
+-	$(INSTALL_DATA) Xtconq $(appdefaultsdir); \
+-	$(INSTALL_DATA) Xtconq-color $(appdefaultsdir); \
+-	$(INSTALL_PROGRAM) xshowimf $(bindir); \
+-	chown $(GAMEUID) $(bindir)/xshowimf ; \
+-	chgrp $(GAMEGRP) $(bindir)/xshowimf ; \
+-	chmod $(IAPPPERM) $(bindir)/xshowimf ; \
+-	$(INSTALL_DATA) XShowimf $(appdefaultsdir); \
+-	$(INSTALL_DATA) XShowimf-color $(appdefaultsdir); \
+-	$(INSTALL_DATA) xtconq.6 $(man6dir)
++	$(INSTALL_PROGRAM) $(XTCONQ_EXEC_NAME) $(DESTDIR)$(bindir); \
++	chmod $(GAMEPERM) $(DESTDIR)$(bindir)/xtconq; \
++	$(INSTALL_DATA) Xtconq $(DESTDIR)$(appdefaultsdir); \
++	$(INSTALL_DATA) Xtconq-color $(DESTDIR)$(appdefaultsdir); \
++	$(INSTALL_PROGRAM) xshowimf $(DESTDIR)$(bindir); \
++	chmod $(IAPPPERM) $(DESTDIR)$(bindir)/xshowimf ; \
++	$(INSTALL_DATA) XShowimf $(DESTDIR)$(appdefaultsdir); \
++	$(INSTALL_DATA) XShowimf-color $(DESTDIR)$(appdefaultsdir); \
++	$(INSTALL_DATA) xtconq.6 $(DESTDIR)$(man6dir)
+ 
+ # Installation of converter programs.
+ 
+ install-ximfconvs-only: x2imf imf2x
+ 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
+-	$(INSTALL_PROGRAM) imf2x $(bindir); \
+-	$(INSTALL_PROGRAM) x2imf $(bindir); \
+-	chown $(GAMEUID) $(bindir)/imf2x $(bindir)/x2imf ; \
+-	chgrp $(GAMEGRP) $(bindir)/imf2x $(bindir)/x2imf ; \
+-	chmod $(IAPPPERM) $(bindir)/imf2x $(bindir)/x2imf
++	$(INSTALL_PROGRAM) imf2x $(DESTDIR)$(bindir); \
++	$(INSTALL_PROGRAM) x2imf $(DESTDIR)$(bindir); \
++	chmod $(IAPPPERM) $(DESTDIR)$(bindir)/imf2x $(DESTDIR)$(bindir)/x2imf
+ 
+ # Installation of manpages.
+ 
+ install-manpages-only: xconq.6
+ 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
+-	$(INSTALL_DATA) xconq.6 $(man6dir)
++	$(INSTALL_DATA) xconq.6 $(DESTDIR)$(man6dir)
+ 
+ # Cleanliness support.
+ 

Modified: branches/2014Q1/games/xconq/pkg-plist
==============================================================================
--- branches/2014Q1/games/xconq/pkg-plist	Wed Jan 15 21:19:24 2014	(r339823)
+++ branches/2014Q1/games/xconq/pkg-plist	Wed Jan 15 21:32:19 2014	(r339824)
@@ -1,7 +1,11 @@
+@group games
 %%NOSDL%%bin/imf2x
 %%NOSDL%%bin/imfapp
 %%NOSDL%%bin/x2imf
+@mode 2755
 bin/xconq
+@mode
+man/man6/xconq.6.gz
 %%DATADIR%%/images/3rd-age.gif
 %%DATADIR%%/images/advances.gif
 %%DATADIR%%/images/advt12x13.gif
@@ -470,6 +474,7 @@ bin/xconq
 %%NOSDL%%@dirrm %%DATADIR%%/tcltk
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/images
+@group
 @dirrm %%DATADIR%%
 @exec if [ ! -e %%SCOREDIR%% ] ; then mkdir -p -m 775 %%SCOREDIR%% ; fi
 @unexec if [ -e %%SCOREDIR%% ] ; then rm -rf %%SCOREDIR%% ; fi

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 22:18:01 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 159AE613;
 Wed, 15 Jan 2014 22:18:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 010331B68;
 Wed, 15 Jan 2014 22:18:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FMI0lB053010;
 Wed, 15 Jan 2014 22:18:00 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FMI039053008;
 Wed, 15 Jan 2014 22:18:00 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201401152218.s0FMI039053008@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 15 Jan 2014 22:18:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339828 - branches/2014Q1/security/vuxml
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 22:18:01 -0000

Author: rene
Date: Wed Jan 15 22:18:00 2014
New Revision: 339828
URL: http://svnweb.freebsd.org/changeset/ports/339828
QAT: https://qat.redports.org/buildarchive/r339828/

Log:
  MFH: r339825
  
  Document new vulnerabilities in www/chromium < 32.0.1700.77
  
  Obtained from:	http://googlechromereleases.blogspot.nl/
  
  MFH: r339721
  
  Merge latest ntpd entry from remko@ which came in as a merge conflict.
  
  Approved by:	portmgr (erwin)

Modified:
  branches/2014Q1/security/vuxml/vuln.xml
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/vuxml/vuln.xml
==============================================================================
--- branches/2014Q1/security/vuxml/vuln.xml	Wed Jan 15 22:11:43 2014	(r339827)
+++ branches/2014Q1/security/vuxml/vuln.xml	Wed Jan 15 22:18:00 2014	(r339828)
@@ -51,6 +51,87 @@ Note:  Please add new entries to the beg
 
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+  <vuln vid="5acf4638-7e2c-11e3-9fba-00262d5ed8ee">
+    <topic>chromium -- multiple vulnerabilities</topic>
+    <affects>
+      <package>
+	<name>chromium</name>
+	<range><lt>32.0.1700.77</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Google Chrome Releases reports:</p>
+	<blockquote cite="http://googlechromereleases.blogspot.nl/">
+	  <p>11 security fixes in this release, including:</p>
+	  <ul>
+	    <li>[249502] High CVE-2013-6646: Use-after-free in web workers.
+	      Credit to Collin Payne.</li>
+	    <li>[326854] High CVE-2013-6641: Use-after-free related to forms.
+	      Credit to Atte Kettunen of OUSPG.</li>
+	    <li>[324969] High CVE-2013-6642: Address bar spoofing in Chrome for
+	      Android. Credit to lpilorz.</li>
+	    <li>[321940] High CVE-2013-6643: Unprompted sync with an attacker’s
+	      Google account. Credit to Joao Lucas Melo Brasio.</li>
+	    <li>[318791] Medium CVE-2013-6645 Use-after-free related to speech
+	      input elements. Credit to Khalil Zhani.</li>
+	    <li>[333036] CVE-2013-6644: Various fixes from internal audits,
+	      fuzzing and other initiatives.</li>
+	  </ul>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2013-6641</cvename>
+      <cvename>CVE-2013-6642</cvename>
+      <cvename>CVE-2013-6643</cvename>
+      <cvename>CVE-2013-6644</cvename>
+      <cvename>CVE-2013-6645</cvename>
+      <cvename>CVE-2013-6646</cvename>
+      <url>http://googlechromereleases.blogspot.nl/</url>
+    </references>
+    <dates>
+      <discovery>2014-01-14</discovery>
+      <entry>2014-01-15</entry>
+    </dates>
+  </vuln>
+
+  <vuln vid="3d95c9a7-7d5c-11e3-a8c1-206a8a720317">
+    <topic>ntpd DRDoS / Amplification Attack using ntpdc monlist command</topic>
+    <affects>
+      <package>
+	<name>ntp</name>
+	<range><lt>4.2.7p26</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>ntp.org reports:</p>
+	<blockquote cite="http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplification_Attack_using">
+	  <p>Unrestricted access to the monlist feature in
+	    ntp_request.c in ntpd in NTP before 4.2.7p26 allows remote
+	    attackers to cause a denial of service (traffic
+	    amplification) via forged (1) REQ_MON_GETLIST or (2)
+	    REQ_MON_GETLIST_1 requests, as exploited in the wild in
+	    December 2013</p>
+	  <p>Use noquery to your default restrictions to block all
+	    status queries.</p>
+	  <p>Use disable monitor to disable the ``ntpdc -c monlist''
+	    command while still allowing other status queries.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2013-5211</cvename>
+      <freebsdsa>SA-14:02.ntpd</freebsdsa>
+      <url>http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplification_Attack_using</url>
+    </references>
+    <dates>
+      <discovery>2014-01-01</discovery>
+      <entry>2014-01-14</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="ba04a373-7d20-11e3-8992-00132034b086">
     <topic>nagios -- denial of service vulnerability</topic>
     <affects>

From owner-svn-ports-branches@FreeBSD.ORG  Wed Jan 15 22:19:39 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B584733;
 Wed, 15 Jan 2014 22:19:39 +0000 (UTC)
Received: from mail.jr-hosting.nl (mail.jr-hosting.nl [78.47.69.234])
 by mx1.freebsd.org (Postfix) with ESMTP id A1B891C7E;
 Wed, 15 Jan 2014 22:19:38 +0000 (UTC)
Received: from [IPv6:2001:470:d701::c0e:e04e:82ac:cab3] (unknown
 [IPv6:2001:470:d701:0:c0e:e04e:82ac:cab3])
 by mail.jr-hosting.nl (Postfix) with ESMTPSA id 6559D3F619;
 Wed, 15 Jan 2014 23:19:30 +0100 (CET)
Content-Type: multipart/signed;
 boundary="Apple-Mail=_66167912-B6BA-46AD-A54C-C7DC2EB0F1CE";
 protocol="application/pgp-signature"; micalg=pgp-sha1
Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\))
Subject: Re: svn commit: r339828 - branches/2014Q1/security/vuxml
From: Remko Lodder <remko@FreeBSD.org>
In-Reply-To: <201401152218.s0FMI039053008@svn.freebsd.org>
Date: Wed, 15 Jan 2014 23:19:28 +0100
Message-Id: <7D594B65-2957-43C0-BF7D-8A33B977DA6A@FreeBSD.org>
References: <201401152218.s0FMI039053008@svn.freebsd.org>
To: Rene Ladan <rene@FreeBSD.org>
X-Mailer: Apple Mail (2.1827)
Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 22:19:39 -0000


--Apple-Mail=_66167912-B6BA-46AD-A54C-C7DC2EB0F1CE
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=windows-1252


On 15 Jan 2014, at 23:18, Rene Ladan <rene@FreeBSD.org> wrote:

> Author: rene
> Date: Wed Jan 15 22:18:00 2014
> New Revision: 339828
> URL: http://svnweb.freebsd.org/changeset/ports/339828
> QAT: https://qat.redports.org/buildarchive/r339828/
>=20
> Log:
>  MFH: r339825
>=20
>  Document new vulnerabilities in www/chromium < 32.0.1700.77
>=20
>  Obtained from:	http://googlechromereleases.blogspot.nl/
>=20
>  MFH: r339721
>=20
>  Merge latest ntpd entry from remko@ which came in as a merge =
conflict.
>=20
>  Approved by:	portmgr (erwin)


Thank you!

>=20
> Modified:
>  branches/2014Q1/security/vuxml/vuln.xml
> Directory Properties:
>  branches/2014Q1/   (props changed)
>=20
> Modified: branches/2014Q1/security/vuxml/vuln.xml
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- branches/2014Q1/security/vuxml/vuln.xml	Wed Jan 15 22:11:43 2014	=
(r339827)
> +++ branches/2014Q1/security/vuxml/vuln.xml	Wed Jan 15 22:18:00 2014	=
(r339828)
> @@ -51,6 +51,87 @@ Note:  Please add new entries to the beg
>=20
> -->
> <vuxml xmlns=3D"http://www.vuxml.org/apps/vuxml-1">
> +  <vuln vid=3D"5acf4638-7e2c-11e3-9fba-00262d5ed8ee">
> +    <topic>chromium -- multiple vulnerabilities</topic>
> +    <affects>
> +      <package>
> +	<name>chromium</name>
> +	<range><lt>32.0.1700.77</lt></range>
> +      </package>
> +    </affects>
> +    <description>
> +      <body xmlns=3D"http://www.w3.org/1999/xhtml">
> +	<p>Google Chrome Releases reports:</p>
> +	<blockquote cite=3D"http://googlechromereleases.blogspot.nl/">
> +	  <p>11 security fixes in this release, including:</p>
> +	  <ul>
> +	    <li>[249502] High CVE-2013-6646: Use-after-free in web =
workers.
> +	      Credit to Collin Payne.</li>
> +	    <li>[326854] High CVE-2013-6641: Use-after-free related to =
forms.
> +	      Credit to Atte Kettunen of OUSPG.</li>
> +	    <li>[324969] High CVE-2013-6642: Address bar spoofing in =
Chrome for
> +	      Android. Credit to lpilorz.</li>
> +	    <li>[321940] High CVE-2013-6643: Unprompted sync with an =
attacker=92s
> +	      Google account. Credit to Joao Lucas Melo Brasio.</li>
> +	    <li>[318791] Medium CVE-2013-6645 Use-after-free related to =
speech
> +	      input elements. Credit to Khalil Zhani.</li>
> +	    <li>[333036] CVE-2013-6644: Various fixes from internal =
audits,
> +	      fuzzing and other initiatives.</li>
> +	  </ul>
> +	</blockquote>
> +      </body>
> +    </description>
> +    <references>
> +      <cvename>CVE-2013-6641</cvename>
> +      <cvename>CVE-2013-6642</cvename>
> +      <cvename>CVE-2013-6643</cvename>
> +      <cvename>CVE-2013-6644</cvename>
> +      <cvename>CVE-2013-6645</cvename>
> +      <cvename>CVE-2013-6646</cvename>
> +      <url>http://googlechromereleases.blogspot.nl/</url>
> +    </references>
> +    <dates>
> +      <discovery>2014-01-14</discovery>
> +      <entry>2014-01-15</entry>
> +    </dates>
> +  </vuln>
> +
> +  <vuln vid=3D"3d95c9a7-7d5c-11e3-a8c1-206a8a720317">
> +    <topic>ntpd DRDoS / Amplification Attack using ntpdc monlist =
command</topic>
> +    <affects>
> +      <package>
> +	<name>ntp</name>
> +	<range><lt>4.2.7p26</lt></range>
> +      </package>
> +    </affects>
> +    <description>
> +      <body xmlns=3D"http://www.w3.org/1999/xhtml">
> +	<p>ntp.org reports:</p>
> +	<blockquote =
cite=3D"http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplific=
ation_Attack_using">
> +	  <p>Unrestricted access to the monlist feature in
> +	    ntp_request.c in ntpd in NTP before 4.2.7p26 allows remote
> +	    attackers to cause a denial of service (traffic
> +	    amplification) via forged (1) REQ_MON_GETLIST or (2)
> +	    REQ_MON_GETLIST_1 requests, as exploited in the wild in
> +	    December 2013</p>
> +	  <p>Use noquery to your default restrictions to block all
> +	    status queries.</p>
> +	  <p>Use disable monitor to disable the ``ntpdc -c monlist''
> +	    command while still allowing other status queries.</p>
> +	</blockquote>
> +      </body>
> +    </description>
> +    <references>
> +      <cvename>CVE-2013-5211</cvename>
> +      <freebsdsa>SA-14:02.ntpd</freebsdsa>
> +      =
<url>http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplificati=
on_Attack_using</url>
> +    </references>
> +    <dates>
> +      <discovery>2014-01-01</discovery>
> +      <entry>2014-01-14</entry>
> +    </dates>
> +  </vuln>
> +
>   <vuln vid=3D"ba04a373-7d20-11e3-8992-00132034b086">
>     <topic>nagios -- denial of service vulnerability</topic>
>     <affects>
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to =
"svn-ports-all-unsubscribe@freebsd.org"

--=20

/"\   Best regards,                      | remko@FreeBSD.org
\ /   Remko Lodder                       | remko@EFnet
 X    http://www.evilcoder.org/          |
/ \   ASCII Ribbon Campaign              | Against HTML Mail and News


--Apple-Mail=_66167912-B6BA-46AD-A54C-C7DC2EB0F1CE
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIcBAEBAgAGBQJS1wlxAAoJEKjD27JZ84ywMcwQAKECANBGJU5yIiVCrsZS0PfP
9/TRWMzGvpYJm0RYyb/2V3jGbv3RP6qt5ZCmXt5gmooxrml6coc+VvkZkrR9CbiQ
c+DswFqnHreu6Vr37PE8YTXuAGCF0WdSEUhgABhvNjsQ1fHNoS85mvtIXXRm8zMb
tUUFYSXWsZ0ghwpE14mNnQcrGqcPt55bYHf+YyOkDV/80I6NJ+fE6ZibTgCHyTIr
wxhgpvyQj9kcVdJ/cEU9GYErAGQnGcjPYsUhdvfnHHYnEu08gpzpQdg9zA3GeOzR
Pf8fJbNdzKdhl7tHS5GRq/4XDeknRUDTAjw1vzGk6NgtN9n/EgY8tHUptvVctY8P
aUojCUptkmuw4qYwUI0P1Z4tZdtLYQ3Wff6WT0bJPBmKbce/iQKOdX2G8nX1DQdN
lZRlU0dMMRPUV5BIDzydnpYg6ZcHwq6+IkrdwOYqykdInoNN6keuVc6KRRSB5YGm
1iWVjxhKxsCBP1mKb/aDsmlVkdRdEyNnjWLdo4tYVWa6eogbt2VdqcwPf37xoxu2
+lhmUnKGZivB08hhn+65ruYxuoA3Zv5P3U3iKwboTZbvdRD5mK8xQ0/4PAsXFsEC
nTXhr2rbPdEy3yhAUwmQ4+qTBmAwDby1VSmojt6/b3yO5asAXHVaOPk2SPGZlxz4
ZKSz5LHotN7d+GFoEr81
=IXDN
-----END PGP SIGNATURE-----

--Apple-Mail=_66167912-B6BA-46AD-A54C-C7DC2EB0F1CE--

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 08:43:44 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E1744141;
 Thu, 16 Jan 2014 08:43:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC99D1D8D;
 Thu, 16 Jan 2014 08:43:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0G8hin4099746;
 Thu, 16 Jan 2014 08:43:44 GMT (envelope-from erwin@svn.freebsd.org)
Received: (from erwin@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0G8hifS099745;
 Thu, 16 Jan 2014 08:43:44 GMT (envelope-from erwin@svn.freebsd.org)
Message-Id: <201401160843.s0G8hifS099745@svn.freebsd.org>
From: Erwin Lansing <erwin@FreeBSD.org>
Date: Thu, 16 Jan 2014 08:43:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339902 - branches/2014Q1/security/vuxml
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 08:43:45 -0000

Author: erwin
Date: Thu Jan 16 08:43:43 2014
New Revision: 339902
URL: http://svnweb.freebsd.org/changeset/ports/339902
QAT: https://qat.redports.org/buildarchive/r339902/

Log:
  MFH: r339766, r339767
  
  	Document SA-13:07.bind
  
  Approved by:	portmgr (self)

Modified:
  branches/2014Q1/security/vuxml/vuln.xml
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/vuxml/vuln.xml
==============================================================================
--- branches/2014Q1/security/vuxml/vuln.xml	Thu Jan 16 08:19:36 2014	(r339901)
+++ branches/2014Q1/security/vuxml/vuln.xml	Thu Jan 16 08:43:43 2014	(r339902)
@@ -180,6 +180,13 @@ Note:  Please add new entries to the beg
 	<name>bind96-base</name>
 	<range><lt>9.6.3.2.ESV.R10.2</lt></range>
       </package>
+      <package>
+	<name>FreeBSD</name>
+	<range><gt>9.2</gt><lt>9.2_3</lt></range>
+	<range><gt>9.1</gt><lt>9.1_10</lt></range>
+	<range><gt>8.4</gt><lt>8.4_7</lt></range>
+	<range><gt>8.3</gt><lt>8.3_14</lt></range>
+      </package>
     </affects>
     <description>
       <body xmlns="http://www.w3.org/1999/xhtml">
@@ -196,11 +203,13 @@ Note:  Please add new entries to the beg
     </description>
     <references>
       <cvename>CVE-2014-0591</cvename>
+      <freebsdsa>SA-13:07.bind</freebsdsa>
       <url>https://kb.isc.org/article/AA-01078/74/</url>
     </references>
     <dates>
       <discovery>2014-01-08</discovery>
       <entry>2014-01-13</entry>
+      <modified>2014-01-15</modified>
     </dates>
   </vuln>
 

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 16:04:17 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DDE0E700;
 Thu, 16 Jan 2014 16:04:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C95F41A1C;
 Thu, 16 Jan 2014 16:04:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GG4HJ1073523;
 Thu, 16 Jan 2014 16:04:17 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GG4Hu9073521;
 Thu, 16 Jan 2014 16:04:17 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401161604.s0GG4Hu9073521@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 16 Jan 2014 16:04:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339927 - in branches/2014Q1/print/gnome-specimen: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 16:04:17 -0000

Author: swills
Date: Thu Jan 16 16:04:17 2014
New Revision: 339927
URL: http://svnweb.freebsd.org/changeset/ports/339927
QAT: https://qat.redports.org/buildarchive/r339927/

Log:
  MFH: r339926
  
  - Fix build on 10.0
  
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/print/gnome-specimen/files/
     - copied from r339926, head/print/gnome-specimen/files/
Modified:
  branches/2014Q1/print/gnome-specimen/Makefile
  branches/2014Q1/print/gnome-specimen/pkg-descr   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/print/gnome-specimen/Makefile
==============================================================================
--- branches/2014Q1/print/gnome-specimen/Makefile	Thu Jan 16 16:02:10 2014	(r339926)
+++ branches/2014Q1/print/gnome-specimen/Makefile	Thu Jan 16 16:04:17 2014	(r339927)
@@ -13,20 +13,12 @@ COMMENT=	Gnome Specimen is a simple tool
 GNU_CONFIGURE=	yes
 USE_GNOME=	pygnomedesktop
 GCONF_SCHEMAS=	gnome-specimen.schemas
-USE_GMAKE=	yes
 USE_PYTHON=	yes
-USES=		gettext
-USE_AUTOTOOLS=	automake:env autoconf:env
-
+USES=		gettext gmake
+USE_AUTOTOOLS=	automake:env
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-pre-configure:
-	( cd ${WRKSRC} ; ${AUTORECONF} ; ${AUTOMAKE} )
-
 post-configure:
 	@${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/py-compile ${WRKSRC}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: branches/2014Q1/print/gnome-specimen/pkg-descr
==============================================================================
--- branches/2014Q1/print/gnome-specimen/pkg-descr	Thu Jan 16 16:02:10 2014	(r339926)
+++ branches/2014Q1/print/gnome-specimen/pkg-descr	Thu Jan 16 16:04:17 2014	(r339927)
@@ -1,3 +1,3 @@
 Gnome Specimen is a simple tool to preview and compare installed fonts.
 
-WWW:	https://launchpad.net/gnome-specimen
+WWW: https://launchpad.net/gnome-specimen

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 17:36:29 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D7E2A669;
 Thu, 16 Jan 2014 17:36:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C2B261394;
 Thu, 16 Jan 2014 17:36:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GHaTop013286;
 Thu, 16 Jan 2014 17:36:29 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GHaTjI013283;
 Thu, 16 Jan 2014 17:36:29 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401161736.s0GHaTjI013283@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 16 Jan 2014 17:36:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339944 - in branches/2014Q1/sysutils/puppet: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 17:36:29 -0000

Author: swills
Date: Thu Jan 16 17:36:28 2014
New Revision: 339944
URL: http://svnweb.freebsd.org/changeset/ports/339944
QAT: https://qat.redports.org/buildarchive/r339944/

Log:
  MFH: r339793
  
  - Update to 3.4.2 [1]
  - Remove Ruby 1.9 conditional, as 1.8 is gone.
  
  PR:		ports/185549 [1]
  Submitted by:	Bartek Rutkowski <ports@robakdesign.com> [1]
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru
     - copied unchanged from r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru
Deleted:
  branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru
Modified:
  branches/2014Q1/sysutils/puppet/Makefile
  branches/2014Q1/sysutils/puppet/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/sysutils/puppet/Makefile
==============================================================================
--- branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:34:03 2014	(r339943)
+++ branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:36:28 2014	(r339944)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	3.3.1
-PORTREVISION=	6
+PORTVERSION=	3.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -50,10 +49,8 @@ BROKEN=	PACKAGE_ROOT option patch is inc
 
 .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-.if ${RUBY_VER} == 1.9
 RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
 .endif
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
@@ -69,7 +66,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
-		${WRKSRC}/ext/rack/files/config.ru
+		${WRKSRC}/ext/rack/config.ru
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
@@ -93,11 +90,10 @@ post-install:
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/public
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>

Modified: branches/2014Q1/sysutils/puppet/distinfo
==============================================================================
--- branches/2014Q1/sysutils/puppet/distinfo	Thu Jan 16 17:34:03 2014	(r339943)
+++ branches/2014Q1/sysutils/puppet/distinfo	Thu Jan 16 17:36:28 2014	(r339944)
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.3.1.tar.gz) = 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284
-SIZE (puppet-3.3.1.tar.gz) = 1896023
+SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210
+SIZE (puppet-3.4.2.tar.gz) = 1951200

Copied: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru (from r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru	Thu Jan 16 17:36:28 2014	(r339944, copy of r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru)
@@ -0,0 +1,13 @@
+--- ./ext/rack/config.ru.orig	2013-12-20 16:47:22.876896492 +0000
++++ ./ext/rack/config.ru	2013-12-20 16:47:33.826895721 +0000
+@@ -14,8 +14,8 @@
+ # Rack applications typically don't start as root.  Set --confdir and --vardir
+ # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing
+ # to ~puppet/.puppet
+-ARGV << "--confdir" << "/etc/puppet"
+-ARGV << "--vardir"  << "/var/lib/puppet"
++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
++ARGV << "--vardir"  << "/var/puppet"
+ 
+ # NOTE: it's unfortunate that we have to use the "CommandLine" class
+ #  here to launch the app, but it contains some initialization logic

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 17:37:29 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0C712751;
 Thu, 16 Jan 2014 17:37:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC75213A1;
 Thu, 16 Jan 2014 17:37:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GHbSJZ013534;
 Thu, 16 Jan 2014 17:37:28 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GHbSpH013531;
 Thu, 16 Jan 2014 17:37:28 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401161737.s0GHbSpH013531@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 16 Jan 2014 17:37:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339945 - branches/2014Q1/sysutils/puppet
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 17:37:29 -0000

Author: swills
Date: Thu Jan 16 17:37:28 2014
New Revision: 339945
URL: http://svnweb.freebsd.org/changeset/ports/339945
QAT: https://qat.redports.org/buildarchive/r339945/

Log:
  MFH: r339806
  
  - Install the passenger example config file
  
  Reported by:	mat
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/sysutils/puppet/Makefile
  branches/2014Q1/sysutils/puppet/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/sysutils/puppet/Makefile
==============================================================================
--- branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:36:28 2014	(r339944)
+++ branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:37:28 2014	(r339945)
@@ -3,6 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -95,5 +96,6 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>

Modified: branches/2014Q1/sysutils/puppet/pkg-plist
==============================================================================
--- branches/2014Q1/sysutils/puppet/pkg-plist	Thu Jan 16 17:36:28 2014	(r339944)
+++ branches/2014Q1/sysutils/puppet/pkg-plist	Thu Jan 16 17:37:28 2014	(r339945)
@@ -48,6 +48,7 @@ man/man8/puppet.8.gz
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/auth.conf-dist
 www/puppet/config.ru
+%%EXAMPLESDIR%%/example-passenger-vhost.conf
 @exec /usr/sbin/chown -Rh puppet:puppet %D/%F
 @dirrm www/puppet/public
 @dirrm www/puppet

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 17:38:42 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 243AF85F;
 Thu, 16 Jan 2014 17:38:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FF3213B5;
 Thu, 16 Jan 2014 17:38:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GHcf6J013831;
 Thu, 16 Jan 2014 17:38:41 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GHcfGx013830;
 Thu, 16 Jan 2014 17:38:41 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401161738.s0GHcfGx013830@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 16 Jan 2014 17:38:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339946 - branches/2014Q1/sysutils/puppet
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 17:38:42 -0000

Author: swills
Date: Thu Jan 16 17:38:41 2014
New Revision: 339946
URL: http://svnweb.freebsd.org/changeset/ports/339946
QAT: https://qat.redports.org/buildarchive/r339946/

Log:
  MFH: r339883
  
  - Remove unneeded plist line
  
  Reported by:	mat
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/sysutils/puppet/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/sysutils/puppet/pkg-plist
==============================================================================
--- branches/2014Q1/sysutils/puppet/pkg-plist	Thu Jan 16 17:37:28 2014	(r339945)
+++ branches/2014Q1/sysutils/puppet/pkg-plist	Thu Jan 16 17:38:41 2014	(r339946)
@@ -48,7 +48,6 @@ man/man8/puppet.8.gz
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/auth.conf-dist
 www/puppet/config.ru
-%%EXAMPLESDIR%%/example-passenger-vhost.conf
 @exec /usr/sbin/chown -Rh puppet:puppet %D/%F
 @dirrm www/puppet/public
 @dirrm www/puppet

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 17:39:23 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9171193D;
 Thu, 16 Jan 2014 17:39:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7D1B013BD;
 Thu, 16 Jan 2014 17:39:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GHdNcj014037;
 Thu, 16 Jan 2014 17:39:23 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GHdNRj014036;
 Thu, 16 Jan 2014 17:39:23 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401161739.s0GHdNRj014036@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 16 Jan 2014 17:39:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339947 - branches/2014Q1/sysutils/puppet
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 17:39:23 -0000

Author: swills
Date: Thu Jan 16 17:39:22 2014
New Revision: 339947
URL: http://svnweb.freebsd.org/changeset/ports/339947
QAT: https://qat.redports.org/buildarchive/r339947/

Log:
  MFH: r339934
  
  - Bump PORTREVISION for example change
  Approved by:	portmgr (implicit)

Modified:
  branches/2014Q1/sysutils/puppet/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/sysutils/puppet/Makefile
==============================================================================
--- branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:38:41 2014	(r339946)
+++ branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:39:22 2014	(r339947)
@@ -3,7 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 17:43:26 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3184EAC2;
 Thu, 16 Jan 2014 17:43:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D7AF149D;
 Thu, 16 Jan 2014 17:43:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GHhP71017222;
 Thu, 16 Jan 2014 17:43:25 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GHhPle017221;
 Thu, 16 Jan 2014 17:43:25 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201401161743.s0GHhPle017221@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 16 Jan 2014 17:43:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339948 - branches/2014Q1/multimedia/plexmediaserver
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 17:43:26 -0000

Author: feld
Date: Thu Jan 16 17:43:25 2014
New Revision: 339948
URL: http://svnweb.freebsd.org/changeset/ports/339948
QAT: https://qat.redports.org/buildarchive/r339948/

Log:
  MFH: r339923
  
  Mark BROKEN on 10.0+. Bundled python missing patch
  
  Approved by:	swills (mentor, implicit)
  Approved by:	portmgr (erwin)

Modified:
  branches/2014Q1/multimedia/plexmediaserver/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/multimedia/plexmediaserver/Makefile
==============================================================================
--- branches/2014Q1/multimedia/plexmediaserver/Makefile	Thu Jan 16 17:39:22 2014	(r339947)
+++ branches/2014Q1/multimedia/plexmediaserver/Makefile	Thu Jan 16 17:43:25 2014	(r339948)
@@ -34,6 +34,7 @@ IGNORE= supplied binaries compiled for F
 .endif
 
 .if ${OSVERSION} >= 1000054
+BROKEN=	Waiting for Plex to include Python patch http://bugs.python.org/issue18178
 RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
 .endif
 

From owner-svn-ports-branches@FreeBSD.ORG  Thu Jan 16 21:12:59 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F1D065EC;
 Thu, 16 Jan 2014 21:12:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D77A319D3;
 Thu, 16 Jan 2014 21:12:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GLCwHd004035;
 Thu, 16 Jan 2014 21:12:58 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GLCr2U004000;
 Thu, 16 Jan 2014 21:12:53 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201401162112.s0GLCr2U004000@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 16 Jan 2014 21:12:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339991 - in branches/2014Q1/www/chromium: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jan 2014 21:12:59 -0000

Author: rene
Date: Thu Jan 16 21:12:53 2014
New Revision: 339991
URL: http://svnweb.freebsd.org/changeset/ports/339991
QAT: https://qat.redports.org/buildarchive/r339991/

Log:
  MFH: r339940
  
  - Update to 32.0.1700.77
  - Convert to USES=ninja
  - Use shorthand for MASTER_SITE_LOCAL
  
  Security:	http://vuxml.org/freebsd/5acf4638-7e2c-11e3-9fba-00262d5ed8ee.html
  
  Approved by:	portmgr (erwin)

Added:
  branches/2014Q1/www/chromium/files/patch-base__test__launcher__test_launcher.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-base__test__launcher__test_launcher.cc
  branches/2014Q1/www/chromium/files/patch-breakpad__breakpad.gyp
     - copied unchanged from r339940, head/www/chromium/files/patch-breakpad__breakpad.gyp
  branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
  branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
  branches/2014Q1/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
  branches/2014Q1/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
     - copied unchanged from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
     - copied unchanged from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
     - copied unchanged from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
     - copied unchanged from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
  branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-ui__events__event_switches.cc
  branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h
     - copied unchanged from r339940, head/www/chromium/files/patch-ui__events__event_switches.h
  branches/2014Q1/www/chromium/files/patch-v8__src__checks.cc
     - copied unchanged from r339940, head/www/chromium/files/patch-v8__src__checks.cc
Deleted:
  branches/2014Q1/www/chromium/files/patch-base__test__test_launcher.cc
  branches/2014Q1/www/chromium/files/patch-chrome__browser__gpu__chrome_gpu_util.cc
  branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
  branches/2014Q1/www/chromium/files/patch-skia__skia_chrome.gypi
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__core__rendering__RenderingNodeProxy.cpp
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__AccessibilityUIElementChromium.cpp
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__gtk__WebInputEventFactory.cpp
  branches/2014Q1/www/chromium/files/patch-v8__src__platform-posix.h
  branches/2014Q1/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc
Modified:
  branches/2014Q1/www/chromium/Makefile
  branches/2014Q1/www/chromium/distinfo
  branches/2014Q1/www/chromium/files/extra-patch-clang
  branches/2014Q1/www/chromium/files/extra-patch-fixup-execinfo
  branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
  branches/2014Q1/www/chromium/files/patch-chrome__app__policy__policy_templates.json
  branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
  branches/2014Q1/www/chromium/files/patch-skia__skia_library.gypi
  branches/2014Q1/www/chromium/files/patch-sync__util__get_session_name.cc
  branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__config.h
  branches/2014Q1/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
  branches/2014Q1/www/chromium/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/chromium/Makefile
==============================================================================
--- branches/2014Q1/www/chromium/Makefile	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/Makefile	Thu Jan 16 21:12:53 2014	(r339991)
@@ -5,13 +5,12 @@
 
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
-DISTVERSION=	31.0.1650.63
+DISTVERSION=	32.0.1700.77
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \
 		http://download.goodking.org/downloads/:browser \
-		${MASTER_SITE_LOCAL}:browser \
+		LOCAL/rene:browser \
 		http://files.etoilebsd.net/goodking/:browser
-MASTER_SITE_SUBDIR=rene
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:browser
 
 MAINTAINER=	chromium@FreeBSD.org
@@ -27,7 +26,6 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${
 		bash:${PORTSDIR}/shells/bash \
 		yasm:${PORTSDIR}/devel/yasm \
 		flock:${PORTSDIR}/sysutils/flock \
-		ninja:${PORTSDIR}/devel/ninja \
 		v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
 
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
@@ -48,14 +46,14 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/l
 ONLY_FOR_ARCHS=	i386 amd64
 USE_XZ=		yes
 USES=		bison compiler:c++11-lang desktop-file-utils pkgconfig \
-		perl5 shebangfix
+		perl5 shebangfix ninja
 USE_PERL5=	build
 USE_PYTHON_BUILD=	2.6-2.7
 USE_XORG=	scrnsaverproto x11 xproto xscrnsaver xtst
 USE_GNOME=	glib20 gtk20 dconf libxslt
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
-NINJA_TARGETS=	chrome
+ALL_TARGET=	chrome
 
 # See build/common.gypi for all the available variables.
 GYP_DEFINES+=	use_cups=1 \
@@ -143,7 +141,7 @@ TEST_TARGETS=	base_unittests \
 		net_unittests \
 		content_unittests
 EXCLUDED_TESTS=	GpuDriverBugListTest.CurrentDriverBugListValidation
-NINJA_TARGETS+=	${TEST_TARGETS}
+ALL_TARGET+=	${TEST_TARGETS}
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
 .endif
 
@@ -168,6 +166,7 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
 		GPERF=${LOCALBASE}/bin/gperf
+MAKE_ARGS+=	-C out/${BUILDTYPE}
 
 .include <bsd.port.pre.mk>
 
@@ -202,7 +201,8 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/chrome/common/chrome_paths.cc
 	@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
-		${WRKSRC}/third_party/WebKit/Source/core/core.gypi
+		${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \
+		${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi
 	@${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \
 		${WRKSRC}/chrome/chrome_tests_unit.gypi
 	@${REINPLACE_CMD} -e "s|linux|freebsd|" \
@@ -223,10 +223,6 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/gyp_chromium chrome/chrome.gyp --depth .
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ninja \
-		${_MAKE_JOBS} -C out/${BUILDTYPE} ${NINJA_TARGETS}
-
 test regression-test: build
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \

Modified: branches/2014Q1/www/chromium/distinfo
==============================================================================
--- branches/2014Q1/www/chromium/distinfo	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/distinfo	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,4 +1,4 @@
-SHA256 (chromium-courgette-redacted-31.0.1650.63.tar.xz) = f9d368ab3b47bc57d06fb4e36a579f938969af8fca7ad06a27b6a2105f9c74d4
-SIZE (chromium-courgette-redacted-31.0.1650.63.tar.xz) = 183258660
-SHA256 (chromium-31.0.1650.63-testdata.tar.xz) = b554f18f1ec334bf88170683bf08722f101c4cc5d7358a44019d8645cea135ac
-SIZE (chromium-31.0.1650.63-testdata.tar.xz) = 111203540
+SHA256 (chromium-courgette-redacted-32.0.1700.77.tar.xz) = c616f4d4d917b3aa1cf78a200b44e9ae22fed9fb3671ee6d8058f961dc6cad24
+SIZE (chromium-courgette-redacted-32.0.1700.77.tar.xz) = 186231264
+SHA256 (chromium-32.0.1700.77-testdata.tar.xz) = 7da813a54e84d2aa655cd376d2eae41f64132a8790cbc8bcadd9220ef9d6bcd0
+SIZE (chromium-32.0.1700.77-testdata.tar.xz) = 112139016

Modified: branches/2014Q1/www/chromium/files/extra-patch-clang
==============================================================================
--- branches/2014Q1/www/chromium/files/extra-patch-clang	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/extra-patch-clang	Thu Jan 16 21:12:53 2014	(r339991)
@@ -250,3 +250,25 @@
  #if defined(__GCC__)
  #pragma GCC diagnostic pop
  #endif
+--- v8/src/unique.h.orig	2014-01-07 21:03:55.000000000 +0100
++++ v8/src/unique.h	2014-01-13 00:41:59.000000000 +0100
+@@ -130,7 +130,7 @@
+ 
+   // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
+   static Unique<T> CreateUninitialized(Handle<T> handle) {
+-    return Unique<T>(reinterpret_cast<Address>(NULL), handle);
++    return Unique<T>(static_cast<Address>(NULL), handle);
+   }
+ 
+   static Unique<T> CreateImmovable(Handle<T> handle) {
+--- content/browser/renderer_host/render_widget_host_view_guest.cc.orig	2014-01-07 21:02:28.000000000 +0100
++++ content/browser/renderer_host/render_widget_host_view_guest.cc	2014-01-13 13:48:52.000000000 +0100
+@@ -254,7 +254,7 @@
+ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
+   if (guest_->GetEmbedderRenderWidgetHostView())
+     return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId();
+-  return static_cast<gfx::NativeViewId>(NULL);
++  return reinterpret_cast<gfx::NativeViewId>(NULL);
+ }
+ 
+ gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() {

Modified: branches/2014Q1/www/chromium/files/extra-patch-fixup-execinfo
==============================================================================
--- branches/2014Q1/www/chromium/files/extra-patch-fixup-execinfo	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/extra-patch-fixup-execinfo	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,18 +1,11 @@
---- v8/src/platform-posix.h.orig	2013-09-28 19:29:53.000000000 +0200
-+++ v8/src/platform-posix.h	2013-10-11 17:28:41.000000000 +0200
-@@ -40,12 +41,12 @@
- 
- // Used by platform implementation files during OS::DumpBacktrace()
- // and OS::StackWalk().
--template<int (*backtrace)(void**, int),
--         char** (*backtrace_symbols)(void* const*, int)>
-+template<size_t (*backtrace)(void**, size_t),
-+         char** (*backtrace_symbols)(void* const*, size_t)>
- struct POSIXBacktraceHelper {
-   static void DumpBacktrace() {
-     void* trace[100];
--    int size = backtrace(trace, ARRAY_SIZE(trace));
-+    size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace));
-     char** symbols = backtrace_symbols(trace, size);
-     fprintf(stderr, "\n==== C stack trace ===============================\n\n");
-     if (size == 0) {
+--- v8/src/checks.cc.orig	2014-01-07 21:03:55.000000000 +0100
++++ v8/src/checks.cc	2014-01-08 01:14:20.000000000 +0100
+@@ -41,7 +41,7 @@
+ static V8_INLINE void DumpBacktrace() {
+ #if V8_LIBC_GLIBC || V8_OS_BSD
+   void* trace[100];
+-  int size = backtrace(trace, ARRAY_SIZE(trace));
++  size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace));
+   char** symbols = backtrace_symbols(trace, size);
+   i::OS::PrintError("\n==== C stack trace ===============================\n\n");
+   if (size == 0) {

Copied: branches/2014Q1/www/chromium/files/patch-base__test__launcher__test_launcher.cc (from r339940, head/www/chromium/files/patch-base__test__launcher__test_launcher.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-base__test__launcher__test_launcher.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-base__test__launcher__test_launcher.cc)
@@ -0,0 +1,13 @@
+--- base/test/launcher/test_launcher.cc.orig	2014-01-07 21:01:10.000000000 +0100
++++ base/test/launcher/test_launcher.cc	2014-01-13 01:36:07.000000000 +0100
+@@ -36,6 +36,10 @@
+ #include "base/mac/scoped_nsautorelease_pool.h"
+ #endif
+ 
++#if defined(OS_FREEBSD)
++#include <signal.h>
++#endif
++
+ namespace base {
+ 
+ // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .

Copied: branches/2014Q1/www/chromium/files/patch-breakpad__breakpad.gyp (from r339940, head/www/chromium/files/patch-breakpad__breakpad.gyp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-breakpad__breakpad.gyp	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-breakpad__breakpad.gyp)
@@ -0,0 +1,11 @@
+--- breakpad/breakpad.gyp.orig	2014-01-07 21:02:21.000000000 +0100
++++ breakpad/breakpad.gyp	2014-01-12 22:55:47.000000000 +0100
+@@ -334,7 +334,7 @@
+         },
+       ],
+     }],
+-    [ 'OS=="linux" or OS=="android"', {
++    [ 'OS=="linux" or OS=="android" or os_bsd==1', {
+       'conditions': [
+         ['OS=="android"', {
+           'defines': [

Modified: branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,15 +1,15 @@
---- chrome/app/chrome_main_delegate.cc.orig	2013-11-08 07:41:27.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc	2013-11-16 11:29:59.000000000 +0100
-@@ -96,7 +96,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig	2014-01-07 21:01:39.000000000 +0100
++++ chrome/app/chrome_main_delegate.cc	2014-01-13 16:53:27.000000000 +0100
+@@ -97,7 +97,7 @@
  #include "ui/base/x/x11_util.h"
  #endif
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "chrome/app/breakpad_linux.h"
+ #include "components/breakpad/app/breakpad_linux.h"
  #endif
  
-@@ -114,7 +114,7 @@
+@@ -115,7 +115,7 @@
      g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -18,7 +18,7 @@
  base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
      g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -234,7 +234,7 @@
+@@ -235,7 +235,7 @@
        // Mac needs them for the plugin process name.
        process_type == switches::kPluginProcess ||
  #endif
@@ -27,7 +27,7 @@
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -391,7 +391,7 @@
+@@ -392,7 +392,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -36,7 +36,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -432,7 +432,7 @@
+@@ -433,7 +433,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -45,7 +45,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -563,7 +563,7 @@
+@@ -564,7 +564,7 @@
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -54,16 +54,25 @@
    breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
  #endif
  
-@@ -700,7 +700,7 @@
+@@ -701,7 +701,7 @@
  #endif
    }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain
-   // sets this up for the browser process in a different manner. Zygotes
-   // need to call InitCrashReporter() in RunZygote().
-@@ -813,7 +813,7 @@
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+   // Zygote needs to call InitCrashReporter() in RunZygote().
+   if (process_type != switches::kZygoteProcess) {
+ #if defined(OS_ANDROID)
+@@ -713,7 +713,7 @@
+     breakpad::InitCrashReporter();
+ #endif  // defined(OS_ANDROID)
+   }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+ 
+   // After all the platform Breakpads have been initialized, store the command
+   // line for crash reporting.
+@@ -814,7 +814,7 @@
      SetUpProfilingShutdownHandler();
    }
  
@@ -71,4 +80,4 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
    // this up for the browser process in a different manner.
-   InitCrashReporter();
+   breakpad::InitCrashReporter();

Modified: branches/2014Q1/www/chromium/files/patch-chrome__app__policy__policy_templates.json
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-chrome__app__policy__policy_templates.json	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-chrome__app__policy__policy_templates.json	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,6 +1,6 @@
 --- chrome/app/policy/policy_templates.json.orig	2013-09-24 21:57:03.000000000 +0300
 +++ chrome/app/policy/policy_templates.json	2013-09-24 21:59:32.000000000 +0300
-@@ -1365,7 +1365,7 @@
+@@ -1366,7 +1366,7 @@
            'name': 'GSSAPILibraryName',
            'type': 'string',
            'schema': { 'type': 'string' },
@@ -9,16 +9,16 @@
            'features': {
              'dynamic_refresh': False,
              'per_profile': False,
-@@ -3251,7 +3251,7 @@
+@@ -3339,7 +3339,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
--      'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.win:30-'],
-+      'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
+-      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
++      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -3766,7 +3766,7 @@
+@@ -3960,7 +3960,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },

Modified: branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,15 +1,15 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2013-09-25 22:01:36.000000000 +0300
-+++ chrome/browser/chrome_content_browser_client.cc	2013-09-25 22:11:33.000000000 +0300
-@@ -480,7 +480,7 @@
+--- chrome/browser/chrome_content_browser_client.cc.orig	2014-01-07 21:01:57.000000000 +0100
++++ chrome/browser/chrome_content_browser_client.cc	2014-01-11 01:50:13.000000000 +0100
+@@ -492,7 +492,7 @@
    }
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- int GetCrashSignalFD(const CommandLine& command_line) {
-   if (command_line.HasSwitch(switches::kExtensionProcess)) {
-     ExtensionCrashHandlerHostLinux* crash_handler =
-@@ -505,7 +505,7 @@
+ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
+     const std::string& process_type) {
+   base::FilePath dumps_path;
+@@ -548,7 +548,7 @@
  
    return -1;
  }
@@ -18,17 +18,17 @@
  
  #if !defined(OS_CHROMEOS)
  GURL GetEffectiveURLForSignin(const GURL& url) {
-@@ -1346,7 +1346,7 @@
-     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
-                                     child_process_logging::GetClientId());
-   }
--#elif defined(OS_POSIX)
-+#elif defined(OS_POSIX) && !defined(OS_BSD)
-   if (IsCrashReporterEnabled()) {
-     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
-         child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
-@@ -2461,7 +2461,7 @@
-   additional_backends->push_back(new sync_file_system::SyncFileSystemBackend());
+@@ -1397,7 +1397,7 @@
+ 
+ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+     CommandLine* command_line, int child_process_id) {
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+   if (breakpad::IsCrashReporterEnabled()) {
+     std::string enable_crash_reporter;
+     GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
+@@ -2529,7 +2529,7 @@
+           Profile::FromBrowserContext(browser_context)));
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -36,7 +36,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const CommandLine& command_line,
      int child_process_id,
-@@ -2521,7 +2521,7 @@
+@@ -2584,7 +2584,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }

Copied: branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc (from r339940, head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc)
@@ -0,0 +1,14 @@
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-01-07 21:01:47.000000000 +0100
++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2014-01-13 17:44:02.000000000 +0100
+@@ -33,9 +33,11 @@
+     // Note that this initializes the delegate asynchronously, but since
+     // the delegate will only be used from the IO thread, it is guaranteed
+     // to be created before use of it expects it to be there.
++#if !defined(OS_FREEBSD)
+     CreateMTPDeviceAsyncDelegate(device_location,
+         base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
+                    base::Unretained(this), device_location));
++#endif
+     mtp_device_usage_map_[device_location] = 0;
+   }
+ 

Copied: branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc (from r339940, head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/certificate_viewer_webui.cc.orig	2014-01-07 21:01:49.000000000 +0100
++++ chrome/browser/ui/webui/certificate_viewer_webui.cc	2014-01-13 15:16:24.000000000 +0100
+@@ -228,7 +228,7 @@
+   if (cert_index < 0)
+     return;
+ 
+-  NativeWebContentsModalDialog window =
++  _GtkWindow* window =
+       platform_util::GetTopLevel(dialog_->dialog()->GetNativeDialog());
+   ShowCertExportDialog(web_ui()->GetWebContents(),
+                        window,

Copied: branches/2014Q1/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc (from r339940, head/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc)
@@ -0,0 +1,35 @@
+--- content/browser/fileapi/file_system_dir_url_request_job_unittest.cc.orig	2014-01-07 21:02:28.000000000 +0100
++++ content/browser/fileapi/file_system_dir_url_request_job_unittest.cc	2014-01-13 16:18:14.000000000 +0100
+@@ -248,7 +248,7 @@
+ 
+   std::istringstream in(delegate_->data_received());
+   std::string line;
+-  EXPECT_TRUE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
+ 
+ #if defined(OS_WIN)
+   EXPECT_EQ("<script>start(\"foo\\\\bar\");</script>", line);
+@@ -256,10 +256,10 @@
+   EXPECT_EQ("<script>start(\"/foo/bar\");</script>", line);
+ #endif
+ 
+-  EXPECT_TRUE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
+   VerifyListingEntry(line, "hoge", "hoge", false, 10);
+ 
+-  EXPECT_TRUE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
+   VerifyListingEntry(line, "baz", "baz", true, 0);
+ }
+ 
+@@ -307,8 +307,8 @@
+ 
+   std::istringstream in(delegate_->data_received());
+   std::string line;
+-  EXPECT_TRUE(std::getline(in, line));
+-  EXPECT_FALSE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
++  /*EXPECT_FALSE*/(std::getline(in, line));
+ 
+   TestRequestWithContext(CreateFileSystemURL("foo"),
+                          file_system_context.get());

Copied: branches/2014Q1/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc (from r339940, head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc)
@@ -0,0 +1,11 @@
+--- content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-01-07 21:02:28.000000000 +0100
++++ content/browser/geolocation/location_arbitrator_impl.cc	2014-01-13 16:30:21.000000000 +0100
+@@ -160,7 +160,7 @@
+ }
+ 
+ LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
+   return NULL;
+ #else
+   return content::NewSystemLocationProvider();

Modified: branches/2014Q1/www/chromium/files/patch-skia__skia_library.gypi
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-skia__skia_library.gypi	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-skia__skia_library.gypi	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,6 +1,6 @@
 --- skia/skia_library.gypi.orig	2013-09-03 22:15:35.743627150 +0300
 +++ skia/skia_library.gypi	2013-09-03 22:17:46.187628519 +0300
-@@ -214,7 +214,7 @@
+@@ -193,7 +193,7 @@
      }],
  
      #Settings for text blitting, chosen to approximate the system browser.
@@ -9,12 +9,3 @@
        'defines': [
          'SK_GAMMA_EXPONENT=1.2',
          'SK_GAMMA_CONTRAST=0.2',
-@@ -242,7 +242,7 @@
- 
-     # For POSIX platforms, prefer the Mutex implementation provided by Skia
-     # since it does not generate static initializers.
--    [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
-+    [ 'os_posix == 1 or OS == "ios"', {
-       'defines+': [
-         'SK_USE_POSIX_THREADS',
-       ],

Modified: branches/2014Q1/www/chromium/files/patch-sync__util__get_session_name.cc
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-sync__util__get_session_name.cc	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-sync__util__get_session_name.cc	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,15 +1,15 @@
---- sync/util/get_session_name.cc.orig	2013-08-16 23:59:39.000000000 +0300
-+++ sync/util/get_session_name.cc	2013-08-17 00:00:27.000000000 +0300
-@@ -14,7 +14,7 @@
- #if defined(OS_CHROMEOS)
- #include "base/command_line.h"
- #include "chromeos/chromeos_switches.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+--- sync/util/get_session_name.cc.orig	2014-01-07 21:02:32.000000000 +0100
++++ sync/util/get_session_name.cc	2014-01-11 02:17:44.000000000 +0100
+@@ -11,7 +11,7 @@
+ #include "base/sys_info.h"
+ #include "base/task_runner.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
  #include "sync/util/get_session_name_linux.h"
  #elif defined(OS_IOS)
  #include "sync/util/get_session_name_ios.h"
-@@ -59,7 +59,7 @@
+@@ -36,7 +36,7 @@
    // like "stumpy-signed-mp-v2keys" etc. The information can be checked on
    // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
    session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";

Copied: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi (from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/build/features.gypi.orig	2013-08-30 06:55:03.000000000 +0300
++++ third_party/WebKit/Source/build/features.gypi	2013-09-03 22:27:08.777629842 +0300
+@@ -94,7 +94,7 @@
+           'ENABLE_WEB_AUDIO=1',
+         ],
+       }],
+-      ['OS=="win" or OS=="android" or OS=="linux"', {
++      ['OS=="win" or OS=="android" or OS=="linux" or os_bsd==1', {
+         'feature_defines': [
+           'ENABLE_OPENTYPE_VERTICAL=1',
+         ],

Modified: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__config.h
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__config.h	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__config.h	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,10 +1,10 @@
 --- third_party/WebKit/Source/config.h.orig	2013-11-08 07:50:10.000000000 +0100
 +++ third_party/WebKit/Source/config.h	2013-11-15 16:58:16.000000000 +0100
-@@ -181,6 +181,6 @@
+@@ -167,6 +167,6 @@
  #define __STDC_FORMAT_MACROS 1
  #endif
  
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+-#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || ENABLE(HARFBUZZ_ON_WINDOWS)
  #define WTF_USE_HARFBUZZ 1
  #endif

Copied: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp (from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp)
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp.orig	2014-01-07 21:06:22.000000000 +0100
++++ third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp	2014-01-13 13:22:53.000000000 +0100
+@@ -37,6 +37,10 @@
+ #include "public/platform/WebString.h"
+ #include "public/web/WebAXObject.h"
+ 
++#if defined(OS_FREEBSD)
++#include <stdlib.h> // atoi()
++#endif
++
+ using namespace WebKit;
+ using namespace std;
+ 

Copied: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp (from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp)
@@ -0,0 +1,22 @@
+--- third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig	2014-01-07 21:06:23.000000000 +0100
++++ third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp	2014-01-11 00:54:01.000000000 +0100
+@@ -40,6 +40,8 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
++#include <cstdlib>
++
+ #include "wtf/Assertions.h"
+ 
+ namespace {
+@@ -65,8 +67,8 @@
+                  "gtk-double-click-time", &doubleClickTime,
+                  "gtk-double-click-distance", &doubleClickDistance, NULL);
+     return (time - gLastClickTime) > doubleClickTime
+-           || abs(x - gLastClickX) > doubleClickDistance
+-           || abs(y - gLastClickY) > doubleClickDistance;
++           || std::abs(x - gLastClickX) > doubleClickDistance
++           || std::abs(y - gLastClickY) > doubleClickDistance;
+ }
+ 
+ void resetClickCountState()

Copied: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h (from r339940, head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h)
@@ -0,0 +1,24 @@
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-01-07 21:06:25.000000000 +0100
++++ third_party/WebKit/Source/wtf/ByteSwap.h	2014-01-13 01:21:42.000000000 +0100
+@@ -52,8 +52,13 @@
+ 
+ #else
+ 
++#ifndef bswap64
+ inline uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); }
++#endif
++#ifndef bswap32
+ inline uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); }
++#endif
++#ifndef bswap16
+ // GCC lacks bswap16.
+ #if COMPILER(CLANG)
+ inline uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); }
+@@ -61,6 +66,7 @@
+ // GCC lacks __builtin_bswap16.
+ inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); }
+ #endif
++#endif
+ 
+ #endif
+ 

Modified: branches/2014Q1/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
==============================================================================
--- branches/2014Q1/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc	Thu Jan 16 21:12:53 2014	(r339991)
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2013-07-15 17:23:44.000000000 +0300
-+++ third_party/libjingle/source/talk/base/cpumonitor.cc	2013-07-15 17:34:46.000000000 +0300
+--- third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2014-01-07 21:03:06.000000000 +0100
++++ third_party/libjingle/source/talk/base/cpumonitor.cc	2014-01-13 02:01:01.000000000 +0100
 @@ -52,13 +52,13 @@
  #include <mach/task.h>
  #endif  // defined(IOS) || defined(OSX)
@@ -16,24 +16,19 @@
  
  #if defined(IOS) || defined(OSX)
  static uint64 TimeValueTToInt64(const time_value_t &time_value) {
-@@ -281,12 +281,16 @@
+@@ -281,6 +281,11 @@
    const uint64 cpu_times = nice + system + user;
    const uint64 total_times = cpu_times + idle;
  #endif  // defined(LINUX) || defined(ANDROID)
 +#if defined(BSD)
++  const uint64 cpu_times = 0;
++  const uint64 total_times = 0;
 +  return 0.f;
-+#else
-   system_.prev_load_time_ = timenow;
-   system_.prev_load_ = UpdateCpuLoad(total_times,
-                                      cpu_times * cpus_,
-                                      &system_.prev_total_times_,
-                                      &system_.prev_cpu_times_);
-   return system_.prev_load_;
 +#endif
- }
  
- float CpuSampler::GetProcessLoad() {
-@@ -348,7 +352,7 @@
+ #if defined(__native_client__)
+   // TODO(ryanpetrie): Implement this via PPAPI when it's available.
+@@ -355,7 +360,7 @@
        TimeValueTToInt64(task_term_info.system_time));
  #endif  // defined(IOS) || defined(OSX)
  
@@ -42,12 +37,12 @@
    rusage usage;
    if (getrusage(RUSAGE_SELF, &usage) < 0) {
      LOG_ERR(LS_ERROR) << "getrusage failed";
-@@ -358,7 +362,7 @@
+@@ -365,7 +370,7 @@
    const uint64 cpu_times =
        (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec +
        usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
 -#endif  // defined(LINUX) || defined(ANDROID)
 +#endif  // defined(LINUX) || defined(ANDROID) || defined(BSD)
-   process_.prev_load_time_ = timenow;
-   process_.prev_load_ = UpdateCpuLoad(total_times,
-                                      cpu_times,
+ 
+ #if defined(__native_client__)
+   // TODO(ryanpetrie): Implement this via PPAPI when it's available.

Copied: branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.cc (from r339940, head/www/chromium/files/patch-ui__events__event_switches.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-ui__events__event_switches.cc)
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.cc.orig	2014-01-13 11:38:50.000000000 +0100
++++ ui/events/event_switches.cc	2014-01-13 11:38:26.000000000 +0100
+@@ -20,7 +20,7 @@
+ //   disabled: touch events are disabled.
+ const char kTouchEventsDisabled[] = "disabled";
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // Tells chrome to interpret events from these devices as touch events. Only
+ // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
+ // devices can be retrieved from 'xinput list'.

Copied: branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h (from r339940, head/www/chromium/files/patch-ui__events__event_switches.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-ui__events__event_switches.h)
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.h.orig	2014-01-07 21:02:04.000000000 +0100
++++ ui/events/event_switches.h	2014-01-13 11:38:59.000000000 +0100
+@@ -16,7 +16,7 @@
+ EVENTS_EXPORT extern const char kTouchEventsEnabled[];
+ EVENTS_EXPORT extern const char kTouchEventsDisabled[];
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ EVENTS_EXPORT extern const char kTouchDevices[];
+ #endif
+ 

Copied: branches/2014Q1/www/chromium/files/patch-v8__src__checks.cc (from r339940, head/www/chromium/files/patch-v8__src__checks.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/www/chromium/files/patch-v8__src__checks.cc	Thu Jan 16 21:12:53 2014	(r339991, copy of r339940, head/www/chromium/files/patch-v8__src__checks.cc)
@@ -0,0 +1,10 @@
+--- v8/src/checks.cc.orig	2014-01-07 21:03:55.000000000 +0100
++++ v8/src/checks.cc	2014-01-11 01:09:31.000000000 +0100
+@@ -32,6 +32,7 @@
+ # include <execinfo.h>
+ #endif  // V8_LIBC_GLIBC || V8_OS_BSD
+ #include <stdio.h>
++#include <unistd.h> // size_t
+ 
+ #include "platform.h"
+ #include "v8.h"

Modified: branches/2014Q1/www/chromium/pkg-plist
==============================================================================
--- branches/2014Q1/www/chromium/pkg-plist	Thu Jan 16 21:05:13 2014	(r339990)
+++ branches/2014Q1/www/chromium/pkg-plist	Thu Jan 16 21:12:53 2014	(r339991)
@@ -81,6 +81,7 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DATADIR%%/resources/inspector/elementsPanel.css
 %%DATADIR%%/resources/inspector/ElementsPanel.js
+%%DATADIR%%/resources/inspector/filter.css
 %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css
 %%DATADIR%%/resources/inspector/heapProfiler.css
 %%DATADIR%%/resources/inspector/HeapSnapshotWorker.js
@@ -148,12 +149,6 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/Images/searchSmallBrightBlue.png
 %%DATADIR%%/resources/inspector/Images/searchSmallGray.png
 %%DATADIR%%/resources/inspector/Images/searchSmallWhite.png
-%%DATADIR%%/resources/inspector/Images/segment.png
-%%DATADIR%%/resources/inspector/Images/segmentEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentHover.png
-%%DATADIR%%/resources/inspector/Images/segmentHoverEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentSelected.png
-%%DATADIR%%/resources/inspector/Images/segmentSelectedEnd.png
 %%DATADIR%%/resources/inspector/Images/sessionStorage.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png
@@ -197,6 +192,7 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/networkLogView.css
 %%DATADIR%%/resources/inspector/networkPanel.css
 %%DATADIR%%/resources/inspector/NetworkPanel.js
+%%DATADIR%%/resources/inspector/overrides.css
 %%DATADIR%%/resources/inspector/panelEnablerView.css
 %%DATADIR%%/resources/inspector/profilesPanel.css
 %%DATADIR%%/resources/inspector/ProfilesPanel.js
@@ -208,9 +204,9 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/screencastView.css
 %%DATADIR%%/resources/inspector/sourcesPanel.css
 %%DATADIR%%/resources/inspector/SourcesPanel.js
+%%DATADIR%%/resources/inspector/sourcesView.css
 %%DATADIR%%/resources/inspector/spectrum.css
 %%DATADIR%%/resources/inspector/splitView.css
-%%DATADIR%%/resources/inspector/tabbedPane.css
 %%DATADIR%%/resources/inspector/textPrompt.css
 %%DATADIR%%/resources/inspector/timelinePanel.css
 %%DATADIR%%/resources/inspector/TimelinePanel.js

From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 17 15:40:11 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7DF82DCC;
 Fri, 17 Jan 2014 15:40:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 68C441EF7;
 Fri, 17 Jan 2014 15:40:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HFeBLh043565;
 Fri, 17 Jan 2014 15:40:11 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HFeBgc043562;
 Fri, 17 Jan 2014 15:40:11 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201401171540.s0HFeBgc043562@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Fri, 17 Jan 2014 15:40:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340057 - branches/2014Q1/security/vuxml
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 15:40:11 -0000

Author: decke
Date: Fri Jan 17 15:40:10 2014
New Revision: 340057
URL: http://svnweb.freebsd.org/changeset/ports/340057
QAT: https://qat.redports.org/buildarchive/r340057/

Log:
  MFH: r339929
  
  Document virtualbox-ose vulnerabilities
  
  Security:	CVE-2013-5892

Modified:
  branches/2014Q1/security/vuxml/vuln.xml
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/vuxml/vuln.xml
==============================================================================
--- branches/2014Q1/security/vuxml/vuln.xml	Fri Jan 17 15:37:33 2014	(r340056)
+++ branches/2014Q1/security/vuxml/vuln.xml	Fri Jan 17 15:40:10 2014	(r340057)
@@ -51,6 +51,36 @@ Note:  Please add new entries to the beg
 
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+  <vuln vid="81f1fdc2-7ec7-11e3-a6c6-00163e1ed244">
+    <topic>virtualbox-ose -- local vulnerability</topic>
+    <affects>
+      <package>
+	<name>virtualbox-ose</name>
+	<range><lt>4.2.22</lt></range>
+      </package>
+    </affects>
+    <description>
+      <body xmlns="http://www.w3.org/1999/xhtml">
+	<p>Oracle reports:</p>
+	<blockquote cite="http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html">
+	  <p>Unspecified vulnerability in the Oracle VM VirtualBox
+	   component in Oracle Virtualization VirtualBox prior to
+	   3.2.20, 4.0.22, 4.1.30, 4.2.22, and 4.3.6 allows local
+	   users to affect confidentiality, integrity, and availability
+	   via unknown vectors related to Core.</p>
+	</blockquote>
+      </body>
+    </description>
+    <references>
+      <cvename>CVE-2013-5892</cvename>
+      <url>http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html</url>
+    </references>
+    <dates>
+      <discovery>2014-01-15</discovery>
+      <entry>2014-01-16</entry>
+    </dates>
+  </vuln>
+
   <vuln vid="5acf4638-7e2c-11e3-9fba-00262d5ed8ee">
     <topic>chromium -- multiple vulnerabilities</topic>
     <affects>

From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 17 15:43:03 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 36F2FF0D;
 Fri, 17 Jan 2014 15:43:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 200E61F70;
 Fri, 17 Jan 2014 15:43:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HFh2i0046756;
 Fri, 17 Jan 2014 15:43:02 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HFh19w046745;
 Fri, 17 Jan 2014 15:43:01 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201401171543.s0HFh19w046745@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Fri, 17 Jan 2014 15:43:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340058 - in branches/2014Q1/emulators: virtualbox-ose
 virtualbox-ose-additions virtualbox-ose-additions/files virtualbox-ose-kmod
 virtualbox-ose-kmod/files virtualbox-ose/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 15:43:03 -0000

Author: decke
Date: Fri Jan 17 15:43:01 2014
New Revision: 340058
URL: http://svnweb.freebsd.org/changeset/ports/340058
QAT: https://qat.redports.org/buildarchive/r340058/

Log:
  MFH: r339930
  
  - Update to 4.2.22
  - Remove 3D crOpenGl patches that are already included in the new release
  - Convert USE_PYDISTUTILS=easy_install to USE_PYDISTUTILS=yes
  - Add patch to fix building with new gsoap [1]
  - Add direct dependency on qt4-opengl [2]
  
  PR:		ports/185579 [2]
  Security:	CVE-2013-5892
  Submitted by:	Jung-uk Kim <jkim@FreeBSD.org> [1]
  		Jimmy Olgeni <olgeni@FreeBSD.org> [2]

Added:
  branches/2014Q1/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
     - copied unchanged from r339930, head/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
Deleted:
  branches/2014Q1/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
  branches/2014Q1/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-fakedri_drv.c
Modified:
  branches/2014Q1/emulators/virtualbox-ose-additions/Makefile
  branches/2014Q1/emulators/virtualbox-ose-additions/distinfo
  branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile
  branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo
  branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
  branches/2014Q1/emulators/virtualbox-ose/Makefile
  branches/2014Q1/emulators/virtualbox-ose/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-additions/Makefile	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose-additions/Makefile	Fri Jan 17 15:43:01 2014	(r340058)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \

Modified: branches/2014Q1/emulators/virtualbox-ose-additions/distinfo
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-additions/distinfo	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose-additions/distinfo	Fri Jan 17 15:43:01 2014	(r340058)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185

Modified: branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose-kmod/Makefile	Fri Jan 17 15:43:01 2014	(r340058)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \

Modified: branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose-kmod/distinfo	Fri Jan 17 15:43:01 2014	(r340058)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185

Modified: branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose-kmod/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile	Fri Jan 17 15:43:01 2014	(r340058)
@@ -5,7 +5,7 @@
  KMOD = vboxdrv
  
 -CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS
-+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DEBUG
++CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DDEBUG
  
  .if (${MACHINE_ARCH} == "i386")
   CFLAGS += -DRT_ARCH_X86

Modified: branches/2014Q1/emulators/virtualbox-ose/Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose/Makefile	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose/Makefile	Fri Jan 17 15:43:01 2014	(r340058)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
-PORTREVISION=	2
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -39,7 +38,7 @@ USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
 USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	vboxapi
 PYDISTUTILS_PKGVERSION=	1.0
 PYDISTUTILS_NOEGGINFO=	yes
@@ -125,7 +124,7 @@ CONFIGURE_ARGS+=--build-headless
 
 .if ${PORT_OPTIONS:MQT4}
 QT_NONSTANDARD=	yes
-USE_QT4=	gui network moc_build uic_build rcc_build linguist
+USE_QT4=	gui network moc_build opengl uic_build rcc_build linguist
 INSTALLS_ICONS=	yes
 VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
 .else

Modified: branches/2014Q1/emulators/virtualbox-ose/distinfo
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose/distinfo	Fri Jan 17 15:40:10 2014	(r340057)
+++ branches/2014Q1/emulators/virtualbox-ose/distinfo	Fri Jan 17 15:43:01 2014	(r340058)
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
-SHA256 (VBoxGuestAdditions_4.2.20.iso) = 2fb3aa0f370d503b0e77725dbec76b989a251f613abee378f53c1fed9d6edf01
-SIZE (VBoxGuestAdditions_4.2.20.iso) = 59664384
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VBoxGuestAdditions_4.2.22.iso) = 222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76
+SIZE (VBoxGuestAdditions_4.2.22.iso) = 59686912

Copied: branches/2014Q1/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk (from r339930, head/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk	Fri Jan 17 15:43:01 2014	(r340058, copy of r339930, head/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk)
@@ -0,0 +1,42 @@
+Ticket #11803: Fails to build with gSOAP 2.8.13
+https://www.virtualbox.org/ticket/11803
+
+--- src/VBox/Main/webservice/Makefile.kmk.orig	2013-12-18 11:10:26.000000000 -0500
++++ src/VBox/Main/webservice/Makefile.kmk	2014-01-09 15:56:26.000000000 -0500
+@@ -159,7 +159,6 @@
+ RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
+ 
+ PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml
+-PATH_TARGET_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
+ PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
+ PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
+ 
+@@ -512,8 +511,6 @@
+ 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
+ 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
+ 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
+-	$(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
+-	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
+ 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
+ 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
+ 
+@@ -690,17 +687,14 @@
+ # want to use wildcard (all commands are expaned when the rule is evaluated).
+ $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
+ 	$(RM) -f $@
+-	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
++	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
+ ifdef VBOX_GSOAP_VERBOSE
+ 	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml) $(PATH_TARGET_SOAPDEMOXML)
+ endif
+-	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapvbox*.h) $(PATH_TARGET_SOAPDEMOHEADERS)
+ 	$(MV) -f $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)
+ 	$(APPEND) $@ done
+ 
+-$(PATH_TARGET_SOAPDEMONSMAPS) \
+-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
+-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
++$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
+ 
+ # soapcpp2 -2: generate SOAP 1.2 calls
+ # soapcpp2 -S: server-side code only

From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 17 15:44:05 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 080D7FF3;
 Fri, 17 Jan 2014 15:44:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC8971F7C;
 Fri, 17 Jan 2014 15:44:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HFi4ax047148;
 Fri, 17 Jan 2014 15:44:04 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HFi3L4047141;
 Fri, 17 Jan 2014 15:44:03 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201401171544.s0HFi3L4047141@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Fri, 17 Jan 2014 15:44:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340059 - in branches/2014Q1/emulators:
 virtualbox-ose-kmod-legacy virtualbox-ose-kmod-legacy/files
 virtualbox-ose-legacy virtualbox-ose-legacy/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 15:44:05 -0000

Author: decke
Date: Fri Jan 17 15:44:03 2014
New Revision: 340059
URL: http://svnweb.freebsd.org/changeset/ports/340059
QAT: https://qat.redports.org/buildarchive/r340059/

Log:
  MFH: r339932
  
  - Update to 4.2.22
  - Convert USE_PYDISTUTILS=easy_install to USE_PYDISTUTILS=yes
  - Add patch to fix building with new gsoap [1]
  - Add direct dependency on qt4-opengl [2]
  
  PR:		ports/185579 [2]
  Security:	CVE-2013-5892
  Submitted by:	Jung-uk Kim <jkim@FreeBSD.org> [1]
  		Jimmy Olgeni <olgeni@FreeBSD.org> [2]

Added:
  branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-Makefile.kmk
     - copied unchanged from r339932, head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-Makefile.kmk
Modified:
  branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/Makefile
  branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/distinfo
  branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
  branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile
  branches/2014Q1/emulators/virtualbox-ose-legacy/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/Makefile	Fri Jan 17 15:43:01 2014	(r340058)
+++ branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/Makefile	Fri Jan 17 15:44:03 2014	(r340059)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \

Modified: branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/distinfo
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/distinfo	Fri Jan 17 15:43:01 2014	(r340058)
+++ branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/distinfo	Fri Jan 17 15:44:03 2014	(r340059)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185

Modified: branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile	Fri Jan 17 15:43:01 2014	(r340058)
+++ branches/2014Q1/emulators/virtualbox-ose-kmod-legacy/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile	Fri Jan 17 15:44:03 2014	(r340059)
@@ -5,7 +5,7 @@
  KMOD = vboxdrv
  
 -CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS
-+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DEBUG
++CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DDEBUG
  
  .if (${MACHINE_ARCH} == "i386")
   CFLAGS += -DRT_ARCH_X86

Modified: branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile	Fri Jan 17 15:43:01 2014	(r340058)
+++ branches/2014Q1/emulators/virtualbox-ose-legacy/Makefile	Fri Jan 17 15:44:03 2014	(r340059)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.20
-PORTREVISION=	1
+DISTVERSION=	4.2.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -40,7 +39,7 @@ USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
 USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	vboxapi
 PYDISTUTILS_PKGVERSION=	1.0
 PYDISTUTILS_NOEGGINFO=	yes
@@ -126,7 +125,7 @@ CONFIGURE_ARGS+=--build-headless
 
 .if ${PORT_OPTIONS:MQT4}
 QT_NONSTANDARD=	yes
-USE_QT4=	gui network moc_build uic_build rcc_build linguist
+USE_QT4=	gui network moc_build opengl uic_build rcc_build linguist
 INSTALLS_ICONS=	yes
 VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
 .else

Modified: branches/2014Q1/emulators/virtualbox-ose-legacy/distinfo
==============================================================================
--- branches/2014Q1/emulators/virtualbox-ose-legacy/distinfo	Fri Jan 17 15:43:01 2014	(r340058)
+++ branches/2014Q1/emulators/virtualbox-ose-legacy/distinfo	Fri Jan 17 15:44:03 2014	(r340059)
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.2.20.tar.bz2) = 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61
-SIZE (VirtualBox-4.2.20.tar.bz2) = 77050211
-SHA256 (VBoxGuestAdditions_4.2.20.iso) = 2fb3aa0f370d503b0e77725dbec76b989a251f613abee378f53c1fed9d6edf01
-SIZE (VBoxGuestAdditions_4.2.20.iso) = 59664384
+SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
+SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VBoxGuestAdditions_4.2.22.iso) = 222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76
+SIZE (VBoxGuestAdditions_4.2.22.iso) = 59686912

Copied: branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-Makefile.kmk (from r339932, head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-Makefile.kmk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-Makefile.kmk	Fri Jan 17 15:44:03 2014	(r340059, copy of r339932, head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-webservice-Makefile.kmk)
@@ -0,0 +1,42 @@
+Ticket #11803: Fails to build with gSOAP 2.8.13
+https://www.virtualbox.org/ticket/11803
+
+--- src/VBox/Main/webservice/Makefile.kmk.orig	2013-12-18 11:10:26.000000000 -0500
++++ src/VBox/Main/webservice/Makefile.kmk	2014-01-09 15:56:26.000000000 -0500
+@@ -159,7 +159,6 @@
+ RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
+ 
+ PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml
+-PATH_TARGET_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
+ PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
+ PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
+ 
+@@ -512,8 +511,6 @@
+ 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
+ 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
+ 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
+-	$(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
+-	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
+ 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
+ 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
+ 
+@@ -690,17 +687,14 @@
+ # want to use wildcard (all commands are expaned when the rule is evaluated).
+ $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
+ 	$(RM) -f $@
+-	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
++	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
+ ifdef VBOX_GSOAP_VERBOSE
+ 	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml) $(PATH_TARGET_SOAPDEMOXML)
+ endif
+-	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapvbox*.h) $(PATH_TARGET_SOAPDEMOHEADERS)
+ 	$(MV) -f $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)
+ 	$(APPEND) $@ done
+ 
+-$(PATH_TARGET_SOAPDEMONSMAPS) \
+-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
+-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
++$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
+ 
+ # soapcpp2 -2: generate SOAP 1.2 calls
+ # soapcpp2 -S: server-side code only

From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 17 18:39:31 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E0E9C542;
 Fri, 17 Jan 2014 18:39:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCBC11E94;
 Fri, 17 Jan 2014 18:39:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HIdVW3019322;
 Fri, 17 Jan 2014 18:39:31 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HIdVag019321;
 Fri, 17 Jan 2014 18:39:31 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201401171839.s0HIdVag019321@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Fri, 17 Jan 2014 18:39:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340094 - in branches/2014Q1/net-im/gloox: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 18:39:32 -0000

Author: madpilot
Date: Fri Jan 17 18:39:31 2014
New Revision: 340094
URL: http://svnweb.freebsd.org/changeset/ports/340094
QAT: https://qat.redports.org/buildarchive/r340094/

Log:
  MFH: r340030
  
  - Fix build on head/10
  - Support staging
  - Use new LIB_DEPENDS format
  - Unsilence post-install commands
  
  Approved by:	portmgr (antoine)

Added:
  branches/2014Q1/net-im/gloox/files/
     - copied from r340030, head/net-im/gloox/files/
Modified:
  branches/2014Q1/net-im/gloox/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net-im/gloox/Makefile
==============================================================================
--- branches/2014Q1/net-im/gloox/Makefile	Fri Jan 17 18:21:42 2014	(r340093)
+++ branches/2014Q1/net-im/gloox/Makefile	Fri Jan 17 18:39:31 2014	(r340094)
@@ -10,8 +10,8 @@ MASTER_SITES=	http://camaya.net/download
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber/XMPP client library
 
-LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn \
-		gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
+		libgnutls.so:${PORTSDIR}/security/gnutls
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
@@ -21,13 +21,13 @@ CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/in
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|' ${WRKSRC}/configure
+
 post-install:
-	@${FIND} ${PREFIX}/include/gloox ! -type d | \
-		${SED} "s,${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/include/gloox -type d | ${SORT} -r | \
-		${SED} "s,${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${PREFIX}/include/gloox ! -type d | \
+		${SED} "s,${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${PREFIX}/include/gloox -type d | ${SORT} -r | \
+		${SED} "s,${STAGEDIR}${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>

From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 17 21:55:19 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4623C17E;
 Fri, 17 Jan 2014 21:55:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1786C1F31;
 Fri, 17 Jan 2014 21:55:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HLtIgo001686;
 Fri, 17 Jan 2014 21:55:18 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HLtIdW001684;
 Fri, 17 Jan 2014 21:55:18 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201401172155.s0HLtIdW001684@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri, 17 Jan 2014 21:55:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340123 - in
 branches/2014Q1/textproc/p5-SGML-Parser-OpenSP: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 21:55:19 -0000

Author: rakuco
Date: Fri Jan 17 21:55:18 2014
New Revision: 340123
URL: http://svnweb.freebsd.org/changeset/ports/340123
QAT: https://qat.redports.org/buildarchive/r340123/

Log:
  MFH: r340100
  
  - Fix the build when GCC is not present. [1]
  - Set LICENSE.
  - USE_DOS2UNIX -> USES=dos2unix
  
  PR:		ports/183267 [1]
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
  Approved by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
  Approved by:	portmgr (erwin, antoine)

Modified:
  branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/Makefile
  branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/Makefile
==============================================================================
--- branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/Makefile	Fri Jan 17 21:53:13 2014	(r340122)
+++ branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/Makefile	Fri Jan 17 21:55:18 2014	(r340123)
@@ -11,13 +11,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Parse SGML documents using OpenSP
 
+# The port's README says the port "is licensed under the same terms as Perl
+# itself".
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	onsgmls:${PORTSDIR}/textproc/opensp \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_DOS2UNIX=	yes
-USES=		perl5
+USES=		dos2unix perl5
 USE_PERL5=	configure
 CC=		${CXX}
 CONFIGURE_ARGS+="INC=-I${LOCALBASE}/include"

Modified: branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL
==============================================================================
--- branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL	Fri Jan 17 21:53:13 2014	(r340122)
+++ branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL	Fri Jan 17 21:55:18 2014	(r340123)
@@ -1,14 +1,17 @@
---- Makefile.PL.orig	2010-02-07 23:33:39.000000000 +0900
-+++ Makefile.PL	2010-02-07 23:34:03.000000000 +0900
-@@ -15,7 +15,7 @@
+--- Makefile.PL.orig	2013-10-24 16:00:49.000000000 +0900
++++ Makefile.PL	2013-10-24 16:08:32.000000000 +0900
+@@ -13,9 +13,9 @@
+ else
+ {
      # assume some compatible Linux
-     $options{LD}   = "g++";
-     $options{CC}   = "g++";
+-    $options{LD}   = "g++";
+-    $options{CC}   = "g++";
 -    $options{LIBS} = "-lstdc++ -losp";
++    $options{LD}   = "c++";
++    $options{CC}   = "c++";
 +    $options{LIBS} = "-L%%LOCALBASE%%/lib -lstdc++ -losp";
  }
- 
- WriteMakefile(
+  WriteMakefile(
 @@ -26,6 +26,10 @@
        Test::Exception => 0,
        File::Temp      => 0,

From owner-svn-ports-branches@FreeBSD.ORG  Fri Jan 17 21:56:54 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2C12F26B;
 Fri, 17 Jan 2014 21:56:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 16F0A1F3F;
 Fri, 17 Jan 2014 21:56:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HLurab001996;
 Fri, 17 Jan 2014 21:56:53 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HLurKr001995;
 Fri, 17 Jan 2014 21:56:53 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201401172156.s0HLurKr001995@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri, 17 Jan 2014 21:56:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340124 -
 branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jan 2014 21:56:54 -0000

Author: rakuco
Date: Fri Jan 17 21:56:53 2014
New Revision: 340124
URL: http://svnweb.freebsd.org/changeset/ports/340124
QAT: https://qat.redports.org/buildarchive/r340124/

Log:
  MFH: r340107
  
  Fix make patch after r340100
  
  Approved by:	portmgr (antoine)

Modified:
  branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL
==============================================================================
--- branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL	Fri Jan 17 21:55:18 2014	(r340123)
+++ branches/2014Q1/textproc/p5-SGML-Parser-OpenSP/files/patch-Makefile.PL	Fri Jan 17 21:56:53 2014	(r340124)
@@ -12,6 +12,7 @@
 +    $options{LIBS} = "-L%%LOCALBASE%%/lib -lstdc++ -losp";
  }
   WriteMakefile(
+
 @@ -26,6 +26,10 @@
        Test::Exception => 0,
        File::Temp      => 0,

From owner-svn-ports-branches@FreeBSD.ORG  Sat Jan 18 19:47:14 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6C464931;
 Sat, 18 Jan 2014 19:47:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3DC781A9D;
 Sat, 18 Jan 2014 19:47:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IJlEtj009986;
 Sat, 18 Jan 2014 19:47:14 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IJlDZS009984;
 Sat, 18 Jan 2014 19:47:13 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201401181947.s0IJlDZS009984@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 18 Jan 2014 19:47:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340209 - in branches/2014Q1/graphics/gts: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jan 2014 19:47:14 -0000

Author: rakuco
Date: Sat Jan 18 19:47:13 2014
New Revision: 340209
URL: http://svnweb.freebsd.org/changeset/ports/340209
QAT: https://qat.redports.org/buildarchive/r340209/

Log:
  MFH: r340194
  
  - Pass -lm when using gts' pkg-config file. [1]
    This is also done in the package's upstream darcs repository.
  - Support staging.
  - Set LICENSE.
  - Use the new OPTIONS/LIB_DEPENDS syntax.
  
  PR:		ports/185263 [1]
  Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com>
  Approved by:	Erik Greenwald <erik@elfga.com> (maintainer)
  Approved by:	portmgr (mat)

Added:
  branches/2014Q1/graphics/gts/files/patch-gts.pc.in
     - copied unchanged from r340194, head/graphics/gts/files/patch-gts.pc.in
Modified:
  branches/2014Q1/graphics/gts/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/graphics/gts/Makefile
==============================================================================
--- branches/2014Q1/graphics/gts/Makefile	Sat Jan 18 19:44:47 2014	(r340208)
+++ branches/2014Q1/graphics/gts/Makefile	Sat Jan 18 19:47:13 2014	(r340209)
@@ -3,34 +3,31 @@
 
 PORTNAME=	gts
 PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	GNU Triangulated Surface Library
 
+LICENSE=	LGPL20
+
 USES=		pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NETPBM
-NETPBM_DESC=	Build with libnetpbm support
+OPTIONS_SUB=	yes
+
+NETPBM_DESC=		Build with libnetpbm support
+NETPBM_LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNETPBM}
-LIB_DEPENDS+=	netpbm.1:${PORTSDIR}/graphics/netpbm
-PLIST_SUB=	NETPBM=""
-.else
-PLIST_SUB=	NETPBM="@comment "
-.endif
-
 post-extract:
 .if ! ${PORT_OPTIONS:MNETPBM}
 	@${REINPLACE_CMD} -e 's|netpbm="true"|netpbm="false"|' \

Copied: branches/2014Q1/graphics/gts/files/patch-gts.pc.in (from r340194, head/graphics/gts/files/patch-gts.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/graphics/gts/files/patch-gts.pc.in	Sat Jan 18 19:47:13 2014	(r340209, copy of r340194, head/graphics/gts/files/patch-gts.pc.in)
@@ -0,0 +1,10 @@
+--- ./gts.pc.in.orig	2005-01-19 04:48:19.000000000 +0000
++++ ./gts.pc.in	2013-12-29 08:54:18.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: GTS
+ Description: GNU Triangulated Surface Library
+ Version: @VERSION@
+ Requires: glib-2.0,gthread-2.0,gmodule-2.0
+-Libs: -L${libdir} @LIBS@ -lgts
++Libs: -L${libdir} @LIBS@ -lgts -lm
+ Cflags: -I${includedir}

From owner-svn-ports-branches@FreeBSD.ORG  Sat Jan 18 19:49:06 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 81A0DA22;
 Sat, 18 Jan 2014 19:49:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6CBAE1AB3;
 Sat, 18 Jan 2014 19:49:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IJn6Ko010305;
 Sat, 18 Jan 2014 19:49:06 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IJn6Z6010302;
 Sat, 18 Jan 2014 19:49:06 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201401181949.s0IJn6Z6010302@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 18 Jan 2014 19:49:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340210 - in branches/2014Q1/textproc/sigil: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jan 2014 19:49:06 -0000

Author: rakuco
Date: Sat Jan 18 19:49:05 2014
New Revision: 340210
URL: http://svnweb.freebsd.org/changeset/ports/340210
QAT: https://qat.redports.org/buildarchive/r340210/

Log:
  MFH: r340198
  
  - Allow the port to build with archivers/libzip installed.
    libzip installs /usr/local/include/zip.h, and -I/usr/local/include ended
    up being passed to the compiler before -I<path-to-internal-minizip-copy>,
    which caused problems. [1]
  
  While here, modernize the Makefile:
  - Move LICENSE to the appropriate place.
  - Remove USE_DOS2UNIX: the files it was supposed to fix are not DOS-encoded
    anymore.
  - Support staging.
  - Convert from manually calling update-desktop-database and
    USE_GNOME=desktopfileutils to USES=desktop-file-utils.
  
  PR:		ports/180350 [1]
  Approved by:	maintainer timeout (no activity since the original report 7 months ago)
  
  Approved by:	portmgr (mat)

Added:
  branches/2014Q1/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt
     - copied unchanged from r340198, head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt
Modified:
  branches/2014Q1/textproc/sigil/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/sigil/Makefile
==============================================================================
--- branches/2014Q1/textproc/sigil/Makefile	Sat Jan 18 19:47:13 2014	(r340209)
+++ branches/2014Q1/textproc/sigil/Makefile	Sat Jan 18 19:49:05 2014	(r340210)
@@ -11,25 +11,19 @@ DISTNAME=	Sigil-${PORTVERSION}-Code
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	WYSIWYG ePub editor
 
+LICENSE=	GPLv3
+
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-LICENSE=	GPLv3
-
 USE_ZIP=	yes
-USES=		cmake pkgconfig
-USE_DOS2UNIX=	CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp
+USES=		cmake desktop-file-utils pkgconfig
 NO_WRKSUBDIR=	yes
 USE_QT4=	qmake gui svg webkit xml moc uic rcc imageformats linguist
-USE_GNOME=	desktopfileutils
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt
 
-post-install:
-	@-update-desktop-database > /dev/null
-
 .include <bsd.port.mk>

Copied: branches/2014Q1/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt (from r340198, head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt	Sat Jan 18 19:49:05 2014	(r340210, copy of r340198, head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt)
@@ -0,0 +1,18 @@
+See ports/180350: if archivers/libzip is installed there's a conflict because
+/usr/local/include ends up being included before the minizip directory inside
+the port.
+--- src/Sigil/CMakeLists.txt.orig	2012-10-27 20:24:40.000000000 +0300
++++ src/Sigil/CMakeLists.txt	2014-01-18 19:08:50.000000000 +0200
+@@ -594,11 +594,11 @@
+                      ${HUNSPELL_INCLUDE_DIRS}
+                      ${PCRE_INCLUDE_DIRS}
+                      ${tidyLib_SOURCE_DIR}
+-                     ${MINIZIP_INCLUDE_DIRS}
+                      ${ZLIB_INCLUDE_DIRS}
+                      ${XERCESEXTENSIONS_INCLUDE_DIRS}
+                      ${XERCES_INCLUDE_DIRS}
+                      ${BOOST_INCLUDE_DIRS}
++                     ${MINIZIP_INCLUDE_DIRS}
+                      ${CMAKE_CURRENT_SOURCE_DIR}
+                      ${CMAKE_CURRENT_BINARY_DIR} )
+ 

From owner-svn-ports-branches@FreeBSD.ORG  Sat Jan 18 20:10:56 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3A565EA3;
 Sat, 18 Jan 2014 20:10:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 254B11CF2;
 Sat, 18 Jan 2014 20:10:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IKAujJ019120;
 Sat, 18 Jan 2014 20:10:56 GMT (envelope-from riggs@svn.freebsd.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IKAtpK019119;
 Sat, 18 Jan 2014 20:10:56 GMT (envelope-from riggs@svn.freebsd.org)
Message-Id: <201401182010.s0IKAtpK019119@svn.freebsd.org>
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sat, 18 Jan 2014 20:10:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340212 - branches/2014Q1/multimedia/transcode/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jan 2014 20:10:56 -0000

Author: riggs
Date: Sat Jan 18 20:10:55 2014
New Revision: 340212
URL: http://svnweb.freebsd.org/changeset/ports/340212
QAT: https://qat.redports.org/buildarchive/r340212/

Log:
  MFH: r339971
  
  Fix build problem (subtitler looks for freetype headers in the wrong dir)
  
  PR:		ports/185248
  Submitted by:	Kevin Oberman <rkoberman@gmail.com>
  Approved by:	portmgr (miwi)

Added:
  branches/2014Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c
     - copied unchanged from r339971, head/multimedia/transcode/files/patch-filter-subtitler-load_font.c
Modified:
Directory Properties:
  branches/2014Q1/   (props changed)

Copied: branches/2014Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c (from r339971, head/multimedia/transcode/files/patch-filter-subtitler-load_font.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/multimedia/transcode/files/patch-filter-subtitler-load_font.c	Sat Jan 18 20:10:55 2014	(r340212, copy of r339971, head/multimedia/transcode/files/patch-filter-subtitler-load_font.c)
@@ -0,0 +1,12 @@
+--- filter/subtitler/load_font.c.orig	2013-12-28 11:40:29.000000000 -0800
++++ filter/subtitler/load_font.c	2013-12-28 10:44:23.000000000 -0800
+@@ -48,7 +48,7 @@
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ 
+-#include <freetype/ftglyph.h>
++#include <freetype2/ftglyph.h>
+ 
+ /**
+  * @file bswap.h
+

From owner-svn-ports-branches@FreeBSD.ORG  Sat Jan 18 22:57:43 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 53A03691;
 Sat, 18 Jan 2014 22:57:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3423F182D;
 Sat, 18 Jan 2014 22:57:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0IMvhDB083364;
 Sat, 18 Jan 2014 22:57:43 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0IMvgCr083362;
 Sat, 18 Jan 2014 22:57:42 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <201401182257.s0IMvgCr083362@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 18 Jan 2014 22:57:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r340223 - in branches/2014Q1/net/netatalk3: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jan 2014 22:57:43 -0000

Author: marcus
Date: Sat Jan 18 22:57:42 2014
New Revision: 340223
URL: http://svnweb.freebsd.org/changeset/ports/340223
QAT: https://qat.redports.org/buildarchive/r340223/

Log:
  MFH: (r340219)
  
  Fix a segfault when Zeroconf is enabled with Timemachine.
  
  PR:		185862
  Submitted by:	jpaetzel
  Approved by:	portmgr

Added:
  branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c
     - copied unchanged from r340219, head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c
Modified:
  branches/2014Q1/net/netatalk3/Makefile

Modified: branches/2014Q1/net/netatalk3/Makefile
==============================================================================
--- branches/2014Q1/net/netatalk3/Makefile	Sat Jan 18 22:57:37 2014	(r340222)
+++ branches/2014Q1/net/netatalk3/Makefile	Sat Jan 18 22:57:42 2014	(r340223)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF

Copied: branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c (from r340219, head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c	Sat Jan 18 22:57:42 2014	(r340223, copy of r340219, head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c)
@@ -0,0 +1,34 @@
+--- etc/afpd/afp_mdns.c.orig	2013-10-28 06:43:13.000000000 -0700
++++ etc/afpd/afp_mdns.c	2014-01-17 22:10:59.000000000 -0800
+@@ -37,17 +37,15 @@
+  * Its easier to use asprintf to set the TXT record values
+  */
+ #define TXTRecordPrintf(rec, key, args, ...) {           \
+-        char *str;                                      \
+-        asprintf(&str, args);                           \
++        char str[1024];                                      \
++        sprintf(str, args);                           \
+         TXTRecordSetValue(rec, key, strlen(str), str);  \
+-        free(str);                                      \
+     }
+ #define TXTRecordKeyPrintf(rec, k, var, args, ...) {     \
+-        char *key, *str;                                \
+-        asprintf(&key, k, var);                         \
+-        asprintf(&str, args);                           \
++        char key[1024], str[1024];                                \
++        sprintf(key, k, var);                         \
++        sprintf(str, args);                           \
+         TXTRecordSetValue(rec, key, strlen(str), str);  \
+-        free(str); free(key);                           \
+     }
+ 
+ static struct pollfd *fds;
+@@ -134,7 +132,7 @@
+ 
+     /* Register our service, prepare the TXT record */
+     TXTRecordCreate(&txt_adisk, 0, NULL);
+-    TXTRecordPrintf(&txt_adisk, "sys", "waMa=0,adVF=0x100");
++    TXTRecordPrintf(&txt_adisk, "sys", "waMa=0,adVF=0x100", NULL);
+ 
+     /* Build AFP volumes list */
+     int i = 0;