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 /misc/magicpoint | |
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 'misc/magicpoint')
-rw-r--r-- | misc/magicpoint/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 6de089b..e230adf 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 |