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 /x11/wrapper | |
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 'x11/wrapper')
-rw-r--r-- | x11/wrapper/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index 0e9750538f43..0e66b66f32c3 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -30,4 +30,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper-4 ${PREFIX}/bin @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include <bsd.port.post.mk> |