From f1a88e4042b36e457d1e326756c57527f954e2e1 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Sun, 10 Mar 2002 22:03:45 +0000
Subject: Add the PTHREAD_CFLAGS correctly to SOLARDEF, even if this is not yet
 used and the CFLAGS are hardcoded in solenv/inc/unxfbsd.mk

---
 editors/openoffice-1.1/files/patch-set_soenv.1 | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'editors/openoffice-1.1/files/patch-set_soenv.1')

diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1
index 0281f98a02d0..cb0b90d9bb02 100644
--- a/editors/openoffice-1.1/files/patch-set_soenv.1
+++ b/editors/openoffice-1.1/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig	Tue Nov 20 18:26:33 2001
-+++ set_soenv.1	Sun Mar 10 22:44:58 2002
+--- ../config_office/set_soenv.1.orig	Tue Nov 20 18:26:33 2001
++++ ../config_office/set_soenv.1	Sun Mar 10 22:56:18 2002
 @@ -40,7 +40,7 @@
  #
  # Set this value equal to the corresponding amount of
@@ -40,15 +40,18 @@
  } 
  elsif ( $platform eq "$Linux" ) 
  {
-@@ -857,11 +861,14 @@
+@@ -853,15 +857,16 @@
+                         $D.$COM.
+ 			$D.$CVER.
+                         $D.$GVER.
+-                        $D."_PTHREADS".
                          $D.$OS.
                          $D.$CPUNAME;
  if  ($platform eq "$FreeBSD")
 -{  $SOLARDEF         .= $D."X86";
 +{  $SOLARDEF         .= $D."X86".
 +                        $D."OSVERSION=$OSVERSION".
-+			$D."PTHREAD_CFLAGS=$PTHREAD_CFLAGS".
-+			$D."PTHREAD_LIBS=$PTHREAD_LIBS";
++			" ".$PTHREAD_CFLAGS;
  }
  $SOLARDEF            .= $D."_REENTRANT".
                          $D."_POSIX_PTHREAD_SEMANTICS";
@@ -57,7 +60,7 @@
  {  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
  }
  $SOLARDEF            .= $D."SUPD=$UPD".
-@@ -954,7 +961,7 @@
+@@ -954,7 +959,7 @@
                          $ps.$USR.$LIB.
                          $ps.$USR_LOCAL.$BIN;
  }
@@ -66,7 +69,7 @@
  {  $PATH              = $cur_dir.
                          $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                          $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -968,6 +975,22 @@
+@@ -968,6 +973,22 @@
                          $ps.$USR.$BIN.$ds."X11".
                          $ps.$USR.$LIB;
  }
@@ -89,7 +92,7 @@
  elsif ($platform eq "$Winnt")
  {  $COMPATH_ROOT      = $COMPATH;
     $COMPATH_ROOT      =~ s/\/vc98$//;
-@@ -1067,25 +1090,19 @@
+@@ -1067,25 +1088,19 @@
  {
  $SOLARINC            .= $I.$USR.$INCLUDE.
  			$STLPORT_stlport;
@@ -119,7 +122,7 @@
  $SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
                          $I.'$JAVA_HOME'.$INCLUDE;
  
-@@ -1273,6 +1290,9 @@
+@@ -1273,6 +1288,9 @@
  ToFile( "GUIENV",            $GUIENV,            "e" );
  ToFile( "GVER",              $GVER,              "e" );
  ToFile( "OS",                $OS,                "e" );
-- 
cgit v1.2.3