*/*: sync with upstream

Taken from: FreeBSD
2016-03-15 07:37:34 +01:00 · 2016-03-15 07:37:34 +01:00 · 25297f7447
parent e38ff67f67
commit 25297f7447
253 changed files with 2645 additions and 3686 deletions
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	p7zip
-PORTVERSION=	15.09
+PORTVERSION=	15.14
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${DISTVERSION}_src_all
@ -35,7 +35,7 @@ post-patch:
 	       -e 's/ -s //' \
 	       -e 's/-D_LARGEFILE_SOURCE//' \
 	       -e 's/-D_FILE_OFFSET_BITS=64//' \
-	       ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine
+	       ${WRKSRC}/makefile.freebsd6+ > ${WRKSRC}/makefile.machine
 	${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \
 		${WRKSRC}/man1/*
 	${MV} ${WRKSRC}/README ${WRKSRC}/DOC/readme.unix
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@ -1,2 +1,2 @@
-SHA256 (p7zip_15.09_src_all.tar.bz2) = 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f
-SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
+SHA256 (p7zip_15.14_src_all.tar.bz2) = b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8
+SIZE (p7zip_15.14_src_all.tar.bz2) = 4147609
--- a/archivers/p7zip/files/patch-CVE-2015-1038
+++ b/archivers/p7zip/files/patch-CVE-2015-1038
@ -1,283 +0,0 @@
-Author: Ben Hutchings <ben@decadent.org.uk>
-Date: Tue, 19 May 2015 02:38:40 +0100
-Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038)
-Bug: http://sourceforge.net/p/p7zip/bugs/147/
-Bug-Debian: https://bugs.debian.org/774660
-
-Alexander Cherepanov discovered that 7zip is susceptible to a
-directory traversal vulnerability.  While extracting an archive, it
-will extract symlinks and then follow them if they are referenced in
-further entries.  This can be exploited by a rogue archive to write
-files outside the current directory.
-
-We have to create placeholder files (which we already do) and delay
-creating symlinks until the end of extraction.
-
-Due to the possibility of anti-items (deletions) in the archive, it is
-possible for placeholders to be deleted and replaced before we create
-the symlinks.  It's not clear that this can be used for mischief, but
-GNU tar guards against similar problems by checking that the placeholder
-still exists and is the same inode.  XXX It also checks 'birth time' but
-this isn't portable.  We can probably get away with comparing ctime
-since we don't support hard links.
-
--- CPP/7zip/UI/Agent/Agent.cpp.orig	2015-09-17 19:02:35 UTC
-+++ CPP/7zip/UI/Agent/Agent.cpp
-@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const
-   HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
-       realIndices.Size(), testMode, extractCallback);
-   if (result == S_OK)
-    result = extractCallbackSpec->SetDirsTimes();
-+    result = extractCallbackSpec->SetFinalAttribs();
-   return result;
-   COM_TRY_END
- }
--- CPP/7zip/UI/Client7z/Client7z.cpp.orig	2015-10-17 14:52:30 UTC
-+++ CPP/7zip/UI/Client7z/Client7z.cpp
-@@ -230,8 +230,11 @@ private:
-   COutFileStream *_outFileStreamSpec;
-   CMyComPtr<ISequentialOutStream> _outFileStream;
- 
-+  CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
-+
- public:
-   void Init(IInArchive *archiveHandler, const FString &directoryPath);
-+  HRESULT SetFinalAttribs();
- 
-   UInt64 NumErrors;
-   bool PasswordIsDefined;
-@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
-   }
-   _outFileStream.Release();
-   if (_extractMode && _processedFileInfo.AttribDefined)
-    SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
-+    SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks);
-   PrintNewLine();
-   return S_OK;
- }
- 
-+HRESULT CArchiveExtractCallback::SetFinalAttribs()
-+{
-+  HRESULT result = S_OK;
-+
-+  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
-+    if (!_delayedSymLinks[i].Create())
-+      result = E_FAIL;
-+
-+  _delayedSymLinks.Clear();
-+
-+  return result;
-+}
- 
- STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
- {
-@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha
-       // extractCallbackSpec->PasswordIsDefined = true;
-       // extractCallbackSpec->Password = L"1";
-       HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);
-+      if (result == S_OK)
-+	result = extractCallbackSpec->SetFinalAttribs();
-       if (result != S_OK)
-       {
-         PrintError("Extract Error");
--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig	2015-10-03 08:49:15 UTC
-+++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
-@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se
-     NumFiles++;
- 
-   if (!_stdOutMode && _extractMode && _fi.AttribDefined)
-    SetFileAttrib(_diskFilePath, _fi.Attrib);
-+    SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
-   
-   RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));
-   
-@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha
-   }
- }
- 
-HRESULT CArchiveExtractCallback::SetDirsTimes()
-+HRESULT CArchiveExtractCallback::SetFinalAttribs()
- {
-+  HRESULT result = S_OK;
-   CRecordVector<CExtrRefSortPair> pairs;
-   pairs.ClearAndSetSize(_extractedFolderPaths.Size());
-   unsigned i;
-@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs
-       (WriteATime && ATimeDefined) ? &ATime : NULL,
-       (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
-   }
-  return S_OK;
-+
-+  for (int i = 0; i != _delayedSymLinks.Size(); ++i)
-+    if (!_delayedSymLinks[i].Create())
-+      result = E_FAIL;
-+
-+  _delayedSymLinks.Clear();
-+
-+  return result;
- }
--- CPP/7zip/UI/Common/ArchiveExtractCallback.h.orig	2015-10-03 10:29:09 UTC
-+++ CPP/7zip/UI/Common/ArchiveExtractCallback.h
-@@ -6,6 +6,8 @@
- #include "../../../Common/MyCom.h"
- #include "../../../Common/Wildcard.h"
- 
-+#include "../../../Windows/FileDir.h"
-+
- #include "../../IPassword.h"
- 
- #include "../../Common/FileStreams.h"
-@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
-   bool _saclEnabled;
-   #endif
- 
-+  CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
-+
-   void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
-   HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
-   HRESULT GetUnpackSize();
-@@ -330,7 +334,7 @@ public:
-   }
-   #endif
- 
-  HRESULT SetDirsTimes();
-+  HRESULT SetFinalAttribs();
- };
- 
- bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
--- CPP/7zip/UI/Common/Extract.cpp.orig	2015-09-07 19:47:32 UTC
-+++ CPP/7zip/UI/Common/Extract.cpp
-@@ -207,7 +207,7 @@ static HRESULT DecompressArchive(
-   else
-     result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
-   if (result == S_OK && !options.StdInMode)
-    result = ecs->SetDirsTimes();
-+    result = ecs->SetFinalAttribs();
-   return callback->ExtractResult(result);
- }
- 
--- CPP/Windows/FileDir.cpp.orig	2015-10-10 12:37:41 UTC
-+++ CPP/Windows/FileDir.cpp
-@@ -347,7 +347,8 @@ static int convert_to_symlink(const char
-   return -1;
- }
- 
-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes)
-+bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes,
-+		   CObjectVector<CDelayedSymLink> *delayedSymLinks)
- {
-   if (!fileName) {
-     SetLastError(ERROR_PATH_NOT_FOUND);
-@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD
-      stat_info.st_mode = fileAttributes >> 16;
- #ifdef ENV_HAVE_LSTAT
-      if (S_ISLNK(stat_info.st_mode)) {
-        if ( convert_to_symlink(name) != 0) {
-+        if (delayedSymLinks)
-+          delayedSymLinks->Add(CDelayedSymLink(name));
-+        else if ( convert_to_symlink(name) != 0) {
-           TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
-           return false;
-         }
-@@ -814,6 +817,43 @@ bool CTempDir::Remove()
-   return !_mustBeDeleted;
- }
- 
-+#ifdef ENV_UNIX
-+
-+CDelayedSymLink::CDelayedSymLink(const char * source)
-+  : _source(source)
-+{
-+  struct stat st;
-+
-+  if (lstat(_source, &st) == 0) {
-+    _dev = st.st_dev;
-+    _ino = st.st_ino;
-+  } else {
-+    _dev = 0;
-+  }
-+}
-+
-+bool CDelayedSymLink::Create()
-+{
-+  struct stat st;
-+
-+  if (_dev == 0) {
-+    errno = EPERM;
-+    return false;
-+  }
-+  if (lstat(_source, &st) != 0)
-+    return false;
-+  if (_dev != st.st_dev || _ino != st.st_ino) {
-+    // Placeholder file has been overwritten or moved by another
-+    // symbolic link creation
-+    errno = EPERM;
-+    return false;
-+  }
-+
-+  return convert_to_symlink(_source) == 0;
-+}
-+
-+#endif // ENV_UNIX
-+
- }}}
- 
- #ifndef _SFX
--- CPP/Windows/FileDir.h.orig	2015-06-19 10:52:06 UTC
-+++ CPP/Windows/FileDir.h
-@@ -4,6 +4,7 @@
- #define __WINDOWS_FILE_DIR_H
- 
- #include "../Common/MyString.h"
-+#include "../Common/MyVector.h"
- 
- #include "FileIO.h"
- 
-@@ -11,11 +12,14 @@ namespace NWindows {
- namespace NFile {
- namespace NDir {
- 
-+class CDelayedSymLink;
-+
- bool GetWindowsDir(FString &path);
- bool GetSystemDir(FString &path);
- 
- bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime);
-bool SetFileAttrib(CFSTR path, DWORD attrib);
-+bool SetFileAttrib(CFSTR path, DWORD attrib,
-+		   CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
- bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
- 
- #ifndef UNDER_CE
-@@ -76,6 +80,31 @@ public:
-   bool Remove();
- };
- 
-+// Symbolic links must be created last so that they can't be used to
-+// create or overwrite files above the extraction directory.
-+class CDelayedSymLink
-+{
-+#ifdef ENV_UNIX
-+  // Where the symlink should be created.  The target is specified in
-+  // the placeholder file.
-+  AString _source;
-+
-+  // Device and inode of the placeholder file.  Before creating the
-+  // symlink, we must check that these haven't been changed by creation
-+  // of another symlink.
-+  dev_t _dev;
-+  ino_t _ino;
-+
-+public:
-+  explicit CDelayedSymLink(const char * source);
-+  bool Create();
-+#else // !ENV_UNIX
-+public:
-+  CDelayedSymLink(const char * source) {}
-+  bool Create() { return true; }
-+#endif // ENV_UNIX
-+};
-+
- #if !defined(UNDER_CE)
- class CCurrentDirRestorer
- {
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@ -2,9 +2,9 @@
 # $FreeBSD$

 PORTNAME=	soundconverter
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.6
 CATEGORIES=	audio python
-MASTER_SITES=	https://launchpad.net/soundconverter/trunk/2.1.5/+download/ \
+MASTER_SITES=	https://launchpad.net/soundconverter/trunk/2.1.6/+download/ \
 		http://BSDforge.com/projects/source/audio/soundconverter/

 MAINTAINER=	portmaster@BSDforge.com
--- a/audio/soundconverter/distinfo
+++ b/audio/soundconverter/distinfo
@ -1,2 +1,2 @@
-SHA256 (soundconverter-2.1.5.tar.xz) = cace2109b967744325e4ce8938d286b78b86f0615d4f145966f42decc7a74e06
-SIZE (soundconverter-2.1.5.tar.xz) = 195380
+SHA256 (soundconverter-2.1.6.tar.xz) = 2ffb6718d8e43a67be4d99e5a9c7b5cd82fce15d30b4861608b7d1666884a690
+SIZE (soundconverter-2.1.6.tar.xz) = 195864
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	fio
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://brick.kernel.dk/snaps/

--- a/benchmarks/fio/distinfo
+++ b/benchmarks/fio/distinfo
@ -1,2 +1,2 @@
-SHA256 (fio-2.6.tar.bz2) = b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0
-SIZE (fio-2.6.tar.bz2) = 509685
+SHA256 (fio-2.7.tar.bz2) = 4a76b6edb4dd50181d79c713e9d3f2753f165d6b1b582ce92e8eb707a5de0896
+SIZE (fio-2.7.tar.bz2) = 513729
--- a/benchmarks/fio/pkg-plist
+++ b/benchmarks/fio/pkg-plist
@ -16,6 +16,7 @@ man/man1/fio_generate_plots.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fusion-aw-sync.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gfapi.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iometer-file-access-server.fio
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jesd219.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/latency-profile.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libhdfs.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mtd.fio
@ -24,6 +25,7 @@ man/man1/fio_generate_plots.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/null.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/numa.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/poisson-rate-submission.fio
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rand-zones.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rbd.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rdmaio-client.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rdmaio-server.fio
--- a/biology/seqtools/Makefile
+++ b/biology/seqtools/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	seqtools
-PORTVERSION=	4.40.0
+PORTVERSION=	4.41.1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.sanger.ac.uk/pub4/resources/software/seqtools/PRODUCTION/

@ -13,7 +13,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3

-USES=		execinfo pkgconfig
+USES=		execinfo libtool pkgconfig
 GNU_CONFIGURE=	yes
 USE_GCC=	any
 USE_GNOME=	gtk20
--- a/biology/seqtools/distinfo
+++ b/biology/seqtools/distinfo
@ -1,2 +1,2 @@
-SHA256 (seqtools-4.40.0.tar.gz) = ccffe22309174fc6b2d93e77ebd503bff21427fdbc92fd6a361264f0ac6f2cab
-SIZE (seqtools-4.40.0.tar.gz) = 5608178
+SHA256 (seqtools-4.41.1.tar.gz) = a11168bc1f9176081dba7021fd98c8b6eb1e05806d9b5b7809303c0b067aed4d
+SIZE (seqtools-4.41.1.tar.gz) = 5906920
--- a/biology/seqtools/pkg-plist
+++ b/biology/seqtools/pkg-plist
@ -3,7 +3,9 @@ bin/blixem
 bin/blixemh
 bin/dotter
 include/gbtools/gbtools.hpp
+include/gbtools/gbtoolsCurl.hpp
 include/gbtools/gbtoolsGUI.hpp
+include/gbtools/gbtoolsPfetch.hpp
 include/gbtools/gbtoolsUtils.hpp
 lib/libgbtools.a
 %%PORTDOCS%%%%DOCSDIR%%/Belvu_manual.pdf
--- a/comms/Makefile
+++ b/comms/Makefile
@ -142,6 +142,7 @@
    SUBDIR += py-serial
    SUBDIR += pyla
    SUBDIR += qico
+    SUBDIR += qpage
    SUBDIR += qrq
    SUBDIR += qsstv
    SUBDIR += qt5-connectivity
--- a/comms/cdr_read/Makefile
+++ b/comms/cdr_read/Makefile
@ -11,6 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility for reading of the call detail records from PBX

 BROKEN=		unfetchable
+DEPRECATED=	unfetchable
+EXPIRATION_DATE=2016-04-14

 LICENSE=	UNKNOWN
 LICENSE_NAME=	unknown
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@ -0,0 +1,74 @@
+# Created by: joes@seaport.net
+# $FreeBSD$
+
+PORTNAME=	qpage
+PORTVERSION=	3.3
+PORTREVISION=	8
+CATEGORIES=	comms
+MASTER_SITES=	http://www.qpage.org/download/
+MASTER_SITES=	http://tomiii.com/qpage/qpage.org/download/
+
+MAINTAINER=	rand@iteris.com
+COMMENT=	SNPP client/server for sending messages to an alphanumeric pager
+
+USES=tar:Z
+USE_RC_SUBR=	qpage
+GNU_CONFIGURE=	yes
+
+OPTIONS_DEFINE=	IDENT_PATCH
+IDENT_PATCH_DESC=	Disable libwrap ident lookups
+
+IDENT_PATCH_EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c
+
+.if !defined(WITH_QPAGE_SYSLOG_FACILITY) || !defined(WITH_QPAGE_USER)
+.if !defined(WITH_QPAGE_SYSLOG_FACILITY) && !defined(WITH_QPAGE_USER)
+_QPAGE_MSG=	You may set the following configuration options:
+.else
+_QPAGE_MSG=	The following additional configuration options are available:
+.endif
+.if !defined(WITH_QPAGE_SYSLOG_FACILITY)
+WITH_QPAGE_SYSLOG_FACILITY=	LOG_DAEMON
+_QPAGE_SYSLOG_MSG=1
+.endif
+.if !defined(WITH_QPAGE_USER)
+WITH_QPAGE_USER=	uucp
+_QPAGE_USER_MSG=1
+.endif
+pre-patch:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} ${_QPAGE_MSG}
+	@if [ -n "${_QPAGE_SYSLOG_MSG}" ]; then \
+		${ECHO_MSG} ""; \
+		${ECHO_MSG} "  WITH_QPAGE_SYSLOG_FACILITY=syslog_facility"; \
+		${ECHO_MSG} "      Default is LOG_DAEMON"; \
+	fi
+	@if [ -n "${_QPAGE_USER_MSG}" ]; then \
+		${ECHO_MSG} ""; \
+		${ECHO_MSG} "  WITH_QPAGE_USER=userid"; \
+		${ECHO_MSG} "      Default is \"uucp\"; recommended that user be in group \"dialer\""; \
+	fi
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Press ^C now to stop the build and set make options."
+	@${ECHO_MSG} "You may find it necessary to 'make clean' before restarting the build."
+	@sleep 2
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
+		${WRKSRC}/qpage.man \
+		${WRKSRC}/config.input \
+		${WRKSRC}/config.h.in
+	${REINPLACE_CMD} \
+		-e 's,%%WITH_QPAGE_SYSLOG_FACILITY%%,${WITH_QPAGE_SYSLOG_FACILITY},' \
+		-e 's,%%WITH_QPAGE_USER%%,${WITH_QPAGE_USER},' \
+		${WRKSRC}/config.input
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/qpage ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/qpage.man \
+		${STAGEDIR}${MAN1PREFIX}/man/man1/qpage.1
+	${INSTALL_DATA} ${WRKSRC}/example.cf \
+		${STAGEDIR}${PREFIX}/etc/qpage.conf.sample
+	${MKDIR} ${STAGEDIR}/var/spool/qpage
+
+.include <bsd.port.mk>
--- a/comms/qpage/distinfo
+++ b/comms/qpage/distinfo
@ -0,0 +1,2 @@
+SHA256 (qpage-3.3.tar.Z) = 0bbecd2908380c5d28b8beeee0d0238854162128db5ef4ea603614d52ee7d24c
+SIZE (qpage-3.3.tar.Z) = 225689
--- a/comms/qpage/files/libwrap_ident_patch-srvrsnpp.c
+++ b/comms/qpage/files/libwrap_ident_patch-srvrsnpp.c
@ -0,0 +1,16 @@
+--- srvrsnpp.c.orig	2008-10-20 10:30:57.539127452 -0400
+++ srvrsnpp.c	2008-10-20 10:35:43.096529509 -0400
+@@ -1066,7 +1066,12 @@
+ 
+ 		fromhost(&request);
+ 
+-		ptr = eval_user(&request);
+		/*
+		** If we aren't doing an ident request, don't ask
+		** TCP Wrappers to do it either
+		*/
+		if (IdentTimeout) ptr = eval_user(&request);
+		else ptr = NULL;
+ 
+ 		if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
+ 			p->ident = strdup(ptr);
--- a/comms/qpage/files/patch-config.c
+++ b/comms/qpage/files/patch-config.c
@ -0,0 +1,10 @@
+--- config.c.orig	1999-01-02 03:14:50 UTC
+++ config.c
+@@ -1407,7 +1407,6 @@ free_pagers(pager_t *list)
+ 		my_free(list->name);
+ 		my_free(list->text);
+ 		my_free(list->pagerid);
+-		my_free(list->service);
+ 		free(list);
+ 	}
+ }
--- a/comms/qpage/files/patch-config.h.in
+++ b/comms/qpage/files/patch-config.h.in
@ -0,0 +1,11 @@
+--- config.h.in.orig	1998-07-26 19:38:35 UTC
+++ config.h.in
+@@ -17,7 +17,7 @@
+ #undef SNPP_SERVER_FILE
+ 
+ /* Define as the location of the qpage configuration file.  */
+-#define QPAGE_CONFIG "/etc/qpage.cf"
+#define QPAGE_CONFIG "/usr/local/etc/qpage.conf"
+ 
+ /* Define as the location of the lock directory.  */
+ #undef DEFAULT_LOCKDIR
--- a/comms/qpage/files/patch-config.input
+++ b/comms/qpage/files/patch-config.input
@ -0,0 +1,29 @@
+--- config.input.orig	1998-11-05 06:05:36 UTC
+++ config.input
+@@ -20,7 +20,7 @@
+ # See the QuickPage documentation for complete details about
+ # the syntax of the configuration file.
+ #
+-QPAGE_CONFIG="/etc/qpage.cf"
+QPAGE_CONFIG="/usr/local/etc/qpage.conf"
+ 
+ 
+ #
+@@ -41,7 +41,7 @@ SNPP_SERVER="localhost"
+ # copies of the configuration file.  Only one filename
+ # may be specified.
+ #
+-SNPP_SERVER_FILE="/etc/qpage.servers"
+SNPP_SERVER_FILE="/usr/local/etc/qpage.servers"
+ 
+ 
+ #
+@@ -51,7 +51,7 @@ SNPP_SERVER_FILE="/etc/qpage.servers"
+ # for that user, QuickPage will assume all group privileges
+ # assigned to that user.
+ #
+-DAEMON_USER="daemon"
+DAEMON_USER="uucp"
+ 
+ 
+ #
--- a/comms/qpage/files/patch-ixo.c
+++ b/comms/qpage/files/patch-ixo.c
@ -0,0 +1,10 @@
+--- ixo.c.orig	1999-01-02 01:59:33 UTC
+++ ixo.c
+@@ -368,7 +368,6 @@ hangup_modem(int fd)
+ 	if (tcsetattr(fd, TCSANOW, &ti) < 0) {
+ 		qpage_log(LOG_DEBUG, "tcsetattr(): %s", strerror(errno));
+ 		closemodem(fd);
+-		return;
+ 	}
+ 
+ 	/*
--- a/comms/qpage/files/patch-qpage.man
+++ b/comms/qpage/files/patch-qpage.man
@ -0,0 +1,11 @@
+--- qpage.man.orig	1999-05-08 22:07:31 UTC
+++ qpage.man
+@@ -867,7 +867,7 @@ if more than one paging service is used 
+ must be able to detect when it's safe to send dial commands to the modem.
+ .LP
+ .SH FILES
+-/etc/qpage.cf
+/usr/local/etc/qpage.conf
+ .SH SEE ALSO
+ .B RFC-1861
+ .SH KNOWN BUGS
--- a/comms/qpage/files/patch-srvrsnpp.c
+++ b/comms/qpage/files/patch-srvrsnpp.c
@ -0,0 +1,28 @@
+--- srvrsnpp.c.orig	2016-01-16 20:44:37 UTC
+++ srvrsnpp.c
+@@ -523,6 +523,7 @@ snpp(PAGE *p)
+ 	char		*errmsg;
+ 	char		*a;
+ 	char		*b;
+	char		*m;
+ 	int		i;
+ 	int		badarg;
+ 	int		gotpager;
+@@ -701,7 +702,16 @@ snpp(PAGE *p)
+ 
+ 				p->created = time(NULL);
+ 				(void)sprintf(buff, "%d", pagecount++);
+-				(void)strcat(p->messageid, buff);
+				m = (void *)malloc(sizeof(*m) * (strlen(p->messageid) + strlen(buff) + 1));
+				if ( m == NULL ) {
+					message("554 Message failed (out of memory)");
+					qpage_log(LOG_ERR, "snpp(): cannot allocate memory for p->messageid");
+					clear_page(p, TRUE);
+					break;
+				}
+				(void)sprintf(m, "%s%s", p->messageid, buff);
+				my_free(p->messageid);
+				p->messageid = m;
+ 
+ 				qpage_log(LOG_ALERT, "page submitted, id=%s, from=%s",
+ 					p->messageid,
--- a/comms/qpage/files/patch-util.c
+++ b/comms/qpage/files/patch-util.c
@ -0,0 +1,11 @@
+--- util.c.orig	1998-10-25 19:55:11 UTC
+++ util.c
+@@ -537,7 +537,7 @@ msgcpy(char *dst, char *src, int n)
+ 	** Now make sure we didn't chop a word in the middle.
+ 	*/
+ 	if (*src && end) {
+-		*end++ = '\0';
+		*++end = '\0';
+ 		src = start;
+ 	}
+ 
--- a/comms/qpage/files/qpage.in
+++ b/comms/qpage/files/qpage.in
@ -0,0 +1,54 @@
+#!/bin/sh
+
+# PROVIDE: qpage
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable/configure this service:
+#
+# qpage_enable (bool):         Set to NO by default.
+#                              Set it to YES to enable qpage.
+# qpage_queue_interval (int):  Set to 10 (seconds) by default.
+# qpage_cfg_file (path):       Set it to an alternate configuration file path
+#                              if desired.
+# qpage_flags (str):           Set it to a list of additional command-line
+#                              parameters if desired.
+#
+
+. /etc/rc.subr
+
+name="qpage"
+rcvar=qpage_enable
+
+command=%%PREFIX%%/bin/${name}
+
+load_rc_config $name
+
+: ${qpage_enable="NO"}
+: ${qpage_queue_interval="10"}
+
+stop_cmd=${name}_stop
+extra_commands="reload"
+reload_cmd=${name}_reload
+
+command_args="-q ${qpage_queue_interval} ${qpage_flags}"
+if [ -n "${qpage_cfg_file}" ]; then
+	command_args="${command_args} -C ${qpage_cfg_file}"
+fi
+
+qpage_stop() {
+	/usr/bin/killall qpage
+}
+
+qpage_reload() {
+	# awk pattern matches master daemon process only (PPID 1 in 3rd column)
+	pid=`/bin/ps alcxww | /usr/bin/awk "/^ *[0-9]+ +[0-9]+ +1 .* ${name}\$/{print \\\$2}"`
+
+	if [ -n "$pid" ]; then
+		kill -HUP $pid
+	else
+		echo "$0: no qpage daemon found" >& 2
+	fi
+}
+
+run_rc_command "$1"
--- a/comms/qpage/pkg-descr
+++ b/comms/qpage/pkg-descr
@ -0,0 +1,11 @@
+QuickPage sends messages to a paging terminal using the SNPP and IXO
+(also known as TAP) protocols.  It is normally used with no options
+other than a recipient and the message text, in which case the message
+is sent to the SNPP server where it is submitted to a page queue to be
+sent by a separate daemon process.
+
+Page groups and duty schedules are supported.  Status notification
+messages indicating the success or failure of a page are sent via
+e-mail to submitters of high-priority (level 0) pages.
+
+WWW: http://www.qpage.org/
--- a/comms/qpage/pkg-plist
+++ b/comms/qpage/pkg-plist
@ -0,0 +1,4 @@
+bin/qpage
+@sample etc/qpage.conf.sample
+man/man1/qpage.1.gz
+@dir(uucp,dialer,0775) /var/spool/qpage
--- a/databases/mongodb32-tools/Makefile
+++ b/databases/mongodb32-tools/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mongodb32-tools
-PORTVERSION=	3.2.3
+PORTVERSION=	3.2.4
 DISTVERSIONPREFIX=	r
 CATEGORIES=	databases net

--- a/databases/mongodb32-tools/distinfo
+++ b/databases/mongodb32-tools/distinfo
@ -1,2 +1,2 @@
-SHA256 (mongodb-mongo-tools-r3.2.3_GH0.tar.gz) = 280a4a5d12a0b36d780fcc6b9c24b48722f39a4acf5cfadf8c9b8679aa953bfd
-SIZE (mongodb-mongo-tools-r3.2.3_GH0.tar.gz) = 2227509
+SHA256 (mongodb-mongo-tools-r3.2.4_GH0.tar.gz) = 9d52028fb2be6a6e0a779aa73587c52ccd5fa59b258e26e5c2c3fce167599138
+SIZE (mongodb-mongo-tools-r3.2.4_GH0.tar.gz) = 2229852
--- a/databases/mongodb32/Makefile
+++ b/databases/mongodb32/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mongodb32
-PORTVERSION=	3.2.3
+PORTVERSION=	3.2.4
 DISTVERSIONPREFIX=	r
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
@ -34,6 +34,7 @@ CHOSEN_COMPILER_TYPE=	clang
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"

+CONFLICTS_BUILD=	mongo-cxx-driver
 OPTIONS_DEFINE=		SASL SSL
 OPTIONS_DEFAULT=	SASL SSL

@ -68,6 +69,7 @@ post-install:
 .for f in mongo mongod mongoperf mongos mongosniff
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
+	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample

 do-test:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
--- a/databases/mongodb32/distinfo
+++ b/databases/mongodb32/distinfo
@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r3.2.3.tar.gz) = 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa
-SIZE (mongodb-src-r3.2.3.tar.gz) = 29607224
+SHA256 (mongodb-src-r3.2.4.tar.gz) = b60743cc641de975c38e6e69ebbef60059ee9fe176cdd98bfab8d5c844dab42c
+SIZE (mongodb-src-r3.2.4.tar.gz) = 29647777
--- a/databases/mongodb32/files/patch-rpm_mongod.conf
+++ b/databases/mongodb32/files/patch-rpm_mongod.conf
@ -0,0 +1,31 @@
+--- rpm/mongod.conf.orig	2016-03-01 04:38:06 UTC
+++ rpm/mongod.conf
+@@ -1,4 +1,4 @@
+-# mongod.conf
+# mongodb.conf
+ 
+ # for documentation of all options, see:
+ #   http://docs.mongodb.org/manual/reference/configuration-options/
+@@ -7,11 +7,11 @@
+ systemLog:
+   destination: file
+   logAppend: true
+-  path: /var/log/mongodb/mongod.log
+  path: /var/log/mongodb/log
+ 
+ # Where and how to store data.
+ storage:
+-  dbPath: /var/lib/mongo
+  dbPath: /var/db/mongo
+   journal:
+     enabled: true
+ #  engine:
+@@ -21,7 +21,7 @@ storage:
+ # how the process runs
+ processManagement:
+   fork: true  # fork and run in background
+-  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
+  pidFilePath: /var/run/mongodb/pid  # location of pidfile
+ 
+ # network interfaces
+ net:
--- a/databases/mongodb32/pkg-plist
+++ b/databases/mongodb32/pkg-plist
@ -1,5 +1,4 @@
-@unexec if [ ! -s %D/etc/mongodb.conf ]; then /bin/rm -f %D/etc/mongodb.conf; fi
-@exec  if [ ! -f %D/etc/mongodb.conf ]; then /usr/bin/touch %D/etc/mongodb.conf; fi
+@sample etc/mongodb.conf.sample
 bin/mongo
 bin/mongod
 bin/mongoperf
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	apsw
-PORTVERSION=	3.9.2
+PORTVERSION=	3.11.1
 DISTVERSIONSUFFIX=	-r1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -15,9 +15,8 @@ LICENSE=	ZLIB
 USE_GITHUB=	yes
 GH_ACCOUNT=	rogerbinns

-USES=		localbase python
+USES=		localbase python sqlite:3
 USE_PYTHON=	distutils autoplist
-USE_SQLITE=	3
 PYDISTUTILS_EGGINFO=	apsw-${PORTVERSION|.post1-py${PYTHON_VER}.egg-info

 post-install:
--- a/databases/py-apsw/distinfo
+++ b/databases/py-apsw/distinfo
@ -1,2 +1,2 @@
-SHA256 (rogerbinns-apsw-3.9.2-r1_GH0.tar.gz) = 6fae3f701f5cadca47195d814a02cec016f813f35d9d44d39596d293f5067577
-SIZE (rogerbinns-apsw-3.9.2-r1_GH0.tar.gz) = 308216
+SHA256 (rogerbinns-apsw-3.11.1-r1_GH0.tar.gz) = 503b4975c00a66e6f5aa5f4593a4141ef8f71c11928bc3e7d6a356e5476878e2
+SIZE (rogerbinns-apsw-3.11.1-r1_GH0.tar.gz) = 309872
--- a/databases/tcl-sqlite3/Makefile
+++ b/databases/tcl-sqlite3/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	sqlite3
-PORTVERSION=	3.10.2
+PORTVERSION=	3.11.1
 CATEGORIES=	databases tcl
 MASTER_SITES=	https://www.sqlite.org/2016/ http://www2.sqlite.org/2016/ http://www3.sqlite.org/2016/
 PKGNAMEPREFIX=	tcl-
--- a/databases/tcl-sqlite3/distinfo
+++ b/databases/tcl-sqlite3/distinfo
@ -1,2 +1,2 @@
-SHA256 (sqlite-autoconf-3100200.tar.gz) = a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971
-SIZE (sqlite-autoconf-3100200.tar.gz) = 2332013
+SHA256 (sqlite-autoconf-3110100.tar.gz) = 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377
+SIZE (sqlite-autoconf-3110100.tar.gz) = 2359545
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	calibre
-PORTVERSION=	2.52.0
+PORTVERSION=	2.53.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/

@ -27,7 +27,6 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}psutil>=2.0.0:${PORTSDIR}/sysutils/py-psutil \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
 		${PYTHON_PKGNAMEPREFIX}apsw>=0:${PORTSDIR}/databases/py-apsw
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@ -1,2 +1,2 @@
-SHA256 (calibre-2.52.0.tar.xz) = 9a2b01af095017eb94322df98251a15fc7e691d09cff9cc18ee3d409370941d1
-SIZE (calibre-2.52.0.tar.xz) = 39904084
+SHA256 (calibre-2.53.0.tar.xz) = 1f36c5f4144571576637a401067d0cf5aa0ef75ff97773511ab948a3d2806e67
+SIZE (calibre-2.53.0.tar.xz) = 40086616
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@ -215,6 +215,7 @@ lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
 lib/calibre/calibre/ebooks/conversion/utils.py
 lib/calibre/calibre/ebooks/covers.py
+lib/calibre/calibre/ebooks/css_transform_rules.py
 lib/calibre/calibre/ebooks/djvu/__init__.py
 lib/calibre/calibre/ebooks/djvu/djvu.py
 lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
@ -747,6 +748,7 @@ lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
 lib/calibre/calibre/gui2/covers.py
+lib/calibre/calibre/gui2/css_transform_rules.py
 lib/calibre/calibre/gui2/custom_column_widgets.py
 lib/calibre/calibre/gui2/dbus_export/__init__.py
 lib/calibre/calibre/gui2/dbus_export/demo.py
@ -836,7 +838,6 @@ lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/template_dialog.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
-lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 lib/calibre/calibre/gui2/dialogs/trim_image.py
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/dnd.py
@ -1203,6 +1204,7 @@ lib/calibre/calibre/srv/errors.py
 lib/calibre/calibre/srv/handler.py
 lib/calibre/calibre/srv/http_request.py
 lib/calibre/calibre/srv/http_response.py
+lib/calibre/calibre/srv/jobs.py
 lib/calibre/calibre/srv/legacy.py
 lib/calibre/calibre/srv/loop.py
 lib/calibre/calibre/srv/metadata.py
@ -1210,6 +1212,7 @@ lib/calibre/calibre/srv/opds.py
 lib/calibre/calibre/srv/opts.py
 lib/calibre/calibre/srv/pool.py
 lib/calibre/calibre/srv/pre_activated.py
+lib/calibre/calibre/srv/render_book.py
 lib/calibre/calibre/srv/routes.py
 lib/calibre/calibre/srv/sendfile.py
 lib/calibre/calibre/srv/standalone.py
@ -1594,6 +1597,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff
 %%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff2
 %%DATADIR%%/content-server/index.html
+%%DATADIR%%/content-server/locales.zip
 %%DATADIR%%/content-server/main.js
 %%DATADIR%%/content-server/mobile.css
 %%DATADIR%%/content-server/reset.css
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1116,6 +1116,7 @@
    SUBDIR += libafterbase
    SUBDIR += liballium
    SUBDIR += libantlr3c
+    SUBDIR += libarea
    SUBDIR += libarena
    SUBDIR += libassa
    SUBDIR += libassetml
@ -2520,6 +2521,8 @@
    SUBDIR += p5-List-Permutor
    SUBDIR += p5-List-PowerSet
    SUBDIR += p5-List-Rotation-Cycle
+    SUBDIR += p5-List-SomeUtils
+    SUBDIR += p5-List-SomeUtils-XS
    SUBDIR += p5-List-Uniq
    SUBDIR += p5-List-UtilsBy
    SUBDIR += p5-Locale-Maketext
@ -4274,6 +4277,7 @@
    SUBDIR += py-pyro
    SUBDIR += py-pyshapelib
    SUBDIR += py-pytemplate
+    SUBDIR += py-pyte
    SUBDIR += py-pytest
    SUBDIR += py-pytest-cache
    SUBDIR += py-pytest-capturelog
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	awscli
-PORTVERSION=	1.9.17
+PORTVERSION=	1.10.11
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP

@ -11,8 +11,9 @@ COMMENT=	Universal Command Line Interface for Amazon Web Services

 LICENSE=	APACHE20

-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.3.15:${PORTSDIR}/devel/py-botocore \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.4.1:${PORTSDIR}/devel/py-botocore \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:${PORTSDIR}/devel/py-colorama \
+		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.0.1:${PORTSDIR}/net/py-s3transfer \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
 		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:${PORTSDIR}/security/py-rsa

--- a/devel/awscli/distinfo
+++ b/devel/awscli/distinfo
@ -1,2 +1,2 @@
-SHA256 (awscli-1.9.17.tar.gz) = 5144b7bf73e39a5c556e84493bd4556f8081dcd2d206bfa083a7e04b379647da
-SIZE (awscli-1.9.17.tar.gz) = 433342
+SHA256 (awscli-1.10.11.tar.gz) = c792ae655ca4e43643539026798d51bd65b2f5eee48bfaf048fe1c4c715f9467
+SIZE (awscli-1.10.11.tar.gz) = 451719
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	boost-libs
-PORTREVISION=	9
+PORTREVISION=	10

 COMMENT=	Free portable C++ libraries (without Boost.Python)

--- a/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f
+++ b/devel/boost-libs/files/patch-bae401b1eb0594932c4e780d496cba852c23b75f
@ -0,0 +1,49 @@
+--- boost/asio/ssl/impl/context.ipp.orig	2013-10-26 23:25:53 UTC
+++ boost/asio/ssl/impl/context.ipp
+@@ -87,6 +87,14 @@ context::context(context::method m)
+     handle_ = ::SSL_CTX_new(::SSLv2_server_method());
+     break;
+ #endif // defined(OPENSSL_NO_SSL2)
+#if defined(OPENSSL_NO_SSL3)
+  case context::sslv3:
+  case context::sslv3_client:
+  case context::sslv3_server:
+    boost::asio::detail::throw_error(
+        boost::asio::error::invalid_argument, "context");
+    break;
+#else // defined(OPENSSL_NO_SSL3)
+   case context::sslv3:
+     handle_ = ::SSL_CTX_new(::SSLv3_method());
+     break;
+@@ -96,6 +104,7 @@ context::context(context::method m)
+   case context::sslv3_server:
+     handle_ = ::SSL_CTX_new(::SSLv3_server_method());
+     break;
+#endif // defined(OPENSSL_NO_SSL3)
+   case context::tlsv1:
+     handle_ = ::SSL_CTX_new(::TLSv1_method());
+     break;
+--- boost/asio/ssl/old/detail/openssl_context_service.hpp.orig	2013-05-20 12:32:20 UTC
+++ boost/asio/ssl/old/detail/openssl_context_service.hpp
+@@ -85,6 +85,13 @@ public:
+       impl = ::SSL_CTX_new(::SSLv2_server_method());
+       break;
+ #endif // defined(OPENSSL_NO_SSL2)
+#if defined(OPENSSL_NO_SSL3)
+    case context_base::sslv3:
+    case context_base::sslv3_client:
+    case context_base::sslv3_server:
+      boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
+      break;
+#else // defined(OPENSSL_NO_SSL3)
+     case context_base::sslv3:
+       impl = ::SSL_CTX_new(::SSLv3_method());
+       break;
+@@ -94,6 +101,7 @@ public:
+     case context_base::sslv3_server:
+       impl = ::SSL_CTX_new(::SSLv3_server_method());
+       break;
+#endif // defined(OPENSSL_NO_SSL3)
+     case context_base::tlsv1:
+       impl = ::SSL_CTX_new(::TLSv1_method());
+       break;
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	gdb
-PORTVERSION=	7.10
-PORTREVISION=	5
+PORTVERSION=	7.11
+#PORTREVISION=
 CATEGORIES=	devel
 MASTER_SITES=	GNU

@ -36,9 +36,9 @@ PLIST_SUB=	VER=${VER}

 ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64 armv6	# untested elsewhere, might work

-OPTIONS_DEFINE=	DEBUG EXPAT GDB_LINK GUILE KGDB PYTHON THREADS TUI
+OPTIONS_DEFINE=	DEBUG EXPAT GDB_LINK GUILE KGDB PYTHON TUI

-OPTIONS_DEFAULT=	GDB_LINK KGDB THREADS TUI PORT_READLINE
+OPTIONS_DEFAULT=	GDB_LINK KGDB TUI PORT_READLINE

 OPTIONS_SINGLE=	READLINE
 OPTIONS_SINGLE_READLINE=	BASE_READLINE BUNDLED_READLINE PORT_READLINE
@ -80,21 +80,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$| [GDB v${PORTVERSION} for FreeBSD]|' \
 		${WRKSRC}/gdb/version.in
-.if ${PORT_OPTIONS:MTHREADS}
-	@${CP} ${FILESDIR}/fbsd-threads.c ${WRKSRC}/gdb/
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-threads
-.endif
-.if ${PORT_OPTIONS:MKGDB}
+
+post-patch-KGDB-on:
 	@${CP} -r ${FILESDIR}/kgdb/*.[ch] ${WRKSRC}/gdb/
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-kgdb
-.if ${PORT_OPTIONS:MTHREADS}
-	@${PATCH} ${PATCH_ARGS} < \
-	    ${FILESDIR}/extrapatch-kgdb-configure.tgt-threads
-.else
-	@${PATCH} ${PATCH_ARGS} < \
-	    ${FILESDIR}/extrapatch-kgdb-configure.tgt-plain
-.endif
-.endif

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
@ -119,7 +108,7 @@ do-install-PYTHON-on:
 	(cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
 	(cd ${WRKSRC}/gdb/data-directory ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
-. for f in gdb gdb/command gdb/function
+. for f in gdb gdb/command gdb/function gdb/printer
 	@(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 *.py* )
 . endfor

--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@ -1,2 +1,2 @@
-SHA256 (gdb-7.10.tar.xz) = 7ebdaa44f9786ce0c142da4e36797d2020c55fa091905ac5af1846b5756208a8
-SIZE (gdb-7.10.tar.xz) = 18540820
+SHA256 (gdb-7.11.tar.xz) = 7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1
+SIZE (gdb-7.11.tar.xz) = 18934392
--- a/devel/gdb/files/extrapatch-kgdb
+++ b/devel/gdb/files/extrapatch-kgdb
@ -71,6 +71,15 @@ index dfaa8a3..182d875 100644
 	fbsd-nat.c \
 	fbsd-tdep.c \
 	fork-child.c \
+@@ -2740,7 +2752,7 @@
+ 
+ # A list of all the objects we might care about in this build, for
+ # dependency tracking.
+-all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o \
+all_object_files = kgdb-main.o gdb.o $(LIBGDB_OBS) gdbtk-main.o \
+ 	test-cp-name-parser.o
+ 
+ # Ensure that generated files are created early.  Use order-only
 diff --git gdb/config.in gdb/config.in
 index 9ef53b3..c55c01b 100644
 --- gdb/config.in
@ -234,3 +243,53 @@ index a9fb44b..a156918 100644
 extern void regcache_raw_collect (const struct regcache *regcache,
 				  int regnum, void *buf);
 
+diff --git gdb/configure.tgt gdb/configure.tgt
+index 4e4d6a9..57e4b3a 100644
+--- gdb/configure.tgt
+++ gdb/configure.tgt
+@@ -185,7 +185,13 @@ i[34567]86-*-dicos*)
+ i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
+ 	# Target: FreeBSD/i386
+ 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
+-			bsd-uthread.o fbsd-tdep.o solib-svr4.o"
+			bsd-uthread.o fbsd-tdep.o solib-svr4.o \
+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o i386fbsd-kern.o"
+	if test "x$enable_64_bit_bfd" = "xyes"; then
+	    # Target: FreeBSD amd64
+	    gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o amd64fbsd-kern.o \
+			    ${gdb_target_obs}"
+	fi
+ 	;;
+ i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
+ 	# Target: NetBSD/i386
+@@ -405,7 +411,8 @@ powerpc*-*-freebsd*)
+ 	# Target: FreeBSD/powerpc
+ 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
+ 		        ppcfbsd-tdep.o fbsd-tdep.o solib-svr4.o \
+-			ravenscar-thread.o ppc-ravenscar-thread.o"
+			ravenscar-thread.o ppc-ravenscar-thread.o \
+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o ppcfbsd-kern.o"
+ 	;;
+ 
+ powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
+@@ -534,7 +541,8 @@ sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
+ 	# Target: FreeBSD/sparc64
+ 	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
+ 			fbsd-tdep.o solib-svr4.o \
+-			ravenscar-thread.o sparc-ravenscar-thread.o"
+			ravenscar-thread.o sparc-ravenscar-thread.o \
+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o sparc64fbsd-kern.o"
+ 	;;
+ sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
+ 	# Target: NetBSD/sparc
+@@ -662,7 +670,9 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+ 	# Target: FreeBSD/amd64
+ 	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
+ 			i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
+-			bsd-uthread.o fbsd-tdep.o solib-svr4.o"
+			bsd-uthread.o fbsd-tdep.o solib-svr4.o \
+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o amd64fbsd-kern.o \
+			i386fbsd-kern.o"
+ 	;;
+ x86_64-*-mingw* | x86_64-*-cygwin*)
+         # Target: MingW/amd64
--- a/devel/gdb/files/extrapatch-kgdb-configure.tgt-plain
+++ b/devel/gdb/files/extrapatch-kgdb-configure.tgt-plain
@ -1,50 +0,0 @@
-diff --git gdb/configure.tgt gdb/configure.tgt
-index 4e4d6a9..57e4b3a 100644
--- gdb/configure.tgt
-+++ gdb/configure.tgt
-@@ -185,7 +185,13 @@ i[34567]86-*-dicos*)
- i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/i386
- 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			bsd-uthread.o fbsd-tdep.o solib-svr4.o"
-+			bsd-uthread.o fbsd-tdep.o solib-svr4.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o i386fbsd-kern.o"
-+	if test "x$enable_64_bit_bfd" = "xyes"; then
-+	    # Target: FreeBSD amd64
-+	    gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o amd64fbsd-kern.o \
-+			    ${gdb_target_obs}"
-+	fi
- 	;;
- i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
- 	# Target: NetBSD/i386
-@@ -405,7 +411,8 @@ powerpc*-*-freebsd*)
- 	# Target: FreeBSD/powerpc
- 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
- 		        ppcfbsd-tdep.o fbsd-tdep.o solib-svr4.o \
-			ravenscar-thread.o ppc-ravenscar-thread.o"
-+			ravenscar-thread.o ppc-ravenscar-thread.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o ppcfbsd-kern.o"
- 	;;
- 
- powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
-@@ -534,7 +541,8 @@ sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/sparc64
- 	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
- 			fbsd-tdep.o solib-svr4.o \
-			ravenscar-thread.o sparc-ravenscar-thread.o"
-+			ravenscar-thread.o sparc-ravenscar-thread.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o sparc64fbsd-kern.o"
- 	;;
- sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
- 	# Target: NetBSD/sparc
-@@ -662,7 +670,9 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/amd64
- 	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
- 			i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			bsd-uthread.o fbsd-tdep.o solib-svr4.o"
-+			bsd-uthread.o fbsd-tdep.o solib-svr4.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o amd64fbsd-kern.o \
-+			i386fbsd-kern.o"
- 	;;
- x86_64-*-mingw* | x86_64-*-cygwin*)
-         # Target: MingW/amd64
--- a/devel/gdb/files/extrapatch-kgdb-configure.tgt-threads
+++ b/devel/gdb/files/extrapatch-kgdb-configure.tgt-threads
@ -1,50 +0,0 @@
-diff --git gdb/configure.tgt gdb/configure.tgt
-index 4e4d6a9..57e4b3a 100644
--- gdb/configure.tgt
-+++ gdb/configure.tgt
-@@ -185,7 +185,13 @@ i[34567]86-*-dicos*)
- i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/i386
- 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			fbsd-threads.o fbsd-tdep.o solib-svr4.o"
-+			fbsd-threads.o fbsd-tdep.o solib-svr4.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o i386fbsd-kern.o"
-+	if test "x$enable_64_bit_bfd" = "xyes"; then
-+	    # Target: FreeBSD amd64
-+	    gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o amd64fbsd-kern.o \
-+			    ${gdb_target_obs}"
-+	fi
- 	;;
- i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
- 	# Target: NetBSD/i386
-@@ -405,7 +411,8 @@ powerpc*-*-freebsd*)
- 	# Target: FreeBSD/powerpc
- 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
- 		        ppcfbsd-tdep.o fbsd-threads.o fbsd-tdep.o solib-svr4.o \
-			ravenscar-thread.o ppc-ravenscar-thread.o"
-+			ravenscar-thread.o ppc-ravenscar-thread.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o ppcfbsd-kern.o"
- 	;;
- 
- powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
-@@ -534,7 +541,8 @@ sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/sparc64
- 	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
- 			fbsd-tdep.o solib-svr4.o \
-			ravenscar-thread.o sparc-ravenscar-thread.o"
-+			ravenscar-thread.o sparc-ravenscar-thread.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o sparc64fbsd-kern.o"
- 	;;
- sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
- 	# Target: NetBSD/sparc
-@@ -662,7 +670,9 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/amd64
- 	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
- 			i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			fbsd-threads.o fbsd-tdep.o solib-svr4.o"
-+			fbsd-threads.o fbsd-tdep.o solib-svr4.o \
-+			fbsd-kld.o fbsd-kthr.o fbsd-kvm.o amd64fbsd-kern.o \
-+			i386fbsd-kern.o"
- 	;;
- x86_64-*-mingw* | x86_64-*-cygwin*)
-         # Target: MingW/amd64
--- a/devel/gdb/files/extrapatch-threads
+++ b/devel/gdb/files/extrapatch-threads
@ -1,712 +0,0 @@
-diff --git gdb/Makefile.in gdb/Makefile.in
-index 7937801..6122f16 100644
--- gdb/Makefile.in
-+++ gdb/Makefile.in
-@@ -691,6 +691,7 @@ ALL_TARGET_OBS = \
- 	xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \
- 	glibc-tdep.o \
- 	bsd-uthread.o \
-+	fbsd-threads.o \
- 	nbsd-tdep.o obsd-tdep.o \
- 	sol2-tdep.o \
- 	solib-frv.o solib-svr4.o \
-@@ -1366,7 +1367,7 @@ libgdb.a: $(LIBGDB_OBS)
- # Removing the old gdb first works better if it is running, at least on SunOS.
- gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
- 	rm -f gdb$(EXEEXT)
-	$(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \
-+	$(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) -Wl,-E \
- 		-o gdb$(EXEEXT) gdb.o $(LIBGDB_OBS) \
- 		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
- 
-@@ -1639,7 +1640,7 @@ ALLDEPFILES = \
- 	armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
- 	avr-tdep.c \
- 	bfin-linux-tdep.c bfin-tdep.c \
-	bsd-uthread.c bsd-kvm.c \
-+	bsd-uthread.c fbsd-threads.c bsd-kvm.c \
- 	core-regset.c \
- 	dcache.c dicos-tdep.c darwin-nat.c \
- 	exec.c \
-diff --git gdb/amd64bsd-nat.c gdb/amd64bsd-nat.c
-index b1d4a0e..7f189f6 100644
--- gdb/amd64bsd-nat.c
-+++ gdb/amd64bsd-nat.c
-@@ -40,6 +40,19 @@
- size_t amd64bsd_xsave_len;
- #endif
- 
-+static pid_t
-+ptrace_pid (ptid_t ptid)
-+{
-+  pid_t pid;
-+
-+#ifdef __FreeBSD__
-+  pid = ptid_get_lwp (ptid);
-+  if (pid == 0)
-+#endif
-+    pid = ptid_get_pid (ptid);
-+  return pid;
-+}
-+  
- /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
-    for all registers (including the floating-point registers).  */
- 
-@@ -53,7 +66,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
-     {
-       struct reg regs;
- 
-      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
- 	perror_with_name (_("Couldn't get registers"));
- 
-@@ -71,7 +84,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
-       if (amd64bsd_xsave_len != 0)
- 	{
- 	  xstateregs = alloca (amd64bsd_xsave_len);
-	  if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
-@@ -80,7 +93,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
- 	}
- #endif
- 
-      if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETFPREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	perror_with_name (_("Couldn't get floating point status"));
- 
-@@ -103,11 +116,11 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
- 
-       memset( &regs, 0, sizeof(struct reg));
-       memset( &oldregs, 0, sizeof(struct reg));
-      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
-                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-         perror_with_name (_("Couldn't get registers"));
- 
-      ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+      ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
-                   (PTRACE_TYPE_ARG3) &oldregs, 0);
-       amd64_collect_native_gregset (regcache, &regs, regnum);
- 
-@@ -117,7 +130,7 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
-         regs.r_rflags ^= (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE;
-         //printf("    allowed regs.r_rflags = 0x%8.8X\n", regs.r_rflags );
-       }
-      if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_SETREGS, ptrace_pid (inferior_ptid),
- 	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-         perror_with_name (_("Couldn't write registers"));
- 
-@@ -134,26 +147,26 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
-       if (amd64bsd_xsave_len != 0)
- 	{
- 	  xstateregs = alloca (amd64bsd_xsave_len);
-	  if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
- 	  amd64_collect_xsave (regcache, regnum, xstateregs, 0);
- 
-	  if (ptrace (PT_SETXSTATE, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_SETXSTATE, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xstateregs, amd64bsd_xsave_len) == -1)
- 	    perror_with_name (_("Couldn't write extended state status"));
- 	  return;
- 	}
- #endif
- 
-      if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETFPREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	perror_with_name (_("Couldn't get floating point status"));
- 
-       amd64_collect_fxsave (regcache, regnum, &fpregs);
- 
-      if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_SETFPREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	perror_with_name (_("Couldn't write floating point status"));
-     }
-@@ -183,7 +196,7 @@ amd64bsd_dr_get (ptid_t ptid, int regnum)
- {
-   struct dbreg dbregs;
- 
-  if (ptrace (PT_GETDBREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_GETDBREGS, ptrace_pid (inferior_ptid),
- 	      (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-     perror_with_name (_("Couldn't read debug registers"));
- 
-@@ -195,7 +208,7 @@ amd64bsd_dr_set (int regnum, unsigned long value)
- {
-   struct dbreg dbregs;
- 
-  if (ptrace (PT_GETDBREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_GETDBREGS, ptrace_pid (inferior_ptid),
-               (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-     perror_with_name (_("Couldn't get debug registers"));
- 
-@@ -206,7 +219,7 @@ amd64bsd_dr_set (int regnum, unsigned long value)
- 
-   DBREG_DRX ((&dbregs), regnum) = value;
- 
-  if (ptrace (PT_SETDBREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_SETDBREGS, ptrace_pid (inferior_ptid),
-               (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-     perror_with_name (_("Couldn't write debug registers"));
- }
-diff --git gdb/amd64fbsd-nat.c gdb/amd64fbsd-nat.c
-index a721f48..2534360 100644
--- gdb/amd64fbsd-nat.c
-+++ gdb/amd64fbsd-nat.c
-@@ -18,6 +18,7 @@
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- #include "defs.h"
-+#include "gregset.h"
- #include "inferior.h"
- #include "regcache.h"
- #include "target.h"
-@@ -92,6 +93,46 @@ static int amd64fbsd32_r_reg_offset[I386_NUM_GREGS] =
- };
- 
- 
-+/* Transfering the registers between GDB, inferiors and core files.  */
-+
-+/* Fill GDB's register array with the general-purpose register values
-+   in *GREGSETP.  */
-+
-+void
-+supply_gregset (struct regcache *regcache, const gregset_t *gregsetp)
-+{
-+  amd64_supply_native_gregset (regcache, gregsetp, -1);
-+}
-+
-+/* Fill register REGNUM (if it is a general-purpose register) in
-+   *GREGSETPS with the value in GDB's register array.  If REGNUM is -1,
-+   do this for all registers.  */
-+
-+void
-+fill_gregset (const struct regcache *regcache, gdb_gregset_t *gregsetp, int regnum)
-+{
-+  amd64_collect_native_gregset (regcache, gregsetp, regnum);
-+}
-+
-+/* Fill GDB's register array with the floating-point register values
-+   in *FPREGSETP.  */
-+
-+void
-+supply_fpregset (struct regcache *regcache, const fpregset_t *fpregsetp)
-+{
-+  amd64_supply_fxsave (regcache, -1, fpregsetp);
-+}
-+
-+/* Fill register REGNUM (if it is a floating-point register) in
-+   *FPREGSETP with the value in GDB's register array.  If REGNUM is -1,
-+   do this for all registers.  */
-+
-+void
-+fill_fpregset (const struct regcache *regcache, gdb_fpregset_t *fpregsetp, int regnum)
-+{
-+  amd64_collect_fxsave (regcache, regnum, fpregsetp);
-+}
-+
- /* Support for debugging kernel virtual memory images.  */
- 
- #include <machine/pcb.h>
-diff --git gdb/amd64fbsd-tdep.c gdb/amd64fbsd-tdep.c
-index 52705d9..6d48d8f 100644
--- gdb/amd64fbsd-tdep.c
-+++ gdb/amd64fbsd-tdep.c
-@@ -28,7 +28,6 @@
- #include "x86-xstate.h"
- 
- #include "amd64-tdep.h"
-#include "bsd-uthread.h"
- #include "fbsd-tdep.h"
- #include "solib-svr4.h"
- 
-@@ -226,46 +225,6 @@ amd64fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
- }
- 
- static void
-amd64fbsd_supply_uthread (struct regcache *regcache,
-			  int regnum, CORE_ADDR addr)
-{
-  gdb_byte buf[8];
-  int i;
-
-  gdb_assert (regnum >= -1);
-
-  for (i = 0; i < ARRAY_SIZE (amd64fbsd_jmp_buf_reg_offset); i++)
-    {
-      if (amd64fbsd_jmp_buf_reg_offset[i] != -1
-	  && (regnum == -1 || regnum == i))
-	{
-	  read_memory (addr + amd64fbsd_jmp_buf_reg_offset[i], buf, 8);
-	  regcache_raw_supply (regcache, i, buf);
-	}
-    }
-}
-
-static void
-amd64fbsd_collect_uthread (const struct regcache *regcache,
-			   int regnum, CORE_ADDR addr)
-{
-  gdb_byte buf[8];
-  int i;
-
-  gdb_assert (regnum >= -1);
-
-  for (i = 0; i < ARRAY_SIZE (amd64fbsd_jmp_buf_reg_offset); i++)
-    {
-      if (amd64fbsd_jmp_buf_reg_offset[i] != -1
-	  && (regnum == -1 || regnum == i))
-	{
-	  regcache_raw_collect (regcache, i, buf);
-	  write_memory (addr + amd64fbsd_jmp_buf_reg_offset[i], buf, 8);
-	}
-    }
-}
-
-static void
- amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
- {
-   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-@@ -298,10 +257,6 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-   set_gdbarch_core_read_description (gdbarch,
- 				     amd64fbsd_core_read_description);
- 
-  /* FreeBSD provides a user-level threads implementation.  */
-  bsd_uthread_set_supply_uthread (gdbarch, amd64fbsd_supply_uthread);
-  bsd_uthread_set_collect_uthread (gdbarch, amd64fbsd_collect_uthread);
-
-   /* FreeBSD uses SVR4-style shared libraries.  */
-   set_solib_svr4_fetch_link_map_offsets
-     (gdbarch, svr4_lp64_fetch_link_map_offsets);
-diff --git gdb/configure.tgt gdb/configure.tgt
-index 7fdd34e..64afacf 100644
--- gdb/configure.tgt
-+++ gdb/configure.tgt
-@@ -187,7 +187,7 @@ i[34567]86-*-dicos*)
- i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/i386
- 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			bsd-uthread.o fbsd-tdep.o solib-svr4.o"
-+			fbsd-threads.o fbsd-tdep.o solib-svr4.o"
- 	;;
- i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
- 	# Target: NetBSD/i386
-@@ -410,7 +410,7 @@ nios2*-*-*)
- powerpc*-*-freebsd*)
- 	# Target: FreeBSD/powerpc
- 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
-		        ppcfbsd-tdep.o fbsd-tdep.o solib-svr4.o \
-+		        ppcfbsd-tdep.o fbsd-threads.o fbsd-tdep.o solib-svr4.o \
- 			ravenscar-thread.o ppc-ravenscar-thread.o"
- 	;;
- 
-@@ -663,7 +663,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
- 	# Target: FreeBSD/amd64
- 	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
- 			i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			bsd-uthread.o fbsd-tdep.o solib-svr4.o"
-+			fbsd-threads.o fbsd-tdep.o solib-svr4.o"
- 	;;
- x86_64-*-mingw* | x86_64-*-cygwin*)
-         # Target: MingW/amd64
-diff --git gdb/i386bsd-nat.c gdb/i386bsd-nat.c
-index ac8a19b..cb2d50e 100644
--- gdb/i386bsd-nat.c
-+++ gdb/i386bsd-nat.c
-@@ -87,9 +87,22 @@ size_t i386bsd_xsave_len;
- #endif
- 
- 
-+static pid_t
-+ptrace_pid (ptid_t ptid)
-+{
-+  pid_t pid;
-+
-+#ifdef __FreeBSD__
-+  pid = ptid_get_lwp (ptid);
-+  if (pid == 0)
-+#endif
-+    pid = ptid_get_pid (ptid);
-+  return pid;
-+}
-+  
- /* Supply the general-purpose registers in GREGS, to REGCACHE.  */
- 
-static void
-+void
- i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
- {
-   const char *regs = gregs;
-@@ -108,7 +121,7 @@ i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
-    GREGS.  If REGNUM is -1, collect and store all appropriate
-    registers.  */
- 
-static void
-+void
- i386bsd_collect_gregset (const struct regcache *regcache,
- 			 void *gregs, int regnum)
- {
-@@ -138,7 +151,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
-     {
-       struct reg regs;
- 
-      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
- 	perror_with_name (_("Couldn't get registers"));
- 
-@@ -160,7 +173,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
- 	  char *xstateregs;
- 
- 	  xstateregs = alloca (i386bsd_xsave_len);
-	  if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
-@@ -171,7 +184,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
-       
- #ifdef HAVE_PT_GETXMMREGS
-       if (have_ptrace_xmmregs != 0
-	  && ptrace(PT_GETXMMREGS, ptid_get_pid (inferior_ptid),
-+	  && ptrace(PT_GETXMMREGS, ptrace_pid (inferior_ptid),
- 		    (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
- 	{
- 	  have_ptrace_xmmregs = 1;
-@@ -181,7 +194,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
- 	{
- 	  have_ptrace_xmmregs = 0;
- #endif
-          if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
-+          if (ptrace (PT_GETFPREGS, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	    perror_with_name (_("Couldn't get floating point status"));
- 
-@@ -203,13 +216,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
-     {
-       struct reg regs;
- 
-      if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
-                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-         perror_with_name (_("Couldn't get registers"));
- 
-       i386bsd_collect_gregset (regcache, &regs, regnum);
- 
-      if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_SETREGS, ptrace_pid (inferior_ptid),
- 	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-         perror_with_name (_("Couldn't write registers"));
- 
-@@ -230,13 +243,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
- 	  char *xstateregs;
- 
- 	  xstateregs = alloca (i386bsd_xsave_len);
-	  if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
- 	  i387_collect_xsave (regcache, -1, xstateregs, 0);
- 
-	  if (ptrace (PT_SETXSTATE, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_SETXSTATE, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xstateregs, i386bsd_xsave_len) == -1)
- 	    perror_with_name (_("Couldn't write extended state status"));
- 	  return;
-@@ -245,14 +258,14 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
- 
- #ifdef HAVE_PT_GETXMMREGS
-       if (have_ptrace_xmmregs != 0
-	  && ptrace(PT_GETXMMREGS, ptid_get_pid (inferior_ptid),
-+	  && ptrace(PT_GETXMMREGS, ptrace_pid (inferior_ptid),
- 		    (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
- 	{
- 	  have_ptrace_xmmregs = 1;
- 
- 	  i387_collect_fxsave (regcache, regnum, xmmregs);
- 
-	  if (ptrace (PT_SETXMMREGS, ptid_get_pid (inferior_ptid),
-+	  if (ptrace (PT_SETXMMREGS, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
-             perror_with_name (_("Couldn't write XMM registers"));
- 	}
-@@ -260,13 +273,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
- 	{
- 	  have_ptrace_xmmregs = 0;
- #endif
-          if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
-+          if (ptrace (PT_GETFPREGS, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	    perror_with_name (_("Couldn't get floating point status"));
- 
-           i387_collect_fsave (regcache, regnum, &fpregs);
- 
-          if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
-+          if (ptrace (PT_SETFPREGS, ptrace_pid (inferior_ptid),
- 		      (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	    perror_with_name (_("Couldn't write floating point status"));
- #ifdef HAVE_PT_GETXMMREGS
-@@ -305,7 +318,7 @@ i386bsd_dr_get (ptid_t ptid, int regnum)
- {
-   struct dbreg dbregs;
- 
-  if (ptrace (PT_GETDBREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_GETDBREGS, ptrace_pid (inferior_ptid),
- 	      (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-     perror_with_name (_("Couldn't read debug registers"));
- 
-@@ -317,7 +330,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
- {
-   struct dbreg dbregs;
- 
-  if (ptrace (PT_GETDBREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_GETDBREGS, ptrace_pid (inferior_ptid),
-               (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-     perror_with_name (_("Couldn't get debug registers"));
- 
-@@ -328,7 +341,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
- 
-   DBREG_DRX ((&dbregs), regnum) = value;
- 
-  if (ptrace (PT_SETDBREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_SETDBREGS, ptrace_pid (inferior_ptid),
-               (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
-     perror_with_name (_("Couldn't write debug registers"));
- }
-diff --git gdb/i386bsd-nat.h gdb/i386bsd-nat.h
-index 2f50c32..bf7f2ff 100644
--- gdb/i386bsd-nat.h
-+++ gdb/i386bsd-nat.h
-@@ -38,6 +38,14 @@ extern CORE_ADDR i386bsd_dr_get_addr (int regnum);
- 
- extern unsigned long i386bsd_dr_get_status (void);
- 
-+/* low level i386 register functions used in i386fbsd-nat.c. */
-+
-+extern void i386bsd_supply_gregset (struct regcache *regcache,
-+				    const void *gregs);
-+
-+extern void i386bsd_collect_gregset (const struct regcache *regcache,
-+				     void *gregs, int regnum);
-+
- extern unsigned long i386bsd_dr_get_control (void);
- 
- #endif /* i386bsd-nat.h */
-diff --git gdb/i386fbsd-nat.c gdb/i386fbsd-nat.c
-index a205a26..29b9444 100644
--- gdb/i386fbsd-nat.c
-+++ gdb/i386fbsd-nat.c
-@@ -21,6 +21,7 @@
- #include "inferior.h"
- #include "regcache.h"
- #include "target.h"
-+#include "gregset.h"
- 
- #include <sys/types.h>
- #include <sys/ptrace.h>
-@@ -81,6 +82,49 @@ i386fbsd_resume (struct target_ops *ops,
- }
- 
- 
-+/* Transfering the registers between GDB, inferiors and core files.  */
-+
-+/* Fill GDB's register array with the general-purpose register values
-+   in *GREGSETP.  */
-+
-+void
-+supply_gregset (struct regcache *regcache, const gregset_t *gregsetp)
-+{
-+  i386bsd_supply_gregset (regcache, gregsetp);
-+}
-+
-+/* Fill register REGNUM (if it is a general-purpose register) in
-+   *GREGSETPS with the value in GDB's register array.  If REGNUM is -1,
-+   do this for all registers.  */
-+
-+void
-+fill_gregset (const struct regcache *regcache, gdb_gregset_t *gregsetp, int regnum)
-+{
-+  i386bsd_collect_gregset (regcache, gregsetp, regnum);
-+}
-+
-+#include "i387-tdep.h"
-+
-+/* Fill GDB's register array with the floating-point register values
-+   in *FPREGSETP.  */
-+
-+void
-+supply_fpregset (struct regcache *regcache, const fpregset_t *fpregsetp)
-+{
-+  i387_supply_fsave (regcache, -1, fpregsetp);
-+}
-+
-+/* Fill register REGNUM (if it is a floating-point register) in
-+   *FPREGSETP with the value in GDB's register array.  If REGNUM is -1,
-+   do this for all registers.  */
-+
-+void
-+fill_fpregset (const struct regcache *regcache, gdb_fpregset_t *fpregsetp, int regnum)
-+{
-+  i387_collect_fsave (regcache, regnum, fpregsetp);
-+}
-+
-+
- /* Support for debugging kernel virtual memory images.  */
- 
- #include <machine/pcb.h>
-diff --git gdb/i386fbsd-tdep.c gdb/i386fbsd-tdep.c
-index 99e08cb..5bb15f6 100644
--- gdb/i386fbsd-tdep.c
-+++ gdb/i386fbsd-tdep.c
-@@ -28,7 +28,6 @@
- 
- #include "i386-tdep.h"
- #include "i387-tdep.h"
-#include "bsd-uthread.h"
- #include "fbsd-tdep.h"
- #include "solib-svr4.h"
- 
-@@ -333,46 +332,6 @@ i386fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
- }
- 
- static void
-i386fbsd_supply_uthread (struct regcache *regcache,
-			 int regnum, CORE_ADDR addr)
-{
-  gdb_byte buf[4];
-  int i;
-
-  gdb_assert (regnum >= -1);
-
-  for (i = 0; i < ARRAY_SIZE (i386fbsd_jmp_buf_reg_offset); i++)
-    {
-      if (i386fbsd_jmp_buf_reg_offset[i] != -1
-	  && (regnum == -1 || regnum == i))
-	{
-	  read_memory (addr + i386fbsd_jmp_buf_reg_offset[i], buf, 4);
-	  regcache_raw_supply (regcache, i, buf);
-	}
-    }
-}
-
-static void
-i386fbsd_collect_uthread (const struct regcache *regcache,
-			  int regnum, CORE_ADDR addr)
-{
-  gdb_byte buf[4];
-  int i;
-
-  gdb_assert (regnum >= -1);
-
-  for (i = 0; i < ARRAY_SIZE (i386fbsd_jmp_buf_reg_offset); i++)
-    {
-      if (i386fbsd_jmp_buf_reg_offset[i] != -1
-	  && (regnum == -1 || regnum == i))
-	{
-	  regcache_raw_collect (regcache, i, buf);
-	  write_memory (addr + i386fbsd_jmp_buf_reg_offset[i], buf, 4);
-	}
-    }
-}
-
-static void
- i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
- {
-   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-@@ -399,10 +358,6 @@ i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
-   /* FreeBSD has a more complete `struct sigcontext'.  */
-   tdep->sc_reg_offset = i386fbsd_sc_reg_offset;
-   tdep->sc_num_regs = ARRAY_SIZE (i386fbsd_sc_reg_offset);
-
-  /* FreeBSD provides a user-level threads implementation.  */
-  bsd_uthread_set_supply_uthread (gdbarch, i386fbsd_supply_uthread);
-  bsd_uthread_set_collect_uthread (gdbarch, i386fbsd_collect_uthread);
- }
- 
- static void
-diff --git gdb/ppcfbsd-nat.c gdb/ppcfbsd-nat.c
-index 778b4bb..fa9285f 100644
--- gdb/ppcfbsd-nat.c
-+++ gdb/ppcfbsd-nat.c
-@@ -37,6 +37,19 @@
- #include "inf-ptrace.h"
- #include "bsd-kvm.h"
- 
-+static pid_t
-+ptrace_pid (ptid_t ptid)
-+{
-+  pid_t pid;
-+
-+#ifdef __FreeBSD__
-+  pid = ptid_get_lwp (ptid);
-+  if (pid == 0)
-+#endif
-+    pid = ptid_get_pid (ptid);
-+  return pid;
-+}
-+  
- /* Fill GDB's register array with the general-purpose register values
-    in *GREGSETP.  */
- 
-@@ -121,7 +134,7 @@ ppcfbsd_fetch_inferior_registers (struct target_ops *ops,
- {
-   gdb_gregset_t regs;
- 
-  if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
- 	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-     perror_with_name (_("Couldn't get registers"));
- 
-@@ -132,7 +145,7 @@ ppcfbsd_fetch_inferior_registers (struct target_ops *ops,
-       const struct regset *fpregset = ppc_fbsd_fpregset ();
-       gdb_fpregset_t fpregs;
- 
-      if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETFPREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	perror_with_name (_("Couldn't get FP registers"));
- 
-@@ -149,13 +162,13 @@ ppcfbsd_store_inferior_registers (struct target_ops *ops,
- {
-   gdb_gregset_t regs;
- 
-  if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_GETREGS, ptrace_pid (inferior_ptid),
- 	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-     perror_with_name (_("Couldn't get registers"));
- 
-   fill_gregset (regcache, &regs, regno);
- 
-  if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
-+  if (ptrace (PT_SETREGS, ptrace_pid (inferior_ptid),
- 	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-     perror_with_name (_("Couldn't write registers"));
- 
-@@ -163,13 +176,13 @@ ppcfbsd_store_inferior_registers (struct target_ops *ops,
-     {
-       gdb_fpregset_t fpregs;
- 
-      if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_GETFPREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	perror_with_name (_("Couldn't get FP registers"));
- 
-       fill_fpregset (regcache, &fpregs, regno);
- 
-      if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
-+      if (ptrace (PT_SETFPREGS, ptrace_pid (inferior_ptid),
- 		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- 	perror_with_name (_("Couldn't set FP registers"));
-     }
--- a/devel/gdb/files/fbsd-threads.c
+++ b/devel/gdb/files/fbsd-threads.c
--- a/devel/gdb/files/kgdb/fbsd-kvm.c
+++ b/devel/gdb/files/kgdb/fbsd-kvm.c
@ -478,7 +478,7 @@ kgdb_switch_to_thread(int tid)
 	char buf[16];
 	int thread_id;

-	thread_id = pid_to_thread_id(fbsd_vmcore_ptid(tid));
+	thread_id = ptid_to_global_thread_id(fbsd_vmcore_ptid(tid));
 	if (thread_id == 0)
 		error ("invalid tid");
 	snprintf(buf, sizeof(buf), "%d", thread_id);
--- a/devel/gdb/files/patch-armfbsd
+++ b/devel/gdb/files/patch-armfbsd
@ -347,20 +347,21 @@ diff --git gdb/Makefile.in gdb/Makefile.in
 index dfaa8a3..ddad28d 100644
 --- gdb/Makefile.in
 +++ gdb/Makefile.in
-@@ -655,7 +655,7 @@ ALL_64_TARGET_OBS = \
- # All other target-dependent objects files (used with --enable-targets=all).
+@@ -659,7 +659,7 @@
 ALL_TARGET_OBS = \
- 	armbsd-tdep.o arm-linux-tdep.o arm-symbian-tdep.o \
+ 	armbsd-tdep.o arm.o arm-linux.o arm-linux-tdep.o \
+ 	arm-get-next-pcs.o arm-symbian-tdep.o \
 -	armnbsd-tdep.o armobsd-tdep.o \
 +	armnbsd-tdep.o armobsd-tdep.o armfbsd-tdep.o \
 	arm-tdep.o arm-wince-tdep.o \
 	avr-tdep.o \
 	bfin-linux-tdep.o bfin-tdep.o \
-@@ -1660,6 +1660,6 @@ ALLDEPFILES = \
- 	amd64-linux-nat.c amd64-linux-tdep.c \
- 	amd64-sol2-tdep.c \
- 	arm-linux-nat.c arm-linux-tdep.c arm-symbian-tdep.c arm-tdep.c \
+@@ -1666,7 +1666,7 @@
+ 	arm.c arm-get-next-pcs.c \
+ 	arm-linux.c arm-linux-nat.c arm-linux-tdep.c \
+ 	arm-symbian-tdep.c arm-tdep.c \
 -	armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
 +	armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c armfbsd-tdep.c \
 	avr-tdep.c \
 	bfin-linux-tdep.c bfin-tdep.c \
+ 	bsd-uthread.c bsd-kvm.c \
--- a/devel/gdb/files/patch-gdb-amd64bsd-nat.c
+++ b/devel/gdb/files/patch-gdb-amd64bsd-nat.c
@ -1,7 +1,5 @@
-diff --git gdb/amd64bsd-nat.c gdb/amd64bsd-nat.c
-index 66d4289..b1d4a0e 100644
--- gdb/amd64bsd-nat.c
-+++ gdb/amd64bsd-nat.c
+--- gdb/amd64bsd-nat.c.orig	2016-02-10 04:19:39.000000000 +0100
+++ gdb/amd64bsd-nat.c	2016-03-04 11:17:58.581638025 +0100
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/ptrace.h>
@ -10,7 +8,7 @@ index 66d4289..b1d4a0e 100644
 
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
-@@ -98,14 +99,24 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
+@@ -98,14 +99,25 @@
 
   if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum))
     {
@ -19,20 +17,21 @@ index 66d4289..b1d4a0e 100644
 
 +      memset( &regs, 0, sizeof(struct reg));
 +      memset( &oldregs, 0, sizeof(struct reg));
-       if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
+       if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't get registers"));
 
-+      ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
-+                  (PTRACE_TYPE_ARG3) &oldregs, 0);
+      ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
+		  (PTRACE_TYPE_ARG3) &oldregs, 0);
       amd64_collect_native_gregset (regcache, &regs, regnum);
 
-+      if( (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE) {
-+        //printf("regs.r_rflags = 0x%8.8lX\n", regs.r_rflags );
-+        //printf("oldregs.r_rflags = 0x%8.8lX\n", oldregs.r_rflags );
-+        regs.r_rflags ^= (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE;
-+        //printf("    allowed regs.r_rflags = 0x%8.8X\n", regs.r_rflags );
-+      }
-       if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
+      if( (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE)
+        {
+          //printf("regs.r_rflags = 0x%8.8lX\n", regs.r_rflags );
+          //printf("oldregs.r_rflags = 0x%8.8lX\n", oldregs.r_rflags );
+          regs.r_rflags ^= (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE;
+          //printf("    allowed regs.r_rflags = 0x%8.8X\n", regs.r_rflags );
+        }
+       if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid),
 	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't write registers"));
--- a/devel/gdb/files/patch-gdb-configure
+++ b/devel/gdb/files/patch-gdb-configure
@ -1,24 +1,12 @@
-diff --git gdb/configure gdb/configure
-index 355f190..9c60e01 100755
--- gdb/configure
-+++ gdb/configure
-@@ -11423,7 +11423,8 @@ fi
- 
- # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
- # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.
-ac_fn_c_check_member "$LINENO" "struct reg" "r_fs" "ac_cv_member_struct_reg_r_fs" "#include <machine/reg.h>
-+ac_fn_c_check_member "$LINENO" "struct reg" "r_fs" "ac_cv_member_struct_reg_r_fs" "#include <sys/types.h>
-+#include <machine/reg.h>
- "
- if test "x$ac_cv_member_struct_reg_r_fs" = x""yes; then :
- 
-@@ -11433,7 +11434,8 @@ _ACEOF
- 
- 
+--- gdb/configure.orig	2016-03-07 10:33:02.757803766 +0100
+++ gdb/configure	2016-03-07 10:32:39.480804873 +0100
+@@ -14297,8 +14297,7 @@
+ -Wno-narrowing"
+ else
+    build_warnings="$build_warnings -Wpointer-sign -Wmissing-prototypes \
+--Wdeclaration-after-statement -Wmissing-parameter-type \
+--Wold-style-declaration -Wold-style-definition"
+-Wdeclaration-after-statement -Wold-style-definition"
 fi
-ac_fn_c_check_member "$LINENO" "struct reg" "r_gs" "ac_cv_member_struct_reg_r_gs" "#include <machine/reg.h>
-+ac_fn_c_check_member "$LINENO" "struct reg" "r_gs" "ac_cv_member_struct_reg_r_gs" "#include <sys/types.h>
-+#include <machine/reg.h>
- "
- if test "x$ac_cv_member_struct_reg_r_gs" = x""yes; then :
 
+ # Enable -Wno-format by default when using gcc on mingw since many
--- a/devel/gdb/files/patch-gdb-fbsd-nat.c
+++ b/devel/gdb/files/patch-gdb-fbsd-nat.c
@ -0,0 +1,17 @@
+--- gdb/fbsd-nat.c.orig	2016-03-14 00:00:11.831889802 +0100
+++ gdb/fbsd-nat.c	2016-03-14 00:04:35.906871361 +0100
+@@ -471,6 +471,14 @@
+ 			ptid_get_tid (ptid));
+   if (ptid_lwp_p (ptid))
+     {
+#ifndef PT_LWP_EVENTS
+      /* When LWP events are not supported, a new thread might already be
+	 running that has not yet reported an event when GDB wishes to
+         only run a single thread.  Force an update of the thread list
+	 to ensure that any such threads are suspended before the process
+	 is resumed.  */
+      fbsd_add_threads (ptid_get_pid (ptid));
+#endif
+       /* If ptid is a specific LWP, suspend all other LWPs in the process.  */
+       iterate_over_threads (resume_one_thread_cb, &ptid);
+     }
--- a/devel/gdb/files/patch-gdb_common_common-defs.h
+++ b/devel/gdb/files/patch-gdb_common_common-defs.h
@ -1,12 +0,0 @@
--- gdb/common/common-defs.h.orig	2015-07-06 19:57:46 UTC
-+++ gdb/common/common-defs.h
-@@ -34,7 +34,9 @@
- #include <stdint.h>
- #include <string.h>
- #include <errno.h>
-+#ifndef __FreeBSD__
- #include <alloca.h>
-+#endif
- #include "ansidecl.h"
- #include "libiberty.h"
- #include "pathmax.h"
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@ -1,13 +1,12 @@
 # $FreeBSD$

 PORTNAME=	git-review
-PORTVERSION=	1.24
-PORTREVISION=	2
+PORTVERSION=	1.25.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP

 MAINTAINER=	dereckson@gmail.com
-COMMENT=	Allow to push review and interact with a Gerrit server
+COMMENT=	Allow to push code to review and interact with a Gerrit server

 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@ -20,7 +19,6 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes

-PLIST_FILES=	man/man1/git-review.1.gz
 PORTDOCS=	README.rst HACKING.rst AUTHORS

 OPTIONS_DEFINE=	DOCS
--- a/devel/git-review/distinfo
+++ b/devel/git-review/distinfo
@ -1,2 +1,2 @@
-SHA256 (git-review-1.24.tar.gz) = 20fa8be4b86430b41153c270f770dd270bde06ff70c60c411aa9adc9db2f512a
-SIZE (git-review-1.24.tar.gz) = 39106
+SHA256 (git-review-1.25.0.tar.gz) = 087e0a7dc2415796a9f21c484a6f652c5410e6ba4562c36291c5399f9395a11d
+SIZE (git-review-1.25.0.tar.gz) = 51903
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jenkins
-PORTVERSION=	1.652
+PORTVERSION=	1.653
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@ -1,2 +1,2 @@
-SHA256 (jenkins/1.652/jenkins.war) = 5d06f14d1035bc5eb6b77ebae90efc0f87de905ff04505dec30eea0eddd3ac27
-SIZE (jenkins/1.652/jenkins.war) = 64618097
+SHA256 (jenkins/1.653/jenkins.war) = 48e33fab851459c0e81fc2d6f36f1795490d862d1d1f3d3a79c46c945bdb44fc
+SIZE (jenkins/1.653/jenkins.war) = 64689474
--- a/devel/libarea/Makefile
+++ b/devel/libarea/Makefile
@ -0,0 +1,23 @@
+# Created by: Pedro Giffuni
+# $FreeBSD$
+
+PORTNAME=	libarea
+PORTVERSION=	20160313
+CATEGORIES=	devel cad
+
+MAINTAINER=	pfg@FreeBSD.org
+COMMENT=	CAM-related software for profile and pocketing operations
+
+LICENSE=	BSD3CLAUSE
+
+BUILD_DEPENDS=	python-config:${PORTSDIR}/lang/python
+LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	Heeks
+GH_TAGNAME=	f1986ac
+
+USES=		cmake:outsource python
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
--- a/devel/libarea/distinfo
+++ b/devel/libarea/distinfo
@ -0,0 +1,2 @@
+SHA256 (Heeks-libarea-20160313-f1986ac_GH0.tar.gz) = 6040965d28fe3896350d45411f0a7cd1bef5dfef4d16cdae4f9fb28ddbfd8f95
+SIZE (Heeks-libarea-20160313-f1986ac_GH0.tar.gz) = 208638
--- a/devel/libarea/pkg-descr
+++ b/devel/libarea/pkg-descr
@ -0,0 +1,10 @@
+libarea is a CAM-related software for profile and pocketing operation.
+
+This project provides library and associated python-modules to compute 
+profile and pocket operations.
+
+libarea is used by HeeksCNC and FreeCAD's Path workbench.
+
+Written by Dan Heeks <danheeks @ gmail>
+
+WWW: https://github.com/heeks/libarea
--- a/devel/libarea/pkg-plist
+++ b/devel/libarea/pkg-plist
@ -0,0 +1,14 @@
+include/area/Arc.h
+include/area/Area.h
+include/area/AreaDxf.h
+include/area/AreaOrderer.h
+include/area/Box2D.h
+include/area/Circle.h
+include/area/Curve.h
+include/area/Point.h
+include/area/PythonStuff.h
+include/area/dxf.h
+include/area/kurve/geometry.h
+lib/libarea.so
+lib/libarea.so.0
+%%PYTHON_SITELIBDIR%%/area.so
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@ -2,9 +2,10 @@
 # $FreeBSD$

 PORTNAME=	lacaml
-PORTVERSION=	7.2.6
-DISTVERSIONPREFIX=	v
+PORTVERSION=	8.0.7
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION:S/^/v/}
 PKGNAMEPREFIX=	ocaml-

 MAINTAINER=	ports@FreeBSD.org
@ -13,9 +14,6 @@ COMMENT=	OCaml interface to BLAS and LAPACK libraries
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.txt

-USE_GITHUB=	yes
-GH_ACCOUNT=	mmottl
-
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
 USE_OCAMLFIND_PLIST=yes
@ -54,7 +52,8 @@ post-install:
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.txt CHANGES.txt README.md TODO.md
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
 .endfor

 post-install-EXAMPLES-on:
--- a/devel/ocaml-lacaml/distinfo
+++ b/devel/ocaml-lacaml/distinfo
@ -1,2 +1,2 @@
-SHA256 (mmottl-lacaml-v7.2.6_GH0.tar.gz) = ae525319ef146e6b661cde4442e188376982d6ca0767b228319129e4b0b7ab7c
-SIZE (mmottl-lacaml-v7.2.6_GH0.tar.gz) = 171304
+SHA256 (lacaml-8.0.7.tar.gz) = 33c939ec663e6fb7ef483e785b59f8e21027590452a7a6e9ca20fe0cf23888e9
+SIZE (lacaml-8.0.7.tar.gz) = 180651
--- a/devel/ocaml-xstrp4/Makefile
+++ b/devel/ocaml-xstrp4/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	xstrp4
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-xstrp4/distinfo
+++ b/devel/ocaml-xstrp4/distinfo
@ -1,2 +1,2 @@
-SHA256 (xstrp4-1.8.1.tar.gz) = 1c66496019222f092b0bd8b606198f0db0939ef7ccf1be14dc196bef7a6bc519
-SIZE (xstrp4-1.8.1.tar.gz) = 7547
+SHA256 (xstrp4-1.8.2.tar.gz) = a62b8b66142a454e14e491c4023855068bbdc1489d27a2d698cb19f52d34cb9b
+SIZE (xstrp4-1.8.2.tar.gz) = 7583
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	oozie
 PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
 		LOCAL/demon/:maven \
@ -29,7 +29,7 @@ USES=		shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 TOMCAT_VERSION=	6.0.43
-HADOOP_VERSION=	2.7.1		# Matches devel/hadoop2
+HADOOP_VERSION=	2.7.2		# Matches devel/hadoop2
 SHEBANG_FILES=	client/src/main/bin/oozie distro/src/main/bin/addtowar.sh distro/src/main/bin/oozied.sh distro/src/main/bin/oozie-setup.sh distro/src/main/bin/oozie-sys.sh tools/src/main/bin/ooziedb.sh core/src/main/conf/oozie-env.sh

 OOZIE_USER=	oozie
@ -65,7 +65,7 @@ do-install:
 	${CHMOD} 755 ${STAGEDIR}${PREFIX}/oozie/oozie-server/bin/catalina.sh ${STAGEDIR}${PREFIX}/oozie/oozie-server/bin/setclasspath.sh
 	${FIND} ${STAGEDIR}${PREFIX}/oozie/oozie-server/conf -name '*.xml' -or -name '*.properties' | ${XARGS} ${CHMOD} 644
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ext-2.2.zip ${STAGEDIR}${PREFIX}/oozie/libext/
-	cd ${PREFIX}/share/hadoop/common/lib && ${INSTALL_DATA} activation-1.1.jar avro-1.7.4.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar commons-codec-1.4.jar commons-collections-3.2.1.jar commons-compress-1.4.1.jar commons-configuration-1.6.jar commons-digester-1.8.jar commons-httpclient-3.1.jar commons-io-2.4.jar commons-lang-2.6.jar commons-logging-1.1.3.jar commons-math3-3.1.1.jar commons-net-3.1.jar guava-11.0.2.jar httpclient-4.2.5.jar httpcore-4.2.5.jar jackson-core-asl-1.9.13.jar jackson-mapper-asl-1.9.13.jar jaxb-api-2.2.2.jar jersey-core-1.9.jar jetty-util-6.1.14.jar jsr305-3.0.0.jar log4j-1.2.17.jar paranamer-2.3.jar protobuf-java-2.5.0.jar servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-java-1.0.4.1.jar stax-api-1.0-2.jar xmlenc-0.52.jar xz-1.0.jar zookeeper-3.4.6.jar ${STAGEDIR}${PREFIX}/oozie/libext/
+	cd ${PREFIX}/share/hadoop/common/lib && ${INSTALL_DATA} activation-1.1.jar avro-1.7.4.jar commons-beanutils-1.7.0.jar commons-beanutils-core-1.8.0.jar commons-cli-1.2.jar commons-codec-1.4.jar commons-collections-3.2.2.jar commons-compress-1.4.1.jar commons-configuration-1.6.jar commons-digester-1.8.jar commons-httpclient-3.1.jar commons-io-2.4.jar commons-lang-2.6.jar commons-logging-1.1.3.jar commons-math3-3.1.1.jar commons-net-3.1.jar guava-11.0.2.jar httpclient-4.2.5.jar httpcore-4.2.5.jar jackson-core-asl-1.9.13.jar jackson-mapper-asl-1.9.13.jar jaxb-api-2.2.2.jar jersey-core-1.9.jar jetty-util-6.1.14.jar jsr305-3.0.0.jar log4j-1.2.17.jar paranamer-2.3.jar protobuf-java-2.5.0.jar servlet-api-2.5.jar slf4j-api-1.7.10.jar slf4j-log4j12-1.7.10.jar snappy-java-1.0.4.1.jar stax-api-1.0-2.jar xmlenc-0.52.jar xz-1.0.jar zookeeper-3.4.6.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	cd ${PREFIX}/share/hadoop && ${INSTALL_DATA} common/lib/hadoop-annotations-${HADOOP_VERSION}.jar common/lib/hadoop-auth-${HADOOP_VERSION}.jar common/hadoop-common-${HADOOP_VERSION}.jar hdfs/hadoop-hdfs-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-app-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-common-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-core-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-jobclient-${HADOOP_VERSION}.jar mapreduce/hadoop-mapreduce-client-shuffle-${HADOOP_VERSION}.jar yarn/hadoop-yarn-api-${HADOOP_VERSION}.jar yarn/hadoop-yarn-client-${HADOOP_VERSION}.jar yarn/hadoop-yarn-common-${HADOOP_VERSION}.jar yarn/hadoop-yarn-server-common-${HADOOP_VERSION}.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/hadoop-client-${HADOOP_VERSION}.jar ${STAGEDIR}${PREFIX}/oozie/libext/
 	cd ${STAGEDIR}${PREFIX}/oozie && bin/oozie-setup.sh prepare-war
--- a/devel/oozie/distinfo
+++ b/devel/oozie/distinfo
@ -1,10 +1,10 @@
 SHA256 (hadoop/oozie-4.2.0.tar.gz) = fb67da2af5ada4439de4b4745e9af26e5d9966525fd027701f1926994e718293
 SIZE (hadoop/oozie-4.2.0.tar.gz) = 1912402
-SHA256 (hadoop/FreeBSD-oozie-4.2.0-maven-repository.tar.gz) = ce44fc60fb8ba4d049f20e1221d6d388ff0517d84321c3baabd195430a1bbc06
-SIZE (hadoop/FreeBSD-oozie-4.2.0-maven-repository.tar.gz) = 218633705
+SHA256 (hadoop/FreeBSD-oozie-4.2.0-maven-repository.tar.gz) = 0fb513c3798cf82b8e93f68c26ddbd26f2b5324a977fea5c83615c755ed2b335
+SIZE (hadoop/FreeBSD-oozie-4.2.0-maven-repository.tar.gz) = 219213287
 SHA256 (hadoop/apache-tomcat-6.0.43.tar.gz) = 8952239e20856714fd3ae0ae88aa57e69f50c196091c39ec033906109f67b068
 SIZE (hadoop/apache-tomcat-6.0.43.tar.gz) = 7185524
 SHA256 (hadoop/ext-2.2.zip) = c463e298c7cc6fe3c5c863424a688b53a452bfe8f136bf20002e15b2bd201369
 SIZE (hadoop/ext-2.2.zip) = 6800612
-SHA256 (hadoop/hadoop-client-2.7.1.jar) = 7eef4e1162da1129bfdf59dd390bcb90c33332db4aeaeec37efc701413361051
-SIZE (hadoop/hadoop-client-2.7.1.jar) = 2545
+SHA256 (hadoop/hadoop-client-2.7.2.jar) = 83c04e67aff723df0fb9b636d13fbf9ef2e6c72acc365acdc65042d2ff157cf3
+SIZE (hadoop/hadoop-client-2.7.2.jar) = 2545
--- a/devel/oozie/pkg-plist
+++ b/devel/oozie/pkg-plist
@ -93,7 +93,7 @@ oozie/libext/commons-beanutils-1.7.0.jar
 oozie/libext/commons-beanutils-core-1.8.0.jar
 oozie/libext/commons-cli-1.2.jar
 oozie/libext/commons-codec-1.4.jar
-oozie/libext/commons-collections-3.2.1.jar
+oozie/libext/commons-collections-3.2.2.jar
 oozie/libext/commons-compress-1.4.1.jar
 oozie/libext/commons-configuration-1.6.jar
 oozie/libext/commons-digester-1.8.jar
--- a/devel/p5-List-SomeUtils-XS/Makefile
+++ b/devel/p5-List-SomeUtils-XS/Makefile
@ -0,0 +1,25 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	List-SomeUtils-XS
+PORTVERSION=	0.51
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	XS implementation for List::SomeUtils
+
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
+		p5-Test-Warnings>=0.006:${PORTSDIR}/devel/p5-Test-Warnings
+
+USE_PERL5=	configure
+USES=		perl5
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/List/SomeUtils/XS/XS.so
+
+.include <bsd.port.mk>
--- a/devel/p5-List-SomeUtils-XS/distinfo
+++ b/devel/p5-List-SomeUtils-XS/distinfo
@ -0,0 +1,2 @@
+SHA256 (List-SomeUtils-XS-0.51.tar.gz) = 64cdf8172568fe4fa689f01c83b54d2471ff7f293ec3d71ba83153204a90550e
+SIZE (List-SomeUtils-XS-0.51.tar.gz) = 88420
--- a/devel/p5-List-SomeUtils-XS/pkg-descr
+++ b/devel/p5-List-SomeUtils-XS/pkg-descr
@ -0,0 +1,3 @@
+List::SomeUtils::XS is XS implementation for List::SomeUtils.
+
+WWW: http://search.cpan.org/dist/List-SomeUtils-XS/
--- a/devel/p5-List-SomeUtils-XS/pkg-plist
+++ b/devel/p5-List-SomeUtils-XS/pkg-plist
@ -0,0 +1,3 @@
+%%SITE_ARCH%%/List/SomeUtils/XS.pm
+%%SITE_ARCH%%/auto/List/SomeUtils/XS/XS.so
+%%PERL5_MAN3%%/List::SomeUtils::XS.3.gz
--- a/devel/p5-List-SomeUtils/Makefile
+++ b/devel/p5-List-SomeUtils/Makefile
@ -0,0 +1,26 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	List-SomeUtils
+PORTVERSION=	0.51
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Provide the stuff missing in List::Util
+
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
+		p5-List-SomeUtils-XS>=0:${PORTSDIR}/devel/p5-List-SomeUtils-XS \
+		p5-Module-Implementation>=0:${PORTSDIR}/devel/p5-Module-Implementation
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+NO_ARCH=	yes
+USE_PERL5=	configure
+USES=		perl5
+
+.include <bsd.port.mk>
--- a/devel/p5-List-SomeUtils/distinfo
+++ b/devel/p5-List-SomeUtils/distinfo
@ -0,0 +1,2 @@
+SHA256 (List-SomeUtils-0.51.tar.gz) = 17fc9ae1df51cf94aea14eb5e229b0e7737aed48a6a5ca40761ba387a2fdafc1
+SIZE (List-SomeUtils-0.51.tar.gz) = 55179
--- a/devel/p5-List-SomeUtils/files/patch-Makefile.PL
+++ b/devel/p5-List-SomeUtils/files/patch-Makefile.PL
@ -0,0 +1,21 @@
+--- Makefile.PL.orig	2016-02-27 15:18:00 UTC
+++ Makefile.PL
+@@ -13,7 +13,6 @@ my %WriteMakefileArgs = (
+   "ABSTRACT" => "Provide the stuff missing in List::Util",
+   "AUTHOR" => "Tassilo von Parseval <tassilo.von.parseval\@rwth-aachen.de>, Adam Kennedy <adamk\@cpan.org>, Jens Rehsack <rehsack\@cpan.org>, Dave Rolsky <autarch\@urth.org>",
+   "CONFIGURE_REQUIRES" => {
+-    "ExtUtils::HasCompiler" => 0,
+     "ExtUtils::MakeMaker" => 0
+   },
+   "DISTNAME" => "List-SomeUtils",
+@@ -76,9 +75,6 @@ unless ( eval { ExtUtils::MakeMaker->VER
+ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+ 
+-use ExtUtils::HasCompiler qw( can_compile_loadable_object );
+-if ( can_compile_loadable_object( quiet => 1 ) ) {
+-    $WriteMakefileArgs{PREREQ_PM}{'List::SomeUtils::XS'} = 0;
+-}
+$WriteMakefileArgs{PREREQ_PM}{'List::SomeUtils::XS'} = 0;
+ 
+ WriteMakefile(%WriteMakefileArgs);
--- a/devel/p5-List-SomeUtils/pkg-descr
+++ b/devel/p5-List-SomeUtils/pkg-descr
@ -0,0 +1,10 @@
+List::SomeUtils provides some trivial but commonly needed functionality on lists
+which is not going to go into List::Util.
+
+All of the below functions are implementable in only a couple of lines of Perl
+code. Using the functions from this module however should give slightly better
+performance as everything is implemented in C. The pure-Perl implementation of
+these functions only serves as a fallback in case the C portions of this module
+couldn't be compiled on this machine.
+
+WWW: http://search.cpan.org/dist/List-SomeUtils/
--- a/devel/p5-List-SomeUtils/pkg-plist
+++ b/devel/p5-List-SomeUtils/pkg-plist
@ -0,0 +1,4 @@
+%%SITE_PERL%%/List/SomeUtils.pm
+%%SITE_PERL%%/List/SomeUtils/PP.pm
+%%PERL5_MAN3%%/List::SomeUtils.3.gz
+%%PERL5_MAN3%%/List::SomeUtils::PP.3.gz
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	MooseX-Runnable
-PORTVERSION=	0.09
-PORTREVISION=	1
+PORTVERSION=	0.10
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -15,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

 BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
+		p5-List-SomeUtils>=0:${PORTSDIR}/devel/p5-List-SomeUtils \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
 		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
--- a/devel/p5-MooseX-Runnable/distinfo
+++ b/devel/p5-MooseX-Runnable/distinfo
@ -1,2 +1,2 @@
-SHA256 (MooseX-Runnable-0.09.tar.gz) = d69074bbc1631be2cfdac438cab07d2284c2294c29d8be77aa72da0225a40ffc
-SIZE (MooseX-Runnable-0.09.tar.gz) = 37034
+SHA256 (MooseX-Runnable-0.10.tar.gz) = 40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199
+SIZE (MooseX-Runnable-0.10.tar.gz) = 41241
--- a/devel/py-botocore/Makefile
+++ b/devel/py-botocore/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	botocore
-PORTVERSION=	1.3.17
+PORTVERSION=	1.4.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-botocore/distinfo
+++ b/devel/py-botocore/distinfo
@ -1,2 +1,2 @@
-SHA256 (botocore-1.3.17.tar.gz) = 1ca85c5ebe0beed7b54fc47de81d3f39c6bb907951fe6db6a38185de63db7723
-SIZE (botocore-1.3.17.tar.gz) = 2300885
+SHA256 (botocore-1.4.2.tar.gz) = 3391e31ad3df0b4a0f05c82bdfd33c7fa7b052071bd5b57980e504d8770c6d86
+SIZE (botocore-1.4.2.tar.gz) = 2398684
--- a/devel/py-characteristic/Makefile
+++ b/devel/py-characteristic/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	characteristic
-PORTVERSION=	14.1.0
+PORTVERSION=	14.3.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-characteristic/distinfo
+++ b/devel/py-characteristic/distinfo
@ -1,2 +1,2 @@
-SHA256 (characteristic-14.1.0.tar.gz) = 91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d
-SIZE (characteristic-14.1.0.tar.gz) = 24612
+SHA256 (characteristic-14.3.0.tar.gz) = ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380
+SIZE (characteristic-14.3.0.tar.gz) = 26993
--- a/devel/py-pyte/Makefile
+++ b/devel/py-pyte/Makefile
@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	pyte
+PORTVERSION=	0.5.1
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	wg@FreeBSD.org
+COMMENT=	Simple VTXXX-compatible terminal emulator
+
+LICENSE=	LGPL3
+
+NO_ARCH=	yes
+USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+
+.include <bsd.port.mk>
--- a/devel/py-pyte/distinfo
+++ b/devel/py-pyte/distinfo
@ -0,0 +1,2 @@
+SHA256 (pyte-0.5.1.tar.gz) = d2cf77ef6395c6b97d5c10ee47f38d348114170e504fc55a043d4c7dd1aea6e1
+SIZE (pyte-0.5.1.tar.gz) = 49849
--- a/devel/py-pyte/pkg-descr
+++ b/devel/py-pyte/pkg-descr
@ -0,0 +1,4 @@
+Its an in memory VTXXX-compatible terminal emulator. XXX stands for a series
+of video terminals, developed by DEC between 1970 and 1995.
+
+WWW: https://github.com/selectel/pyte
--- a/devel/py-raven/Makefile
+++ b/devel/py-raven/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	raven
-PORTVERSION=	5.11.0
+PORTVERSION=	5.11.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP

--- a/devel/py-raven/distinfo
+++ b/devel/py-raven/distinfo
@ -1,2 +1,2 @@
-SHA256 (raven-5.11.0.tar.gz) = 03a55716d30e98780de0fe6c11cb3954744b604a97ee6dcc695dea61b120c108
-SIZE (raven-5.11.0.tar.gz) = 255342
+SHA256 (raven-5.11.1.tar.gz) = 581632f59f4d0ab89e3562d36820c0b4c949789be61422d92078f2396db27042
+SIZE (raven-5.11.1.tar.gz) = 255337
--- a/devel/rubygem-ice_cube/Makefile
+++ b/devel/rubygem-ice_cube/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	ice_cube
-PORTVERSION=	0.13.3
+PORTVERSION=	0.14.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-ice_cube/distinfo
+++ b/devel/rubygem-ice_cube/distinfo
@ -1,2 +1,2 @@
-SHA256 (rubygem/ice_cube-0.13.3.gem) = 3bcf1154808b6d1d706f155e5e6fada2c98d33f2c16a2f84f00873124e29da35
-SIZE (rubygem/ice_cube-0.13.3.gem) = 28672
+SHA256 (rubygem/ice_cube-0.14.0.gem) = 0bd7699c8621f22b265770b1ebe68d474542babf3fccb836a60d0a089f6be887
+SIZE (rubygem/ice_cube-0.14.0.gem) = 26624
--- a/devel/rubygem-paperclip/Makefile
+++ b/devel/rubygem-paperclip/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	paperclip
-PORTVERSION=	4.3.5
+PORTVERSION=	4.3.6
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-paperclip/distinfo
+++ b/devel/rubygem-paperclip/distinfo
@ -1,2 +1,2 @@
-SHA256 (rubygem/paperclip-4.3.5.gem) = 809283d24231d87796ffb4fbd344f2be3c65a26000266388c12097b00145d8ca
-SIZE (rubygem/paperclip-4.3.5.gem) = 294912
+SHA256 (rubygem/paperclip-4.3.6.gem) = 5154e33005e900f99e211175ab9962300598e6660182115e0a8930aa660082c0
+SIZE (rubygem/paperclip-4.3.6.gem) = 295424
--- a/devel/rubygem-sidetiq/Makefile
+++ b/devel/rubygem-sidetiq/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	sidetiq
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-sidetiq/files/patch-gemspec
+++ b/devel/rubygem-sidetiq/files/patch-gemspec
@ -0,0 +1,11 @@
+--- sidetiq.gemspec.orig	2016-03-14 12:53:20 UTC
+++ sidetiq.gemspec
+@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<sidekiq>, [">= 4.0.0"])
+       s.add_runtime_dependency(%q<celluloid>, [">= 0.17.3"])
+-      s.add_runtime_dependency(%q<ice_cube>, ["~> 0.13.2"])
+      s.add_runtime_dependency(%q<ice_cube>, [">= 0.13.2"])
+       s.add_development_dependency(%q<rake>, [">= 0"])
+       s.add_development_dependency(%q<sinatra>, [">= 0"])
+       s.add_development_dependency(%q<mocha>, [">= 0"])
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	simian
-PORTVERSION=	2.3.35
+PORTVERSION=	2.4.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.harukizaemon.com/simian/

@ -11,7 +11,7 @@ COMMENT=	Similarity analyser for source and other text files

 LICENSE=	SIMIAN
 LICENSE_NAME=	SIMIAN SOFTWARE LICENSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE=	${WRKSRC}/license.pdf
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept

 NO_BUILD=	yes
@ -23,10 +23,10 @@ SUB_FILES=	simian
 SUB_LIST+=	VERSION=${PORTVERSION}
 PLIST_SUB+=	VERSION=${PORTVERSION}

-PORTDOCS=	changes.html customers.html features.html \
+PORTDOCS=	changes.html features.html \
 		get_dotnet.png get_it_now.html \
 		get_java_blue-button.gif index.html installation.html \
-		simian.jpg \
+		simian.dtd simian.jpg simian.xsl \
 		javadoc

 OPTIONS_DEFINE=	DOCS
@ -67,7 +67,7 @@ pre-fetch:
 	@${ECHO}	period greater than 15 days, you will purchase a
 	@${ECHO}	license as described following URL.
 	@${ECHO}
-	@${ECHO}	http://www.harukizaemon.com/simian/LICENSE.txt
+	@${ECHO}	http://www.harukizaemon.com/simian/license.pdf
 	@${ECHO}
 	@${ECHO}	Build with SIMIAN_AGREE_LICENSE=yes to continue.
 	@${ECHO}
--- a/devel/simian/distinfo
+++ b/devel/simian/distinfo
@ -1,2 +1,2 @@
-SHA256 (simian-2.3.35.tar.gz) = 6f17574b8e828bff8e2ff5f7f11ef7beb04877aa010c2c64d29103b622012db8
-SIZE (simian-2.3.35.tar.gz) = 3594608
+SHA256 (simian-2.4.0.tar.gz) = 6d41d8cac8a3e6b8e219d0eafea4b59ac2b641c1b6e72070ed3969738160f38d
+SIZE (simian-2.4.0.tar.gz) = 5247261
--- a/Show More
+++ b/Show More