diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-07 15:24:41 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-07 15:24:41 +0000 |
| commit | c7b31b51f7256ca8895a17fc293f3ff0188d3ab2 (patch) | |
| tree | f89f504c5c9fd64f0ea8f296c5461a9deef9e712 | |
| parent | Make a ugly hack and remove the DISPLAY dependency. We use the (diff) | |
- Dependency fix.
- Really build OO on CURRENT with g++ from ports
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 10 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/Makefile | 10 | ||||
| -rw-r--r-- | editors/openoffice/Makefile | 10 |
3 files changed, 27 insertions, 3 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index c28f31c6f6ca..409937b58440 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -28,6 +28,14 @@ USE_GCC=3.1 .endif .if ${OSVERSION} > 500000 +.if ${USE_GCC} == 3.1 +# +# We depend on the port. System g++ is broken at the moment. +# +BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31 +CC= gcc31 +CXX= g++31 +.endif .if defined(USE_GCC) && ${USE_GCC} == 2.95 MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz .else @@ -50,7 +58,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth USE_PERL5= yes diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index c28f31c6f6ca..409937b58440 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -28,6 +28,14 @@ USE_GCC=3.1 .endif .if ${OSVERSION} > 500000 +.if ${USE_GCC} == 3.1 +# +# We depend on the port. System g++ is broken at the moment. +# +BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31 +CC= gcc31 +CXX= g++31 +.endif .if defined(USE_GCC) && ${USE_GCC} == 2.95 MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz .else @@ -50,7 +58,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth USE_PERL5= yes diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index c28f31c6f6ca..409937b58440 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -28,6 +28,14 @@ USE_GCC=3.1 .endif .if ${OSVERSION} > 500000 +.if ${USE_GCC} == 3.1 +# +# We depend on the port. System g++ is broken at the moment. +# +BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31 +CC= gcc31 +CXX= g++31 +.endif .if defined(USE_GCC) && ${USE_GCC} == 2.95 MOZILLADIST= oo_moz1.0RC3_${ARCH}_FreeBSD-5-gcc2.95-ports.tar.gz .else @@ -50,7 +58,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth USE_PERL5= yes |