x11-toolkits/fox17: Update to 1.7.75

Bump PORTREVISION on consumers. Since this is a development version, rebuild
is required even for minor releases due to API/ABI changes.

Relnotes:	http://www.fox-toolkit.org/news.html

7 files changed, 63 insertions, 68 deletions

diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index b5e7343b15cc..4a13f1f62b49 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fox
-PORTVERSION=	1.7.74
+PORTVERSION=	1.7.75
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/
@@ -26,7 +26,9 @@ USE_XORG=	ice sm x11 xcursor xext xfixes xft xi xrandr xrender
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-opengl=yes \
+CONFIGURE_ARGS=	--with-freetype-include="`freetype-config --cflags | sed -e 's|^-I||'`" \
+		--with-freetype-library="`freetype-config --libs | sed -e 's|^-L||'`" \
+		--with-opengl=yes \
 		--with-xim \
 		--enable-png \
 		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
diff --git a/x11-toolkits/fox17/distinfo b/x11-toolkits/fox17/distinfo
index be71b8d5bcc6..a38f11273643 100644
--- a/x11-toolkits/fox17/distinfo
+++ b/x11-toolkits/fox17/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610207572
-SHA256 (fox-1.7.74.tar.gz) = 21f8a10116102e0b1d43b779c2cc287df8d01902b020faea8e32b151c1935093
-SIZE (fox-1.7.74.tar.gz) = 5705006
+TIMESTAMP = 1614790916
+SHA256 (fox-1.7.75.tar.gz) = 7711b0cc498de68b7da6f7fd1b4e57560a3db73ef557fda962c54cc54b5276d7
+SIZE (fox-1.7.75.tar.gz) = 5709577
diff --git a/x11-toolkits/fox17/files/patch-configure b/x11-toolkits/fox17/files/patch-configure
deleted file mode 100644
index 1a2ad7fe6452..000000000000
--- a/x11-toolkits/fox17/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2016-12-07 22:04:54 UTC
-+++ configure
-@@ -18010,8 +18010,8 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_xft" >&5
- $as_echo "$with_xft" >&6; }
- if test "x$with_xft" != "xno"; then
--XFTCFLAGS="-I/usr/include/freetype2"
--XFTLIBS="-lXft -lfontconfig -lfreetype"
-+XFTCFLAGS="`freetype-config --cflags`"
-+XFTLIBS="-lXft -lfontconfig `freetype-config --libs`"
- saved_cppflags="${CXXFLAGS}"
- CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H=1 $XFTCFLAGS"
- X_BASE_LIBS="${X_BASE_LIBS} $XFTLIBS"
diff --git a/x11-toolkits/fox17/files/patch-lib_FXAtomic.cpp b/x11-toolkits/fox17/files/patch-lib_FXAtomic.cpp
index 5d9668b8ef20..ff908bc48de2 100644
--- a/x11-toolkits/fox17/files/patch-lib_FXAtomic.cpp
+++ b/x11-toolkits/fox17/files/patch-lib_FXAtomic.cpp
@@ -1,4 +1,4 @@
---- lib/FXAtomic.cpp.orig	2017-11-29 04:44:13 UTC
+--- lib/FXAtomic.cpp.orig	2020-11-30 16:10:17 UTC
 +++ lib/FXAtomic.cpp
 @@ -54,7 +54,7 @@
  
@@ -14,7 +14,7 @@
  
  // Can we use inline-assembly
 -#if (defined(__GNUC__) || defined(__INTEL_COMPILER))
-+#if (defined(__GNUC__) || defined(__INTEL_COMPILER)) || defined(__clang__)
++#if (defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__))
  #define HAVE_INLINE_ASSEMBLY 1
  #endif
  
diff --git a/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp b/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp
index 97e9be181e1a..bd02f4c782a5 100644
--- a/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp
+++ b/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp
@@ -1,24 +1,40 @@
-Emulate the behavior of the USG UXIX daylight variable implemented in glibc.
-It is supposed to be 0 if the time zone does not have any daylight saving time
+Emulate the behavior of the USG UNIX 'daylight' and 'timezone' variables
+implemented in glibc.
+
+int daylight: Zero if the time zone does not have any daylight saving time
 rules and non-zero if there is a time during the year when daylight saving
-time applies. [1]
+time applies. [1] In FreeBSD, tzname[1] should be set to "   " (three spaces)
+if DST is never observed. [2]
 
-In FreeBSD, tzname[1] should be set to "   " (three spaces) if DST is never
-observed. [2]
+long int timezone: contains the difference between UTC and the latest local
+standard time, in seconds west of UTC. For example, in the U.S. Eastern time
+zone, the value is 5*60*60. Unlike the tm_gmtoff member of the broken-down
+time structure, this value is not adjusted for daylight saving, and its sign
+is reversed. [1]
 
 [1] https://www.gnu.org/software/libc/manual/html_node/Time-Zone-Functions.html#Time-Zone-Functions
-[2] https://svnweb.freebsd.org/base/head/contrib/tzcode/stdtime/localtime.c?revision=313774&view=markup#l84
+[2] https://cgit.freebsd.org/src/tree/contrib/tzcode/stdtime/localtime.c?id=9436aa0e668b147c9a5bf1898ef091934c676434#n84
 
---- lib/FXSystemTime.cpp.orig	2020-11-28 04:52:31 UTC
+--- lib/FXSystemTime.cpp.orig	2020-12-24 17:03:54 UTC
 +++ lib/FXSystemTime.cpp
-@@ -278,6 +278,10 @@ FXTime FXSystem::daylightSavingsOffset(){
+@@ -265,7 +265,10 @@ FXTime FXSystem::localTimeZoneOffset(){
+ #if defined(_WIN32)
+   return minutes*tzi.Bias;              // +minutes*tzi.StandardBias;
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__)
+-  return 0;     // FIXME
++  struct tm tmresult;
++  time_t tmp=time(&tmp);
++  struct tm* ptm=localtime_r(&tmp,&tmresult);
++  return seconds*(-ptm->tm_gmtoff + ptm->tm_isdst*3600);
+ #else
+   return seconds*timezone;
+ #endif
+@@ -278,7 +281,7 @@ FXTime FXSystem::daylightSavingsOffset(){
  #if defined(_WIN32)
    return minutes*tzi.DaylightBias;      // Or difference between standard and daylight bias.
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__)
+-  return 0;     // FIXME
++  return -hours*((tzname[1][0] == ' ') ? 0 : 1);
  #else
-+# if defined(__FreeBSD__)
-+   tzset();
-+   int daylight = ((tzname[1][0] == ' ') ? 0 : 1);
-+# endif
    return -hours*daylight;
  #endif
-   }
diff --git a/x11-toolkits/fox17/files/patch-lib_FXThread.cpp b/x11-toolkits/fox17/files/patch-lib_FXThread.cpp
index 207483bb8c56..77f59d87ab1f 100644
--- a/x11-toolkits/fox17/files/patch-lib_FXThread.cpp
+++ b/x11-toolkits/fox17/files/patch-lib_FXThread.cpp
@@ -1,43 +1,33 @@
-FXThread.cpp:929:5: error: no matching function for call to 'pthread_set_name_np'
-    pthread_set_name_np(tid,desc.text());
-    ^~~~~~~~~~~~~~~~~~~
-/usr/include/pthread_np.h:67:6: note: candidate function not viable: no known
-conversionfrom 'volatile FX::FXThreadID' (aka 'volatile unsigned long')
-to 'pthread_t' (aka 'pthread *') for 1st argument
-void pthread_set_name_np(pthread_t, const char *);
-     ^
-FXThread.cpp:962:8: error: no matching function for call to 'pthread_getname_np'
-    if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){
-       ^~~~~~~~~~~~~~~~~~
-/usr/include/pthread.h:305:6: note: candidate function not viable: no known
-conversion from 'const volatile FX::FXThreadID' (aka 'const volatile unsigned long')
-to 'pthread_t' (aka 'pthread *') for 1st argument
-int             pthread_getname_np(pthread_t, char *, size_t);
-                ^
+pthread_setname_np() and pthread_getname_np() are only implemented on FreeBSD
+12.x >=  1201518 and 13.x >= 1300098. Port to pthread_set_name_np() and
+pthread_get_name_np(), respectively, for older versions.
 
---- lib/FXThread.cpp.orig	2020-11-30 16:10:17 UTC
+--- lib/FXThread.cpp.orig	2020-12-24 17:03:54 UTC
 +++ lib/FXThread.cpp
-@@ -925,7 +925,10 @@ FXbool FXThread::description(const FXString& desc){
+@@ -911,7 +911,10 @@ FXbool FXThread::description(const FXString& desc){
+     return 0<=fxSetThreadDescription((HANDLE)tid,udesc);
+ #elif defined(__APPLE__)
      return pthread_setname_np(desc.text())==0;
- #elif defined(__NetBSD__)
-     return pthread_setname_np(tid,"%s",desc.text())==0;
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__)
+-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) && !defined(HAVE_PTHREAD_SETNAME_NP)
 +    pthread_set_name_np((pthread_t)tid,desc.text());
 +    return true;
-+#elif defined(__OpenBSD__)
-     pthread_set_name_np(tid,desc.text());
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+     pthread_setname_np((pthread_t)tid,desc.text());
      return true;
  #elif defined(HAVE_PTHREAD_SETNAME_NP)
-@@ -955,6 +958,11 @@ FXString FXThread::description() const {
- #elif defined(__NetBSD__)
-     FXchar desc[256];
-     if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){
+@@ -938,7 +941,13 @@ FXString FXThread::description() const {
+     if(pthread_getname_np(*((pthread_t*)&tid),desc,ARRAYNUMBER(desc))==0){
+       return desc;
+       }
+-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) && !defined(HAVE_PTHREAD_GETNAME_NP)
++    FXchar desc[256];
++    pthread_get_name_np((pthread_t)tid,desc,ARRAYNUMBER(desc));
++    if(desc[0]!='\0'){
 +      return desc;
 +      }
-+#elif defined(__FreeBSD__) && ((__FreeBSD_version >= 1201518 && __FreeBSD_version < 1300000) || (__FreeBSD_version >= 1300098))
-+    FXchar desc[256];
-+    if(pthread_getname_np((pthread_t)tid,desc,ARRAYNUMBER(desc))==0){
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+     FXchar desc[256];
+     if(pthread_getname_np((pthread_t)tid,desc,ARRAYNUMBER(desc))==0){
        return desc;
-       }
- #elif defined(HAVE_PTHREAD_GETNAME_NP)
diff --git a/x11-toolkits/fox17/pkg-plist b/x11-toolkits/fox17/pkg-plist
index 296607a61aee..9c583cc710b9 100644
--- a/x11-toolkits/fox17/pkg-plist
+++ b/x11-toolkits/fox17/pkg-plist
@@ -368,11 +368,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.74
+lib/libCHART-%%MAJORVER%%.so.0.0.75
 lib/libFOX-%%MAJORVER%%.a
 lib/libFOX-%%MAJORVER%%.so
 lib/libFOX-%%MAJORVER%%.so.0
-lib/libFOX-%%MAJORVER%%.so.0.0.74
+lib/libFOX-%%MAJORVER%%.so.0.0.75
 libdata/pkgconfig/fox17.pc
 man/man1/ControlPanel-17.1.gz
 %%PORTEXAMPLES%%man/man1/PathFinder-17.1.gz