diff options
author | Maho Nakata <maho@FreeBSD.org> | 2008-01-08 11:04:20 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2008-01-08 11:04:20 +0000 |
commit | d27340eeeb68b43c38f37c8c1da2123446cbaf6a (patch) | |
tree | 066772516884bbade18eaea5b68eee8117334368 /editors | |
parent | 1. Update to version 0.62. If you are doing uncommon things including (diff) |
Include libgcc_s.so and libstdc++.so
in the installation set, and bump portrevision.
Notes
Notes:
svn path=/head/; revision=205256
Diffstat (limited to 'editors')
-rw-r--r-- | editors/openoffice.org-1.1/Makefile | 2 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/files/patch-libgcc | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index aa6c004adee2..0d009fe68288 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -7,7 +7,7 @@ PORTNAME= openoffice.org PORTVERSION= 1.1.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \ http://openoffice.lunarshells.com/sources/1.1/ \ diff --git a/editors/openoffice.org-1.1/files/patch-libgcc b/editors/openoffice.org-1.1/files/patch-libgcc new file mode 100644 index 000000000000..a3197c00be66 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-libgcc @@ -0,0 +1,39 @@ +Index: work/OOo_1.1.5/external/gcc3_specific/makefile.mk +=================================================================== +RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v +retrieving revision 1.3 +diff -u -r1.3 makefile.mk +--- external/gcc3_specific/makefile.mk 18 Jun 2003 12:44:10 -0000 1.3 ++++ external/gcc3_specific/makefile.mk 8 Jan 2008 03:22:55 -0000 +@@ -11,7 +11,6 @@ + + .IF "$(OS)"!="MACOSX" + .IF "$(OS)"!="IRIX" +-.IF "$(OS)"!="FREEBSD" + + + all : $(SOLARLIBDIR)$/libstdc++.so.$(SHORTSTDCPP3) $(SOLARLIBDIR)$/libgcc_s.so.1 $(SOLARLIBDIR)$/libgcc_s.so +@@ -27,7 +26,6 @@ + -rm -f $@ + +ln -s libgcc_s.so.1 $@ + +-.ENDIF + .ENDIF + .ENDIF + +Index: work/OOo_1.1.5/scp/source/global/udk_base.scp +=================================================================== +RCS file: /cvs/installation/scp/source/global/Attic/udk_base.scp,v +retrieving revision 1.7.24.2 +diff -u -r1.7.24.2 udk_base.scp +--- scp/source/global/udk_base.scp 28 Jan 2004 17:18:34 -0000 1.7.24.2 ++++ scp/source/global/udk_base.scp 8 Jan 2008 03:24:54 -0000 +@@ -6,7 +6,7 @@ + // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are + // needed for unxlngi4 environment (setup is linked against it). + +-#if ! (defined (FREEBSD) || defined(MACOSX) || defined(NETBSD) ) ++#if ! (defined(MACOSX) || defined(NETBSD) ) + #if ( defined( _gcc3 ) && ( defined( C300 ) || defined( C322 ) )) + + File gid_File_Lib_gcc |