summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-1.1/files/patch-freetype+makefile.mk')
-rw-r--r--editors/openoffice.org-1.1/files/patch-freetype+makefile.mk37
1 files changed, 14 insertions, 23 deletions
diff --git a/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
index 9c238f45b04d..9cf22888eb25 100644
--- a/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk
@@ -1,24 +1,15 @@
---- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002
-+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002
-@@ -79,7 +79,11 @@
- #relative to CONFIGURE_DIR
- CONFIGURE_ACTION=$(GNUMAKE)
- .IF "$(GUI)"=="UNX"
--CONFIGURE_FLAGS=setup
-+.IF "$(debug)"==""
-+CONFIGURE_FLAGS=setup CFLAGS="-O"
-+.ELSE # "$(debug)"==""
-+CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb"
-+.ENDIF # "$(debug)"==""
- .ELSE # "$(GUI)"=="UNX"
- CONFIGURE_FLAGS=setup visualc
- .ENDIF # "$(GUI)"=="UNX"
-@@ -90,7 +94,7 @@
- .IF "$(GUI)"=="UNX"
- OUT2LIB= \
- objs$/.libs$/libfreetype.a \
-- objs$/.libs$/libfreetype.so.6*
-+ objs$/.libs$/libfreetype.so.7
-
- .ENDIF # "$(GUI)"=="UNX"
+--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002
++++ ../freetype/makefile.mk Fri Oct 18 20:06:42 2002
+@@ -95,9 +95,11 @@
+ objs$/.libs$/libfreetype.a
+ .IF "$(OS)"=="MACOSX"
+ OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
++.ELIF "$(OS)"=="FREEBSD"
++OUT2LIB+=objs$/.libs$/libfreetype.so.7*
+ .ELSE
+ OUT2LIB+=objs$/.libs$/libfreetype.so.6*
+-.ENDIF # "$(OS)"=="MACOSX"
++.ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+ .ELSE # "$(GUI)"=="UNX"
+ .IF "$(USE_SHELL)"=="4nt"