diff options
author | anholt <anholt@FreeBSD.org> | 2004-07-24 03:10:32 +0800 |
---|---|---|
committer | anholt <anholt@FreeBSD.org> | 2004-07-24 03:10:32 +0800 |
commit | 3c76fd7fad82c9f137407348028fde08754f2866 (patch) | |
tree | 9818557f7ca7be09aba8db3b18a8262f50280603 /security/ssh2/Makefile | |
parent | a861bc861bc7251a2f2399f845d673f742a19ee1 (diff) | |
download | freebsd-ports-gnome-3c76fd7fad82c9f137407348028fde08754f2866.tar.gz freebsd-ports-gnome-3c76fd7fad82c9f137407348028fde08754f2866.tar.zst freebsd-ports-gnome-3c76fd7fad82c9f137407348028fde08754f2866.zip |
- 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 'security/ssh2/Makefile')
-rw-r--r-- | security/ssh2/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index 9615e72cc9f2..53f0ffdcde51 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -92,10 +92,8 @@ EXTRA_PATCHES+= ${FILESDIR}/kerberos-patch-apps::ssh::ssh2_config \ .endif .if !defined(WITHOUT_X11) -.if ${XFREE86_VERSION} == 4 -BUILD_DEPENDS+= ${X11BASE}/bin/xauth:${PORTSDIR}/x11/XFree86-4-clients -RUN_DEPENDS+= ${X11BASE}/bin/xauth:${PORTSDIR}/x11/XFree86-4-clients -.endif +BUILD_DEPENDS+= ${X11BASE}/bin/xauth:${X_CLIENTS_PORT} +RUN_DEPENDS+= ${X11BASE}/bin/xauth:${X_CLIENTS_PORT} USE_XLIB= yes PLIST_SUB+= WITH_X11:="" .else |