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

3 files changed, 32 insertions, 43 deletions

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