diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-07-21 03:09:56 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-07-21 03:09:56 +0000 |
| commit | f5e0c389e070554994f26f24d480c3859200cfb9 (patch) | |
| tree | 9ce0b9bfd59704ae3c2dc43e4494552ac965cb3b /editors/openoffice.org-3-devel | |
| parent | d0f364e1a185ef11a757b6e5c9fcf3571d2b774e (diff) | |
| download | ports-f5e0c389e070554994f26f24d480c3859200cfb9.tar.gz ports-f5e0c389e070554994f26f24d480c3859200cfb9.zip | |
Notes
Diffstat (limited to 'editors/openoffice.org-3-devel')
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 7 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i91369 | 16 |
2 files changed, 18 insertions, 5 deletions
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 9fcf7691cfc9..f0bb484bd217 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -105,11 +105,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 @@ -151,7 +146,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-3-devel/files/patch-i91369 b/editors/openoffice.org-3-devel/files/patch-i91369 new file mode 100644 index 000000000000..f1de25ebdfad --- /dev/null +++ b/editors/openoffice.org-3-devel/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 |