3 files changed, 93 insertions, 35 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 2faeef556aae..ccf3046ca535 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -33,21 +33,25 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libtiff=sys \
 		--with-zlib=sys \
 		--with-opengl
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
-			  -I${WRKSRC}/include \
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
 			  -I${LOCALBASE}/include \
 			  -I${X11BASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} \
-			 -L${LOCALBASE}/lib -liconv \
-			 -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -liconv \
+			 -L${X11BASE}/lib" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.if defined(WITH_GTK2)
+USE_GNOME=	gtk20
+.else
+USE_GNOME=	gtk12
+.endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GTK2)
-USE_GNOME=	gtk20
 CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .else
-USE_GNOME=	gtk12
 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET}
 .endif
 
@@ -62,8 +66,6 @@ pre-everything:
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
 .if defined(WITH_GTK2)
 	@${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure
 .else
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index 374d4acd99d5..b22ea8d78897 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -1,9 +1,18 @@
 
 $FreeBSD$
 
---- configure.in.orig	Sun Jan  5 13:55:00 2003
-+++ configure.in	Tue Jan 14 18:25:25 2003
-@@ -2723,8 +2723,8 @@
+--- configure.in.orig	Sun Sep 21 20:31:30 2003
++++ configure.in	Mon Oct  6 15:02:13 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
+         dnl Carbon framework
+-        if test "$USE_DARWIN" = 1; then
++        if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then
+             system_zlib_h_ok="yes"
+         else
+             dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is
+@@ -2785,8 +2785,8 @@
  
  WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
  
@@ -14,7 +23,7 @@ $FreeBSD$
  
  if test "$cross_compiling" = "yes"; then
      TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
-@@ -2737,14 +2737,12 @@
+@@ -2799,14 +2799,12 @@
  WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
  
  dnl the name of the shared library
@@ -33,16 +42,35 @@ $FreeBSD$
  
  case "${host}" in
      *-*-cygwin* | *-*-mingw32* )
-@@ -3459,7 +3457,7 @@
-           *-*-freebsd*)
-                 dnl look, in order, for the kernel threads, then Linux threads
-                 dnl and finally the userland threads
--                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+                THREAD_OPTS="$THREAD_OPTS pthread c_r"
+@@ -3607,7 +3605,7 @@
+         dnl simply linking with libpthread should make the test below work but
+         dnl it's far from certain that the threaded programs compiled without
+         dnl any special switches actually work, so try it after all the others
+-        THREAD_OPTS="$THREAD_OPTS pthread none"
++        THREAD_OPTS=
+ 
+         dnl now test for all possibilities
+         THREADS_OK=no
+@@ -3649,6 +3647,9 @@
+               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 @@
+                 flag="-D_THREAD_SAFE"
+                 ;;
+             *-freebsd*)
+-                flag="-D_THREAD_SAFE"
++                flag="${PTHREAD_CFLAGS}"
                  ;;
-           *-*-darwin* | *-*-cygwin* )
-                 dnl Darwin / Mac OS X just uses -lpthread tested below
-@@ -3817,21 +3815,6 @@
+             *-hp-hpux* )
+                 flag="-D_REENTRANT"
+@@ -3954,21 +3955,6 @@
      esac
  fi
  
@@ -64,7 +92,7 @@ $FreeBSD$
  if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
      AC_DEFINE(WXWIN_COMPATIBILITY_2)
  
-@@ -5288,7 +5271,6 @@
+@@ -5439,7 +5425,6 @@
  AC_SUBST(WX_LIBRARY_IMPORTLIB)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -72,7 +100,7 @@ $FreeBSD$
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -5296,7 +5278,6 @@
+@@ -5447,7 +5432,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 7adf976e0efd..36f56c2c0869 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,5 +1,14 @@
---- configure.orig	Sat Oct  4 02:17:08 2003
-+++ configure	Sat Oct  4 02:37:10 2003
+--- configure.orig	Mon Oct  6 15:01:07 2003
++++ configure	Mon Oct  6 15:04:11 2003
+@@ -11731,7 +11731,7 @@
+ 
+ 
+     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
+-                                                if test "$USE_DARWIN" = 1; then
++                                                if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then
+             system_zlib_h_ok="yes"
+         else
+                                                                                     echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
 @@ -16048,8 +16048,8 @@
  
  WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
@@ -29,16 +38,35 @@
  
  case "${host}" in
      *-*-cygwin* | *-*-mingw32* )
-@@ -18669,7 +18667,7 @@
-                 fi
+@@ -18679,7 +18677,7 @@
+                 ;;
+         esac
+ 
+-                                THREAD_OPTS="$THREAD_OPTS pthread none"
++                                THREAD_OPTS=
+ 
+                 THREADS_OK=no
+         for flag in $THREAD_OPTS; do
+@@ -18736,6 +18734,9 @@
+               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 @@
+                 flag="-D_THREAD_SAFE"
                  ;;
-           *-*-freebsd*)
--                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+                                                THREAD_OPTS="$THREAD_OPTS pthread c_r"
+             *-freebsd*)
+-                flag="-D_THREAD_SAFE"
++                flag="${PTHREAD_CFLAGS}"
                  ;;
-           *-*-darwin* | *-*-cygwin* )
-                                                 THREAD_OPTS=""
-@@ -19531,21 +19530,6 @@
+             *-hp-hpux* )
+                 flag="-D_REENTRANT"
+@@ -19531,21 +19532,6 @@
      esac
  fi
  
@@ -60,7 +88,7 @@
  if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
      cat >> confdefs.h <<\EOF
  #define WXWIN_COMPATIBILITY_2 1
-@@ -22780,13 +22764,11 @@
+@@ -22780,13 +22766,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