*/*: sync with upstream

Taken from: FreeBSD
2016-08-01 06:46:33 +02:00 · 2016-08-01 06:46:33 +02:00 · 4178ffc886
commit 4178ffc886
parent bcbc07cfe2
196 changed files with 2231 additions and 1220 deletions
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -240,6 +240,7 @@
    SUBDIR += zipper
    SUBDIR += zoo
    SUBDIR += zopfli
+    SUBDIR += zstd
    SUBDIR += zutils

 .include <bsd.port.subdir.mk>
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@ -0,0 +1,24 @@
+# Created by: John Marino <marino@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	zstd
+PORTVERSION=	0.7.4
+DISTVERSIONPREFIX=	v
+CATEGORIES=	archivers
+
+MAINTAINER=	marino@FreeBSD.org
+COMMENT=	Zstandard - Fast real-time compression algorithm
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/lib/LICENSE
+
+USES=		gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	Cyan4973
+
+ALL_TARGET=	default
+MAKE_ARGS=	MANDIR="${PREFIX}/man/man1" \
+		LIBDIR="${PREFIX}/lib" \
+		INCLUDEDIR="${PREFIX}/include"
+
+.include <bsd.port.mk>
--- a/archivers/zstd/distinfo
+++ b/archivers/zstd/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1469858423
+SHA256 (Cyan4973-zstd-v0.7.4_GH0.tar.gz) = 35ab3a5084d0194e9ff08e702edb6f507eab1bfb8c09c913639241cec852e2b7
+SIZE (Cyan4973-zstd-v0.7.4_GH0.tar.gz) = 567830
--- a/archivers/zstd/files/patch-Makefile
+++ b/archivers/zstd/files/patch-Makefile
@ -0,0 +1,11 @@
+--- Makefile.orig	2016-07-16 18:17:53 UTC
+++ Makefile
+@@ -73,7 +73,7 @@ clean:
+ #------------------------------------------------------------------------
+ #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+ #------------------------------------------------------------------------
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly))
+ HOST_OS = POSIX
+ install:
+ 	$(MAKE) -C $(ZSTDDIR) $@
--- a/archivers/zstd/files/patch-lib_Makefile
+++ b/archivers/zstd/files/patch-lib_Makefile
@ -0,0 +1,36 @@
+--- lib/Makefile.orig	2016-07-16 18:17:53 UTC
+++ lib/Makefile
+@@ -99,7 +99,7 @@ clean:
+ 
+ #------------------------------------------------------------------------
+ #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly))
+ 
+ libzstd.pc:
+ libzstd.pc: libzstd.pc.in
+@@ -111,15 +111,15 @@ libzstd.pc: libzstd.pc.in
+              $< >$@
+ 
+ install: libzstd libzstd.pc
+-	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
+-	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+-	@cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
+-	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
+-	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+-	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
+-	@install -m 644 common/zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
+-	@install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
+-	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+	@install -d -m 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
+	@$(BSD_INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+	@$(BSD_INSTALL_DATA) libzstd.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+	@$(BSD_INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
+	@$(BSD_INSTALL_DATA) common/zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
+	@$(BSD_INSTALL_DATA) common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
+	@$(BSD_INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+ 	@echo zstd static and shared library installed
+ 
+ uninstall:
--- a/archivers/zstd/files/patch-programs_Makefile
+++ b/archivers/zstd/files/patch-programs_Makefile
@ -0,0 +1,22 @@
+--- programs/Makefile.orig	2016-07-16 18:17:53 UTC
+++ programs/Makefile
+@@ -157,16 +157,16 @@ clean:
+ #---------------------------------------------------------------------------------
+ #make install is validated only for Linux, OSX, kFreeBSD, Hurd and OpenBSD targets
+ #---------------------------------------------------------------------------------
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD))
+ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly))
+ HOST_OS = POSIX
+ install: zstd
+ 	@echo Installing binaries
+ 	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
+-	@install -m 755 zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT)
+	@$(BSD_INSTALL_PROGRAM) zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT)
+ 	@ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/zstdcat
+ 	@ln -sf zstd$(EXT) $(DESTDIR)$(BINDIR)/unzstd
+ 	@echo Installing man pages
+-	@install -m 644 zstd.1 $(DESTDIR)$(MANDIR)/zstd.1
+	@$(BSD_INSTALL_MAN) zstd.1 $(DESTDIR)$(MANDIR)/zstd.1
+ 	@ln -sf zstd.1 $(DESTDIR)$(MANDIR)/zstdcat.1
+ 	@ln -sf zstd.1 $(DESTDIR)$(MANDIR)/unzstd.1
+ 	@echo zstd installation completed
--- a/archivers/zstd/pkg-descr
+++ b/archivers/zstd/pkg-descr
@ -0,0 +1,12 @@
+Zstd, short for Zstandard, is a real-time compression algorithm providing
+high compression ratios.  It offers a very wide range of compression vs.
+speed trade-offs while being backed by a very fast decoder.  It offers
+a special mode for small data called "dictionary compression" and it can
+create dictionaries from any sample set.  Zstd is BSD-licensed.
+
+Using Izbench on the Silesia compression corpus, zstd ranked at the
+top with a compression ratio of 2.877, a compression rate of 325 Mb/s,
+and a decompression rate of 325.  Zlib followed at 2.730, 95 Mb/s (C)
+and 360 Mb/s (D).  See WWW page for the full benchmark results.
+
+WWW: http://cyan4973.github.io/zstd/
--- a/archivers/zstd/pkg-plist
+++ b/archivers/zstd/pkg-plist
@ -0,0 +1,14 @@
+bin/unzstd
+bin/zstd
+bin/zstdcat
+include/zbuff.h
+include/zdict.h
+include/zstd.h
+lib/libzstd.a
+lib/libzstd.so
+lib/libzstd.so.0
+lib/libzstd.so.0.7.4
+libdata/pkgconfig/libzstd.pc
+man/man1/unzstd.1.gz
+man/man1/zstd.1.gz
+man/man1/zstdcat.1.gz
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@ -22,6 +22,7 @@ RUN_DEPENDS=	mpg321:audio/mpg321 \
 		flac:audio/flac

 GNU_CONFIGURE=	yes
+CFLAGS+=	-D_WITH_GETLINE
 LDFLAGS+=	`fltk-config --ldflags`
 USES=		gmake
 USE_GNOME=	glib20
@ -30,7 +31,4 @@ post-patch:
 	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' \
 		${WRKSRC}/configure ${WRKSRC}/raop_play/Makefile.in

-pre-build:
-	${CP} ${FILESDIR}/getline.c ${FILESDIR}/getline.h ${WRKSRC}/rendezvous/
-
 .include <bsd.port.mk>
--- a/audio/raop_play/files/getline.c
+++ b/audio/raop_play/files/getline.c
@ -1,174 +0,0 @@
-/* getline.c -- Replacement for GNU C library function getline
-
-Copyright (C) 1993 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.  */
-
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include "getline.h"
-
-#if STDC_HEADERS
-#include <stdlib.h>
-#else
-char *malloc (), *realloc ();
-#endif
-
-/* Always add at least this many bytes when extending the buffer.  */
-#define MIN_CHUNK 64
-
-/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-   + OFFSET (and null-terminate it).  If LIMIT is non-negative, then
-   read no more than LIMIT chars.
-
-   *LINEPTR is a pointer returned from malloc (or NULL), pointing to
-   *N characters of space.  It is realloc'd as necessary.  
-
-   Return the number of characters read (not including the null
-   terminator), or -1 on error or EOF.  On a -1 return, the caller
-   should check feof(), if not then errno has been set to indicate the
-   error.  */
-
-int
-getstr (lineptr, n, stream, terminator, offset, limit)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
-     int terminator;
-     int offset;
-     int limit;
-{
-  int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
-  char *read_pos;		/* Where we're reading into *LINEPTR. */
-  int ret;
-
-  if (!lineptr || !n || !stream)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  if (!*lineptr)
-    {
-      *n = MIN_CHUNK;
-      *lineptr = malloc (*n);
-      if (!*lineptr)
-	{
-	  errno = ENOMEM;
-	  return -1;
-	}
-      *lineptr[0] = '\0';
-    }
-
-  nchars_avail = *n - offset;
-  read_pos = *lineptr + offset;
-
-  for (;;)
-    {
-      int save_errno;
-      register int c;
-
-      if (limit == 0)
-          break;
-      else
-      {
-          c = getc (stream);
-
-          /* If limit is negative, then we shouldn't pay attention to
-             it, so decrement only if positive. */
-          if (limit > 0)
-              limit--;
-      }
-
-      save_errno = errno;
-
-      /* We always want at least one char left in the buffer, since we
-	 always (unless we get an error while reading the first char)
-	 NUL-terminate the line buffer.  */
-
-      assert((*lineptr + *n) == (read_pos + nchars_avail));
-      if (nchars_avail < 2)
-	{
-	  if (*n > MIN_CHUNK)
-	    *n *= 2;
-	  else
-	    *n += MIN_CHUNK;
-
-	  nchars_avail = *n + *lineptr - read_pos;
-	  *lineptr = realloc (*lineptr, *n);
-	  if (!*lineptr)
-	    {
-	      errno = ENOMEM;
-	      return -1;
-	    }
-	  read_pos = *n - nchars_avail + *lineptr;
-	  assert((*lineptr + *n) == (read_pos + nchars_avail));
-	}
-
-      if (ferror (stream))
-	{
-	  /* Might like to return partial line, but there is no
-	     place for us to store errno.  And we don't want to just
-	     lose errno.  */
-	  errno = save_errno;
-	  return -1;
-	}
-
-      if (c == EOF)
-	{
-	  /* Return partial line, if any.  */
-	  if (read_pos == *lineptr)
-	    return -1;
-	  else
-	    break;
-	}
-
-      *read_pos++ = c;
-      nchars_avail--;
-
-      if (c == terminator)
-	/* Return the line.  */
-	break;
-    }
-
-  /* Done - NUL terminate and return the number of chars read.  */
-  *read_pos = '\0';
-
-  ret = read_pos - (*lineptr + offset);
-  return ret;
-}
-
-int
-get_line (lineptr, n, stream)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
-{
-  return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
-}
-
-int
-getline_safe (lineptr, n, stream, limit)
-     char **lineptr;
-     size_t *n;
-     FILE *stream;
-     int limit;
-{
-  return getstr (lineptr, n, stream, '\n', 0, limit);
-}
--- a/audio/raop_play/files/getline.h
+++ b/audio/raop_play/files/getline.h
@ -1,24 +0,0 @@
-#ifndef _getline_h_
-#define _getline_h_ 1
-
-#include <stdio.h>
-
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __PROTO(args) args
-#else
-#define __PROTO(args) ()
-#endif  /* GCC.  */
-
-#define GETLINE_NO_LIMIT -1
-
-#ifndef _WITH_GETLINE
-int
-  get_line __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
-int
-  getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
-                         int limit));
-int
-  getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
-		   int _terminator, int _offset, int limit));
-#endif
-#endif /* _getline_h_ */
--- a/audio/raop_play/files/patch-aexcl_Makefile.in
+++ b/audio/raop_play/files/patch-aexcl_Makefile.in
@ -25,13 +25,11 @@
 
 ifdef GLIB_SUBST
   GLIB_SUBST_OBJ = ipod/glibsubst.o
-@@ -29,8 +29,8 @@ endif
- 
+@@ -30,7 +30,7 @@ endif
 all: $(TARGET)
 
-$(TARGET): aexcl_gui.o aexcl_play.o ipod_browser.o ../raop_play/aexcl_lib.o ipod/itunesdb.o $(GLIB_SUBST_OBJ)
+ $(TARGET): aexcl_gui.o aexcl_play.o ipod_browser.o ../raop_play/aexcl_lib.o ipod/itunesdb.o $(GLIB_SUBST_OBJ)
 -	$(CXX) -o $@  $^ -lfltk $(GLIB_LINK)
-+$(TARGET): aexcl_gui.o aexcl_play.o ipod_browser.o ../raop_play/aexcl_lib.o ipod/itunesdb.o ../rendezvous/getline.o $(GLIB_SUBST_OBJ)
 +	$(CXX) $(LDFLAGS) -o $@  $^ -lfltk $(GLIB_LINK)
 
 install:
--- a/audio/raop_play/files/patch-aexcl_aexcl__play.cxx
+++ b/audio/raop_play/files/patch-aexcl_aexcl__play.cxx
@ -1,12 +0,0 @@
--- aexcl/aexcl_play.cxx.orig	2005-12-16 14:17:00 UTC
-+++ aexcl/aexcl_play.cxx
-@@ -23,6 +23,9 @@
- #include <signal.h>
- #include <sys/wait.h>
- #include <getopt.h>
-+extern "C" {
-+#include "getline.h"
-+};
- #include "aexcl_gui.h"
- #include "aexcl_lib.h"
- #include "mDNS.h"
--- a/audio/raop_play/files/patch-raop__play_Makefile.in
+++ b/audio/raop_play/files/patch-raop__play_Makefile.in
@ -8,7 +8,7 @@
 LIBS = @LIBS@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-@@ -12,15 +13,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+@@ -12,7 +13,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
 TARGET=raop_play
 DESTDIR =
 
@ -16,9 +16,8 @@
 +CFLAGS=-Wall -I$(prefix)/include/
 OBJS := raop_play.o raop_client.o rtsp_client.o aexcl_lib.o base64.o aes.o m4a_stream.o \
 audio_stream.o wav_stream.o mp3_stream.o flac_stream.o ogg_stream.o aac_stream.o pls_stream.o \
-pcm_stream.o flac_stream.o
-+pcm_stream.o flac_stream.o ../rendezvous/getline.o
- 
+ pcm_stream.o flac_stream.o
+@@ -20,7 +21,7 @@ pcm_stream.o flac_stream.o
 all: $(TARGET)
 
 raop_play: $(OBJS)
--- a/audio/raop_play/files/patch-rendezvous_Client.c
+++ b/audio/raop_play/files/patch-rendezvous_Client.c
@ -1,13 +1,11 @@
 --- rendezvous/Client.c.orig	2005-12-16 14:17:02 UTC
 +++ rendezvous/Client.c
-@@ -83,8 +83,9 @@
+@@ -83,7 +83,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 -#include <asm/types.h>
 +#include <sys/types.h>
 
-+#include "getline.h"
 #include "mDNSClientAPI.h"// Defines the interface to the mDNS core code
 #include "mDNSPosix.h"    // Defines the specific types needed to run mDNS on this platform
- #include "ExampleClientApp.h"
--- a/audio/raop_play/files/patch-rendezvous_Makefile.in
+++ b/audio/raop_play/files/patch-rendezvous_Makefile.in
@ -17,14 +17,12 @@
 
 TARGET = mDNSClient
 DESTDIR =
-@@ -17,8 +18,8 @@ DESTDIR =
- all: $(TARGET)
+@@ -18,7 +19,7 @@ all: $(TARGET)
 
 
-mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o
+ mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o
 -	$(CC) $(LFLAGS) $^ -o $@
-+mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o getline.o
-+	$(CC) $(LDFLAGS) mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o getline.o -o $@
+	$(CC) $(LDFLAGS) mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o -o $@
 
 install:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)/
--- a/audio/sfront/Makefile
+++ b/audio/sfront/Makefile
@ -11,8 +11,6 @@ COMMENT=	Translator that converts MP4-SA files into efficient C programs

 LICENSE=	BSD3CLAUSE

-USES=		bison
-
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 ALL_TARGET=	${PORTNAME}

--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@ -21,11 +21,9 @@ GNUPLOT_BUILD_DEPENDS=	${LOCALBASE}/bin/gnuplot:math/gnuplot
 .include <bsd.port.options.mk>

 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000013
-USES+=		bison
-MAKE_ARGS+=	YACC=${LOCALBASE}/bin/bison
-.endif
+BUILD_DEPENDS+=	byacc>0:devel/byacc
+MAKE_ARGS+=	YACC=${LOCALBASE}/bin/yacc

-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	flex>0:textproc/flex
 MAKE_ARGS+=	LEX=${LOCALBASE}/bin/flex
 .endif
--- a/biology/seqtools/Makefile
+++ b/biology/seqtools/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

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

@ -11,12 +11,16 @@ COMMENT=	Tools for visualising sequence alignments
 LICENSE=	GPLv3

 LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libsqlite3.so:databases/sqlite3
+		libsqlite3.so:databases/sqlite3 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2

-USES=		compiler:c++14-lang execinfo libtool pkgconfig
+BROKEN_FreeBSD_9=	Fails to build due to C++ std issues
+
+USES=		compiler:c++14-lang execinfo gettext libtool pkgconfig
 GNU_CONFIGURE=	yes
-#USE_GCC=	any
-USE_GNOME=	gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_XORG=	x11
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lcurl -lsqlite3 -lm
 MAKE_JOBS_UNSAFE=	yes
--- a/biology/seqtools/distinfo
+++ b/biology/seqtools/distinfo
@ -1,2 +1,3 @@
-SHA256 (seqtools-4.42.1.tar.gz) = 5b3f7f5f213f47d72c7b2070ff94d0e5ca31a5be8b4558492d45e7dbbfad774b
-SIZE (seqtools-4.42.1.tar.gz) = 5847308
+TIMESTAMP = 1469510431
+SHA256 (seqtools-4.43.0.tar.gz) = 01861098451eab001d49a039e60ddc6df22a61a7472924c850942ffdae396c8b
+SIZE (seqtools-4.43.0.tar.gz) = 6862548
--- a/biology/seqtools/pkg-plist
+++ b/biology/seqtools/pkg-plist
@ -1,13 +1,3 @@
-bin/belvu
-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
 %%PORTDOCS%%%%DOCSDIR%%/Blixem_manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/Dotter_manual.pdf
@ -19,3 +9,218 @@ lib/libgbtools.a
 %%PORTDOCS%%%%DOCSDIR%%/dotter_usage.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/todo.html
+bin/belvu
+bin/blixem
+bin/blixemh
+bin/dotter
+include/blatSrc/ace.h
+include/blatSrc/aliType.h
+include/blatSrc/annoAssembly.h
+include/blatSrc/annoFilter.h
+include/blatSrc/annoFormatTab.h
+include/blatSrc/annoFormatter.h
+include/blatSrc/annoGrateWig.h
+include/blatSrc/annoGrator.h
+include/blatSrc/annoGratorQuery.h
+include/blatSrc/annoOption.h
+include/blatSrc/annoRow.h
+include/blatSrc/annoStreamBigBed.h
+include/blatSrc/annoStreamBigWig.h
+include/blatSrc/annoStreamTab.h
+include/blatSrc/annoStreamVcf.h
+include/blatSrc/annoStreamer.h
+include/blatSrc/apacheLog.h
+include/blatSrc/asParse.h
+include/blatSrc/axt.h
+include/blatSrc/bPlusTree.h
+include/blatSrc/bamFile.h
+include/blatSrc/bandExt.h
+include/blatSrc/base64.h
+include/blatSrc/basicBed.h
+include/blatSrc/bbiFile.h
+include/blatSrc/bigBed.h
+include/blatSrc/bigWig.h
+include/blatSrc/binRange.h
+include/blatSrc/bits.h
+include/blatSrc/blastParse.h
+include/blatSrc/boxClump.h
+include/blatSrc/boxLump.h
+include/blatSrc/bwgInternal.h
+include/blatSrc/cda.h
+include/blatSrc/cgi_build_rules.mk
+include/blatSrc/chain.h
+include/blatSrc/chainBlock.h
+include/blatSrc/chainConnect.h
+include/blatSrc/chainToAxt.h
+include/blatSrc/chainToPsl.h
+include/blatSrc/cheapcgi.h
+include/blatSrc/cirTree.h
+include/blatSrc/codebias.h
+include/blatSrc/common.h
+include/blatSrc/common.mk
+include/blatSrc/correlate.h
+include/blatSrc/crTree.h
+include/blatSrc/crudeali.h
+include/blatSrc/diGraph.h
+include/blatSrc/diGraph.h.97
+include/blatSrc/dlist.h
+include/blatSrc/dnaLoad.h
+include/blatSrc/dnaMarkov.h
+include/blatSrc/dnaMotif.h
+include/blatSrc/dnaseq.h
+include/blatSrc/dnautil.h
+include/blatSrc/dtdParse.h
+include/blatSrc/dyOut.h
+include/blatSrc/dystring.h
+include/blatSrc/elmTree.h
+include/blatSrc/emblParse.h
+include/blatSrc/ens.h
+include/blatSrc/errAbort.h
+include/blatSrc/errCatch.h
+include/blatSrc/fa.h
+include/blatSrc/fieldedTable.h
+include/blatSrc/filePath.h
+include/blatSrc/flydna.h
+include/blatSrc/fof.h
+include/blatSrc/fq.h
+include/blatSrc/fuzzyFind.h
+include/blatSrc/gapCalc.h
+include/blatSrc/gdf.h
+include/blatSrc/genoFind.h
+include/blatSrc/genomeRangeTree.h
+include/blatSrc/gfClientLib.h
+include/blatSrc/gfPcrLib.h
+include/blatSrc/gfWebLib.h
+include/blatSrc/gff.h
+include/blatSrc/gff3.h
+include/blatSrc/gfxPoly.h
+include/blatSrc/gifLabel.h
+include/blatSrc/hacTree.h
+include/blatSrc/hash.h
+include/blatSrc/hex.h
+include/blatSrc/hgGene.h
+include/blatSrc/hgap.h
+include/blatSrc/hgdb.h
+include/blatSrc/histogram.h
+include/blatSrc/hmac.h
+include/blatSrc/hmmPfamParse.h
+include/blatSrc/hmmstats.h
+include/blatSrc/htmlPage.h
+include/blatSrc/htmshell.h
+include/blatSrc/https.h
+include/blatSrc/intValTree.h
+include/blatSrc/internet.h
+include/blatSrc/itsa.h
+include/blatSrc/iupac.h
+include/blatSrc/jointalign.h
+include/blatSrc/jpegSize.h
+include/blatSrc/jsonParse.h
+include/blatSrc/jsonWrite.h
+include/blatSrc/keys.h
+include/blatSrc/knetUdc.h
+include/blatSrc/kxTok.h
+include/blatSrc/linefile.h
+include/blatSrc/localEnvironment.mk
+include/blatSrc/localmem.h
+include/blatSrc/log.h
+include/blatSrc/longToList.h
+include/blatSrc/maDbRep.h
+include/blatSrc/maToFf.h
+include/blatSrc/maf.h
+include/blatSrc/mailViaPipe.h
+include/blatSrc/md5.h
+include/blatSrc/memalloc.h
+include/blatSrc/memgfx.h
+include/blatSrc/meta.h
+include/blatSrc/metaWig.h
+include/blatSrc/mime.h
+include/blatSrc/net.h
+include/blatSrc/nib.h
+include/blatSrc/nibTwo.h
+include/blatSrc/nt4.h
+include/blatSrc/obscure.h
+include/blatSrc/oldGff.h
+include/blatSrc/oligoTm.h
+include/blatSrc/ooc.h
+include/blatSrc/options.h
+include/blatSrc/pairDistance.h
+include/blatSrc/pairHmm.h
+include/blatSrc/paraFetch.h
+include/blatSrc/patSpace.h
+include/blatSrc/peakCluster.h
+include/blatSrc/phyloTree.h
+include/blatSrc/pipeline.h
+include/blatSrc/portable.h
+include/blatSrc/psGfx.h
+include/blatSrc/psPoly.h
+include/blatSrc/pscmGfx.h
+include/blatSrc/psl.h
+include/blatSrc/pslTbl.h
+include/blatSrc/pslTransMap.h
+include/blatSrc/pthreadDoList.h
+include/blatSrc/pthreadWrap.h
+include/blatSrc/qa.h
+include/blatSrc/quickHeap.h
+include/blatSrc/quotedP.h
+include/blatSrc/ra.h
+include/blatSrc/raToStruct.h
+include/blatSrc/rainbow.h
+include/blatSrc/rangeTree.h
+include/blatSrc/rbTree.h
+include/blatSrc/regexHelper.h
+include/blatSrc/repMask.h
+include/blatSrc/rle.h
+include/blatSrc/rnautil.h
+include/blatSrc/rql.h
+include/blatSrc/rudp.h
+include/blatSrc/scoreWindow.h
+include/blatSrc/seg.h
+include/blatSrc/seqOut.h
+include/blatSrc/seqStats.h
+include/blatSrc/shaRes.h
+include/blatSrc/sig.h
+include/blatSrc/slog.h
+include/blatSrc/snof.h
+include/blatSrc/snofmake.h
+include/blatSrc/spaceSaver.h
+include/blatSrc/spacedColumn.h
+include/blatSrc/spacedSeed.h
+include/blatSrc/splatAli.h
+include/blatSrc/splix.h
+include/blatSrc/sqlList.h
+include/blatSrc/sqlNum.h
+include/blatSrc/subText.h
+include/blatSrc/sufa.h
+include/blatSrc/sufx.h
+include/blatSrc/supStitch.h
+include/blatSrc/synQueue.h
+include/blatSrc/tabRow.h
+include/blatSrc/textOut.h
+include/blatSrc/tokenizer.h
+include/blatSrc/trans3.h
+include/blatSrc/trix.h
+include/blatSrc/twoBit.h
+include/blatSrc/udc.h
+include/blatSrc/unfin.h
+include/blatSrc/userApp.mk
+include/blatSrc/vGfx.h
+include/blatSrc/vcf.h
+include/blatSrc/vcfBits.h
+include/blatSrc/verbose.h
+include/blatSrc/wormdna.h
+include/blatSrc/xAli.h
+include/blatSrc/xa.h
+include/blatSrc/xap.h
+include/blatSrc/xenalign.h
+include/blatSrc/xmlEscape.h
+include/blatSrc/xp.h
+include/blatSrc/zlibFace.h
+include/gbtools/gbtools.hpp
+include/gbtools/gbtoolsCurl.hpp
+include/gbtools/gbtoolsGUI.hpp
+include/gbtools/gbtoolsPfetch.hpp
+include/gbtools/gbtoolsTrackhub.hpp
+include/gbtools/gbtoolsUtils.hpp
+include/json/json-forwards.h
+include/json/json.h
+lib/libgbtools.a
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	elmerfem
-PORTVERSION=	8.2.20160404
+PORTVERSION=	8.2.20160715
 CATEGORIES=	cad science

 MAINTAINER=	ports@FreeBSD.org
@ -15,7 +15,7 @@ LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\

 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	2f5a55c
+GH_TAGNAME=	e69732a

 USES=		blaslapack:netlib cmake fortran gmake tcl

--- a/cad/elmerfem/distinfo
+++ b/cad/elmerfem/distinfo
@ -1,2 +1,3 @@
-SHA256 (ElmerCSC-elmerfem-8.2.20160404-2f5a55c_GH0.tar.gz) = 653c94c5052b757427019358653308b7fba175889b2d9bb759e3e28d6c24ec65
-SIZE (ElmerCSC-elmerfem-8.2.20160404-2f5a55c_GH0.tar.gz) = 48681524
+TIMESTAMP = 1469311055
+SHA256 (ElmerCSC-elmerfem-8.2.20160715-e69732a_GH0.tar.gz) = a8622455b961d762342cf912e5099f4463e905cc440b1833e472b18c08a0cdc6
+SIZE (ElmerCSC-elmerfem-8.2.20160715-e69732a_GH0.tar.gz) = 49026399
--- a/cad/elmerfem/files/patch-CMakeLists.txt
+++ b/cad/elmerfem/files/patch-CMakeLists.txt
@ -1,6 +1,6 @@
--- CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ CMakeLists.txt
-@@ -248,7 +248,7 @@ ADD_SUBDIRECTORY(umfpack)
+@@ -255,7 +255,7 @@ ADD_SUBDIRECTORY(umfpack)
 ADD_SUBDIRECTORY(fhutiter)
 ADD_SUBDIRECTORY(meshgen2d)
 ADD_SUBDIRECTORY(fem)
--- a/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
@ -1,4 +1,4 @@
--- elmergrid/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- elmergrid/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ elmergrid/src/CMakeLists.txt
@@ -29,7 +29,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
 
--- a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
@ -1,6 +1,6 @@
--- fem/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- fem/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ fem/src/CMakeLists.txt
-@@ -131,9 +131,9 @@ ENDIF()
+@@ -132,9 +132,9 @@ ENDIF()
 
 
 ADD_EXECUTABLE(Solver_TGT Solver.F90)
@ -12,7 +12,7 @@
 ENDIF()
 
 IF(NOT(WITH_MPI))
-@@ -229,7 +229,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
+@@ -235,7 +235,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
 INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
 
 IF(NOT(WIN32))
@ -21,7 +21,7 @@
 ENDIF()
 
 # GebhardFactors
-@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
+@@ -244,7 +244,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
                                       mpi_stubs elmersolver)
 
 IF(NOT(WIN32))
@ -30,7 +30,7 @@
 ENDIF()
 
 IF(WITH_Trilinos)
-@@ -282,9 +282,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
+@@ -288,9 +288,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
 
 IF(WITH_MPI)
   IF(NOT(WIN32))
--- a/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
@ -1,4 +1,4 @@
--- matc/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- matc/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ matc/src/CMakeLists.txt
@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
 
--- a/cad/elmerfem/files/patch-post-src-elmerpost.h
+++ b/cad/elmerfem/files/patch-post-src-elmerpost.h
@ -1,4 +1,4 @@
--- post/src/elmerpost.h.orig	2015-08-18 12:26:58 UTC
+--- post/src/elmerpost.h.orig	2016-07-15 11:02:59 UTC
 +++ post/src/elmerpost.h
@@ -62,6 +62,7 @@
 
--- a/cad/elmerfem/files/patch-post-src-screensave.c
+++ b/cad/elmerfem/files/patch-post-src-screensave.c
@ -1,4 +1,4 @@
--- post/src/screensave.c.orig	2015-08-18 12:26:58 UTC
+--- post/src/screensave.c.orig	2016-07-15 11:02:59 UTC
 +++ post/src/screensave.c
@@ -32,6 +32,7 @@
 #include <GL/glu.h>
--- a/cad/elmerfem/pkg-plist
+++ b/cad/elmerfem/pkg-plist
@ -44,6 +44,7 @@ share/elmersolver/include/gebhardtfactorglobals.mod
 share/elmersolver/include/generalutils.mod
 share/elmersolver/include/globmat.mod
 share/elmersolver/include/globmatc.mod
+share/elmersolver/include/h1elementbasisfunctions.mod
 share/elmersolver/include/harmutils.mod
 share/elmersolver/include/hashtable.mod
 share/elmersolver/include/huti_aux.mod
@ -63,6 +64,7 @@ share/elmersolver/include/iterativemethods.mod
 share/elmersolver/include/itersolve.mod
 share/elmersolver/include/kinds.mod
 share/elmersolver/include/linearalgebra.mod
+share/elmersolver/include/linearforms.mod
 share/elmersolver/include/listmatrix.mod
 share/elmersolver/include/lists.mod
 share/elmersolver/include/loadmod.mod
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	openvsp
-PORTVERSION=	3.7.2
+PORTVERSION=	3.8.0
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 CATEGORIES=	cad
 MASTER_SITES=	GH
@ -39,6 +39,7 @@ GH_ACCOUNT=	${GH_PROJECT}
 WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION}

 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
+CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
 USES=		cmake:outsource compiler:gcc-c++11-lib
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
@ -59,6 +60,7 @@ BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenV

 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin
+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/vsp*
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for d in CustomScripts airfoil matlab scripts textures
 	(cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
--- a/cad/openvsp/distinfo
+++ b/cad/openvsp/distinfo
@ -1,2 +1,3 @@
-SHA256 (OpenVSP-OpenVSP-OpenVSP_3.7.2_GH0.tar.gz) = 7cdb917ddcee91ad53f1f711b4b9dbc57222379cf203cde902cb064883f7db9a
-SIZE (OpenVSP-OpenVSP-OpenVSP_3.7.2_GH0.tar.gz) = 32615883
+TIMESTAMP = 1468855552
+SHA256 (OpenVSP-OpenVSP-OpenVSP_3.8.0_GH0.tar.gz) = 6271c68578ea37974ce7e616da283903f29f5d9b1d954fcce2102712b6be7a6d
+SIZE (OpenVSP-OpenVSP-OpenVSP_3.8.0_GH0.tar.gz) = 32644020
--- a/cad/openvsp/pkg-plist
+++ b/cad/openvsp/pkg-plist
@ -1,7 +1,45 @@
+CustomScripts/Box.vsppart
+CustomScripts/BoxGroup.vsppart
+CustomScripts/Cone.vsppart
+CustomScripts/Disk.vsppart
+CustomScripts/Duct.vsppart
+CustomScripts/OnOffExample.vsppart
+CustomScripts/PodMan.vsppart
+CustomScripts/Seat.vsppart
+CustomScripts/SeatGroup.vsppart
+CustomScripts/TransportFuse.vsppart
+LICENSE
+README.md
+airfoil/23015.af
+airfoil/N0012_VSP.af
+airfoil/N0012_VSP_sym.af
+airfoil/b737a.af
+airfoil/b737b.af
+airfoil/b737c.af
+airfoil/b737d.af
+airfoil/clarky_Lednicer.dat
+airfoil/e205_Selig.dat
+airfoil/n0012.dat
+airfoil/sc2_0404.af
 bin/vsp
 bin/vspaero
 bin/vspscript
 bin/vspviewer
+matlab/plotDegenPlate.m
+matlab/plotDegenStick.m
+matlab/plotDegenSurf.m
+scripts/CFDMesh.vspscript
+scripts/CreateEditGeom.vspscript
+scripts/DegenGeom.vspscript
+scripts/DumpResults.vspscript
+scripts/Fuselage.vspscript
+scripts/SnapToDemo.vspscript
+scripts/Stack.vspscript
+scripts/SubSurface.vspscript
+scripts/TestAll.vspscript
+scripts/TestAnalysis.vspscript
+scripts/TestAreaProj.vspscript
+scripts/Wing.vspscript
 %%DATADIR%%/23015.af
 %%DATADIR%%/Box.vsppart
 %%DATADIR%%/BoxGroup.vsppart
@ -43,3 +81,11 @@ bin/vspviewer
 %%DATADIR%%/redbluearrow.tga
 %%DATADIR%%/sc2_0404.af
 %%DATADIR%%/window.tga
+textures/SharkTeeth.tga
+textures/nasa-logo.tga
+textures/redbluearrow.tga
+textures/window.tga
+vsp
+vspaero
+vspscript
+vspviewer
--- a/databases/elixir-ecto/Makefile
+++ b/databases/elixir-ecto/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ecto
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-
--- a/databases/elixir-ecto/distinfo
+++ b/databases/elixir-ecto/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1467120235
-SHA256 (elixir-ecto-ecto-v2.0.2_GH0.tar.gz) = c891b7b1aa8ba1f50f7c520c11319f0cc7dd694af800268f347dcc6b71e14d07
-SIZE (elixir-ecto-ecto-v2.0.2_GH0.tar.gz) = 261355
+TIMESTAMP = 1469955026
+SHA256 (elixir-ecto-ecto-v2.0.3_GH0.tar.gz) = a25d7822c3d92ef4f0a14177d928e1fef21814c7762262340567fb9e65dd3767
+SIZE (elixir-ecto-ecto-v2.0.3_GH0.tar.gz) = 276869
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@ -19,7 +19,7 @@ OPTIONS_SUB=	yes

 ONLY_FOR_ARCHS=	i386 amd64

-USES=		bison gmake iconv pkgconfig
+USES=		gmake iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}

--- a/devel/elixir-exprotobuf/Makefile
+++ b/devel/elixir-exprotobuf/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	exprotobuf
-DISTVERSION=	1.0.2
+DISTVERSION=	1.1.0
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-

--- a/devel/elixir-exprotobuf/distinfo
+++ b/devel/elixir-exprotobuf/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1469168926
-SHA256 (bitwalker-exprotobuf-1.0.2_GH0.tar.gz) = c99c5ceb60db832e652dd5770ad3a17c09d9a369f2bf75e270527f1f5f483c93
-SIZE (bitwalker-exprotobuf-1.0.2_GH0.tar.gz) = 21617
+TIMESTAMP = 1469957112
+SHA256 (bitwalker-exprotobuf-1.1.0_GH0.tar.gz) = 0d87d99986a2bc9c02040c0bc64ece6a6c46fe1dc61b526101c5d404c935057c
+SIZE (bitwalker-exprotobuf-1.1.0_GH0.tar.gz) = 21596
--- a/devel/elixir-hex/Makefile
+++ b/devel/elixir-hex/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	hex
-PORTVERSION=	0.12.1
+PORTVERSION=	0.13.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-
--- a/devel/elixir-hex/distinfo
+++ b/devel/elixir-hex/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1464768723
-SHA256 (hexpm-hex-v0.12.1_GH0.tar.gz) = 7b70542a144fe3034b2a4c3d762fedc16a0e6059e73a77ecac4bb7c5c03a027d
-SIZE (hexpm-hex-v0.12.1_GH0.tar.gz) = 218390
+TIMESTAMP = 1469955119
+SHA256 (hexpm-hex-v0.13.0_GH0.tar.gz) = f28cf6c89d272e03eab2fdb7f76e18e9b5b6d202e579b9cd552f6dc30f19fe0d
+SIZE (hexpm-hex-v0.13.0_GH0.tar.gz) = 230714
--- a/devel/elixir-hex/pkg-plist
+++ b/devel/elixir-hex/pkg-plist
@ -10,12 +10,21 @@ lib/elixir/lib/hex/ebin/Elixir.Hex.API.Utils.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.API.VerifyHostname.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.API.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Config.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.AES_CBC_HMAC_SHA2.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.AES_GCM.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.ContentEncryptor.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.Encryption.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.KeyManager.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.PBES2_HMAC_SHA2.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.PKCS5.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Crypto.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Mix.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Parallel.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.PublicKey.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Registry.ETS.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Registry.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.RemoteConverger.beam
+lib/elixir/lib/hex/ebin/Elixir.Hex.Repo.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Resolver.Backtracks.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.Resolver.beam
 lib/elixir/lib/hex/ebin/Elixir.Hex.SCM.beam
@ -55,12 +64,21 @@ lib/elixir/lib/hex/lib/hex/api/user.ex
 lib/elixir/lib/hex/lib/hex/api/util.ex
 lib/elixir/lib/hex/lib/hex/api/verify_hostname.ex
 lib/elixir/lib/hex/lib/hex/config.ex
+lib/elixir/lib/hex/lib/hex/crypto.ex
+lib/elixir/lib/hex/lib/hex/crypto/aes_cbc_hmac_sha2.ex
+lib/elixir/lib/hex/lib/hex/crypto/aes_gcm.ex
+lib/elixir/lib/hex/lib/hex/crypto/content_encryptor.ex
+lib/elixir/lib/hex/lib/hex/crypto/encryption.ex
+lib/elixir/lib/hex/lib/hex/crypto/key_manager.ex
+lib/elixir/lib/hex/lib/hex/crypto/pbes2_hmac_sha2.ex
+lib/elixir/lib/hex/lib/hex/crypto/pkcs5.ex
 lib/elixir/lib/hex/lib/hex/mix.ex
 lib/elixir/lib/hex/lib/hex/parallel.ex
 lib/elixir/lib/hex/lib/hex/public_key.ex
 lib/elixir/lib/hex/lib/hex/registry.ex
 lib/elixir/lib/hex/lib/hex/registry/ets.ex
 lib/elixir/lib/hex/lib/hex/remote_converger.ex
+lib/elixir/lib/hex/lib/hex/repo.ex
 lib/elixir/lib/hex/lib/hex/resolver.ex
 lib/elixir/lib/hex/lib/hex/resolver/backtracks.ex
 lib/elixir/lib/hex/lib/hex/scm.ex
@ -84,5 +102,4 @@ lib/elixir/lib/hex/lib/mix/tasks/hex/publish.ex
 lib/elixir/lib/hex/lib/mix/tasks/hex/registry.ex
 lib/elixir/lib/hex/lib/mix/tasks/hex/search.ex
 lib/elixir/lib/hex/lib/mix/tasks/hex/user.ex
-
 %%PORTDOCS%%%%DOCSDIR%%/README.md
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kBuild
 DISTVERSION=	${KBUILD_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netlabs.org/pub/kbuild/ \
 		http://tmp.chruetertee.ch/ \
@ -18,6 +18,7 @@ BROKEN_powerpc64=	Does not build
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex

 USES=		autoreconf:build gmake makeinfo
+CFLAGS+=	-D_WITH_GETLINE=1 -D_WITH_DPRINTF=1

 CONFLICTS_INSTALL=	kBuild-devel-[0-9]*

@ -25,11 +26,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}

 KBUILD_VERSION=	0.1.9998
 KBUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/:S/x86_64/amd64/:S/powerpc/ppc32/}
-KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
+KBUILD_ENV=	${MAKE_ENV}
+KBUILD_ENV+=	ACLOCAL=${ACLOCAL} \
 		AUTOMAKE=${AUTOMAKE} \
 		AUTORECONF=${AUTORECONF} \
 		AUTOPOINT=true
-USE_GCC=	any
 KBUILD_TARGET=	${OPSYS:tl}

 KBUILD_BINS=	kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \
--- a/devel/kBuild/files/patch-src_ash_output.c
+++ b/devel/kBuild/files/patch-src_ash_output.c
@ -0,0 +1,18 @@
+--- src/ash/output.c.orig	2012-07-17 22:30:18 UTC
+++ src/ash/output.c
+@@ -230,6 +230,7 @@ out1fmt(const char *fmt, ...)
+ 	va_end(ap);
+ }
+ 
+#if 0
+ void
+ dprintf(const char *fmt, ...)
+ {
+@@ -240,6 +241,7 @@ dprintf(const char *fmt, ...)
+ 	va_end(ap);
+ 	flushout(out2);
+ }
+#endif
+ 
+ void
+ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
--- a/devel/kBuild/files/patch-src_ash_output.h
+++ b/devel/kBuild/files/patch-src_ash_output.h
@ -0,0 +1,13 @@
+--- src/ash/output.h.orig	2012-07-17 22:30:18 UTC
+++ src/ash/output.h
+@@ -65,8 +65,10 @@ void outfmt(struct output *, const char 
+     __attribute__((__format__(__printf__,2,3)));
+ void out1fmt(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
+#if 0
+ void dprintf(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
+#endif
+ void fmtstr(char *, size_t, const char *, ...)
+     __attribute__((__format__(__printf__,3,4)));
+ void doformat(struct output *, const char *, va_list);
--- a/devel/kBuild/files/patch-src_kmk_kmkbuiltin.h
+++ b/devel/kBuild/files/patch-src_kmk_kmkbuiltin.h
@ -0,0 +1,15 @@
+--- src/kmk/kmkbuiltin.h.orig	2012-07-17 22:30:15 UTC
+++ src/kmk/kmkbuiltin.h
+@@ -50,7 +50,11 @@ extern int kmk_builtin_printf(int argc, 
+ extern int kmk_builtin_rm(int argc, char **argv, char **envp);
+ extern int kmk_builtin_rmdir(int argc, char **argv, char **envp);
+ extern int kmk_builtin_sleep(int argc, char **argv, char **envp);
+-extern int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn);
+extern int kmk_builtin_test(int argc, char **argv, char **envp
+#ifndef kmk_builtin_test
+			   , char ***ppapszArgvSpawn
+#endif
+			   );
+ extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp);
+ extern int kmk_builtin_kDepObj(int argc, char **argv, char **envp);
+ 
--- a/devel/kBuild/files/patch-src_kmk_kmkbuiltin_test.c
+++ b/devel/kBuild/files/patch-src_kmk_kmkbuiltin_test.c
@ -0,0 +1,15 @@
+--- src/kmk/kmkbuiltin/test.c.orig	2012-07-17 22:30:16 UTC
+++ src/kmk/kmkbuiltin/test.c
+@@ -201,7 +201,11 @@ extern void *xmalloc(unsigned int sz)
+ }
+ #endif
+ 
+-int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn)
+int kmk_builtin_test(int argc, char **argv, char **envp
+#ifndef kmk_builtin_test
+                     , char ***ppapszArgvSpawn
+#endif
+		    )
+ {
+ 	int res;
+ 	char **argv_spawn;
--- a/devel/kBuild/files/patch-src_sed_lib_getline.c
+++ b/devel/kBuild/files/patch-src_sed_lib_getline.c
@ -0,0 +1,11 @@
+--- src/sed/lib/getline.c.orig	2012-07-17 22:30:18 UTC
+++ src/sed/lib/getline.c
+@@ -31,7 +31,7 @@
+    null terminator), or -1 on error or EOF.  */
+ 
+ size_t
+-getline (lineptr, n, stream)
+get_line (lineptr, n, stream)
+      char **lineptr;
+      size_t *n;
+      FILE *stream;
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-devel

@ -160,6 +161,10 @@ MAN1SRCS+=	clang.1 \
 CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
 .endif

+.if ${PORT_OPTIONS:MCOMPILER_RT}
+COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|xray)
+.endif
+
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	lit.1 FileCheck.1
 _USES_PYTHON=	python
@ -373,7 +378,7 @@ build-plist:
 	    ${SORT} >> ${PLIST}.tmp
 	awk '{ \
 	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
-	    if ($$0 ~ /asan_blacklist.txt|sanitizer/) \
+	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@ -2077,7 +2077,7 @@ llvm-devel/include/llvm/Transforms/Vectorize/SLPVectorizer.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
-llvm-devel/include/xray/xray_interface.h
+%%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h
 llvm-devel/lib/BugpointPasses.so
 llvm-devel/lib/LLVMHello.so
 %%GOLD%%llvm-devel/lib/LLVMgold.so
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pmd
-PORTVERSION=	5.5.0
+PORTVERSION=	5.5.1
 CATEGORIES=	devel java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
--- a/devel/pmd/distinfo
+++ b/devel/pmd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466954861
-SHA256 (pmd-bin-5.5.0.zip) = b3b5b79513ba7f7ac1caa028599647c68528d5b0316ab79aa1fef7dc665755f5
-SIZE (pmd-bin-5.5.0.zip) = 54646622
+TIMESTAMP = 1469918558
+SHA256 (pmd-bin-5.5.1.zip) = d4d88e6c6db33441a9f5cd4537401d6e2b808412990e4f54b711ed10c9a918ae
+SIZE (pmd-bin-5.5.1.zip) = 54652390
--- a/devel/py-contextlib2/Makefile
+++ b/devel/py-contextlib2/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	contextlib2
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-contextlib2/distinfo
+++ b/devel/py-contextlib2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1463676814
-SHA256 (contextlib2-0.5.3.tar.gz) = 30e500f13921c73c96f49a6dd2adfbdd92bc3fae12183e91b06b2e4583486206
-SIZE (contextlib2-0.5.3.tar.gz) = 26415
+TIMESTAMP = 1469961673
+SHA256 (contextlib2-0.5.4.tar.gz) = 710626cde569f51a87f216ff757fe60f5cd13ae8f8114706590510cd5649ce88
+SIZE (contextlib2-0.5.4.tar.gz) = 28523
--- a/devel/py-stdnum/Makefile
+++ b/devel/py-stdnum/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	stdnum
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-stdnum/distinfo
+++ b/devel/py-stdnum/distinfo
@ -1,2 +1,3 @@
-SHA256 (python-stdnum-1.3.tar.gz) = 3e33f1d3e15fb5fe68518ed8a41d0f3247703f3a8d53864005529441c5ddc9d9
-SIZE (python-stdnum-1.3.tar.gz) = 274077
+TIMESTAMP = 1469973275
+SHA256 (python-stdnum-1.4.tar.gz) = 78e763b08a4b378397cba9cb155922b30149bb34757e22cab66705fb196cd8e6
+SIZE (python-stdnum-1.4.tar.gz) = 252850
--- a/devel/visualparadigm/Makefile
+++ b/devel/visualparadigm/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	visualparadigm
-PORTVERSION=	13.1.20160602
-CATEGORIES=	devel
+PORTVERSION=	13.1.20160702
+CATEGORIES=	devel java
 MASTER_SITES=	http://eu6.visual-paradigm.com/visual-paradigm/vpce${PORTVERSION:R}/${PORTVERSION:E}/
 DISTNAME=	Visual_Paradigm_CE_${PORTVERSION:C/\./_/g}_Unix_InstallFree

@ -32,4 +32,9 @@ do-install:
 	@${MKDIR} ${INSTALLDIR}
 	cd ${WRKSRC}/${EXTRACT_NAME} && ${COPYTREE_SHARE} \* ${INSTALLDIR} && ${CP} -R .install4j ${INSTALLDIR}

+post-install:
+	@${CHMOD} +w ${STAGEDIR}${PREFIX}/visualparadigm/Application/bin/vp_windows/ci
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/visualparadigm/Application/bin/vp_windows/ci
+	@${CHMOD} -w ${STAGEDIR}${PREFIX}/visualparadigm/Application/bin/vp_windows/ci
+
 .include <bsd.port.mk>
--- a/devel/visualparadigm/distinfo
+++ b/devel/visualparadigm/distinfo
@ -1,2 +1,3 @@
-SHA256 (Visual_Paradigm_CE_13_1_20160602_Unix_InstallFree.tar.gz) = 36c3aedb28d68f38188796d138529c0c8b8d51a9edb517fc8ba3131c5dd569f2
-SIZE (Visual_Paradigm_CE_13_1_20160602_Unix_InstallFree.tar.gz) = 208835408
+TIMESTAMP = 1469464277
+SHA256 (Visual_Paradigm_CE_13_1_20160702_Unix_InstallFree.tar.gz) = 4c0511e2a83eb26be86fff980be79332b9027bb64afdb4b9d7ed8f96e445a3b6
+SIZE (Visual_Paradigm_CE_13_1_20160702_Unix_InstallFree.tar.gz) = 208849314
--- a/devel/visualparadigm/pkg-message
+++ b/devel/visualparadigm/pkg-message
@ -1,4 +1,4 @@
 ******************************************************************
 Visit http://www.visual-paradigm.com/ to get either a community or
-an entreprise license key
+an enterprise license key
 ******************************************************************
--- a/dns/sheerdns/Makefile
+++ b/dns/sheerdns/Makefile
@ -2,22 +2,34 @@
 # $FreeBSD$

 PORTNAME=	sheerdns
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.04
 CATEGORIES=	dns
-MASTER_SITES=	http://threading.2038bug.com/sheerdns/
+MASTER_SITES=	http://bsdforge.com/projects/source/dns/sheerdns/

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Lightweight, simple, and fast master DNS server

-USES=		gmake
+LICENSE=	BSD2CLAUSE
+LICENSE_FILES=	${WRKSRC}/LICENSE
+
+DOCS=	sheerdns.ps sheerdns.html
+PORTDOCS=	*
+
+USES=		gmake tar:xz

 PLIST_FILES=	man/man8/sheerdns.8.gz sbin/sheerdns sbin/sheerdnshash

 WRKSRC=		${WRKDIR}/${PORTNAME}

+OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	DOCS
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/sheerdns
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/sheerdnshash

+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>
--- a/dns/sheerdns/distinfo
+++ b/dns/sheerdns/distinfo
@ -1,2 +1,2 @@
-SHA256 (sheerdns-1.0.3.tar.gz) = 4155c0ad33defb8bc7ce90fa4ecc31bd7e7562478cbfc7b46aaa0f25f0b5b4fb
-SIZE (sheerdns-1.0.3.tar.gz) = 22937
+SHA256 (sheerdns-1.04.tar.xz) = 890d0c4735179b20d2ac9b5a2fa9f7a94849ba880bd8afb919305c677aa44475
+SIZE (sheerdns-1.04.tar.xz) = 22404
--- a/dns/sheerdns/files/patch-Makefile
+++ b/dns/sheerdns/files/patch-Makefile
@ -1,5 +1,5 @@
--- Makefile.orig	2003-04-12 10:04:41.000000000 +0200
-+++ Makefile	2011-06-23 00:18:51.000000000 +0200
+--- Makefile.orig	2016-07-27 04:50:31 UTC
+++ Makefile
@@ -1,5 +1,6 @@
 
 -CFLAGS=-Wall -g -O0 -ansi -pedantic
@ -8,7 +8,7 @@
 
 SRCS=$(wildcard *.c)
 
-@@ -8,13 +9,13 @@
+@@ -8,13 +9,13 @@ all: sheerdns sheerdnshash sheerdns.ps
 OBJECTS=$(SRCS:.c=.o)
 
 sheerdns: $(OBJECTS)
@ -25,8 +25,8 @@
 
 clean:
 	rm -f sheerdns sheerdnshash *.o
-@@ -26,7 +27,6 @@
- 	groff -Tps -mandoc sheerdns.8 > sheerdns.ps
+@@ -26,6 +27,5 @@ sheerdns.ps:
+ 	groff -t sheerdns.8 > sheerdns.ps
 
 install: all
 -	install sheerdnshash sheerdns /usr/sbin/
@ -34,4 +34,3 @@
 -	install sheerdns.8 /usr/man/man8/
 +	install sheerdnshash sheerdns $(DESTDIR)$(PREFIX)/sbin
 +	install sheerdns.8 $(DESTDIR)$(MANPREFIX)/man/man8
- 
--- a/dns/sheerdns/pkg-descr
+++ b/dns/sheerdns/pkg-descr
@ -1,8 +1,11 @@
 sheerdns is a master DNS server whose zone records are stored on a
-One-Record-Per-File bases. Because of this, sheerdns is the simplest of any DNS
-to configure, the easiest to update, and the most efficient for networks that
-experience a lot of updates (for example master servers for dynamic IP address
-ranges). You never have to restart sheerdns; any updates are available
-immediately without having to notify the sheerdns process.
+one-record-per-file bases. Because of this, sheerdns is likely the
+simplest DNS to configure, use, update, and operate. It's especially
+efficient for networks with frequent updates -- serving DHCP, for example.
+Updates to the zones are immediate, and do not require restarting sheerdns.

-WWW: http://threading.2038bug.com/sheerdns/
+SheerDNS is a good candidate for creating and RBL for mail, or web sites,
+as well as for providing DNS on embeded systems. Or anything else that
+requires a fast DNS, with very low overhead.
+
+WWW: http://BSDforge.com/projects/dns/sheerdns/
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	Padre
 PORTVERSION=	1.00
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors perl5
 MASTER_SITES=	CPAN/${PORTNAME}/ CPAN/Wx/:wxsc
 PKGNAMEPREFIX=	p5-
@ -66,12 +66,13 @@ BUILD_DEPENDS=	p5-JSON-XS>=2.29:converters/p5-JSON-XS \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 BUILD_DEPENDS+=	p5-Module-Build>=0.36:devel/p5-Module-Build

-USES=		compiler:c++11-lib gettext perl5
+USES=		compiler:c++11-lib dos2unix gettext perl5
 USE_PERL5=	configure
 USE_WX=		3.0
 WX_COMPS=	wx
-WX_UNICODE=	yes
 MAKE_JOBS_UNSAFE=	yes
+DOS2UNIX_WRKSRC=${WRKDIR}/${WXSC_DISTNAME}
+DOS2UNIX_FILES=	wx-scintilla/src/scintilla/src/Editor.cxx

 BROKEN_FreeBSD_9=	Does not build.

@ -104,12 +105,16 @@ IGNORE=		needs a threaded Perl, build with enabling THREADS option and try again
 .endif
 .endif

+pre-patch:
+	(cd ${WRKDIR}/${WXSC_DISTNAME} && \
+		${PATCH} < ${FILESDIR}/extra-patch-editor )
+
 post-patch:
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		'/my /s|wx-config|${WX_CONFIG:T}|g' \
 		-e '/ret/ s|urn .flags;|urn $$flags . " -std=c++11";|' \
 		${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla.pm
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|_scintilla-|_scintilla| ; \
 		 s|$$major.*$$release \.|| ; \
 		 /$$major.*$$release;/s|^|#| ; \
@ -121,15 +126,15 @@ post-patch:
 		${WRKDIR}/${WXSC_DISTNAME}/inc/Module/Build/Scintilla/GTK.pm

 pre-configure:
-	@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} ${CONFIGURE_ENV} \
+	(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} ${CONFIGURE_ENV} \
 		${PERL} Build.PL ${CONFIGURE_ARGS} --destdir=${STAGEDIR})

 pre-build:
-	@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
+	(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
 		${PERL} Build)

 pre-install:
-	@(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
+	(cd ${WRKDIR}/${WXSC_DISTNAME} && ${SETENV} CC="$$(${WHICH} ${CC})" \
 		${PERL} Build install)

 post-install:
--- a/editors/p5-Padre/files/extra-patch-editor
+++ b/editors/p5-Padre/files/extra-patch-editor
@ -0,0 +1,10 @@
+--- wx-scintilla/src/scintilla/src/Editor.cxx.orig	2016-07-10 12:18:20.419137000 +0200
+++ wx-scintilla/src/scintilla/src/Editor.cxx	2016-07-10 12:18:29.917664000 +0200
+@@ -16,6 +16,7 @@
+ #include <map>
+ #include <algorithm>
+ #include <memory>
+#include <cmath>
+ 
+ #include "Platform.h"
+ 
--- a/editors/p5-Padre/files/patch-Makefile.PL
+++ b/editors/p5-Padre/files/patch-Makefile.PL
@ -1,6 +1,6 @@
--- Makefile.PL.orig
+--- Makefile.PL.orig	2013-11-09 03:10:25 UTC
 +++ Makefile.PL
-@@ -46,20 +46,6 @@
+@@ -46,20 +46,6 @@ configure_requires 'ExtUtils::Embed' => 
 #	exit 0;
 #}
 
--- a/editors/p5-Padre/files/patch-lib_Padre_Wx.pm
+++ b/editors/p5-Padre/files/patch-lib_Padre_Wx.pm
@ -1,6 +1,6 @@
--- lib/Padre/Wx.pm.orig
+--- lib/Padre/Wx.pm.orig	2013-11-09 03:43:41 UTC
 +++ lib/Padre/Wx.pm
-@@ -67,6 +67,7 @@
+@@ -158,6 +158,7 @@ sub aui_pane_info {
 
 sub launch_browser {
 	require Padre::Task::LaunchDefaultBrowser;
--- a/games/falconseye/files/patch-include_system_h
+++ b/games/falconseye/files/patch-include_system_h
@ -5,7 +5,7 @@
 # endif
 # if !defined(SUNOS4) || defined(RANDOM)
 -E void FDECL(srandom, (unsigned int));
-+E void FDECL(srandom, (unsigned long));
+#include <stdlib.h> /* srandom() differs between versions of FreeBSD. */
 # else
 #  if !defined(bsdi) && !defined(__FreeBSD__)
 E int FDECL(srandom, (unsigned int));
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	freeciv
-PORTVERSION=	2.5.4
+PORTVERSION=	2.5.5
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
 		http://download.gna.org/freeciv/stable/
@ -14,7 +14,8 @@ RUN_DEPENDS=	hicolor-icon-theme>=0:misc/hicolor-icon-theme
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libcurl.so:ftp/curl

-USES=		gettext gmake iconv libtool pkgconfig tar:bzip2 python sqlite
+USES=		gettext gmake iconv libtool pkgconfig tar:bzip2 python sqlite \
+		readline
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
@ -30,7 +31,7 @@ OPTIONS_SUB=		yes
 SDL_CONFIGURE_ON=	--enable-client=gtk,sdl
 SDL_USE=		SDL=sdl,image,ttf,gfx
 MYSQL_CONFIGURE_ON=	--enable-fcdb=mysql --with-mysql-prefix=${LOCALBASE}
-MYSQL_USE=		MYSQL=yes
+MYSQL_USES+=		mysql
 IPV6_CONFIGURE_EANBALE=	ipv6

 .include <bsd.port.options.mk>
@ -48,7 +49,7 @@ LIB_DEPENDS+=	libtiff.so:graphics/tiff \
 		libggzmod.so:games/ggz-client-libs
 USE_XORG=	xpm
 USE_SDL+=	mixer
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 cairo
 INSTALLS_ICONS=	yes
 . if ! ${PORT_OPTIONS:MSDL}
 CONFIGURE_ARGS+=--enable-client=gtk
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1463235221
-SHA256 (freeciv-2.5.4.tar.bz2) = 9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b
-SIZE (freeciv-2.5.4.tar.bz2) = 40977253
+TIMESTAMP = 1469915217
+SHA256 (freeciv-2.5.5.tar.bz2) = 5622f2142637057f7e47b1eda764c4e131222fab4d5bb42cd59fbd58ba3db1d4
+SIZE (freeciv-2.5.5.tar.bz2) = 40828396
--- a/games/nethack34/files/patch-include-system.h
+++ b/games/nethack34/files/patch-include-system.h
@ -6,7 +6,7 @@
 # endif
 -# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
 +# if defined(__FreeBSD__)
-+E void FDECL(srandom, (unsigned long));
+#include <stdlib.h> /* srandom() differs between versions of FreeBSD. */
 +# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
 E void FDECL(srandom, (unsigned int));
 # else
--- a/games/nethack36/files/patch-include-system.h
+++ b/games/nethack36/files/patch-include-system.h
@ -6,7 +6,7 @@
 #endif
 -#if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
 +# if defined(__FreeBSD__)
-+E void FDECL(srandom, (unsigned long));
+#include <stdlib.h> /* srandom() differs between versions of FreeBSD. */
 +#elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
     || defined(RANDOM)
 E void FDECL(srandom, (unsigned int));
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	solarus-quest-editor
-PORTVERSION=	1.4.5
+PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games

--- a/games/solarus-quest-editor/distinfo
+++ b/games/solarus-quest-editor/distinfo
@ -1,2 +1,3 @@
-SHA256 (christopho-solarus-quest-editor-v1.4.5_GH0.tar.gz) = e569282947b8e4d1c21f62d9243dfb0534411bbc469fda7ff29706adb797c493
-SIZE (christopho-solarus-quest-editor-v1.4.5_GH0.tar.gz) = 11824339
+TIMESTAMP = 1469816068
+SHA256 (christopho-solarus-quest-editor-v1.5.0_GH0.tar.gz) = 5cb3ccaca86512399625403eac02eceff62a3ec06830d8ff86585979ca2dfc6a
+SIZE (christopho-solarus-quest-editor-v1.5.0_GH0.tar.gz) = 63369273
--- a/games/solarus-quest-editor/files/patch-include_widgets_plaintextedit.h
+++ b/games/solarus-quest-editor/files/patch-include_widgets_plaintextedit.h
@ -1,6 +1,6 @@
--- include/gui/plain_text_edit.h.orig	2015-11-29 14:07:34 UTC
-+++ include/gui/plain_text_edit.h
-@@ -73,7 +73,7 @@ protected:
+--- include/widgets/plain_text_edit.h.orig	2016-07-30 20:59:16 UTC
+++ include/widgets/plain_text_edit.h
+@@ -75,7 +75,7 @@ protected:
       if (show_margin) {
         const QRect rect = event->rect();
         const QFont font = currentCharFormat().font();
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	solarus
-PORTVERSION=	1.4.5
+PORTVERSION=	1.5.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.solarus-games.org/downloads/solarus/
 DISTNAME=	solarus-${PORTVERSION}-src
@ -19,10 +19,11 @@ LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libogg.so:audio/libogg

 CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=OFF
-
+MAKE_ARGS+=	DESTDIR=${STAGEDIR}
+USE_QT5=	buildtools_build core gui linguisttools_build widgets
 USE_SDL=	sdl2 ttf2 image2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES=		cmake compiler:c++11-lib openal
+USES=		cmake qmake compiler:c++11-lib openal
 USE_LDCONFIG=	yes

 .include <bsd.port.mk>
--- a/games/solarus/distinfo
+++ b/games/solarus/distinfo
@ -1,2 +1,3 @@
-SHA256 (solarus-1.4.5-src.tar.gz) = c251dd65502162a8db586e3559353871b3d6b2d3729e39ca814cf20ada362503
-SIZE (solarus-1.4.5-src.tar.gz) = 2450121
+TIMESTAMP = 1469723091
+SHA256 (solarus-1.5.0-src.tar.gz) = f586877fe7eb28b3429fb41141fb4b1d9452f390061b386006773c8a1e0cd87f
+SIZE (solarus-1.5.0-src.tar.gz) = 4817611
--- a/games/solarus/pkg-plist
+++ b/games/solarus/pkg-plist
@ -1,26 +1,28 @@
-bin/solarus_run
+bin/solarus
+bin/solarus-run
 include/solarus/Ability.h
 include/solarus/AbilityInfo.h
 include/solarus/Arguments.h
-include/solarus/Camera.h
+include/solarus/CommandsEffects.h
 include/solarus/Common.h
 include/solarus/CurrentQuest.h
 include/solarus/Dialog.h
 include/solarus/DialogBoxSystem.h
 include/solarus/DialogResources.h
 include/solarus/Drawable.h
+include/solarus/DrawablePtr.h
 include/solarus/EntityData.h
+include/solarus/EnumInfo.h
+include/solarus/EnumInfo.inl
 include/solarus/Equipment.h
 include/solarus/EquipmentItem.h
 include/solarus/EquipmentItemUsage.h
 include/solarus/Game.h
 include/solarus/GameCommand.h
 include/solarus/GameCommands.h
-include/solarus/KeysEffect.h
 include/solarus/MainLoop.h
 include/solarus/Map.h
 include/solarus/MapData.h
-include/solarus/MapLoader.h
 include/solarus/QuestProperties.h
 include/solarus/QuestResources.h
 include/solarus/ResourceType.h
@ -45,12 +47,16 @@ include/solarus/Treasure.h
 include/solarus/config.h
 include/solarus/config.h.in
 include/solarus/containers/Grid.h
+include/solarus/containers/Quadtree.h
+include/solarus/containers/Quadtree.inl
 include/solarus/entities/AnimatedTilePattern.h
 include/solarus/entities/Arrow.h
 include/solarus/entities/Block.h
 include/solarus/entities/Bomb.h
 include/solarus/entities/Boomerang.h
-include/solarus/entities/CarriedItem.h
+include/solarus/entities/Camera.h
+include/solarus/entities/CameraPtr.h
+include/solarus/entities/CarriedObject.h
 include/solarus/entities/Chest.h
 include/solarus/entities/CollisionMode.h
 include/solarus/entities/Crystal.h
@ -58,12 +64,15 @@ include/solarus/entities/CrystalBlock.h
 include/solarus/entities/CustomEntity.h
 include/solarus/entities/Destination.h
 include/solarus/entities/Destructible.h
-include/solarus/entities/Detector.h
 include/solarus/entities/Door.h
 include/solarus/entities/DynamicTile.h
 include/solarus/entities/Enemy.h
 include/solarus/entities/EnemyAttack.h
 include/solarus/entities/EnemyReaction.h
+include/solarus/entities/Entities.h
+include/solarus/entities/Entity.h
+include/solarus/entities/EntityPtr.h
+include/solarus/entities/EntityState.h
 include/solarus/entities/EntityType.h
 include/solarus/entities/EntityTypeInfo.h
 include/solarus/entities/Explosion.h
@ -71,12 +80,9 @@ include/solarus/entities/Fire.h
 include/solarus/entities/Ground.h
 include/solarus/entities/GroundInfo.h
 include/solarus/entities/Hero.h
+include/solarus/entities/HeroPtr.h
 include/solarus/entities/Hookshot.h
 include/solarus/entities/Jumper.h
-include/solarus/entities/Layer.h
-include/solarus/entities/MapEntities.h
-include/solarus/entities/MapEntity.h
-include/solarus/entities/MapEntityPtr.h
 include/solarus/entities/NonAnimatedRegions.h
 include/solarus/entities/Npc.h
 include/solarus/entities/ParallaxScrollingTilePattern.h
@ -84,20 +90,37 @@ include/solarus/entities/Pickable.h
 include/solarus/entities/SelfScrollingTilePattern.h
 include/solarus/entities/Sensor.h
 include/solarus/entities/Separator.h
+include/solarus/entities/SeparatorPtr.h
 include/solarus/entities/ShopTreasure.h
 include/solarus/entities/SimpleTilePattern.h
 include/solarus/entities/Stairs.h
+include/solarus/entities/StartingLocationMode.h
 include/solarus/entities/Stream.h
 include/solarus/entities/StreamAction.h
 include/solarus/entities/Switch.h
 include/solarus/entities/Teletransporter.h
 include/solarus/entities/Tile.h
+include/solarus/entities/TileInfo.h
 include/solarus/entities/TilePattern.h
 include/solarus/entities/TilePtr.h
 include/solarus/entities/Tileset.h
 include/solarus/entities/TilesetData.h
 include/solarus/entities/TimeScrollingTilePattern.h
 include/solarus/entities/Wall.h
+include/solarus/gui/about_dialog.h
+include/solarus/gui/console.h
+include/solarus/gui/console_line_edit.h
+include/solarus/gui/gui_common.h
+include/solarus/gui/gui_tools.h
+include/solarus/gui/main_window.h
+include/solarus/gui/quest_runner.h
+include/solarus/gui/quests_item_delegate.h
+include/solarus/gui/quests_model.h
+include/solarus/gui/quests_view.h
+include/solarus/gui/settings.h
+include/solarus/gui/ui_about_dialog.h
+include/solarus/gui/ui_console.h
+include/solarus/gui/ui_main_window.h
 include/solarus/hero/BackToSolidGroundState.h
 include/solarus/hero/BoomerangState.h
 include/solarus/hero/BowState.h
@ -105,9 +128,10 @@ include/solarus/hero/CarryingState.h
 include/solarus/hero/FallingState.h
 include/solarus/hero/ForcedWalkingState.h
 include/solarus/hero/FreeState.h
-include/solarus/hero/FreezedState.h
+include/solarus/hero/FrozenState.h
 include/solarus/hero/GrabbingState.h
 include/solarus/hero/HeroSprites.h
+include/solarus/hero/HeroState.h
 include/solarus/hero/HookshotState.h
 include/solarus/hero/HurtState.h
 include/solarus/hero/JumpingState.h
@ -119,7 +143,6 @@ include/solarus/hero/PushingState.h
 include/solarus/hero/RunningState.h
 include/solarus/hero/SpinAttackState.h
 include/solarus/hero/StairsState.h
-include/solarus/hero/State.h
 include/solarus/hero/SwimmingState.h
 include/solarus/hero/SwordLoadingState.h
 include/solarus/hero/SwordSwingingState.h
@ -127,7 +150,10 @@ include/solarus/hero/SwordTappingState.h
 include/solarus/hero/TreasureState.h
 include/solarus/hero/UsingItemState.h
 include/solarus/hero/VictoryState.h
+include/solarus/lowlevel/BlendMode.h
+include/solarus/lowlevel/BlendModeInfo.h
 include/solarus/lowlevel/Color.h
+include/solarus/lowlevel/Color.inl
 include/solarus/lowlevel/Debug.h
 include/solarus/lowlevel/FontResource.h
 include/solarus/lowlevel/Geometry.h
@ -136,8 +162,9 @@ include/solarus/lowlevel/Hq3xFilter.h
 include/solarus/lowlevel/Hq4xFilter.h
 include/solarus/lowlevel/InputEvent.h
 include/solarus/lowlevel/ItDecoder.h
+include/solarus/lowlevel/Logger.h
 include/solarus/lowlevel/Music.h
-include/solarus/lowlevel/Output.h
+include/solarus/lowlevel/OggDecoder.h
 include/solarus/lowlevel/PixelBits.h
 include/solarus/lowlevel/PixelFilter.h
 include/solarus/lowlevel/Point.h
@ -145,11 +172,13 @@ include/solarus/lowlevel/Point.inl
 include/solarus/lowlevel/QuestFiles.h
 include/solarus/lowlevel/Random.h
 include/solarus/lowlevel/Rectangle.h
+include/solarus/lowlevel/Rectangle.inl
 include/solarus/lowlevel/Scale2xFilter.h
 include/solarus/lowlevel/Size.h
 include/solarus/lowlevel/Size.inl
 include/solarus/lowlevel/Sound.h
 include/solarus/lowlevel/SpcDecoder.h
+include/solarus/lowlevel/String.h
 include/solarus/lowlevel/Surface.h
 include/solarus/lowlevel/SurfacePtr.h
 include/solarus/lowlevel/System.h
@ -173,7 +202,6 @@ include/solarus/lua/ScopedLuaRef.h
 include/solarus/movements/CircleMovement.h
 include/solarus/movements/FallingHeight.h
 include/solarus/movements/FallingOnFloorMovement.h
-include/solarus/movements/FollowMovement.h
 include/solarus/movements/JumpMovement.h
 include/solarus/movements/Movement.h
 include/solarus/movements/PathFinding.h
@ -183,6 +211,7 @@ include/solarus/movements/PixelMovement.h
 include/solarus/movements/PlayerMovement.h
 include/solarus/movements/RandomMovement.h
 include/solarus/movements/RandomPathMovement.h
+include/solarus/movements/RelativeMovement.h
 include/solarus/movements/StraightMovement.h
 include/solarus/movements/TargetMovement.h
 include/solarus/third_party/hqx/common.h
@ -197,4 +226,7 @@ include/solarus/third_party/snes_spc/blargg_endian.h
 include/solarus/third_party/snes_spc/blargg_source.h
 include/solarus/third_party/snes_spc/dsp.h
 include/solarus/third_party/snes_spc/spc.h
+lib/libsolarus-gui.so
 lib/libsolarus.so
+lib/libsolarus.so.1
+lib/libsolarus.so.1.5.0
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=		aseprite
-PORTVERSION=		1.1.6
+PORTVERSION=		1.1.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=		graphics

@ -29,8 +29,8 @@ WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp

 USE_GITHUB=		yes
 GH_TUPLE=		aseprite:aseprite:${DISTVERSIONFULL}
-GH_TUPLE+=		aseprite:clip:8e92c5d:clip
-GH_TUPLE+=		aseprite:flic:da184cb:flic
+GH_TUPLE+=		aseprite:clip:96ed960:clip
+GH_TUPLE+=		aseprite:flic:65a6072:flic
 GH_TUPLE+=		aseprite:gtest:d63c625:gtest
 GH_TUPLE+=		aseprite:simpleini:0687587:simpleini
 GH_TUPLE+=		aseprite:duktape:0de771c:duk
--- a/graphics/aseprite/distinfo
+++ b/graphics/aseprite/distinfo
@ -1,10 +1,10 @@
-TIMESTAMP = 1467919676
-SHA256 (aseprite-aseprite-v1.1.6_GH0.tar.gz) = 770c2d1a8b68264f10204d815c72df4e25de5e1aeb482348e6909b107048b3fd
-SIZE (aseprite-aseprite-v1.1.6_GH0.tar.gz) = 2576949
-SHA256 (aseprite-clip-8e92c5d_GH0.tar.gz) = 65cd36c5942fb23d4128ff31381a1170264655af8180a4e2f8c0aade489525bf
-SIZE (aseprite-clip-8e92c5d_GH0.tar.gz) = 10561
-SHA256 (aseprite-flic-da184cb_GH0.tar.gz) = 118f422957ea59121a14f0474471cfb09fcf62fe9834b9b683671e53fb675075
-SIZE (aseprite-flic-da184cb_GH0.tar.gz) = 6552
+TIMESTAMP = 1469961993
+SHA256 (aseprite-aseprite-v1.1.7_GH0.tar.gz) = 441f67342e97c31a43b24b44268a73874998f3c8660f9c151357497ed290743a
+SIZE (aseprite-aseprite-v1.1.7_GH0.tar.gz) = 2578676
+SHA256 (aseprite-clip-96ed960_GH0.tar.gz) = 9fc2e3f612290e44d194d2e63cdd2696f78ed0ff7403ef9a2954511325b746ac
+SIZE (aseprite-clip-96ed960_GH0.tar.gz) = 10667
+SHA256 (aseprite-flic-65a6072_GH0.tar.gz) = 659ccc01206e94b18246c0b1cb8dd0b6e27027c8adf774f69b1fd791549f2027
+SIZE (aseprite-flic-65a6072_GH0.tar.gz) = 6558
 SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39
 SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187
 SHA256 (aseprite-simpleini-0687587_GH0.tar.gz) = 136c942b13809f3bd3f1ff3bdcc160039217a7006d052e5f005f38a0bd80174b
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@ -10,7 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive viewer for 3- and 4-D geometric objects

-LICENSE=	LGPL21
+LICENSE=	LGPL21+ # COPYING mentions LGPL21, source files LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING

 RUN_DEPENDS=	xdg-open:devel/xdg-utils

@ -43,9 +44,13 @@ post-build:
 post-install:
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} geomview.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} README \
 		${STAGEDIR}${DOCSDIR})
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.c *.tcl \
 		${STAGEDIR}${EXAMPLESDIR})
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gscan2pdf
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	SF

--- a/graphics/gscan2pdf/distinfo
+++ b/graphics/gscan2pdf/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466264351
-SHA256 (gscan2pdf-1.5.0.tar.xz) = fd2e284e6500c5d91eeb88beb66ee798963fd4d29b9bf32765e7f43f21defa3c
-SIZE (gscan2pdf-1.5.0.tar.xz) = 378528
+TIMESTAMP = 1469928268
+SHA256 (gscan2pdf-1.5.1.tar.xz) = c93721e27f73b487b183c5635049e88cc34896de8e739a7a9e10a3d05bca57eb
+SIZE (gscan2pdf-1.5.1.tar.xz) = 379652
--- a/graphics/linux-c6-png/pkg-plist.i686
+++ b/graphics/linux-c6-png/pkg-plist.i686
@ -2,11 +2,4 @@ usr/lib/libpng.so.3
 usr/lib/libpng.so.3.49.0
 usr/lib/libpng12.so.0
 usr/lib/libpng12.so.0.49.0
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/example.c
-%%PORTDOCS%%%%DOCSDIR%%/libpng-1.2.49.txt
 usr/share/man/man5/png.5.gz
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@ -2,19 +2,19 @@
 # $FreeBSD$

 PORTNAME=	shotwell
-PORTVERSION=	0.23.2
-PORTREVISION=	1
+PORTVERSION=	0.23.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}

 MAINTAINER=	cmt@burggraben.net
 COMMENT=	Open source photo manager for GNOME

-LICENSE=	LGPL21
+LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING

 BUILD_DEPENDS=	vala>=0.20.1:lang/vala \
-		bash:shells/bash
+		bash:shells/bash \
+		itstool:textproc/itstool
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libexiv2.so:graphics/exiv2 \
 		libgee-0.8.so:devel/libgee \
@ -30,7 +30,8 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libraw.so:graphics/libraw \
 		librest-0.7.so:devel/librest

-USES=		shebangfix gettext desktop-file-utils gmake pkgconfig sqlite tar:xz
+USES=		gettext desktop-file-utils gmake libtool pkgconfig \
+		sqlite tar:xz
 USE_GNOME=	cairo dconf gtk30 gnomedocutils
 USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
@ -38,6 +39,7 @@ USE_XORG=	x11
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-icon-update
 CONFIGURE_ENV+=	--define=NO_CAMERA
+INSTALL_TARGET=	install-strip
 INSTALLS_ICONS=	yes
 PORTSCOUT=	limitw:1,even
 MAKE_JOBS_UNSAFE=	yes
@ -49,8 +51,6 @@ OPENMP_DESC=	libraw uses OpenMP (implies GCC 4.6+)
 OPENMP_USES=		compiler:gcc-c++11-lib
 OPENMP_USES_OFF=	compiler:c++11-lib

-SHEBANG_FILES=	${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver
-
 GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml

 post-configure:
@ -58,27 +58,11 @@ post-configure:
 		-e 's|share/shotwell|${DATADIR_REL}|g' \
 			${WRKSRC}/${MAKEFILE}

-	@${REINPLACE_CMD} -E \
-		-e 's|\-n ||g' \
-			${WRKSRC}/configure.mk
-
-	@${REINPLACE_CMD} -E \
-		-e 's|--fatal-warnings||g' \
-			${WRKSRC}/plugins/Makefile.plugin.mk
 # attempt at a DATADIR safe port
 	@${REINPLACE_CMD} -E \
 		-e 's|\.get_child\("share")\.get_child\("shotwell")|${SHOTWELL_DATADIR}|' \
 		${WRKSRC}/src/AppDirs.vala

-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/shotwell \
-		${STAGEDIR}${LOCALBASE}/lib/libshotwell-plugin-common.so \
-		${STAGEDIR}${LOCALBASE}/lib/shotwell/plugins/builtin/shotwell-transitions.so \
-		${STAGEDIR}${LOCALBASE}/lib/shotwell/plugins/builtin/shotwell-publishing.so \
-		${STAGEDIR}${LOCALBASE}/lib/shotwell/plugins/builtin/shotwell-data-imports.so \
-		${STAGEDIR}${LOCALBASE}/lib/shotwell/plugins/builtin/shotwell-publishing-extras.so \
-		${STAGEDIR}${LOCALBASE}/libexec/shotwell/shotwell-video-thumbnailer
-
 .include <bsd.port.pre.mk>

 # attempt at a DATADIR safe port
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1466958836
-SHA256 (shotwell-0.23.2.tar.xz) = d52caae4e3204f2f78e2eb828d955848ea6fef5c91d3ac6e9eb0b185c0490b39
-SIZE (shotwell-0.23.2.tar.xz) = 2073932
+TIMESTAMP = 1469717646
+SHA256 (shotwell-0.23.4.tar.xz) = b1af25b2889aeeee9e1d4549463fe1baed27c70a3296e459c895ce153b05d4c2
+SIZE (shotwell-0.23.4.tar.xz) = 5238664
--- a/graphics/shotwell/files/patch-Makefile
+++ b/graphics/shotwell/files/patch-Makefile
@ -1,42 +0,0 @@
--- Makefile.orig	2016-01-29 16:01:18.000000000 +0100
-+++ Makefile	2016-01-29 16:05:58.158292000 +0100
-@@ -13,7 +13,7 @@
- VALAC := $(shell which $(VALAC))
- endif
- 
-VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
-+VALAC_VERSION := `$(VALAC) --version | cut -d' ' -f2`
- MIN_VALAC_VERSION := 0.28.0
- INSTALL_PROGRAM := install
- INSTALL_DATA := install -m 644
-@@ -261,7 +261,6 @@
- 	gstreamer-base-1.0 \
- 	gstreamer-pbutils-1.0 \
- 	gtk+-3.0 \
-	gudev-1.0 \
- 	libexif \
- 	libgphoto2 \
- 	json-glib-1.0 \
-@@ -293,7 +292,6 @@
- 	gstreamer-plugins-base-1.0 >= 1.0.0 \
- 	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.12.2 \
-	gudev-1.0 >= 145 \
- 	libexif >= 0.6.16 \
- 	libgphoto2 >= 2.4.2 \
- 	libraw >= 0.13.2 \
-@@ -539,11 +537,11 @@
- 	$(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- 	$(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- ifndef DISABLE_SCHEMAS_COMPILE
-	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-+#	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- endif
- ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
-	mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
-	$(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/GConf/gsettings
-+	$(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)$(PREFIX)/share/GConf/gsettings
- endif
- ifndef DISABLE_ICON_UPDATE
- 	-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
--- a/graphics/shotwell/files/patch-configure
+++ b/graphics/shotwell/files/patch-configure
@ -0,0 +1,74 @@
+--- configure.orig	2016-07-28 19:17:30.617282000 +0200
+++ configure	2016-07-28 19:17:49.248589000 +0200
+@@ -7988,7 +7988,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8009,7 +8008,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8033,7 +8031,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8065,7 +8062,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8086,7 +8082,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8110,7 +8105,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8151,7 +8145,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8173,7 +8166,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
+@@ -8198,7 +8190,6 @@
+                              gstreamer-plugins-base-1.0 >= 1.0.0
+                              gstreamer-pbutils-1.0 >= 1.0.0
+                              gtk+-3.0 >= 3.12.2
+-                             gudev-1.0 >= 145
+                              libexif >= 0.6.16
+                              libgphoto2 >= 2.5.0
+                              libraw >= 0.13.2
--- a/graphics/shotwell/pkg-plist
+++ b/graphics/shotwell/pkg-plist
@ -1,348 +1,385 @@
 bin/shotwell
+lib/libshotwell-plugin-common.a
 lib/libshotwell-plugin-common.so
+lib/libshotwell-plugin-common.so.0
+lib/libshotwell-plugin-common.so.0.0.0
 lib/shotwell/plugins/builtin/f-spot-24.png
 lib/shotwell/plugins/builtin/facebook.png
-lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/facebook_publishing_options_pane.ui
 lib/shotwell/plugins/builtin/flickr.png
-lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade
-lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/flickr_pin_entry_pane.ui
+lib/shotwell/plugins/builtin/flickr_publishing_options_pane.ui
 lib/shotwell/plugins/builtin/gallery3.png
-lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
-lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/gallery3_authentication_pane.ui
+lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.ui
 lib/shotwell/plugins/builtin/picasa.png
-lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/picasa_publishing_options_pane.ui
 lib/shotwell/plugins/builtin/piwigo.png
-lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
-lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/piwigo_authentication_pane.ui
+lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.ui
 lib/shotwell/plugins/builtin/rajce.png
-lib/shotwell/plugins/builtin/rajce_authentication_pane.glade
-lib/shotwell/plugins/builtin/rajce_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/rajce_authentication_pane.ui
+lib/shotwell/plugins/builtin/rajce_publishing_options_pane.ui
 lib/shotwell/plugins/builtin/shotwell-data-imports.so
 lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
 lib/shotwell/plugins/builtin/shotwell-publishing.so
 lib/shotwell/plugins/builtin/shotwell-transitions.so
 lib/shotwell/plugins/builtin/slideshow-plugin.png
 lib/shotwell/plugins/builtin/tumblr.png
-lib/shotwell/plugins/builtin/tumblr_authentication_pane.glade
-lib/shotwell/plugins/builtin/tumblr_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/yandex_publish_model.glade
+lib/shotwell/plugins/builtin/tumblr_authentication_pane.ui
+lib/shotwell/plugins/builtin/tumblr_publishing_options_pane.ui
+lib/shotwell/plugins/builtin/yandex_publish_model.ui
 lib/shotwell/plugins/builtin/youtube.png
-lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade
+lib/shotwell/plugins/builtin/youtube_publishing_options_pane.ui
 libexec/shotwell/shotwell-settings-migrator
 libexec/shotwell/shotwell-video-thumbnailer
-share/GConf/gsettings/shotwell.convert
 share/appdata/shotwell.appdata.xml
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
-share/gnome/help/shotwell/C/edit-adjustments.page
-share/gnome/help/shotwell/C/edit-crop.page
-share/gnome/help/shotwell/C/edit-date-time.page
-share/gnome/help/shotwell/C/edit-enhance.page
-share/gnome/help/shotwell/C/edit-external.page
-share/gnome/help/shotwell/C/edit-nondestructive.page
-share/gnome/help/shotwell/C/edit-redeye.page
-share/gnome/help/shotwell/C/edit-rotate.page
-share/gnome/help/shotwell/C/edit-straighten.page
-share/gnome/help/shotwell/C/edit-undo.page
-share/gnome/help/shotwell/C/figures/crop_thirds.jpg
-share/gnome/help/shotwell/C/figures/edit_toolbar.png
-share/gnome/help/shotwell/C/figures/editing_overview.png
-share/gnome/help/shotwell/C/figures/shotwell_logo.png
-share/gnome/help/shotwell/C/figures/trash_process.png
-share/gnome/help/shotwell/C/formats.page
-share/gnome/help/shotwell/C/import-camera.page
-share/gnome/help/shotwell/C/import-f-spot.page
-share/gnome/help/shotwell/C/import-file.page
-share/gnome/help/shotwell/C/import-memorycard.page
-share/gnome/help/shotwell/C/index.page
-share/gnome/help/shotwell/C/organize-event.page
-share/gnome/help/shotwell/C/organize-flag.page
-share/gnome/help/shotwell/C/organize-rating.page
-share/gnome/help/shotwell/C/organize-remove.page
-share/gnome/help/shotwell/C/organize-search.page
-share/gnome/help/shotwell/C/organize-tag.page
-share/gnome/help/shotwell/C/organize-title.page
-share/gnome/help/shotwell/C/other-files.page
-share/gnome/help/shotwell/C/other-missing.page
-share/gnome/help/shotwell/C/other-multiple.page
-share/gnome/help/shotwell/C/other-plugins.page
-share/gnome/help/shotwell/C/raw.page
-share/gnome/help/shotwell/C/running.page
-share/gnome/help/shotwell/C/share-background.page
-share/gnome/help/shotwell/C/share-export.page
-share/gnome/help/shotwell/C/share-print.page
-share/gnome/help/shotwell/C/share-send.page
-share/gnome/help/shotwell/C/share-slideshow.page
-share/gnome/help/shotwell/C/share-upload.page
-share/gnome/help/shotwell/C/view-displaying.page
-share/gnome/help/shotwell/C/view-information.page
-share/gnome/help/shotwell/C/view-sidebar.page
-share/gnome/help/shotwell/cs/edit-adjustments.page
-share/gnome/help/shotwell/cs/edit-crop.page
-share/gnome/help/shotwell/cs/edit-date-time.page
-share/gnome/help/shotwell/cs/edit-enhance.page
-share/gnome/help/shotwell/cs/edit-external.page
-share/gnome/help/shotwell/cs/edit-nondestructive.page
-share/gnome/help/shotwell/cs/edit-redeye.page
-share/gnome/help/shotwell/cs/edit-rotate.page
-share/gnome/help/shotwell/cs/edit-straighten.page
-share/gnome/help/shotwell/cs/edit-undo.page
-share/gnome/help/shotwell/cs/formats.page
-share/gnome/help/shotwell/cs/import-camera.page
-share/gnome/help/shotwell/cs/import-f-spot.page
-share/gnome/help/shotwell/cs/import-file.page
-share/gnome/help/shotwell/cs/import-memorycard.page
-share/gnome/help/shotwell/cs/index.page
-share/gnome/help/shotwell/cs/organize-event.page
-share/gnome/help/shotwell/cs/organize-flag.page
-share/gnome/help/shotwell/cs/organize-rating.page
-share/gnome/help/shotwell/cs/organize-remove.page
-share/gnome/help/shotwell/cs/organize-search.page
-share/gnome/help/shotwell/cs/organize-tag.page
-share/gnome/help/shotwell/cs/organize-title.page
-share/gnome/help/shotwell/cs/other-files.page
-share/gnome/help/shotwell/cs/other-missing.page
-share/gnome/help/shotwell/cs/other-multiple.page
-share/gnome/help/shotwell/cs/other-plugins.page
-share/gnome/help/shotwell/cs/raw.page
-share/gnome/help/shotwell/cs/running.page
-share/gnome/help/shotwell/cs/share-background.page
-share/gnome/help/shotwell/cs/share-export.page
-share/gnome/help/shotwell/cs/share-print.page
-share/gnome/help/shotwell/cs/share-send.page
-share/gnome/help/shotwell/cs/share-slideshow.page
-share/gnome/help/shotwell/cs/share-upload.page
-share/gnome/help/shotwell/cs/view-displaying.page
-share/gnome/help/shotwell/cs/view-information.page
-share/gnome/help/shotwell/cs/view-sidebar.page
-share/gnome/help/shotwell/de/edit-adjustments.page
-share/gnome/help/shotwell/de/edit-crop.page
-share/gnome/help/shotwell/de/edit-date-time.page
-share/gnome/help/shotwell/de/edit-enhance.page
-share/gnome/help/shotwell/de/edit-external.page
-share/gnome/help/shotwell/de/edit-nondestructive.page
-share/gnome/help/shotwell/de/edit-redeye.page
-share/gnome/help/shotwell/de/edit-rotate.page
-share/gnome/help/shotwell/de/edit-straighten.page
-share/gnome/help/shotwell/de/edit-undo.page
-share/gnome/help/shotwell/de/formats.page
-share/gnome/help/shotwell/de/import-camera.page
-share/gnome/help/shotwell/de/import-f-spot.page
-share/gnome/help/shotwell/de/import-file.page
-share/gnome/help/shotwell/de/import-memorycard.page
-share/gnome/help/shotwell/de/index.page
-share/gnome/help/shotwell/de/organize-event.page
-share/gnome/help/shotwell/de/organize-flag.page
-share/gnome/help/shotwell/de/organize-rating.page
-share/gnome/help/shotwell/de/organize-remove.page
-share/gnome/help/shotwell/de/organize-search.page
-share/gnome/help/shotwell/de/organize-tag.page
-share/gnome/help/shotwell/de/organize-title.page
-share/gnome/help/shotwell/de/other-files.page
-share/gnome/help/shotwell/de/other-missing.page
-share/gnome/help/shotwell/de/other-multiple.page
-share/gnome/help/shotwell/de/other-plugins.page
-share/gnome/help/shotwell/de/raw.page
-share/gnome/help/shotwell/de/running.page
-share/gnome/help/shotwell/de/share-background.page
-share/gnome/help/shotwell/de/share-export.page
-share/gnome/help/shotwell/de/share-print.page
-share/gnome/help/shotwell/de/share-send.page
-share/gnome/help/shotwell/de/share-slideshow.page
-share/gnome/help/shotwell/de/share-upload.page
-share/gnome/help/shotwell/de/view-displaying.page
-share/gnome/help/shotwell/de/view-information.page
-share/gnome/help/shotwell/de/view-sidebar.page
-share/gnome/help/shotwell/el/edit-adjustments.page
-share/gnome/help/shotwell/el/edit-crop.page
-share/gnome/help/shotwell/el/edit-date-time.page
-share/gnome/help/shotwell/el/edit-enhance.page
-share/gnome/help/shotwell/el/edit-external.page
-share/gnome/help/shotwell/el/edit-nondestructive.page
-share/gnome/help/shotwell/el/edit-redeye.page
-share/gnome/help/shotwell/el/edit-rotate.page
-share/gnome/help/shotwell/el/edit-straighten.page
-share/gnome/help/shotwell/el/edit-undo.page
-share/gnome/help/shotwell/el/formats.page
-share/gnome/help/shotwell/el/import-camera.page
-share/gnome/help/shotwell/el/import-f-spot.page
-share/gnome/help/shotwell/el/import-file.page
-share/gnome/help/shotwell/el/import-memorycard.page
-share/gnome/help/shotwell/el/index.page
-share/gnome/help/shotwell/el/organize-event.page
-share/gnome/help/shotwell/el/organize-flag.page
-share/gnome/help/shotwell/el/organize-rating.page
-share/gnome/help/shotwell/el/organize-remove.page
-share/gnome/help/shotwell/el/organize-search.page
-share/gnome/help/shotwell/el/organize-tag.page
-share/gnome/help/shotwell/el/organize-title.page
-share/gnome/help/shotwell/el/other-files.page
-share/gnome/help/shotwell/el/other-missing.page
-share/gnome/help/shotwell/el/other-multiple.page
-share/gnome/help/shotwell/el/other-plugins.page
-share/gnome/help/shotwell/el/raw.page
-share/gnome/help/shotwell/el/running.page
-share/gnome/help/shotwell/el/share-background.page
-share/gnome/help/shotwell/el/share-export.page
-share/gnome/help/shotwell/el/share-print.page
-share/gnome/help/shotwell/el/share-send.page
-share/gnome/help/shotwell/el/share-slideshow.page
-share/gnome/help/shotwell/el/share-upload.page
-share/gnome/help/shotwell/el/view-displaying.page
-share/gnome/help/shotwell/el/view-information.page
-share/gnome/help/shotwell/el/view-sidebar.page
-share/gnome/help/shotwell/es/edit-adjustments.page
-share/gnome/help/shotwell/es/edit-crop.page
-share/gnome/help/shotwell/es/edit-date-time.page
-share/gnome/help/shotwell/es/edit-enhance.page
-share/gnome/help/shotwell/es/edit-external.page
-share/gnome/help/shotwell/es/edit-nondestructive.page
-share/gnome/help/shotwell/es/edit-redeye.page
-share/gnome/help/shotwell/es/edit-rotate.page
-share/gnome/help/shotwell/es/edit-straighten.page
-share/gnome/help/shotwell/es/edit-undo.page
-share/gnome/help/shotwell/es/formats.page
-share/gnome/help/shotwell/es/import-camera.page
-share/gnome/help/shotwell/es/import-f-spot.page
-share/gnome/help/shotwell/es/import-file.page
-share/gnome/help/shotwell/es/import-memorycard.page
-share/gnome/help/shotwell/es/index.page
-share/gnome/help/shotwell/es/organize-event.page
-share/gnome/help/shotwell/es/organize-flag.page
-share/gnome/help/shotwell/es/organize-rating.page
-share/gnome/help/shotwell/es/organize-remove.page
-share/gnome/help/shotwell/es/organize-search.page
-share/gnome/help/shotwell/es/organize-tag.page
-share/gnome/help/shotwell/es/organize-title.page
-share/gnome/help/shotwell/es/other-files.page
-share/gnome/help/shotwell/es/other-missing.page
-share/gnome/help/shotwell/es/other-multiple.page
-share/gnome/help/shotwell/es/other-plugins.page
-share/gnome/help/shotwell/es/raw.page
-share/gnome/help/shotwell/es/running.page
-share/gnome/help/shotwell/es/share-background.page
-share/gnome/help/shotwell/es/share-export.page
-share/gnome/help/shotwell/es/share-print.page
-share/gnome/help/shotwell/es/share-send.page
-share/gnome/help/shotwell/es/share-slideshow.page
-share/gnome/help/shotwell/es/share-upload.page
-share/gnome/help/shotwell/es/view-displaying.page
-share/gnome/help/shotwell/es/view-information.page
-share/gnome/help/shotwell/es/view-sidebar.page
-share/gnome/help/shotwell/hu/edit-adjustments.page
-share/gnome/help/shotwell/hu/edit-crop.page
-share/gnome/help/shotwell/hu/edit-date-time.page
-share/gnome/help/shotwell/hu/edit-enhance.page
-share/gnome/help/shotwell/hu/edit-external.page
-share/gnome/help/shotwell/hu/edit-nondestructive.page
-share/gnome/help/shotwell/hu/edit-redeye.page
-share/gnome/help/shotwell/hu/edit-rotate.page
-share/gnome/help/shotwell/hu/edit-straighten.page
-share/gnome/help/shotwell/hu/edit-undo.page
-share/gnome/help/shotwell/hu/formats.page
-share/gnome/help/shotwell/hu/import-camera.page
-share/gnome/help/shotwell/hu/import-f-spot.page
-share/gnome/help/shotwell/hu/import-file.page
-share/gnome/help/shotwell/hu/import-memorycard.page
-share/gnome/help/shotwell/hu/index.page
-share/gnome/help/shotwell/hu/organize-event.page
-share/gnome/help/shotwell/hu/organize-flag.page
-share/gnome/help/shotwell/hu/organize-rating.page
-share/gnome/help/shotwell/hu/organize-remove.page
-share/gnome/help/shotwell/hu/organize-search.page
-share/gnome/help/shotwell/hu/organize-tag.page
-share/gnome/help/shotwell/hu/organize-title.page
-share/gnome/help/shotwell/hu/other-files.page
-share/gnome/help/shotwell/hu/other-missing.page
-share/gnome/help/shotwell/hu/other-multiple.page
-share/gnome/help/shotwell/hu/other-plugins.page
-share/gnome/help/shotwell/hu/raw.page
-share/gnome/help/shotwell/hu/running.page
-share/gnome/help/shotwell/hu/share-background.page
-share/gnome/help/shotwell/hu/share-export.page
-share/gnome/help/shotwell/hu/share-print.page
-share/gnome/help/shotwell/hu/share-send.page
-share/gnome/help/shotwell/hu/share-slideshow.page
-share/gnome/help/shotwell/hu/share-upload.page
-share/gnome/help/shotwell/hu/view-displaying.page
-share/gnome/help/shotwell/hu/view-information.page
-share/gnome/help/shotwell/hu/view-sidebar.page
-share/gnome/help/shotwell/pt_BR/edit-adjustments.page
-share/gnome/help/shotwell/pt_BR/edit-crop.page
-share/gnome/help/shotwell/pt_BR/edit-date-time.page
-share/gnome/help/shotwell/pt_BR/edit-enhance.page
-share/gnome/help/shotwell/pt_BR/edit-external.page
-share/gnome/help/shotwell/pt_BR/edit-nondestructive.page
-share/gnome/help/shotwell/pt_BR/edit-redeye.page
-share/gnome/help/shotwell/pt_BR/edit-rotate.page
-share/gnome/help/shotwell/pt_BR/edit-straighten.page
-share/gnome/help/shotwell/pt_BR/edit-undo.page
-share/gnome/help/shotwell/pt_BR/formats.page
-share/gnome/help/shotwell/pt_BR/import-camera.page
-share/gnome/help/shotwell/pt_BR/import-f-spot.page
-share/gnome/help/shotwell/pt_BR/import-file.page
-share/gnome/help/shotwell/pt_BR/import-memorycard.page
-share/gnome/help/shotwell/pt_BR/index.page
-share/gnome/help/shotwell/pt_BR/organize-event.page
-share/gnome/help/shotwell/pt_BR/organize-flag.page
-share/gnome/help/shotwell/pt_BR/organize-rating.page
-share/gnome/help/shotwell/pt_BR/organize-remove.page
-share/gnome/help/shotwell/pt_BR/organize-search.page
-share/gnome/help/shotwell/pt_BR/organize-tag.page
-share/gnome/help/shotwell/pt_BR/organize-title.page
-share/gnome/help/shotwell/pt_BR/other-files.page
-share/gnome/help/shotwell/pt_BR/other-missing.page
-share/gnome/help/shotwell/pt_BR/other-multiple.page
-share/gnome/help/shotwell/pt_BR/other-plugins.page
-share/gnome/help/shotwell/pt_BR/raw.page
-share/gnome/help/shotwell/pt_BR/running.page
-share/gnome/help/shotwell/pt_BR/share-background.page
-share/gnome/help/shotwell/pt_BR/share-export.page
-share/gnome/help/shotwell/pt_BR/share-print.page
-share/gnome/help/shotwell/pt_BR/share-send.page
-share/gnome/help/shotwell/pt_BR/share-slideshow.page
-share/gnome/help/shotwell/pt_BR/share-upload.page
-share/gnome/help/shotwell/pt_BR/view-displaying.page
-share/gnome/help/shotwell/pt_BR/view-information.page
-share/gnome/help/shotwell/pt_BR/view-sidebar.page
-share/gnome/help/shotwell/sv/edit-adjustments.page
-share/gnome/help/shotwell/sv/edit-crop.page
-share/gnome/help/shotwell/sv/edit-date-time.page
-share/gnome/help/shotwell/sv/edit-enhance.page
-share/gnome/help/shotwell/sv/edit-external.page
-share/gnome/help/shotwell/sv/edit-nondestructive.page
-share/gnome/help/shotwell/sv/edit-redeye.page
-share/gnome/help/shotwell/sv/edit-rotate.page
-share/gnome/help/shotwell/sv/edit-straighten.page
-share/gnome/help/shotwell/sv/edit-undo.page
-share/gnome/help/shotwell/sv/formats.page
-share/gnome/help/shotwell/sv/import-camera.page
-share/gnome/help/shotwell/sv/import-f-spot.page
-share/gnome/help/shotwell/sv/import-file.page
-share/gnome/help/shotwell/sv/import-memorycard.page
-share/gnome/help/shotwell/sv/index.page
-share/gnome/help/shotwell/sv/organize-event.page
-share/gnome/help/shotwell/sv/organize-flag.page
-share/gnome/help/shotwell/sv/organize-rating.page
-share/gnome/help/shotwell/sv/organize-remove.page
-share/gnome/help/shotwell/sv/organize-search.page
-share/gnome/help/shotwell/sv/organize-tag.page
-share/gnome/help/shotwell/sv/organize-title.page
-share/gnome/help/shotwell/sv/other-files.page
-share/gnome/help/shotwell/sv/other-missing.page
-share/gnome/help/shotwell/sv/other-multiple.page
-share/gnome/help/shotwell/sv/other-plugins.page
-share/gnome/help/shotwell/sv/raw.page
-share/gnome/help/shotwell/sv/running.page
-share/gnome/help/shotwell/sv/share-background.page
-share/gnome/help/shotwell/sv/share-export.page
-share/gnome/help/shotwell/sv/share-print.page
-share/gnome/help/shotwell/sv/share-send.page
-share/gnome/help/shotwell/sv/share-slideshow.page
-share/gnome/help/shotwell/sv/share-upload.page
-share/gnome/help/shotwell/sv/view-displaying.page
-share/gnome/help/shotwell/sv/view-information.page
-share/gnome/help/shotwell/sv/view-sidebar.page
+share/help/C/shotwell/edit-adjustments.page
+share/help/C/shotwell/edit-crop.page
+share/help/C/shotwell/edit-date-time.page
+share/help/C/shotwell/edit-enhance.page
+share/help/C/shotwell/edit-external.page
+share/help/C/shotwell/edit-nondestructive.page
+share/help/C/shotwell/edit-redeye.page
+share/help/C/shotwell/edit-rotate.page
+share/help/C/shotwell/edit-straighten.page
+share/help/C/shotwell/edit-undo.page
+share/help/C/shotwell/figures/crop_thirds.jpg
+share/help/C/shotwell/figures/edit_toolbar.png
+share/help/C/shotwell/figures/editing_overview.png
+share/help/C/shotwell/figures/shotwell_logo.png
+share/help/C/shotwell/figures/trash_process.png
+share/help/C/shotwell/formats.page
+share/help/C/shotwell/import-camera.page
+share/help/C/shotwell/import-f-spot.page
+share/help/C/shotwell/import-file.page
+share/help/C/shotwell/import-memorycard.page
+share/help/C/shotwell/index.page
+share/help/C/shotwell/organize-event.page
+share/help/C/shotwell/organize-flag.page
+share/help/C/shotwell/organize-rating.page
+share/help/C/shotwell/organize-remove.page
+share/help/C/shotwell/organize-search.page
+share/help/C/shotwell/organize-tag.page
+share/help/C/shotwell/organize-title.page
+share/help/C/shotwell/other-files.page
+share/help/C/shotwell/other-missing.page
+share/help/C/shotwell/other-multiple.page
+share/help/C/shotwell/other-plugins.page
+share/help/C/shotwell/raw.page
+share/help/C/shotwell/running.page
+share/help/C/shotwell/share-background.page
+share/help/C/shotwell/share-export.page
+share/help/C/shotwell/share-print.page
+share/help/C/shotwell/share-send.page
+share/help/C/shotwell/share-slideshow.page
+share/help/C/shotwell/share-upload.page
+share/help/C/shotwell/view-displaying.page
+share/help/C/shotwell/view-information.page
+share/help/C/shotwell/view-sidebar.page
+share/help/cs/shotwell/edit-adjustments.page
+share/help/cs/shotwell/edit-crop.page
+share/help/cs/shotwell/edit-date-time.page
+share/help/cs/shotwell/edit-enhance.page
+share/help/cs/shotwell/edit-external.page
+share/help/cs/shotwell/edit-nondestructive.page
+share/help/cs/shotwell/edit-redeye.page
+share/help/cs/shotwell/edit-rotate.page
+share/help/cs/shotwell/edit-straighten.page
+share/help/cs/shotwell/edit-undo.page
+share/help/cs/shotwell/figures/crop_thirds.jpg
+share/help/cs/shotwell/figures/edit_toolbar.png
+share/help/cs/shotwell/figures/editing_overview.png
+share/help/cs/shotwell/figures/shotwell_logo.png
+share/help/cs/shotwell/figures/trash_process.png
+share/help/cs/shotwell/formats.page
+share/help/cs/shotwell/import-camera.page
+share/help/cs/shotwell/import-f-spot.page
+share/help/cs/shotwell/import-file.page
+share/help/cs/shotwell/import-memorycard.page
+share/help/cs/shotwell/index.page
+share/help/cs/shotwell/organize-event.page
+share/help/cs/shotwell/organize-flag.page
+share/help/cs/shotwell/organize-rating.page
+share/help/cs/shotwell/organize-remove.page
+share/help/cs/shotwell/organize-search.page
+share/help/cs/shotwell/organize-tag.page
+share/help/cs/shotwell/organize-title.page
+share/help/cs/shotwell/other-files.page
+share/help/cs/shotwell/other-missing.page
+share/help/cs/shotwell/other-multiple.page
+share/help/cs/shotwell/other-plugins.page
+share/help/cs/shotwell/raw.page
+share/help/cs/shotwell/running.page
+share/help/cs/shotwell/share-background.page
+share/help/cs/shotwell/share-export.page
+share/help/cs/shotwell/share-print.page
+share/help/cs/shotwell/share-send.page
+share/help/cs/shotwell/share-slideshow.page
+share/help/cs/shotwell/share-upload.page
+share/help/cs/shotwell/view-displaying.page
+share/help/cs/shotwell/view-information.page
+share/help/cs/shotwell/view-sidebar.page
+share/help/de/shotwell/edit-adjustments.page
+share/help/de/shotwell/edit-crop.page
+share/help/de/shotwell/edit-date-time.page
+share/help/de/shotwell/edit-enhance.page
+share/help/de/shotwell/edit-external.page
+share/help/de/shotwell/edit-nondestructive.page
+share/help/de/shotwell/edit-redeye.page
+share/help/de/shotwell/edit-rotate.page
+share/help/de/shotwell/edit-straighten.page
+share/help/de/shotwell/edit-undo.page
+share/help/de/shotwell/figures/crop_thirds.jpg
+share/help/de/shotwell/figures/edit_toolbar.png
+share/help/de/shotwell/figures/editing_overview.png
+share/help/de/shotwell/figures/shotwell_logo.png
+share/help/de/shotwell/figures/trash_process.png
+share/help/de/shotwell/formats.page
+share/help/de/shotwell/import-camera.page
+share/help/de/shotwell/import-f-spot.page
+share/help/de/shotwell/import-file.page
+share/help/de/shotwell/import-memorycard.page
+share/help/de/shotwell/index.page
+share/help/de/shotwell/organize-event.page
+share/help/de/shotwell/organize-flag.page
+share/help/de/shotwell/organize-rating.page
+share/help/de/shotwell/organize-remove.page
+share/help/de/shotwell/organize-search.page
+share/help/de/shotwell/organize-tag.page
+share/help/de/shotwell/organize-title.page
+share/help/de/shotwell/other-files.page
+share/help/de/shotwell/other-missing.page
+share/help/de/shotwell/other-multiple.page
+share/help/de/shotwell/other-plugins.page
+share/help/de/shotwell/raw.page
+share/help/de/shotwell/running.page
+share/help/de/shotwell/share-background.page
+share/help/de/shotwell/share-export.page
+share/help/de/shotwell/share-print.page
+share/help/de/shotwell/share-send.page
+share/help/de/shotwell/share-slideshow.page
+share/help/de/shotwell/share-upload.page
+share/help/de/shotwell/view-displaying.page
+share/help/de/shotwell/view-information.page
+share/help/de/shotwell/view-sidebar.page
+share/help/el/shotwell/edit-adjustments.page
+share/help/el/shotwell/edit-crop.page
+share/help/el/shotwell/edit-date-time.page
+share/help/el/shotwell/edit-enhance.page
+share/help/el/shotwell/edit-external.page
+share/help/el/shotwell/edit-nondestructive.page
+share/help/el/shotwell/edit-redeye.page
+share/help/el/shotwell/edit-rotate.page
+share/help/el/shotwell/edit-straighten.page
+share/help/el/shotwell/edit-undo.page
+share/help/el/shotwell/figures/crop_thirds.jpg
+share/help/el/shotwell/figures/edit_toolbar.png
+share/help/el/shotwell/figures/editing_overview.png
+share/help/el/shotwell/figures/shotwell_logo.png
+share/help/el/shotwell/figures/trash_process.png
+share/help/el/shotwell/formats.page
+share/help/el/shotwell/import-camera.page
+share/help/el/shotwell/import-f-spot.page
+share/help/el/shotwell/import-file.page
+share/help/el/shotwell/import-memorycard.page
+share/help/el/shotwell/index.page
+share/help/el/shotwell/organize-event.page
+share/help/el/shotwell/organize-flag.page
+share/help/el/shotwell/organize-rating.page
+share/help/el/shotwell/organize-remove.page
+share/help/el/shotwell/organize-search.page
+share/help/el/shotwell/organize-tag.page
+share/help/el/shotwell/organize-title.page
+share/help/el/shotwell/other-files.page
+share/help/el/shotwell/other-missing.page
+share/help/el/shotwell/other-multiple.page
+share/help/el/shotwell/other-plugins.page
+share/help/el/shotwell/raw.page
+share/help/el/shotwell/running.page
+share/help/el/shotwell/share-background.page
+share/help/el/shotwell/share-export.page
+share/help/el/shotwell/share-print.page
+share/help/el/shotwell/share-send.page
+share/help/el/shotwell/share-slideshow.page
+share/help/el/shotwell/share-upload.page
+share/help/el/shotwell/view-displaying.page
+share/help/el/shotwell/view-information.page
+share/help/el/shotwell/view-sidebar.page
+share/help/es/shotwell/edit-adjustments.page
+share/help/es/shotwell/edit-crop.page
+share/help/es/shotwell/edit-date-time.page
+share/help/es/shotwell/edit-enhance.page
+share/help/es/shotwell/edit-external.page
+share/help/es/shotwell/edit-nondestructive.page
+share/help/es/shotwell/edit-redeye.page
+share/help/es/shotwell/edit-rotate.page
+share/help/es/shotwell/edit-straighten.page
+share/help/es/shotwell/edit-undo.page
+share/help/es/shotwell/figures/crop_thirds.jpg
+share/help/es/shotwell/figures/edit_toolbar.png
+share/help/es/shotwell/figures/editing_overview.png
+share/help/es/shotwell/figures/shotwell_logo.png
+share/help/es/shotwell/figures/trash_process.png
+share/help/es/shotwell/formats.page
+share/help/es/shotwell/import-camera.page
+share/help/es/shotwell/import-f-spot.page
+share/help/es/shotwell/import-file.page
+share/help/es/shotwell/import-memorycard.page
+share/help/es/shotwell/index.page
+share/help/es/shotwell/organize-event.page
+share/help/es/shotwell/organize-flag.page
+share/help/es/shotwell/organize-rating.page
+share/help/es/shotwell/organize-remove.page
+share/help/es/shotwell/organize-search.page
+share/help/es/shotwell/organize-tag.page
+share/help/es/shotwell/organize-title.page
+share/help/es/shotwell/other-files.page
+share/help/es/shotwell/other-missing.page
+share/help/es/shotwell/other-multiple.page
+share/help/es/shotwell/other-plugins.page
+share/help/es/shotwell/raw.page
+share/help/es/shotwell/running.page
+share/help/es/shotwell/share-background.page
+share/help/es/shotwell/share-export.page
+share/help/es/shotwell/share-print.page
+share/help/es/shotwell/share-send.page
+share/help/es/shotwell/share-slideshow.page
+share/help/es/shotwell/share-upload.page
+share/help/es/shotwell/view-displaying.page
+share/help/es/shotwell/view-information.page
+share/help/es/shotwell/view-sidebar.page
+share/help/hu/shotwell/edit-adjustments.page
+share/help/hu/shotwell/edit-crop.page
+share/help/hu/shotwell/edit-date-time.page
+share/help/hu/shotwell/edit-enhance.page
+share/help/hu/shotwell/edit-external.page
+share/help/hu/shotwell/edit-nondestructive.page
+share/help/hu/shotwell/edit-redeye.page
+share/help/hu/shotwell/edit-rotate.page
+share/help/hu/shotwell/edit-straighten.page
+share/help/hu/shotwell/edit-undo.page
+share/help/hu/shotwell/figures/crop_thirds.jpg
+share/help/hu/shotwell/figures/edit_toolbar.png
+share/help/hu/shotwell/figures/editing_overview.png
+share/help/hu/shotwell/figures/shotwell_logo.png
+share/help/hu/shotwell/figures/trash_process.png
+share/help/hu/shotwell/formats.page
+share/help/hu/shotwell/import-camera.page
+share/help/hu/shotwell/import-f-spot.page
+share/help/hu/shotwell/import-file.page
+share/help/hu/shotwell/import-memorycard.page
+share/help/hu/shotwell/index.page
+share/help/hu/shotwell/organize-event.page
+share/help/hu/shotwell/organize-flag.page
+share/help/hu/shotwell/organize-rating.page
+share/help/hu/shotwell/organize-remove.page
+share/help/hu/shotwell/organize-search.page
+share/help/hu/shotwell/organize-tag.page
+share/help/hu/shotwell/organize-title.page
+share/help/hu/shotwell/other-files.page
+share/help/hu/shotwell/other-missing.page
+share/help/hu/shotwell/other-multiple.page
+share/help/hu/shotwell/other-plugins.page
+share/help/hu/shotwell/raw.page
+share/help/hu/shotwell/running.page
+share/help/hu/shotwell/share-background.page
+share/help/hu/shotwell/share-export.page
+share/help/hu/shotwell/share-print.page
+share/help/hu/shotwell/share-send.page
+share/help/hu/shotwell/share-slideshow.page
+share/help/hu/shotwell/share-upload.page
+share/help/hu/shotwell/view-displaying.page
+share/help/hu/shotwell/view-information.page
+share/help/hu/shotwell/view-sidebar.page
+share/help/pt_BR/shotwell/edit-adjustments.page
+share/help/pt_BR/shotwell/edit-crop.page
+share/help/pt_BR/shotwell/edit-date-time.page
+share/help/pt_BR/shotwell/edit-enhance.page
+share/help/pt_BR/shotwell/edit-external.page
+share/help/pt_BR/shotwell/edit-nondestructive.page
+share/help/pt_BR/shotwell/edit-redeye.page
+share/help/pt_BR/shotwell/edit-rotate.page
+share/help/pt_BR/shotwell/edit-straighten.page
+share/help/pt_BR/shotwell/edit-undo.page
+share/help/pt_BR/shotwell/figures/crop_thirds.jpg
+share/help/pt_BR/shotwell/figures/edit_toolbar.png
+share/help/pt_BR/shotwell/figures/editing_overview.png
+share/help/pt_BR/shotwell/figures/shotwell_logo.png
+share/help/pt_BR/shotwell/figures/trash_process.png
+share/help/pt_BR/shotwell/formats.page
+share/help/pt_BR/shotwell/import-camera.page
+share/help/pt_BR/shotwell/import-f-spot.page
+share/help/pt_BR/shotwell/import-file.page
+share/help/pt_BR/shotwell/import-memorycard.page
+share/help/pt_BR/shotwell/index.page
+share/help/pt_BR/shotwell/organize-event.page
+share/help/pt_BR/shotwell/organize-flag.page
+share/help/pt_BR/shotwell/organize-rating.page
+share/help/pt_BR/shotwell/organize-remove.page
+share/help/pt_BR/shotwell/organize-search.page
+share/help/pt_BR/shotwell/organize-tag.page
+share/help/pt_BR/shotwell/organize-title.page
+share/help/pt_BR/shotwell/other-files.page
+share/help/pt_BR/shotwell/other-missing.page
+share/help/pt_BR/shotwell/other-multiple.page
+share/help/pt_BR/shotwell/other-plugins.page
+share/help/pt_BR/shotwell/raw.page
+share/help/pt_BR/shotwell/running.page
+share/help/pt_BR/shotwell/share-background.page
+share/help/pt_BR/shotwell/share-export.page
+share/help/pt_BR/shotwell/share-print.page
+share/help/pt_BR/shotwell/share-send.page
+share/help/pt_BR/shotwell/share-slideshow.page
+share/help/pt_BR/shotwell/share-upload.page
+share/help/pt_BR/shotwell/view-displaying.page
+share/help/pt_BR/shotwell/view-information.page
+share/help/pt_BR/shotwell/view-sidebar.page
+share/help/sv/shotwell/edit-adjustments.page
+share/help/sv/shotwell/edit-crop.page
+share/help/sv/shotwell/edit-date-time.page
+share/help/sv/shotwell/edit-enhance.page
+share/help/sv/shotwell/edit-external.page
+share/help/sv/shotwell/edit-nondestructive.page
+share/help/sv/shotwell/edit-redeye.page
+share/help/sv/shotwell/edit-rotate.page
+share/help/sv/shotwell/edit-straighten.page
+share/help/sv/shotwell/edit-undo.page
+share/help/sv/shotwell/figures/crop_thirds.jpg
+share/help/sv/shotwell/figures/edit_toolbar.png
+share/help/sv/shotwell/figures/editing_overview.png
+share/help/sv/shotwell/figures/shotwell_logo.png
+share/help/sv/shotwell/figures/trash_process.png
+share/help/sv/shotwell/formats.page
+share/help/sv/shotwell/import-camera.page
+share/help/sv/shotwell/import-f-spot.page
+share/help/sv/shotwell/import-file.page
+share/help/sv/shotwell/import-memorycard.page
+share/help/sv/shotwell/index.page
+share/help/sv/shotwell/organize-event.page
+share/help/sv/shotwell/organize-flag.page
+share/help/sv/shotwell/organize-rating.page
+share/help/sv/shotwell/organize-remove.page
+share/help/sv/shotwell/organize-search.page
+share/help/sv/shotwell/organize-tag.page
+share/help/sv/shotwell/organize-title.page
+share/help/sv/shotwell/other-files.page
+share/help/sv/shotwell/other-missing.page
+share/help/sv/shotwell/other-multiple.page
+share/help/sv/shotwell/other-plugins.page
+share/help/sv/shotwell/raw.page
+share/help/sv/shotwell/running.page
+share/help/sv/shotwell/share-background.page
+share/help/sv/shotwell/share-export.page
+share/help/sv/shotwell/share-print.page
+share/help/sv/shotwell/share-send.page
+share/help/sv/shotwell/share-slideshow.page
+share/help/sv/shotwell/share-upload.page
+share/help/sv/shotwell/view-displaying.page
+share/help/sv/shotwell/view-information.page
+share/help/sv/shotwell/view-sidebar.page
 share/icons/hicolor/16x16/apps/shotwell.png
 share/icons/hicolor/22x22/apps/shotwell.png
 share/icons/hicolor/24x24/apps/shotwell.png
@ -416,10 +453,12 @@ share/locale/vi/LC_MESSAGES/shotwell.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
 share/locale/zh_HK/LC_MESSAGES/shotwell.mo
 share/locale/zh_TW/LC_MESSAGES/shotwell.mo
+share/man/man1/shotwell.1
 %%DATADIR%%/icons/all-rejected.png
 %%DATADIR%%/icons/crop-pivot-reticle.png
 %%DATADIR%%/icons/crop.svg
 %%DATADIR%%/icons/drag_nub.png
+%%DATADIR%%/icons/faces-tool.png
 %%DATADIR%%/icons/filter-flagged.png
 %%DATADIR%%/icons/filter-photos.png
 %%DATADIR%%/icons/filter-raw.png
@ -435,12 +474,14 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/icons/import-all.png
 %%DATADIR%%/icons/import.svg
 %%DATADIR%%/icons/make-primary.svg
+%%DATADIR%%/icons/many-faces.png
 %%DATADIR%%/icons/merge.svg
 %%DATADIR%%/icons/multiple-events.png
 %%DATADIR%%/icons/multiple-tags.png
 %%DATADIR%%/icons/no-event.png
 %%DATADIR%%/icons/noninterpretable-video.png
 %%DATADIR%%/icons/one-event.png
+%%DATADIR%%/icons/one-face.png
 %%DATADIR%%/icons/one-star-filter-plus.svg
 %%DATADIR%%/icons/one-star.svg
 %%DATADIR%%/icons/one-tag.png
@ -448,8 +489,10 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/icons/publish.png
 %%DATADIR%%/icons/redeye.png
 %%DATADIR%%/icons/rejected.svg
+%%DATADIR%%/icons/shotwell-16.png
 %%DATADIR%%/icons/shotwell-auto-enhance.png
 %%DATADIR%%/icons/shotwell-street.jpg
+%%DATADIR%%/icons/shotwell.png
 %%DATADIR%%/icons/slideshow-extension-point.png
 %%DATADIR%%/icons/sprocket.png
 %%DATADIR%%/icons/straighten.svg
@ -475,9 +518,9 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/ui/savedsearch.ui
 %%DATADIR%%/ui/search_bar.ui
 %%DATADIR%%/ui/search_sidebar_context.ui
-%%DATADIR%%/ui/set_background_dialog.glade
-%%DATADIR%%/ui/set_background_slideshow_dialog.glade
-%%DATADIR%%/ui/shotwell.glade
+%%DATADIR%%/ui/set_background_dialog.ui
+%%DATADIR%%/ui/set_background_slideshow_dialog.ui
+%%DATADIR%%/ui/shotwell.ui
 %%DATADIR%%/ui/shotwell.xml
 %%DATADIR%%/ui/sidebar_default_context.ui
 %%DATADIR%%/ui/tag_sidebar_context.ui
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	javavmwrapper
 PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
--- a/java/javavmwrapper/files/pkg-install.in
+++ b/java/javavmwrapper/files/pkg-install.in
@ -9,17 +9,6 @@ if [ "x${2}" != "xPOST-INSTALL" ]; then
    exit 0
 fi

-# The option configuration file
-OPTION_CONF="${PKG_PREFIX}/etc/javavm_opts.conf"
-
-# Install default javavm options configuration
-if [ ! -e "${OPTION_CONF}" ]; then
-    cp "${OPTION_CONF}.dist" "${OPTION_CONF}"
-else
-    echo "${OPTION_CONF} already exists - not installing."
-    echo "You may need to hand merge changes."
-fi
-
 # Ensure all JDKs and JREs are installed
 _excl_dirs='bootstrap-openjdk'
 _find_expr='-depth 2 -regex .*/bin/java'
--- a/java/javavmwrapper/pkg-plist
+++ b/java/javavmwrapper/pkg-plist
@ -4,7 +4,7 @@ bin/javavm
 bin/manvm
 bin/registervm
 bin/unregistervm
-etc/javavm_opts.conf.dist
+@sample etc/javavm_opts.conf.dist etc/javavm_opts.conf
 man/man1/checkvms.1.gz
 man/man1/javavm.1.gz
 man/man1/manvm.1.gz
--- a/java/linux-oracle-jdk18/pkg-plist
+++ b/java/linux-oracle-jdk18/pkg-plist
@ -10,6 +10,7 @@
 %%T%%/bin/jar
 %%T%%/bin/jarsigner
 %%T%%/bin/java
+@javavm %%T%%/bin/java
 %%T%%/bin/java-rmi.cgi
 %%T%%/bin/javac
 %%T%%/bin/javadoc
@ -3416,7 +3417,5 @@
 %%DEMO%%%%T%%/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java
 %%DEMO%%%%T%%/sample/webservices/EbayServer/src/ebay/server/Main.java
 %%T%%/src.zip
-@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Oracle-JDK%%PORTVERSION%%"
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
@dir %%T%%/jre/lib/applet
@dir %%T%%/lib/missioncontrol/p2/org.eclipse.equinox.p2.engine/profileRegistry/JMC.profile/.data
--- a/java/linux-oracle-jre18/pkg-plist
+++ b/java/linux-oracle-jre18/pkg-plist
@ -6,6 +6,7 @@
 %%T%%/Welcome.html
 %%T%%/bin/ControlPanel
 %%T%%/bin/java
+@javavm %%T%%/bin/java
 %%T%%/bin/javaws
 %%T%%/bin/jcontrol
 %%T%%/bin/jjs
@ -298,6 +299,4 @@
 %%T%%/plugin/desktop/sun_java.desktop
 %%T%%/plugin/desktop/sun_java.png
 %%T%%/release
-@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Oracle-JRE%%PORTVERSION%%"
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
@dir %%T%%/lib/applet
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@ -46,9 +46,6 @@ FASTDEBUG_DESC=	Include fastdebug build
 TEST_DESC=	Add support for running regression test
 .endif

-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-
 USES=		compiler gmake iconv motif tar:xz

 .include <bsd.port.options.mk>
@ -320,8 +317,6 @@ do-install:
 	    ${STAGEDIR}${PREFIX}/openjdk6-fastdebug/jre/lib/${ARCH}
 .endif
 .endif
-	@${ECHO_CMD} "#!/bin/sh" > ${PKGDEINSTALL}
-	@${ECHO_CMD} "#!/bin/sh" > ${PKGINSTALL}
 .if defined(BUILD_JRE)
 	@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
 	    ${FIND} -s . -not -type d | \
@ -329,8 +324,7 @@ do-install:
 	@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
 	    ${FIND} -s . -type d -empty | \
 	    ${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST}
-	@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
-	@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
+	@${ECHO_CMD} '@javavm ${PREFIX}/openjdk6-jre/bin/java' >> ${TMPPLIST}
 .else
 	@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
 	    ${FIND} -s . -not -type d | \
@ -338,8 +332,7 @@ do-install:
 	@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
 	    ${FIND} -s . -type d -empty | \
 	    ${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST}
-	@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
-	@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
+	@${ECHO_CMD} '@javavm ${PREFIX}/openjdk6/bin/java' >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MFASTDEBUG}
 	@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
 	    ${FIND} -s . -not -type d | \
@ -347,11 +340,8 @@ do-install:
 	@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
 	    ${FIND} -s . -type d -empty | \
 	    ${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST}
-	@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
-	@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
+	@${ECHO_CMD} "@javavm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST}
 .endif
 .endif
-	@${ECHO_CMD} "exit 0" >> ${PKGDEINSTALL}
-	@${ECHO_CMD} "exit 0" >> ${PKGINSTALL}

 .include <bsd.port.post.mk>
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@ -197,11 +197,10 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/cacerts \
 	    ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts
 .endif
-	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
+	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${INSTALLDIR} -type d -empty | ${SORT} -r | \
 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST}
-	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST}

 .include <bsd.port.post.mk>
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@ -442,9 +442,8 @@ do-install:
 	${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper
 	@${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST}
 .endif
-	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
+	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
 	    ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
-	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST}

 .include <bsd.port.post.mk>
--- a/lang/gcc5-devel/Makefile
+++ b/lang/gcc5-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gcc
-PORTVERSION=	5.4.1.s20160719
+PORTVERSION=	5.4.1.s20160726
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
--- a/lang/gcc5-devel/distinfo
+++ b/lang/gcc5-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1469379000
-SHA256 (gcc-5-20160719.tar.bz2) = edad6df469769071bc63dfb2901b6aae8cadcc4d9c326917b90ffec45314681d
-SIZE (gcc-5-20160719.tar.bz2) = 91608704
+TIMESTAMP = 1469743992
+SHA256 (gcc-5-20160726.tar.bz2) = 4d995f1eedb4b322571f742ebf20923d1a13fab65a409c9c97cf4a435faac392
+SIZE (gcc-5-20160726.tar.bz2) = 91630494
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gcc
-PORTVERSION=	6.1.1.s20160721
+PORTVERSION=	6.1.1.s20160728
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1469462130
-SHA256 (gcc-6-20160721.tar.bz2) = d8821f7125f301afc4057088b2e00259cee1d54d55a62546ff4d48722d412783
-SIZE (gcc-6-20160721.tar.bz2) = 95567007
+TIMESTAMP = 1469972081
+SHA256 (gcc-6-20160728.tar.bz2) = bd7883cac16f9ea7aeb9fc9b26f7fb353c4141b7188b978cb6ab2574e1ca9047
+SIZE (gcc-6-20160728.tar.bz2) = 95552122
--- a/Show more
+++ b/Show more