From 1b8b186e623c924a24c7cd6f9aec470010d2b7dd Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Mon, 8 Sep 2003 22:11:03 +0000
Subject: [PATCH] libXft.a is not available. Do not link static for now.

---
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../openoffice-1.1/files/patch-crashrep+source+unx+makefile.mk  | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../openoffice-3/files/patch-crashrep+source+unx+makefile.mk    | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 .../files/patch-crashrep+source+unx+makefile.mk                 | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/editors/openoffice-1.1-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice-1.1/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-1.1/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice-1.1/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-1.1/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-1.1/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-1.1/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
index daed085f1d21..2ed3ac4d5182 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
@@ -5,7 +5,7 @@
  .ENDIF
  .IF "$(OS)" == "FREEBSD"
 -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
++APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
  .ENDIF
  
  .ENDIF