diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-08-06 12:21:29 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-08-06 12:21:29 +0000 |
| commit | 8fb1d78ca318dde34cfc6abf364ac74415dc0c80 (patch) | |
| tree | 64f6a45253dfe1e47fc6e2482ba8f18a692249e9 /editors/openoffice.org-vcltesttool | |
| parent | - Update to 2.10.9 (diff) | |
Use stock gcc for FreeBSD 6.
Notes
Notes:
svn path=/head/; revision=218133
Diffstat (limited to 'editors/openoffice.org-vcltesttool')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/Makefile | 9 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i91369 | 16 |
2 files changed, 19 insertions, 6 deletions
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 96ea44c634f6..0850893b4f1f 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= 2.4.${SNAPDATE} -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 1 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ @@ -107,11 +107,6 @@ PKGNAMESUFFIX= -${LANG_SUFFIX} RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme -USE_GCC= 4.2 -#following part should sync with ports/Mk/bsd.gcc.mk -.if (${OSVERSION} >= 700042) -CONFIGURE_ARGS+= --with-system-stdlibs -.endif .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CCACHE_PREFIX= ccache @@ -153,7 +148,9 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --enable-crashdump=yes \ --with-system-zlib \ + --with-system-stdlibs \ --with-epm=internal + .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost diff --git a/editors/openoffice.org-vcltesttool/files/patch-i91369 b/editors/openoffice.org-vcltesttool/files/patch-i91369 new file mode 100644 index 000000000000..f1de25ebdfad --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i91369 @@ -0,0 +1,16 @@ +Index: store/util/makefile.mk +=================================================================== +RCS file: /cvs/ucb/store/util/makefile.mk,v +retrieving revision 1.24 +diff -u -r1.24 makefile.mk +--- store/util/makefile.mk 10 Apr 2008 14:23:47 -0000 1.24 ++++ store/util/makefile.mk 30 Jun 2008 23:52:56 -0000 +@@ -78,7 +78,7 @@ + .ELSE + .IF "$(OS)"=="NETBSD" + SHL1STDLIBS+= -lsupc++ +-.ELIF "$(OS)"=="MACOSX" ++.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" + .IF "$(CCNUMVER)"<="000399999999" + SHL1STDLIBS+= -lsupc++ + .ENDIF # CCNUMVER |