diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-06 11:09:27 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-06 11:09:27 +0000 |
| commit | 5ee03bd0eedb810df438fa043b99f9a5f8cf5276 (patch) | |
| tree | 584df24890d8ce7b518b76ea183fac909ef875ee /editors/openoffice.org-1.1-devel/files | |
| parent | Don't install files that aren't used anyway. (diff) | |
Bison > 1.3 fixes, sync with NetBSD port source
Notes
Notes:
svn path=/head/; revision=55628
Diffstat (limited to 'editors/openoffice.org-1.1-devel/files')
3 files changed, 15 insertions, 22 deletions
diff --git a/editors/openoffice.org-1.1-devel/files/patch-connectivity::source::parse::makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-connectivity::source::parse::makefile.mk index 96260511753d..7000bf23cc00 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-connectivity::source::parse::makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-connectivity::source::parse::makefile.mk @@ -1,14 +1,10 @@ ---- ../connectivity/source/parse/makefile.mk.orig Sat Mar 2 21:01:23 2002 -+++ ../connectivity/source/parse/makefile.mk Sat Mar 2 21:03:09 2002 -@@ -97,7 +97,11 @@ +--- ../connectivity/source/parse/makefile.mk.orig Wed Mar 6 10:39:52 2002 ++++ ../connectivity/source/parse/makefile.mk Wed Mar 6 10:40:07 2002 +@@ -95,6 +95,7 @@ + +flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l + $(MISC)$/sqlbison.cxx: sqlbison.y ++ +bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx.h sqlbison.y +bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y -$(MKDIR) $(OUT)$/inc$/connectivity -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" -+ +$(COPY) $(MISC)$/sqlbison.hxx $(OUT)$/inc$/connectivity$/sqlbison.hxx -+.ELSE +$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx -+.ENDIF - - $(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx - diff --git a/editors/openoffice.org-1.1-devel/files/patch-idlc::source::makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-idlc::source::makefile.mk index 9b02a6f4fc18..780425770b86 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-idlc::source::makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-idlc::source::makefile.mk @@ -1,13 +1,10 @@ ---- ../idlc/source/makefile.mk.orig Sat Mar 2 21:14:55 2002 -+++ ../idlc/source/makefile.mk Sat Mar 2 21:15:43 2002 -@@ -148,6 +148,10 @@ +--- ../idlc/source/makefile.mk.orig Wed Mar 6 10:25:35 2002 ++++ ../idlc/source/makefile.mk Wed Mar 6 10:25:53 2002 +@@ -147,6 +147,7 @@ + +flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll $(MISC)$/parser.cxx: parser.yy ++ +bison -v -d -o$(MISC)$/parser.cxx.h parser.yy +bison -v -d -o$(MISC)$/parser.cxx parser.yy -+.IF "$(OS)"=="FREEBSD" -+ +$(COPY) $(MISC)$/parser.hxx $(OUT)$/inc$/parser.h -+.ELSE +$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h -+.ENDIF # with line statements (for debugging) - # +bison -v -d -o$(MISC)$/parser.cxx parser.yy diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_yxx.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_yxx.mk index a2af069cd0a4..0b99a3553cad 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_yxx.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_yxx.mk @@ -1,11 +1,11 @@ ---- ../solenv/inc/tg_yxx.mk.orig Fri Feb 15 13:36:38 2002 -+++ ../solenv/inc/tg_yxx.mk -@@ -4,7 +4,8 @@ +--- ../solenv/inc/tg_yxx.mk.orig Wed Sep 20 16:43:18 2000 ++++ ../solenv/inc/tg_yxx.mk Wed Mar 6 10:47:24 2002 +@@ -4,7 +4,9 @@ @echo ------------------------------ @echo Making: $@ #.IF "$(GUI)"!="UNX" -- $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) + $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET).h $(YACCFILES) + $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) + $(BISON) -o $(YACCOUT)$/$(YACCTARGET) $(YACCFILES) #.ELSE # $(BISON) $(YACCFLAGS) $(YACCFILES) |