Abandon installing xterm as xterm-static. There are checks in

XFree-4-clients and xorg-clients that conditionally create symlinks to
xterm-static if there is no xterm present so chances of loosing ability
to run xterm after upgrade should be minimized. These checks shall go away
in due time.

Discussed with:	krion

7 files changed, 104 insertions, 72 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 6ed0e76bcd26..c7436d4cdcf4 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clients
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -19,7 +20,7 @@ DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 client programs and related files
 
-RUN_DEPENDS=	xterm-static:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	xterm>0:${PORTSDIR}/x11/xterm
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.5:${PORTSDIR}/textproc/expat2 \
 		Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
@@ -69,15 +70,27 @@ pre-everything::
 .endif
 
 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 [ ! -e ${X11BASE}/bin/resize ]; then \
+		${LN} -sf ${X11BASE}/bin/resize-static ${X11BASE}/bin/resize; \
+	fi
+	if [ ! -e ${X11BASE}/bin/xterm ]; then \
+		${LN} -sf ${X11BASE}/bin/xterm-static ${X11BASE}/bin/xterm; \
+	fi
+	if [ ! -e ${X11BASE}/bin/uxterm ]; then \
+		${LN} -sf ${X11BASE}/bin/uxterm-static ${X11BASE}/bin/uxterm; \
+	fi
+	if [ ! -e ${X11BASE}/lib/X11/app-defaults/UXTerm ]; then \
+		${LN} -sf ${X11BASE}/lib/X11/app-defaults/UXTerm-static \
+		${X11BASE}/lib/X11/app-defaults/UXTerm; \
+	fi
+	if [ ! -e ${X11BASE}/lib/X11/app-defaults/XTerm ]; then \
+		${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-static \
+		${X11BASE}/lib/X11/app-defaults/XTerm; \
+	fi
+	if [ ! -e ${X11BASE}/lib/X11/app-defaults/XTerm-color ]; then \
+		${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-color-static \
+		${X11BASE}/lib/X11/app-defaults/XTerm-color; \
+	fi
 .if defined(WITH_SETUID_LUIT)
 	${CHOWN} root:wheel ${PREFIX}/bin/luit
 	${CHMOD} 04711 ${PREFIX}/bin/luit
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 7d4f4c857cdc..08ef81b63b79 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -36,7 +36,6 @@ bin/mkfontdir
 bin/mkfontscale
 bin/oclock
 bin/proxymngr
-bin/resize
 bin/rstart
 bin/rstartd
 bin/sessreg
@@ -49,7 +48,6 @@ bin/sxpm
 bin/texteroids
 bin/twm
 bin/ucs2any
-bin/uxterm
 bin/viewres
 bin/x11perf
 bin/x11perfcomp
@@ -105,7 +103,6 @@ bin/xsetpointer
 bin/xsetroot
 bin/xsm
 bin/xstdcmap
-bin/xterm
 bin/xtrapchar
 bin/xtrapin
 bin/xtrapinfo
@@ -142,7 +139,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
@@ -155,8 +151,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
@@ -756,6 +750,19 @@ lib/X11/xkb/types/pc
 lib/X11/xkb/xkbcomp
 lib/X11/xman.help
 lib/X11/xsm/system.xsm
+@comment xterm workaround
+@exec [ ! -e %D/bin/resize ] && ln -sf %D/bin/resize-static %D/bin/resize
+@exec [ ! -e %D/bin/uxterm ] && ln -sf %D/bin/uxterm-static %D/bin/uxterm
+@exec [ ! -e %D/bin/xterm ] && ln -sf %D/bin/xterm-static %D/bin/xterm
+@exec [ ! -e %D/lib/X11/app-defaults/UXTerm ] && ln -sf %D/lib/X11/app-defaults/UXTerm-static %D/lib/X11/app-defaults/UXTerm
+@exec [ ! -e %D/lib/X11/app-defaults/XTerm-color ] && ln -sf %D/lib/X11/app-defaults/XTerm-color-static %D/lib/X11/app-defaults/XTerm-color
+@exec [ ! -e %D/lib/X11/app-defaults/XTerm ] && ln -s %D/lib/X11/app-defaults/XTerm-static %D/lib/X11/app-defaults/XTerm
+@unexec [ -L %D/bin/resize ] && rm %D/bin/resize
+@unexec [ -L %D/bin/uxterm ] && rm %D/bin/uxterm
+@unexec [ -L %D/bin/xterm ] && rm %D/bin/xterm
+@unexec [ -L %D/lib/X11/app-defaults/UXTerm ] && rm %D/lib/X11/app-defaults/UXTerm
+@unexec [ -L %D/lib/X11/app-defaults/XTerm-color ] && rm %D/lib/X11/app-defaults/XTerm-color
+@unexec [ -L %D/lib/X11/app-defaults/XTerm ] && rm %D/lib/X11/app-defaults/XTerm
 @dirrm lib/X11/fonts/util
 @dirrm lib/X11/icons/default
 @dirrm lib/X11/icons/handhelds/cursors
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index ab143fa5b9e8..314c1a55c0fe 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xorg-clients
 PORTVERSION=	6.8.2
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
@@ -17,7 +18,7 @@ DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X client programs and related files from X.Org
 
-RUN_DEPENDS=	xterm-static:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	xterm>0:${PORTSDIR}/x11/xterm
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
@@ -42,12 +43,27 @@ pre-everything::
 .endif
 
 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 [ ! -e ${X11BASE}/bin/resize ]; then \
+		${LN} -sf ${X11BASE}/bin/resize-static ${X11BASE}/bin/resize; \
+	fi
+	if [ ! -e ${X11BASE}/bin/xterm ]; then \
+		${LN} -sf ${X11BASE}/bin/xterm-static ${X11BASE}/bin/xterm; \
+	fi
+	if [ ! -e ${X11BASE}/bin/uxterm ]; then \
+		${LN} -sf ${X11BASE}/bin/uxterm-static ${X11BASE}/bin/uxterm; \
+	fi
+	if [ ! -e ${X11BASE}/lib/X11/app-defaults/UXTerm ]; then \
+		${LN} -sf ${X11BASE}/lib/X11/app-defaults/UXTerm-static \
+		${X11BASE}/lib/X11/app-defaults/UXTerm; \
+	fi
+	if [ ! -e ${X11BASE}/lib/X11/app-defaults/XTerm ]; then \
+		${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-static \
+		${X11BASE}/lib/X11/app-defaults/XTerm; \
+	fi
+	if [ ! -e ${X11BASE}/lib/X11/app-defaults/XTerm-color ]; then \
+		${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-color-static \
+		${X11BASE}/lib/X11/app-defaults/XTerm-color; \
+	fi
 
 .if defined(WITH_SETUID_LUIT)
 	${CHOWN} root:wheel ${PREFIX}/bin/luit
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index 8f470516426d..3e6cd1b003d0 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -756,12 +756,19 @@ lib/X11/xman.help
 lib/X11/xsm/system.xsm
 
 @comment xterm workaround
-bin/resize
-bin/uxterm
-bin/xterm
-lib/X11/app-defaults/UXTerm
-lib/X11/app-defaults/XTerm-color
-lib/X11/app-defaults/XTerm
+
+@exec [ ! -e %D/bin/resize ] && ln -sf %D/bin/resize-static %D/bin/resize
+@exec [ ! -e %D/bin/uxterm ] && ln -sf %D/bin/uxterm-static %D/bin/uxterm
+@exec [ ! -e %D/bin/xterm ] && ln -sf %D/bin/xterm-static %D/bin/xterm
+@exec [ ! -e %D/lib/X11/app-defaults/UXTerm ] && ln -sf %D/lib/X11/app-defaults/UXTerm-static %D/lib/X11/app-defaults/UXTerm
+@exec [ ! -e %D/lib/X11/app-defaults/XTerm-color ] && ln -sf %D/lib/X11/app-defaults/XTerm-color-static %D/lib/X11/app-defaults/XTerm-color
+@exec [ ! -e %D/lib/X11/app-defaults/XTerm ] && ln -s %D/lib/X11/app-defaults/XTerm-static %D/lib/X11/app-defaults/XTerm
+@unexec [ -L %D/bin/resize ] && rm %D/bin/resize
+@unexec [ -L %D/bin/uxterm ] && rm %D/bin/uxterm
+@unexec [ -L %D/bin/xterm ] && rm %D/bin/xterm
+@unexec [ -L %D/lib/X11/app-defaults/UXTerm ] && rm %D/lib/X11/app-defaults/UXTerm
+@unexec [ -L %D/lib/X11/app-defaults/XTerm-color ] && rm %D/lib/X11/app-defaults/XTerm-color
+@unexec [ -L %D/lib/X11/app-defaults/XTerm ] && rm %D/lib/X11/app-defaults/XTerm
 
 @dirrm include/X11/PM
 @dirrm lib/X11/proxymngr
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 547a3e34d746..f2cec9c5085a 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xterm
 PORTVERSION=	206
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/ \
 		http://voodoo.bawue.com/download/
@@ -17,6 +18,10 @@ COMMENT=	Terminal emulator for the X Window System
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
+CONFLICTS=	xorg-clients-6.7* xorg-clients-6.8.[0-1]* xorg-clients-6.8.2 \
+		XFree86-clients-4.[0-4]* XFree86-clients-4.5.0 \
+		XFree86-3*
+
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -26,7 +31,27 @@ CONFIGURE_ARGS+=	--enable-wide-chars --enable-luit --with-utempter
 
 MAN1=		resize.1 xterm.1
 
+pre-su-install:
+	if [ -L ${PREFIX}/bin/resize ]; then \
+		rm ${PREFIX}/bin/resize; \
+	fi
+	if [ -L ${PREFIX}/bin/uxterm ]; then \
+		rm ${PREFIX}/bin/uxterm; \
+	fi
+	if [ -L ${PREFIX}/bin/xterm ]; then \
+		rm ${PREFIX}/bin/xterm; \
+	fi
+	if [ -L ${PREFIX}/lib/X11/app-defaults/UXTerm ]; then \
+		rm ${PREFIX}/lib/X11/app-defaults/UXTerm; \
+	fi
+	if [ -L ${PREFIX}/lib/X11/app-defaults/XTerm-color ]; then \
+		rm ${PREFIX}/lib/X11/app-defaults/XTerm-color; \
+	fi
+	if [ -L ${PREFIX}/lib/X11/app-defaults/XTerm ]; then \
+		rm ${PREFIX}/lib/X11/app-defaults/XTerm; \
+	fi
+
 post-install:
-	@${CHMOD} 4711 ${PREFIX}/bin/xterm-static
+	@${CHMOD} 4711 ${PREFIX}/bin/xterm
 
 .include <bsd.port.mk>
diff --git a/x11/xterm/files/patch-Makefile.in b/x11/xterm/files/patch-Makefile.in
deleted file mode 100644
index e3649cbe5ba6..000000000000
--- a/x11/xterm/files/patch-Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Tue Jul 13 02:41:24 2004
-+++ Makefile.in	Wed Jul 28 10:59:16 2004
-@@ -141,9 +141,9 @@
- TRANSFORM = sed 's/$x$$//'|sed '$(transform)'|sed 's/$$/$x/'
- actual_xterm  = `echo xterm|    sed '$(transform)'`
- actual_resize = `echo resize|   sed '$(transform)'`
--binary_xterm  = `echo xterm$x|  $(TRANSFORM)`
--binary_resize = `echo resize$x| $(TRANSFORM)`
--binary_uxterm = `echo uxterm|   $(TRANSFORM)`
-+binary_xterm  = `echo xterm-static$x|  $(TRANSFORM)`
-+binary_resize = `echo resize-static$x| $(TRANSFORM)`
-+binary_uxterm = `echo uxterm-static|   $(TRANSFORM)`
- 
- install \
- install-bin \
-@@ -163,13 +163,13 @@
- install-full :: $(APPSDIR)
- 	@echo installing $(APPSDIR)/$(CLASS)
- 	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm.ad >XTerm.tmp
--	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)
-+	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/XTerm-static
- 	@echo installing $(APPSDIR)/$(CLASS)-color
- 	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm-col.ad >XTerm.tmp
--	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color
--	@echo installing $(APPSDIR)/UXTerm
-+	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color-static
-+	@echo installing $(APPSDIR)/UXTerm-static
- 	@sed -e s/XTerm/$(CLASS)/ $(srcdir)/UXTerm.ad >XTerm.tmp
--	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm
-+	@$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm-static
- 	@rm -f XTerm.tmp
- 
- install ::
diff --git a/x11/xterm/pkg-plist b/x11/xterm/pkg-plist
index 32ed8d192e29..1cf77f94cd56 100644
--- a/x11/xterm/pkg-plist
+++ b/x11/xterm/pkg-plist
@@ -1,6 +1,6 @@
-bin/resize-static
-bin/uxterm-static
-bin/xterm-static
-lib/X11/app-defaults/UXTerm-static
-lib/X11/app-defaults/XTerm-static
-lib/X11/app-defaults/XTerm-color-static
+bin/resize
+bin/uxterm
+bin/xterm
+lib/X11/app-defaults/UXTerm
+lib/X11/app-defaults/XTerm
+lib/X11/app-defaults/XTerm-color