diff options
author | anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
---|---|---|
committer | anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
commit | 3c76fd7fad82c9f137407348028fde08754f2866 (patch) | |
tree | 9818557f7ca7be09aba8db3b18a8262f50280603 /editors/openoffice-1.1-devel | |
parent | a861bc861bc7251a2f2399f845d673f742a19ee1 (diff) | |
download | FreeBSD-ports-3c76fd7fad82c9f137407348028fde08754f2866.zip FreeBSD-ports-3c76fd7fad82c9f137407348028fde08754f2866.tar.gz |
- 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)
Diffstat (limited to 'editors/openoffice-1.1-devel')
-rw-r--r-- | editors/openoffice-1.1-devel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 4df3e32..cbce9ad 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -113,7 +113,7 @@ BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \ ${ANT}:${PORTSDIR}/devel/apache-ant \ ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft .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 \ |