aboutsummaryrefslogtreecommitdiffstats
path: root/x11-servers
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2003-12-13 07:50:10 +0800
committeranholt <anholt@FreeBSD.org>2003-12-13 07:50:10 +0800
commit2a57a945c3b51a4730f22b6b1d392de0849a53bc (patch)
treefd3bda4a677f2ef400dd725c8193593c108a0767 /x11-servers
parentf06c5d4bfabfb54cf42119a901d47e4c4b2118be (diff)
downloadfreebsd-ports-gnome-2a57a945c3b51a4730f22b6b1d392de0849a53bc.tar.gz
freebsd-ports-gnome-2a57a945c3b51a4730f22b6b1d392de0849a53bc.tar.zst
freebsd-ports-gnome-2a57a945c3b51a4730f22b6b1d392de0849a53bc.zip
Don't install conflicting Xserver.1 manpage from other XFree86-4-*Server. It
will only be provided by XFree86-4-Server(-snap). PR: ports/59155 Submitted by: Guido Berhoerster <ich@guido-berhoerster.org>
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile6
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile6
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile6
3 files changed, 9 insertions, 9 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index ca85c58a6b2c..58c422cfceb1 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= FontServer
PORTVERSION= 4.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-servers x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -19,10 +19,10 @@ DISTFILES= X430src-1.tgz \
MAINTAINER= x11@FreeBSD.org
COMMENT= XFree86-4 font server
-MAN1= Xserver.1 xfs.1
+MAN1= xfs.1
XBUILD_DIRS= programs/xfs
XINCLUDE_DIRS= lib/xtrans programs/Xserver
-XINSTALL_MAN_DIRS= programs/Xserver programs/xfs
+XINSTALL_MAN_DIRS= programs/xfs
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
.include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index f84bd29f6c06..c4814bcad643 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= NestServer
PORTVERSION= 4.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -25,11 +25,11 @@ EXTRACT_ONLY= X430src-1.tgz \
MAINTAINER= x11@FreeBSD.org
COMMENT= XFree86-4 nested X server
-MAN1= Xnest.1 Xserver.1
+MAN1= Xnest.1
XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans
XINSTALL_DIRS= programs/Xserver
-XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
+XINSTALL_MAN_DIRS= programs/Xserver/hw/xnest
post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index d15ac0f12872..009e6c3da528 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= VirtualFramebufferServer
PORTVERSION= 4.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -29,11 +29,11 @@ RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
-MAN1= Xserver.1 Xvfb.1
+MAN1= Xvfb.1
XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans
XINSTALL_DIRS= programs/Xserver
-XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
+XINSTALL_MAN_DIRS= programs/Xserver/hw/vfb
post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \