Instead of installing xterm here, depend on x11/xterm port. Taken from

xorg-clients port.

Suggested by:	krion
Approved by:	anholt (mentor)

4 files changed, 33 insertions, 9 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index c7a03e63618d..60ff619c673c 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clients
 PORTVERSION=	4.4.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -21,6 +22,7 @@ COMMENT=	XFree86-4 client programs and related files
 
 CONFLICTS=	xorg-clients-*
 
+RUN_DEPENDS=	xterm-static:${PORTSDIR}/x11/xterm
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.5:${PORTSDIR}/textproc/expat2 \
 		Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
@@ -40,6 +42,7 @@ XINSTALL_MAN_DIRS=	programs
 
 .for pf in patch-bdftruncate.pl patch-ucs2any.pl \
 	   patch-programs::fonttosfnt::read.c \
+	   patch-programs::Imakefile \
 	   patch-programs::xdm::Imakefile \
 	   patch-programs::xdm::session.c \
 	   patch-programs::xdm::socket.c
@@ -68,15 +71,21 @@ pre-everything::
 	@${ECHO_MSG} "setuid.  If you want to do this, hit Ctrl-C now and use \"make WITH_SETUID_LUIT=yes\""
 .endif
 
-.if defined(WITH_SETUID_LUIT)
 post-install:
+	@${LN} -sf ${X11BASE}/bin/resize-static ${X11BASE}/bin/resize
+	@${LN} -sf ${X11BASE}/bin/xterm-static ${X11BASE}/bin/xterm
+	@${LN} -sf ${X11BASE}/bin/uxterm-static ${X11BASE}/bin/uxterm
+	@${LN} -sf ${X11BASE}/lib/X11/app-defaults/UXTerm-static \
+		   ${X11BASE}/lib/X11/app-defaults/UXTerm
+	@${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-static \
+		   ${X11BASE}/lib/X11/app-defaults/XTerm
+	@${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-color-static \
+		   ${X11BASE}/lib/X11/app-defaults/XTerm-color
+.if defined(WITH_SETUID_LUIT)
 	${CHOWN} root:wheel ${PREFIX}/bin/luit
 	${CHMOD} 04711 ${PREFIX}/bin/luit
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.else
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
+	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index 16183f16acbb..df8ebce57f05 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -26,7 +26,6 @@ MAN1=	Xmark.1 \
 	mkfontscale.1 \
 	oclock.1 \
 	proxymngr.1 \
-	resize.1 \
 	rstart.1 \
 	rstartd.1 \
 	sessreg.1 \
@@ -90,7 +89,6 @@ MAN1=	Xmark.1 \
 	xsetroot.1 \
 	xsm.1 \
 	xstdcmap.1 \
-	xterm.1 \
 	xtrap.1 \
 	xtrapchar.1 \
 	xtrapin.1 \
diff --git a/x11/XFree86-4-clients/files/patch-programs::Imakefile b/x11/XFree86-4-clients/files/patch-programs::Imakefile
new file mode 100644
index 000000000000..466639cc9aed
--- /dev/null
+++ b/x11/XFree86-4-clients/files/patch-programs::Imakefile
@@ -0,0 +1,19 @@
+--- programs/Imakefile.orig	Sat Aug 21 10:30:43 2004
++++ programs/Imakefile	Sat Aug 21 10:33:24 2004
+@@ -57,7 +57,6 @@
+        XRXSRCDIR = xrx
+ #endif
+        XSMSRCDIR = xsm
+-     XTERMSRCDIR = xterm
+       SCRIPTSDIR = scripts
+ #endif
+ #if BuildCID
+@@ -131,7 +130,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/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 3316f8316fa3..c5429d682919 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -169,8 +169,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