diff options
| author | maho <maho@FreeBSD.org> | 2006-07-23 03:47:55 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2006-07-23 03:47:55 +0000 |
| commit | 257ab1ef175388edb7aca26ce60db84ff376a835 (patch) | |
| tree | b9dfd42f72d0381ae1abec9e2746bf9fa70f0126 /editors/openoffice.org-2-devel | |
| parent | 74225e9682c4e2147d94518f8610f61db5c9df8e (diff) | |
| download | FreeBSD-ports-257ab1ef175388edb7aca26ce60db84ff376a835.zip FreeBSD-ports-257ab1ef175388edb7aca26ce60db84ff376a835.tar.gz | |
Better RUN_DEPENDS section of gcc41-withgcjawt
Diffstat (limited to 'editors/openoffice.org-2-devel')
| -rw-r--r-- | editors/openoffice.org-2-devel/Makefile | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 96961d1..0527cd7 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -96,17 +96,16 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .endif .if defined(WITH_GNUGCJ) -#this wired part must be rewritten -GCCVER=4.1.2 -BUILD_DEPENDS+= ${PREFIX}/lib/gcc/${GCC_TARGET}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt +GCCVER=41 +BUILD_DEPENDS+= ${PREFIX}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc -RUN_DEPENDS+= ${PREFIX}/lib/gcc/${GCC_TARGET}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt +RUN_DEPENDS+= ${PREFIX}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt .else .if ${ARCH} == amd64 -GCCVER=4.1.2 +GCCVER=41 BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 .else -GCCVER=3.4.1 +GCCVER=34 BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif .endif @@ -117,11 +116,11 @@ CCACHE_PREFIX= ccache .else CCACHE_PREFIX= .endif -.if (${GCCVER} == 4.1.2) +.if (${GCCVER} == 41) CC= gcc41 CXX= g++41 .endif -.if (${GCCVER} == 3.4.1) +.if (${GCCVER} == 34) CC= gcc-ooo CXX= g++-ooo .endif @@ -164,7 +163,7 @@ CONFIGURE_ARGS+= --with-system-freetype #link error with internal one .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes .endif -.if (${GCCVER} == 4.1.2) +.if (${GCCVER} == 41) LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost CONFIGURE_ARGS+= --with-system-boost=yes #i58343# .endif |
