diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-18 14:28:08 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-18 14:28:08 +0000 |
| commit | 7f0ffef7c8fb37c8081c140d4c5503d32c717b3b (patch) | |
| tree | 2bb1ddc512bafd45bd684b69366fd583d4a37456 /editors/openoffice/files | |
| parent | Add missing demon error code (diff) | |
Revert the include dirs to the old location as before, and
add the missing dirs.
Notes
Notes:
svn path=/head/; revision=59432
Diffstat (limited to 'editors/openoffice/files')
4 files changed, 80 insertions, 20 deletions
diff --git a/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk index 4dd2ea9705f2..3601766ee561 100644 --- a/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ b/editors/openoffice/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk @@ -1,17 +1,13 @@ --- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 14:16:19 2002 -@@ -62,10 +62,10 @@ - CALL_CDECL=TRUE - ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 +@@ -64,8 +64,8 @@ #mozilla specific stuff. --MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) --MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla + MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) + MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla -#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib -#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) -+#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla -+MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla ++#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib ++#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla #End of mozilla specific stuff. PRJ=..$/..$/..$/.. diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk index 4dd2ea9705f2..3601766ee561 100644 --- a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk +++ b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk @@ -1,17 +1,13 @@ --- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 14:16:19 2002 -@@ -62,10 +62,10 @@ - CALL_CDECL=TRUE - ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 +@@ -64,8 +64,8 @@ #mozilla specific stuff. --MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) --MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla + MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) + MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla -#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib -#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) -+#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla -+MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla ++#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib ++#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla #End of mozilla specific stuff. PRJ=..$/..$/..$/.. diff --git a/editors/openoffice/files/patch-moz+prj+d.lst b/editors/openoffice/files/patch-moz+prj+d.lst new file mode 100644 index 000000000000..d65f2df6cf3b --- /dev/null +++ b/editors/openoffice/files/patch-moz+prj+d.lst @@ -0,0 +1,34 @@ +--- ../moz/prj/d.lst Sat May 18 16:06:23 2002 ++++ ../moz/prj/d.lst Sat May 18 16:16:33 2002 +@@ -43,6 +43,7 @@ + mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul + mkdir: %_DEST%\inc%_EXT%\mozilla\ldap + mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap ++mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr + mkdir: %_DEST%\inc%_EXT%\mozilla\locale + mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk + mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews +@@ -71,6 +72,7 @@ + mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private + mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm + mkdir: %_DEST%\inc%_EXT%\mozilla\oji ++mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete + mkdir: %_DEST%\inc%_EXT%\mozilla\plugin + mkdir: %_DEST%\inc%_EXT%\mozilla\png + mkdir: %_DEST%\inc%_EXT%\mozilla\pref +@@ -158,6 +160,7 @@ + ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul + ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap + ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap ++..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr + ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale + ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk + ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews +@@ -186,6 +189,7 @@ + ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private + ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm + ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji ++..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete + ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin + ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png + ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref diff --git a/editors/openoffice/files/patch-moz::prj::d.lst b/editors/openoffice/files/patch-moz::prj::d.lst new file mode 100644 index 000000000000..d65f2df6cf3b --- /dev/null +++ b/editors/openoffice/files/patch-moz::prj::d.lst @@ -0,0 +1,34 @@ +--- ../moz/prj/d.lst Sat May 18 16:06:23 2002 ++++ ../moz/prj/d.lst Sat May 18 16:16:33 2002 +@@ -43,6 +43,7 @@ + mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul + mkdir: %_DEST%\inc%_EXT%\mozilla\ldap + mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap ++mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr + mkdir: %_DEST%\inc%_EXT%\mozilla\locale + mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk + mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews +@@ -71,6 +72,7 @@ + mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private + mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm + mkdir: %_DEST%\inc%_EXT%\mozilla\oji ++mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete + mkdir: %_DEST%\inc%_EXT%\mozilla\plugin + mkdir: %_DEST%\inc%_EXT%\mozilla\png + mkdir: %_DEST%\inc%_EXT%\mozilla\pref +@@ -158,6 +160,7 @@ + ..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul + ..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap + ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap ++..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr + ..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale + ..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk + ..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews +@@ -186,6 +189,7 @@ + ..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private + ..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm + ..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji ++..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete + ..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin + ..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png + ..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref |