diff options
| author | anholt <anholt@FreeBSD.org> | 2004-06-19 06:10:42 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-06-19 06:10:42 +0000 |
| commit | 04e640165d4fb096fc04da27c8e60aaf635717c2 (patch) | |
| tree | ad51eb7cc662cb5e36f85e72c4a10b02949913aa /x11-servers | |
| parent | f60b49c84aca33d492b7dba80acbac390d3359d9 (diff) | |
| download | FreeBSD-ports-04e640165d4fb096fc04da27c8e60aaf635717c2.zip FreeBSD-ports-04e640165d4fb096fc04da27c8e60aaf635717c2.tar.gz | |
Register new CONFLICTS.
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-PrintServer/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-VirtualFramebufferServer/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index cb203f8..0f26957 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -25,6 +25,8 @@ EXTRACT_ONLY= X430src-1.tgz \ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 print server +CONFLICTS= xorg-printserver-* + PLIST_FILES= bin/Xprt XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index 009e6c3..dfceced 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -25,6 +25,8 @@ EXTRACT_ONLY= X430src-1.tgz \ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 virtual framebuffer server +CONFLICTS= xorg-vfbserver-* + RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz |
