Update to 1.6.50

* Remove old NetBSD support.

Changelog:
not available.

4 files changed, 20 insertions, 83 deletions

diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index a80681bf5a5..e1ff8af5f50 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2014/12/16 12:08:44 mef Exp $
+# $NetBSD: Makefile,v 1.56 2015/02/15 14:04:59 ryoon Exp $
 
-DISTNAME=	fox-1.6.33
-PKGREVISION=	11
+DISTNAME=	fox-1.6.50
 CATEGORIES=	x11
 MASTER_SITES=	ftp://www.fox-toolkit.org/pub/
 
@@ -19,15 +18,8 @@ CONFIGURE_ARGS+=	--with-shm
 CONFIGURE_ARGS+=	--with-xft
 CONFIGURE_ARGS+=	--with-x
 
-CONFIGURE_ENV+=		REAL_PTHREAD_LIBS=${PTHREAD_LIBS:Q}
-
 .include "../../mk/bsd.prefs.mk"
 
-# NetBSD < 3.0 does not have getpwnam_r() getpwuin_r()
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-2]*) || ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-threadsafe
-.endif
-
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/x11/fox/distinfo b/x11/fox/distinfo
index 7405a5c4010..3a55d590794 100644
--- a/x11/fox/distinfo
+++ b/x11/fox/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.20 2011/01/29 16:55:13 wiz Exp $
+$NetBSD: distinfo,v 1.21 2015/02/15 14:04:59 ryoon Exp $
 
-SHA1 (fox-1.6.33.tar.gz) = 3100a829bd121d7620b13aadda5b7087933e2057
-RMD160 (fox-1.6.33.tar.gz) = ddd515868c83b758f5fb36e81e9175d2963de905
-Size (fox-1.6.33.tar.gz) = 4339500 bytes
-SHA1 (patch-aa) = 3e0fa9f47b1e1464121b1c9b97b6391eb047a2d1
-SHA1 (patch-ab) = e0c9dcbe7de5da8b480b6e1786e3e79947864295
+SHA1 (fox-1.6.50.tar.gz) = 7d3affba025df64553f33ab2c547135e8ed1a144
+RMD160 (fox-1.6.50.tar.gz) = e1afb440db7fd46a41eeb10dce1f57af912b1f88
+Size (fox-1.6.50.tar.gz) = 4381855 bytes
+SHA1 (patch-aa) = 06444b562a32d3471dd8d65f5af2c49e11b3e491
diff --git a/x11/fox/patches/patch-aa b/x11/fox/patches/patch-aa
index 3e90c4b51d6..5c5599cc57e 100644
--- a/x11/fox/patches/patch-aa
+++ b/x11/fox/patches/patch-aa
@@ -1,39 +1,22 @@
-$NetBSD: patch-aa,v 1.8 2008/04/25 05:21:30 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2015/02/15 14:04:59 ryoon Exp $
 
---- configure.orig	2008-03-11 04:09:40.000000000 +0100
+--- configure.orig	2014-05-14 04:33:43.000000000 +0000
 +++ configure
-@@ -22648,13 +22648,13 @@ fi
- 
- PTHREAD_LIBS=notfound
- if test "x$PTHREAD_LIBS" = xnotfound; then
--{ echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
--echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_exit in ${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_exit in ${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17640,7 +17640,7 @@ if ${ac_cv_lib_pthread_pthread_exit+:} f
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
++LIBS="${PTHREAD_LDFLAGS}  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -17675,7 +17675,7 @@ if test "x$ac_cv_lib_pthread_pthread_exi
+ #define HAVE_LIBPTHREAD 1
  _ACEOF
-@@ -22710,7 +22710,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6; }
- if test $ac_cv_lib_pthread_pthread_exit = yes; then
--  PTHREAD_LIBS="-lpthread"
-+  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}"
- fi
  
- fi
-@@ -22777,7 +22777,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_exit" >&5
- echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_exit" >&6; }
- if test $ac_cv_lib_pthreads_pthread_exit = yes; then
--  PTHREAD_LIBS="-lpthreads"
-+  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}"
- fi
+-  LIBS="-lpthread $LIBS"
++  LIBS="${PTHREAD_LDFLAGS} $LIBS"
  
  fi
+ 
diff --git a/x11/fox/patches/patch-ab b/x11/fox/patches/patch-ab
deleted file mode 100644
index f20fbbcce99..00000000000
--- a/x11/fox/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/01/29 16:55:13 wiz Exp $
-
-Fix build with png-1.5.
-Fed back upstream, will be included in 1.6.42.
-
---- src/fxpngio.cpp.orig	2006-01-22 17:58:54.000000000 +0000
-+++ src/fxpngio.cpp
-@@ -75,7 +75,11 @@ static void user_flush_fn(png_structp ){
- static void user_error_fn(png_structp png_ptr,png_const_charp){
-   FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
-   store->setError(FXStreamFormat);                      // Flag this as a format error in FXStream
-+#if (PNG_LIBPNG_VER < 10500)
-   longjmp(png_ptr->jmpbuf,1);                           // Bail out
-+#else
-+  png_longjmp(png_ptr,1);                               // Bail out
-+#endif
-   }
- 
- 
-@@ -118,7 +122,7 @@ bool fxloadPNG(FXStream& store,FXColor*&
-     }
- 
-   // Set error handling
--  if(setjmp(png_ptr->jmpbuf)){
-+  if(setjmp(png_jmpbuf(png_ptr))){
- 
-     // Free all of the memory associated with the png_ptr and info_ptr
-     png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL);
-@@ -231,7 +235,7 @@ bool fxsavePNG(FXStream& store,const FXC
-     }
- 
-   // Set error handling.
--  if(setjmp(png_ptr->jmpbuf)){
-+  if(setjmp(png_jmpbuf(png_ptr))){
-     png_destroy_write_struct(&png_ptr,&info_ptr);
-     return false;
-     }