Get rid of $PTHREAD_CFLAGS/_LIBS usage from configure. They are now passed

through CONFIGURE_ENV as did before.
Since rev1.48 unbreaks non-pthreaded wxWindows applications building for
-STABLE (which I broke the other day), PORTREVISION increased.

3 files changed, 13 insertions, 17 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index cf99476d1718..c928203b0ab2 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wxgtk
 PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index b22ea8d78897..bd4ac2acf254 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- configure.in.orig	Sun Sep 21 20:31:30 2003
-+++ configure.in	Mon Oct  6 15:02:13 2003
++++ configure.in	Sun Nov  2 16:18:58 2003
 @@ -1751,7 +1751,7 @@
          dnl Apple did fix the security problem in it and not using the system
          dnl library results in a whole bunch of warnings when linking with
@@ -51,26 +51,24 @@ $FreeBSD$
  
          dnl now test for all possibilities
          THREADS_OK=no
-@@ -3649,6 +3647,9 @@
+@@ -3649,6 +3647,8 @@
                THREADS_CFLAGS=""
        done
  
 +      THREADS_OK=yes
-+      THREADS_LINK="$PTHREAD_LIBS"
 +
        if test "x$THREADS_OK" != "xyes"; then
            wxUSE_THREADS=no
            AC_MSG_WARN([No thread support on this system... disabled])
-@@ -3672,7 +3673,7 @@
+@@ -3672,7 +3672,6 @@
                  flag="-D_THREAD_SAFE"
                  ;;
              *-freebsd*)
 -                flag="-D_THREAD_SAFE"
-+                flag="${PTHREAD_CFLAGS}"
                  ;;
              *-hp-hpux* )
                  flag="-D_REENTRANT"
-@@ -3954,21 +3955,6 @@
+@@ -3954,21 +3953,6 @@
      esac
  fi
  
@@ -92,7 +90,7 @@ $FreeBSD$
  if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
      AC_DEFINE(WXWIN_COMPATIBILITY_2)
  
-@@ -5439,7 +5425,6 @@
+@@ -5439,7 +5423,6 @@
  AC_SUBST(WX_LIBRARY_IMPORTLIB)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -100,7 +98,7 @@ $FreeBSD$
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -5447,7 +5432,6 @@
+@@ -5447,7 +5430,6 @@
  AC_SUBST(WX_LIBRARY_NAME_SHARED_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index 36f56c2c0869..97ca751922d6 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Oct  6 15:01:07 2003
-+++ configure	Mon Oct  6 15:04:11 2003
+--- configure.orig	Sun Nov  2 16:08:40 2003
++++ configure	Sun Nov  2 16:17:32 2003
 @@ -11731,7 +11731,7 @@
  
  
@@ -47,26 +47,24 @@
  
                  THREADS_OK=no
          for flag in $THREAD_OPTS; do
-@@ -18736,6 +18734,9 @@
+@@ -18736,6 +18734,8 @@
                THREADS_CFLAGS=""
        done
  
 +      THREADS_OK=yes
-+      THREADS_LINK="$PTHREAD_LIBS"
 +
        if test "x$THREADS_OK" != "xyes"; then
            wxUSE_THREADS=no
            echo "configure: warning: No thread support on this system... disabled" 1>&2
-@@ -18752,7 +18753,7 @@
+@@ -18752,7 +18752,6 @@
                  flag="-D_THREAD_SAFE"
                  ;;
              *-freebsd*)
 -                flag="-D_THREAD_SAFE"
-+                flag="${PTHREAD_CFLAGS}"
                  ;;
              *-hp-hpux* )
                  flag="-D_REENTRANT"
-@@ -19531,21 +19532,6 @@
+@@ -19531,21 +19530,6 @@
      esac
  fi
  
@@ -88,7 +86,7 @@
  if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
      cat >> confdefs.h <<\EOF
  #define WXWIN_COMPATIBILITY_2 1
-@@ -22780,13 +22766,11 @@
+@@ -22780,13 +22764,11 @@
  s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
  s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
  s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g