*/*: sync with upstream

Taken from: FreeBSD

accessibility/caribou/pkg-descr

@@ -1,4 +1,4 @@
-Caribou is an input assistive technology intended for swithc and
+Caribou is an input assistive technology intended for switch and
 pointer users.
 
 Features:

archivers/unalz/pkg-descr

@@ -1,4 +1,4 @@
 Unalz is a BSD-licensed unarchiver for AlZip format which requires
-proprietary and win32-only software but widely used in Korea.
+proprietary and Win32-only software but widely used in Korea.
 
 WWW: http://www.kipple.pe.kr/win/unalz/

archivers/unrar/Makefile

@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	unrar
-PORTVERSION=	5.21
-PORTREVISION=	1
+PORTVERSION=	5.30
 PORTEPOCH=	5
 CATEGORIES+=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/ \
 		LOCAL/sunpoet
-DISTNAME=	unrarsrc-5.2.6
+DISTNAME=	unrarsrc-5.3.4
 
 MAINTAINER?=	[email protected]
 COMMENT=	Extract, view & test RAR archives

archivers/unrar/distinfo

@@ -1,2 +1,2 @@
-SHA256 (unrarsrc-5.2.6.tar.gz) = c06c7c74dce6151d9653a81f1efb45d8bc89f8f5843489b393855ae11c19f22e
-SIZE (unrarsrc-5.2.6.tar.gz) = 218580
+SHA256 (unrarsrc-5.3.4.tar.gz) = ce4767b8532f0866c609ec99a0b4d21a2f6cb8a786b15092ddf608ec4904b874
+SIZE (unrarsrc-5.3.4.tar.gz) = 222715

archivers/unrar/files/patch-os.hpp

@@ -1,5 +1,5 @@
---- os.hpp.orig	2013-12-01 16:10:14.000000000 +0800
-+++ os.hpp	2014-02-04 08:46:43.448882590 +0800
+--- os.hpp.orig	2013-12-01 08:10:14 UTC
++++ os.hpp
 @@ -151,6 +151,10 @@
  #include <utime.h>
  #include <locale.h>

archivers/unrar/files/patch-rijndael.cpp

@@ -1,5 +1,5 @@
---- rijndael.cpp.orig	2014-06-11 01:14:06.000000000 +0800
-+++ rijndael.cpp	2014-07-31 22:46:27.956084561 +0800
+--- rijndael.cpp.orig	2014-06-10 17:14:06 UTC
++++ rijndael.cpp
 @@ -7,6 +7,8 @@
   ***************************************************************************/
  #include "rar.hpp"

archivers/unrar/files/patch-rijndael.hpp

@@ -1,5 +1,5 @@
---- rijndael.hpp.orig	2014-06-11 01:14:06.000000000 +0800
-+++ rijndael.hpp	2014-08-05 01:31:59.971584264 +0800
+--- rijndael.hpp.orig	2014-06-10 17:14:06 UTC
++++ rijndael.hpp
 @@ -16,6 +16,9 @@
  class Rijndael
  { 

audio/libmodplug/pkg-descr

@@ -1,5 +1,5 @@
 This is a library based on the mod rendering code from ModPlug, a
-popular windows mod player written by Olivier Lapicque, found at
+popular Windows mod player written by Olivier Lapicque, found at
 http://www.modplug.com.  It is required for ModPlug-XMMS (in the
 xmms-modplug package).
 

audio/snd/Makefile

@@ -31,8 +31,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-BROKEN_sparc64=		does not compile on sparc64
-
 FFTW3_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 FFTW3_CONFIGURE_WITH=	fftw
 

audio/zynaddsubfx/Makefile

@@ -16,10 +16,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libmxml.so:${PORTSDIR}/textproc/mxml
 
-BROKEN_ia64=	invokes i386 asm
-BROKEN_powerpc=	invokes i386 asm
-BROKEN_sparc64=	invokes i386 asm
-
 USES=		tar:bzip2 cmake pkgconfig
 
 OPTIONS_DEFINE=		JACK GUI PORTAUDIO LASH LO DOCS EXAMPLES

benchmarks/tcpblast/pkg-descr

@@ -1 +1 @@
-TCPBLAST measures the throughput of a tcp connection.
+TCPBLAST measures the throughput of a TCP connection.

biology/iolib/pkg-descr

@@ -2,6 +2,6 @@ Io_lib is a library of file reading and writing code to provide a
 general purpose trace file (and Experiment File) reading interface.
 The programmer simply calls the (eg) read_reading to create a "Read"
 C structure with the data loaded into memory. It has been compiled
-and tested on a variety of unix systems, MacOS X and MS Windows.
+and tested on a variety of Unix systems, MacOS X and MS Windows.
 
 WWW: http://staden.sourceforge.net/

cad/cura-engine/pkg-descr

@@ -2,14 +2,14 @@ The CuraEngine is a C++ console application for 3D printing GCode generation.
 It has been made as better and faster alternative to the old Skeinforge engine.
 
 The CuraEngine is pure C++ and uses Clipper from
-http://www.angusj.com/delphi/clipper.php. There are no external dependences
+http://www.angusj.com/delphi/clipper.php. There are no external dependencies
 and Clipper is included in the source code without modifications.
 
 This is just a console application for GCode generation. For a full graphical
 application look at https://github.com/daid/Cura with is the graphical
 frontend for CuraEngine.
 
-The CuraEngine can be used seperately or in other applications.
+The CuraEngine can be used separately or in other applications.
 Feel free to add it to your application. But to take note of the License.
 
 WWW: http://wiki.ultimaker.com/Cura

cad/meshdev/files/patch-src_VectorT.h

@@ -0,0 +1,10 @@
+--- src/VectorT.h.orig	2012-02-06 13:02:05 UTC
++++ src/VectorT.h
+@@ -22,6 +22,7 @@
+ #include <math.h>
+ #include <algorithm>
+ #include <iostream>
++#include <cstring>
+
+ template<typename Type, int Size>
+ class VectorT

chinese/qe/pkg-descr

@@ -1,5 +1,5 @@
 QE is a PE2-like editor program under U*nix (PE2 is an editor software
-undePC-DOS), I named it QE for the reason that the P is followed by Q,
+under PC-DOS), I named it QE for the reason that the P is followed by Q,
 hope it can exceed PE2 :-), and I release this program under the terms
 of General Public License (GPL)
 

chinese/sunpinyin/pkg-descr

@@ -1,5 +1,5 @@
 SunPinyin is a statistical language model based Chinese input method, which
 was firstly developed by Sun Beijing Globalization team, and opensource'd
-to community with opensolaris project, with LGPLv2 and CDDL dual-licenses.
+to community with OpenSolaris project, with LGPLv2 and CDDL dual-licenses.
 
 WWW: http://code.google.com/p/sunpinyin/

comms/bluegps/pkg-descr

@@ -1,4 +1,4 @@
-BlueGPS is a simple (freebsd native) command line tool to download
+BlueGPS is a simple (FreeBSD native) command line tool to download
 datalogs from the Royaltek RBT-3000 bluetooth GPS receiver over a
 bluetooth link.
 

comms/concordance/pkg-descr

@@ -1,4 +1,4 @@
 The concordance software suite allows you to program your Logitech Harmony
-remote using a configuration object retreived from the harmony website. The
+remote using a configuration object retrieved from the harmony website. The
 Logitech Harmony is a highly configuration universal remote than can control
 most multimedia devices.

comms/cwdaemon/pkg-descr

@@ -1,3 +1,3 @@
-Cwdaemon is a small daemon which uses the pc parallel or serial port and a
+Cwdaemon is a small daemon which uses the PC parallel or serial port and a
 simple transistor switch to output morse code to a transmitter from a text
 message sent to it via the UDP Internet protocol. 

comms/hf/pkg-descr

@@ -1,6 +1,6 @@
-hf is a gtk+-based linux ham radio fsk digimode program, which can do also
+hf is a gtk+-based Linux ham radio fsk digimode program, which can do also
 the realtime ARQ modes pactor 1, amtor, gtor without a ptc, only with a
-soundcard and a pc and linux(FreeBSD), all of which need not be the newest.
+soundcard and a PC and Linux (FreeBSD), all of which need not be the newest.
 The core of hf, the heart of the program (hfkernel) is a real master-piece
 of code, it has originally been made by Tom Sailer, many thanks Tom!
 hf can also do MT63 and has a CW elbug function. 

comms/py-lirc/pkg-descr

@@ -1,5 +1,5 @@
 Python module to interact with remote controls via lirc. Currently only
-linux version exists, but porters for winLirc or other systems are
+Linux version exists, but porters for winLirc or other systems are
 welcome.
 
 WWW: http://sourceforge.net/projects/pylirc/

comms/qsstv/pkg-descr

@@ -1,3 +1,3 @@
-Amateur Radio SSTV/FAX transmit and reception program for unix
+Amateur Radio SSTV/FAX transmit and reception program for Unix.
 
 WWW: http://users.telenet.be/on4qz/

converters/fconv/pkg-descr

@@ -1,3 +1,3 @@
-   As well as being a work-alike for the BSDI utility mentioned in the
+As well as being a work-alike for the BSDI utility mentioned in the
 doscmd man page, dos2bsd (and bsd2dos), fconv supports conversion to
 and from Macintosh type files (which use only '\r'). 

converters/fix-mime-charset/files/patch-src_argp-local.h

@@ -0,0 +1,10 @@
+--- src/argp-local.h.orig	2003-11-25 23:51:41 UTC
++++ src/argp-local.h
+@@ -12,6 +12,7 @@
+ #include <getopt.h>
+ #include <string.h>
+ #include <iostream>
++#include <cstdlib>
+
+ #define __need_error_t
+ #include <errno.h>

converters/fix-mime-charset/files/patch-src_decoder.cc

@@ -0,0 +1,10 @@
+--- src/decoder.cc.orig	2003-08-28 18:45:38 UTC
++++ src/decoder.cc
+@@ -1,6 +1,7 @@
+ // @(#) $Id: decoder.cc,v 1.7 2003/08/28 18:45:38 balu Exp $
+
+ #include "decoder.h"
++#include <cstring>
+
+ unsigned char base64_rank[256]=
+        {255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,

converters/fix-mime-charset/files/patch-src_input.cc

@@ -0,0 +1,10 @@
+--- src/input.cc.orig	2003-07-29 23:29:11 UTC
++++ src/input.cc
+@@ -3,6 +3,7 @@
+ #include "input.h"
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+
+ /* Input */
+

converters/fondu/pkg-descr

@@ -1,4 +1,4 @@
-A set of programs to interconvert between mac font formats and pfb, ttf, otf
-and bdf files on unix
+A set of programs to interconvert between Mac font formats and PFB, TTF, OTF
+and BDF files on Unix.
 
 WWW:	http://fondu.sourceforge.net/

databases/cassandra-cpp-driver/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cassandra-cpp-driver
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.0
 CATEGORIES=	databases
 
 MAINTAINER=	[email protected]
@@ -26,7 +26,7 @@ USE_OPENSSL=	yes
 PLIST_FILES=	include/cassandra.h \
 		lib/libcassandra.so \
 		lib/libcassandra.so.2 \
-		lib/libcassandra.so.2.0.1 \
+		lib/libcassandra.so.${PORTVERSION} \
 		lib/libcassandra_static.a
 
 .include <bsd.port.mk>

databases/cassandra-cpp-driver/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cassandra-cpp-driver-2.0.1_GH0.tar.gz) = 16ffc9eacecd73538cd5ef971b9c259db030a35d0e03d330facfe0cd93d048de
-SIZE (cassandra-cpp-driver-2.0.1_GH0.tar.gz) = 397032
+SHA256 (cassandra-cpp-driver-2.1.0_GH0.tar.gz) = f5968f9a6e067f04cf42dcc2c8f3adc068ffdadba48b5204612ceecc0a5f5a17
+SIZE (cassandra-cpp-driver-2.1.0_GH0.tar.gz) = 458887

databases/casstcl/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	casstcl
-PORTVERSION=	2.7
-PORTREVISION=	1
+PORTVERSION=	2.10
 DISTVERSIONPREFIX=v
 CATEGORIES=	databases
 

databases/casstcl/distinfo

@@ -1,2 +1,2 @@
-SHA256 (flightaware-casstcl-v2.7_GH0.tar.gz) = 621d2ace2b51748f6561eacf802dd3bea0a6bc25c743a673a8dd0ac9b4fa8056
-SIZE (flightaware-casstcl-v2.7_GH0.tar.gz) = 114179
+SHA256 (flightaware-casstcl-v2.10_GH0.tar.gz) = 4fa8d53797e3d2bbe4db2d61b6d49d0a1ac24e08255f33940130a559722f7d2d
+SIZE (flightaware-casstcl-v2.10_GH0.tar.gz) = 115005

databases/casstcl/pkg-plist

@@ -9,5 +9,5 @@ include/casstcl_log.h
 include/casstcl_prepared.h
 include/casstcl_types.h
 lib/casstcl%%PORTVERSION%%/casstcl.tcl
-lib/casstcl%%PORTVERSION%%/libcasstcl.so.1
+lib/casstcl%%PORTVERSION%%/libcasstcl.so
 lib/casstcl%%PORTVERSION%%/pkgIndex.tcl

databases/cego/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cego
-PORTVERSION=	2.25.1
+PORTVERSION=	2.25.3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 

databases/cego/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cego-2.25.1.tar.gz) = 931edbfde525374714d08ba04cc7aa619ea61a0cb963707787fcdc7a97495e9e
-SIZE (cego-2.25.1.tar.gz) = 1223815
+SHA256 (cego-2.25.3.tar.gz) = 68712d9be6343197377eb0cd0a89872fd2d8c0b17190c3b6d73583d42885c937
+SIZE (cego-2.25.3.tar.gz) = 1224506

databases/leo_center/Makefile

@@ -44,6 +44,7 @@ SUB_LIST+=	LEOFS_USER=${LEOFS_USER} \
 		LEOFS_LOGDIR=${LEOFS_LOGDIR} \
 		LEOFS_RUNDIR=${LEOFS_RUNDIR}
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch:

databases/phpmyadmin/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.4.14.1
+DISTVERSION=	4.4.15
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages

databases/phpmyadmin/distinfo

@@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.4.14.1-all-languages.tar.xz) = 9425a90111078e9cf7bb5a7f0d70e748167649318d49b22752a2c7e795665510
-SIZE (phpMyAdmin-4.4.14.1-all-languages.tar.xz) = 5597308
+SHA256 (phpMyAdmin-4.4.15-all-languages.tar.xz) = 5b0846cb753a94dfc48993c0626e87fab045dfb7b56c33687a387ad2711b3969
+SIZE (phpMyAdmin-4.4.15-all-languages.tar.xz) = 5595740

databases/rocksdb/files/patch-tools_db__stress.cc → databases/rocksdb/files/patch-tools-db_stress.cc

@@ -1,3 +1,5 @@
+Obtained from:	https://github.com/facebook/rocksdb/commit/4b0b0201c9abb7675413ce25e5044b1c9a8853c8
+
 --- tools/db_stress.cc.orig	2015-08-31 18:23:39 UTC
 +++ tools/db_stress.cc
 @@ -222,7 +222,7 @@ DEFINE_int32(set_options_one_in, 0,

databases/rocksdb/files/patch-util_sst__dump_tool.cc → databases/rocksdb/files/patch-util-sst_dump_tool.cc

@@ -1,11 +1,21 @@
+Obtained from:	https://github.com/facebook/rocksdb/commit/90415cfebe90bda845b9ee3e5a00e86d4f80e02e
+
 --- util/sst_dump_tool.cc.orig	2015-08-31 18:23:39 UTC
 +++ util/sst_dump_tool.cc
-@@ -164,7 +164,7 @@ int SstFileReader::ShowAllCompressionSiz
+@@ -12,6 +12,7 @@
+ #endif
+
+ #include <inttypes.h>
++#include "port/port.h"
+
+ namespace rocksdb {
+
+@@ -164,7 +165,7 @@ int SstFileReader::ShowAllCompressionSiz
    compress_type.insert(
        std::make_pair(CompressionType::kLZ4HCCompression, "kLZ4HCCompression"));
 
 -  fprintf(stdout, "Block Size: %lu\n", block_size);
-+  fprintf(stdout, "Block Size: %zu\n", block_size);
++  fprintf(stdout, "Block Size: %" ROCKSDB_PRIszt "\n", block_size);
 
    for (CompressionType i = CompressionType::kNoCompression;
         i != CompressionType::kLZ4HCCompression; i = CompressionType(i + 1)) {

databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc

@@ -0,0 +1,21 @@
+Obtained from:	https://github.com/facebook/rocksdb/commit/f171faa240ccd12ac05d54b7ea0a8c29d2f1d9d6
+
+--- utilities/checkpoint/checkpoint.cc.orig	2015-08-31 18:23:39 UTC
++++ utilities/checkpoint/checkpoint.cc
+@@ -24,6 +24,7 @@
+ #include "rocksdb/env.h"
+ #include "rocksdb/transaction_log.h"
+ #include "util/file_util.h"
++#include "port/port.h"
+
+ namespace rocksdb {
+
+@@ -131,7 +132,7 @@ Status CheckpointImpl::CreateCheckpoint(
+                    (type == kDescriptorFile) ? manifest_file_size : 0);
+     }
+   }
+-  Log(db_->GetOptions().info_log, "Number of log files %ld",
++  Log(db_->GetOptions().info_log, "Number of log files %" ROCKSDB_PRIszt,
+       live_wal_files.size());
+
+   // Link WAL files. Copy exact size of last one because it is the only one

databases/spatialite/Makefile

@@ -38,6 +38,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/configure
 
-BROKEN_powerpc=		Does not compile on powerpc: invokes i386 assembler
-
 .include <bsd.port.mk>

deskutils/cal/pkg-descr

@@ -1,4 +1,4 @@
-CAL is a nicely-enhanced version of the unix `cal' command.
+CAL is a nicely-enhanced version of the Unix `cal' command.
 Features:
 
  * Hilights today's date when displaying a monthly calendar.
@@ -19,10 +19,10 @@ Features:
  * Completely configurable colors -- eight separate color attributes.
 
  * No ANSI driver needed for colors, and the output may be redirected
-   anywhere, just like the unix version.  However, ANSI color control may
-   be enabled (e.g. for unix) with a #define in the source code.
+   anywhere, just like the Unix version.  However, ANSI color control may
+   be enabled (e.g. for Unix) with a #define in the source code.
 
- * Commandline-compatible with unix `cal' command, but with several
+ * Commandline-compatible with Unix `cal' command, but with several
    enhanced switch settings.
 
 Requests, bug reports, suggestions, donations, proposals for

deskutils/mencal/pkg-descr

@@ -1,4 +1,4 @@
-Mencal is a simple variation of the well-known unix command cal.
+Mencal is a simple variation of the well-known Unix command cal.
 The main difference is that you can have some periodically
 repeating days highlighted in color. This can be used to track
 menstruation (or other) cycles conveniently.