diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-06-19 06:10:42 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-06-19 06:10:42 +0000 |
| commit | 49b123650d135ec9221c7ff95421b5d82106ce9a (patch) | |
| tree | f085c78ccfc71005a8155f960f70e0f069100cda /x11-servers | |
| parent | New port: xorg, a metaport for the X.Org distribution. It lacks the documents (diff) | |
Register new CONFLICTS.
Notes
Notes:
svn path=/head/; revision=111787
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 cb203f838745..0f26957091b5 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 009e6c3da528..dfceceda5698 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 |