diff options
| author | maho <maho@FreeBSD.org> | 2005-06-03 05:06:04 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2005-06-03 05:06:04 +0000 |
| commit | a3983d9bb2f733d236b1320cef2a57d0144d6c32 (patch) | |
| tree | 013899b2e5c095477a67e1d8c237a60ff6c0585d /editors/openoffice.org-2.0-devel | |
| parent | 69c4ad7e277cdc0ac33b9f78b5691046cfafa0e9 (diff) | |
| download | FreeBSD-ports-a3983d9bb2f733d236b1320cef2a57d0144d6c32.zip FreeBSD-ports-a3983d9bb2f733d236b1320cef2a57d0144d6c32.tar.gz | |
Forgot to remove this patch
Diffstat (limited to 'editors/openoffice.org-2.0-devel')
| -rw-r--r-- | editors/openoffice.org-2.0-devel/files/patch-vcl+util | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+util b/editors/openoffice.org-2.0-devel/files/patch-vcl+util deleted file mode 100644 index 602e489..0000000 --- a/editors/openoffice.org-2.0-devel/files/patch-vcl+util +++ /dev/null @@ -1,50 +0,0 @@ -Issutracker : #i49686# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : Get rid of -ldl for FREEBSD and MACOSX - -Index: vcl/util/makefile.mk -=================================================================== -RCS file: /cvs/gsl/vcl/util/makefile.mk,v -retrieving revision 1.65 -diff -u -r1.65 makefile.mk ---- vcl/util/makefile.mk 13 Jan 2005 18:16:05 -0000 1.65 -+++ vcl/util/makefile.mk 7 Apr 2005 01:29:29 -0000 -@@ -252,10 +252,11 @@ - - .IF "$(GUI)"=="UNX" - --.IF "$(OS)"=="MACOSX" --SHL1STDLIBS += -ldl -+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" -+SHL1STDLIBS+= -ldl - .ENDIF - -+ - .IF "$(GUIBASE)"=="aqua" - SHL1STDLIBS += -framework Cocoa - .ENDIF -@@ -383,7 +384,11 @@ - - - SHL4STDLIBS+=-l$(SHL2TARGET) -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -+SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+.ELSE - SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX" - .ENDIF # "$(ENABLE_GTK)" != "" - - # KDE plugin -@@ -396,7 +401,11 @@ - # libs for KDE plugin - SHL5STDLIBS=$(KDE_LIBS) - SHL5STDLIBS+=-l$(SHL2TARGET) -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -+SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -+.ELSE - SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX" - .ENDIF # "$(ENABLE_KDE)" != "" - - .ENDIF # UNX |
