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-wm | |
| 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-wm')
| -rw-r--r-- | x11-wm/e16/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/enlightenment-devel/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/enlightenment/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/icewm/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/xfce/Makefile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 078bf687d1ac..e75ca936ad3d 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -40,7 +40,7 @@ MAN1= enlightenment.1 .include <bsd.port.pre.mk> -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile index 078bf687d1ac..e75ca936ad3d 100644 --- a/x11-wm/enlightenment-devel/Makefile +++ b/x11-wm/enlightenment-devel/Makefile @@ -40,7 +40,7 @@ MAN1= enlightenment.1 .include <bsd.port.pre.mk> -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index 078bf687d1ac..e75ca936ad3d 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -40,7 +40,7 @@ MAN1= enlightenment.1 .include <bsd.port.pre.mk> -.if (${MACHINE} == "alpha") && (${XFREE86_VERSION} == 3) +.if (${MACHINE} == "alpha") && ${X_WINDOW_SYSTEM:L} == xfree86-3 CONFIGURE_ARGS+= --disable-zoom .endif diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index f567caa4a8d8..67293f5f0a2e 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -57,13 +57,13 @@ CONFIGURE_ARGS+= --with-icesound=esound CONFIGURE_ARGS+= --with-icesound=oss .endif -.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XFT) CONFIGURE_ARGS+= --enable-corefonts --disable-xfreetype .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif -.if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XINERAMA) +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 || defined(WITHOUT_XINERAMA) CONFIGURE_ARGS+= --disable-xinerama .endif diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index b755e19d8498..cffbddb0963c 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -42,7 +42,7 @@ MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \ .include <bsd.port.pre.mk> -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 .if defined(WITH_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+= --enable-xft |