diff options
author | Maho Nakata <maho@FreeBSD.org> | 2004-06-11 10:57:50 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2004-06-11 10:57:50 +0000 |
commit | d5fd60772a7f785b8bddb86940e690273e8f32dd (patch) | |
tree | da89f99edacdb29c66fe41fc006b9c0193dee64a /editors/openoffice.org-3/files/patch-vcl+util+makefile.mk | |
parent | - Upgrade to 804.027. (diff) |
update to cws_src680_ooo20040620, checkedout at 2004/06/11
Still marked as ignore, but manual installtion works.
Notes
Notes:
svn path=/head/; revision=111268
Diffstat (limited to 'editors/openoffice.org-3/files/patch-vcl+util+makefile.mk')
-rw-r--r-- | editors/openoffice.org-3/files/patch-vcl+util+makefile.mk | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/editors/openoffice.org-3/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-3/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 5d133486e032..000000000000 --- a/editors/openoffice.org-3/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,30 +0,0 @@ -FreeBSD doesn't require/need/have -ldl -http://qa.openoffice.org/issues/show_bug.cgi?id=27043 - ---- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 -+++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 -@@ -208,7 +208,9 @@ - .IF "$(GUI)"!="UNX" - SHL1OBJS= $(SLO)$/salshl.obj - .ELSE --SHL1STDLIBS+=-ldl -+ .IF "$(OS)"!="FREEBSD" -+ SHL1STDLIBS+=-ldl -+ .ENDIF - .ENDIF - - .IF "$(GUI)" != "MAC" -@@ -351,8 +353,11 @@ - # libs for gtk plugin - SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` - SHL4STDLIBS+=-l$(SHL2TARGET) --SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -- -+ .IF "$(OS)"!="FREEBSD" -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+ .ELSE -+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+ .ENDIF # FREEBSD - .ENDIF # UNX - - # --- Allgemein ---------------------------------------------------------- |