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 /misc | |
| 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 'misc')
| -rw-r--r-- | misc/gtkfind/Makefile | 2 | ||||
| -rw-r--r-- | misc/magicpoint/Makefile | 4 | ||||
| -rw-r--r-- | misc/videotext/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile index 1b81df846080..848a842f9a8b 100644 --- a/misc/gtkfind/Makefile +++ b/misc/gtkfind/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_BACKUP} MAINTAINER= billf@FreeBSD.org COMMENT= The program to use to have to remember all the options to find(1) -BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= xterm:${X_CLIENTS_PORT} USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 6de089bacd67..e230adf24d6a 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -51,7 +51,7 @@ post-configure: post-build: (cd ${WRKSRC}/contrib/xmindpath; make) -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 (cd ${WRKSRC}/contrib/xmindpath; \ ${RM} -f xmindpath.1.html xmindpath-1.html; \ ${X11BASE}/bin/rman -f HTML < xmindpath.1 > xmindpath-1.html && \ @@ -62,7 +62,7 @@ post-build: post-install: (cd ${WRKSRC}/contrib/xmindpath; make install) ${GZIP_CMD} ${PREFIX}/man/man1/xmindpath.1 -.if ${XFREE86_VERSION} == 4 +.if ${X_WINDOW_SYSTEM:L} != xfree86-3 (cd ${WRKSRC}/contrib/xmindpath; \ ${INSTALL_MAN} xmindpath.1.html ${PREFIX}/lib/X11/doc/html) .endif diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile index 3498b9656539..dcebe1babe2d 100644 --- a/misc/videotext/Makefile +++ b/misc/videotext/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://elektra.e-technik.uni-ulm.de/~mbuck/download/ MAINTAINER= roger@FreeBSD.org COMMENT= X11/Xview TV Videotext/Teletext page viewer (.vtx files) -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ xview.3:${PORTSDIR}/x11-toolkits/xview |