diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
| commit | 4eb209da7d941e66e0cb065aead6bda76c9e97f3 (patch) | |
| tree | c9cf2fdcee3885499960b9c706dacac0a0080f8e /editors/openoffice.org-2-RC/Makefile | |
| parent | Fix USE_PHP (diff) | |
- Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk,
and make XFREE86_VERSION map to it. XFREE86_VERSION is now deprecated.
- Make xorg the default X_WINDOW_SYSTEM on -current.
- Add several new X_*_PORT variables which point to various pieces of X11 based
on the setting of X_WINDOW_SYSTEM, and make ports use them.
- Add information to CHANGES about how to handle the transition.
PR: ports/68763
Approved by: portmgr (marcus)
Approved by: re (scottl)
Notes
Notes:
svn path=/head/; revision=114511
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 49fb1a50d061..bf16cff1e5ec 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -28,6 +28,7 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes USE_CCACHE= yes +USE_XLIB= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -67,18 +68,16 @@ CC= gcc32 CXX= g++32 .endif - BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant -BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft BUILD_DEPENDS+= ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip BUILD_DEPENDS+= gcp:${PORTSDIR}/sysutils/coreutils .if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ |