Move x11/xterm to BUILD_DEPENDS.

Remove superfluous dependencies.
Pet portlint.
Bump PORTREVISION.

Approved by:	anholt

4 files changed, 26 insertions, 15 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 215fdbf1f158..2560e06434da 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xorg-clients
 PORTVERSION=	6.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
 DISTFILES=	X11R6.7.0-src1.tar.gz \
@@ -17,9 +17,8 @@ DISTFILES=	X11R6.7.0-src1.tar.gz \
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X client programs and related files from X.Org
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		expat.5:${PORTSDIR}/textproc/expat2 \
-		png.5:${PORTSDIR}/graphics/png \
+BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 CONFLICTS=	XFree86-clients-*
@@ -61,7 +60,7 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE= is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
+IGNORE=	is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
 .endif
 
 .include "${FILESDIR}/manpages"
diff --git a/x11/xorg-clients/files/manpages b/x11/xorg-clients/files/manpages
index 465f5075cfe6..483513027ba4 100644
--- a/x11/xorg-clients/files/manpages
+++ b/x11/xorg-clients/files/manpages
@@ -24,7 +24,6 @@ MAN1=	Xmark.1 \
 	mkfontscale.1 \
 	oclock.1 \
 	proxymngr.1 \
-	resize.1 \
 	rstart.1 \
 	rstartd.1 \
 	sessreg.1 \
@@ -88,7 +87,6 @@ MAN1=	Xmark.1 \
 	xsetroot.1 \
 	xsm.1 \
 	xstdcmap.1 \
-	xterm.1 \
 	xtrap.1 \
 	xtrapchar.1 \
 	xtrapin.1 \
diff --git a/x11/xorg-clients/files/patch-programs_Imakefile b/x11/xorg-clients/files/patch-programs_Imakefile
new file mode 100644
index 000000000000..b2d7c924544b
--- /dev/null
+++ b/x11/xorg-clients/files/patch-programs_Imakefile
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- programs/Imakefile.orig	Sat Jul 24 02:13:01 2004
++++ programs/Imakefile	Sat Jul 24 02:13:23 2004
+@@ -57,7 +57,6 @@
+        XRXSRCDIR = xrx
+ #endif
+        XSMSRCDIR = xsm
+-     XTERMSRCDIR = xterm
+       SCRIPTSDIR = scripts
+ #endif
+ #if BuildCID
+@@ -129,7 +128,7 @@
+ 	xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \
+ 	xrefresh $(XRXSRCDIR) xset \
+ 	xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
+-	$(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
++	$(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
+ 	$(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
+ 	$(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \
+ 	$(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) 
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index 7e99ba734a2c..fe9f3a72b779 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -25,7 +25,6 @@ bin/mkfontdir
 bin/mkfontscale
 bin/oclock
 bin/proxymngr
-bin/resize
 bin/rstart
 bin/rstartd
 bin/sessreg
@@ -38,7 +37,6 @@ bin/sxpm
 bin/texteroids
 bin/twm
 bin/ucs2any
-bin/uxterm
 bin/viewres
 bin/x11perf
 bin/x11perfcomp
@@ -94,7 +92,6 @@ bin/xsetpointer
 bin/xsetroot
 bin/xsm
 bin/xstdcmap
-bin/xterm
 bin/xtrapchar
 bin/xtrapin
 bin/xtrapinfo
@@ -133,7 +130,6 @@ lib/X11/app-defaults/Chooser
 lib/X11/app-defaults/Clock-color
 lib/X11/app-defaults/Editres
 lib/X11/app-defaults/Editres-color
-lib/X11/app-defaults/UXTerm
 lib/X11/app-defaults/Viewres
 lib/X11/app-defaults/XCalc
 lib/X11/app-defaults/XCalc-color
@@ -146,8 +142,6 @@ lib/X11/app-defaults/XLoad
 lib/X11/app-defaults/XLogo
 lib/X11/app-defaults/XLogo-color
 lib/X11/app-defaults/XSm
-lib/X11/app-defaults/XTerm
-lib/X11/app-defaults/XTerm-color
 lib/X11/app-defaults/Xditview
 lib/X11/app-defaults/Xditview-chrtr
 lib/X11/app-defaults/Xedit
@@ -160,8 +154,6 @@ lib/X11/app-defaults/Xmessage
 lib/X11/app-defaults/Xmessage-color
 lib/X11/app-defaults/Xmh
 lib/X11/app-defaults/Xvidtune
-lib/X11/etc/xterm.termcap
-lib/X11/etc/xterm.terminfo
 lib/X11/fonts/util/map-ISO8859-1
 lib/X11/fonts/util/map-ISO8859-10
 lib/X11/fonts/util/map-ISO8859-11