From 0d4545aac8d2ba4536ba4201d23d56386a1a20b9 Mon Sep 17 00:00:00 2001
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Tue, 1 Aug 2017 07:34:50 +0000
Subject: - Update to 1.6.55 - Fix LICENSE (it's LGPL21+, not LGPL3+)

---
 x11-toolkits/fox16/Makefile                     |  6 +++---
 x11-toolkits/fox16/distinfo                     |  6 +++---
 x11-toolkits/fox16/files/patch-src_FXString.cpp | 11 +----------
 x11-toolkits/fox16/pkg-plist                    |  4 ++--
 4 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 991e4d2c3c5a..508e3f1694db 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fox
-PORTVERSION=	1.6.52
-PORTREVISION=	2
+PORTVERSION=	1.6.55
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.fox-toolkit.org/pub/ \
 		http://ftp.fox-toolkit.org/pub/
@@ -12,7 +11,8 @@ PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.6
 
-LICENSE=	LGPL3+
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
diff --git a/x11-toolkits/fox16/distinfo b/x11-toolkits/fox16/distinfo
index cf46a8e34d02..5a2c3c20d4e7 100644
--- a/x11-toolkits/fox16/distinfo
+++ b/x11-toolkits/fox16/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479492241
-SHA256 (fox-1.6.52.tar.gz) = 8e57af9801a3400dbecf34927e871896ff4198ab72c1a3a5e4e27258a3a47d1b
-SIZE (fox-1.6.52.tar.gz) = 4384974
+TIMESTAMP = 1501510377
+SHA256 (fox-1.6.55.tar.gz) = 172416625221e54dcc1c4293fc892b9695f1e952f4b895376e6604c6c3813d74
+SIZE (fox-1.6.55.tar.gz) = 4384971
diff --git a/x11-toolkits/fox16/files/patch-src_FXString.cpp b/x11-toolkits/fox16/files/patch-src_FXString.cpp
index b6676526f96f..c981e85fc64d 100644
--- a/x11-toolkits/fox16/files/patch-src_FXString.cpp
+++ b/x11-toolkits/fox16/files/patch-src_FXString.cpp
@@ -1,4 +1,4 @@
---- src/FXString.cpp.orig	2016-06-16 04:16:00 UTC
+--- src/FXString.cpp.orig	2017-04-21 00:34:42 UTC
 +++ src/FXString.cpp
 @@ -2353,7 +2353,7 @@ FXString& FXString::vformat(const FXchar
      length(result);
@@ -9,12 +9,3 @@
      va_list ag;
      va_copy(ag,args);
      result=vsnprintf(str,length(),fmt,ag);
-@@ -2365,7 +2365,7 @@ FXString& FXString::vformat(const FXchar
- #else
-     va_list ag;
- x:  va_copy(ag,args);
--    result=vsnprintf(str,length()+1,fmt,a);
-+    result=vsnprintf(str,length()+1,fmt,ag);
-     va_end(ag);
-     if(result<0){ length(FXMAX(64,length()*2)); goto x; }
-     if(length()<result){ length(result); goto x; }
diff --git a/x11-toolkits/fox16/pkg-plist b/x11-toolkits/fox16/pkg-plist
index 2fab1a89cbf8..67c0a9cd4320 100644
--- a/x11-toolkits/fox16/pkg-plist
+++ b/x11-toolkits/fox16/pkg-plist
@@ -294,11 +294,11 @@ include/fox-%%MAJORVER%%/xincs.h
 lib/libCHART-%%MAJORVER%%.a
 lib/libCHART-%%MAJORVER%%.so
 lib/libCHART-%%MAJORVER%%.so.0
-lib/libCHART-%%MAJORVER%%.so.0.0.52
+lib/libCHART-%%MAJORVER%%.so.0.0.55
 lib/libFOX-%%MAJORVER%%.a
 lib/libFOX-%%MAJORVER%%.so
 lib/libFOX-%%MAJORVER%%.so.0
-lib/libFOX-%%MAJORVER%%.so.0.0.52
+lib/libFOX-%%MAJORVER%%.so.0.0.55
 libdata/pkgconfig/fox.pc
 %%APPS%%man/man1/PathFinder-16.1.gz
 %%APPS%%man/man1/adie-16.1.gz
-- 
cgit