diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-31 22:57:55 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-31 22:57:55 +0000 |
| commit | 13bf943c620f49da906134f8a7076ba6e48513ae (patch) | |
| tree | 25e4b32ad4e9fea6d597c0bcd43f476f433b874b | |
| parent | Update to version 0.8.2. (diff) | |
Only use -g if $debug is true. I'll suggest this also to the
OO.org people.
It would make sence to have a additional GMAKECFLAGS in solvenv,
which could contain a basic CFLAGS configuration. We cannot use
$CFLAGS cause there are dmake specific things in it.
Notes
Notes:
svn path=/head/; revision=63824
23 files changed, 368 insertions, 69 deletions
diff --git a/editors/openoffice-1.0/files/patch-freetype+makefile.mk b/editors/openoffice-1.0/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-1.0/files/patch-freetype+makefile.mk +++ b/editors/openoffice-1.0/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-1.0/files/patch-freetype::makefile.mk b/editors/openoffice-1.0/files/patch-freetype::makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-1.0/files/patch-freetype::makefile.mk +++ b/editors/openoffice-1.0/files/patch-freetype::makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice-1.1-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-1.1/files/patch-freetype+makefile.mk b/editors/openoffice-1.1/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-1.1/files/patch-freetype+makefile.mk +++ b/editors/openoffice-1.1/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice-2.0-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-3-devel/files/patch-freetype+makefile.mk b/editors/openoffice-3-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-3-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice-3-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-3/files/patch-freetype+makefile.mk b/editors/openoffice-3/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-3/files/patch-freetype+makefile.mk +++ b/editors/openoffice-3/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice-devel/files/patch-freetype+makefile.mk b/editors/openoffice-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-1.0/files/patch-freetype::makefile.mk b/editors/openoffice.org-1.0/files/patch-freetype::makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-1.0/files/patch-freetype::makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-freetype::makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ 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 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-1.1/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-2-RC/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-2-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-2.0/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-2/files/patch-freetype+makefile.mk b/editors/openoffice.org-2/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-2/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-2/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk b/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-3-devel/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-3/files/patch-freetype+makefile.mk b/editors/openoffice.org-3/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-3/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-3/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice/files/patch-freetype+makefile.mk b/editors/openoffice/files/patch-freetype+makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice/files/patch-freetype+makefile.mk +++ b/editors/openoffice/files/patch-freetype+makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ diff --git a/editors/openoffice/files/patch-freetype::makefile.mk b/editors/openoffice/files/patch-freetype::makefile.mk index 1e5e5bf12c6b..9c238f45b04d 100644 --- a/editors/openoffice/files/patch-freetype::makefile.mk +++ b/editors/openoffice/files/patch-freetype::makefile.mk @@ -1,6 +1,19 @@ ---- ../freetype/makefile.mk.orig Tue Mar 5 15:43:54 2002 -+++ ../freetype/makefile.mk Tue Mar 5 15:43:56 2002 -@@ -90,7 +90,7 @@ +--- ../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 \ |