aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-07-27 08:06:59 +0800
committerkrion <krion@FreeBSD.org>2004-07-27 08:06:59 +0800
commit94b12a3bc1232e7f4b34330d57c524202f52f06d (patch)
treeaf35ff8aba0482416b6d4dc23eeaa6c9a93ec58a
parent876ae214cac1e6ab4f5bb4b32b277a92d80fbec7 (diff)
downloadfreebsd-ports-gnome-94b12a3bc1232e7f4b34330d57c524202f52f06d.tar.gz
freebsd-ports-gnome-94b12a3bc1232e7f4b34330d57c524202f52f06d.tar.zst
freebsd-ports-gnome-94b12a3bc1232e7f4b34330d57c524202f52f06d.zip
Add one more hack allowing users to update with xterm
dependency. Approved by: anholt
-rw-r--r--x11/xorg-clients/Makefile11
-rw-r--r--x11/xorg-clients/pkg-plist8
2 files changed, 17 insertions, 2 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 2560e06434da..b9d790fff76e 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-clients
PORTVERSION= 6.7.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/
DISTFILES= X11R6.7.0-src1.tar.gz \
@@ -17,7 +17,7 @@ DISTFILES= X11R6.7.0-src1.tar.gz \
MAINTAINER= x11@FreeBSD.org
COMMENT= X client programs and related files from X.Org
-BUILD_DEPENDS= xterm:${PORTSDIR}/x11/xterm
+BUILD_DEPENDS= xterm-static:${PORTSDIR}/x11/xterm
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/libXft
@@ -40,6 +40,13 @@ pre-everything::
.endif
post-install:
+ @${LN} -s ${X11BASE}/bin/resize-static ${X11BASE}/bin/resize
+ @${LN} -s ${X11BASE}/bin/xterm-static ${X11BASE}/bin/xterm
+ @${LN} -s ${X11BASE}/bin/uxterm-static ${X11BASE}/bin/uxterm
+ @${LN} -s ${X11BASE}/lib/X11/app-defaults/UXTerm-static ${X11BASE}/lib/X11/app-defaults/UXTerm
+ @${LN} -s ${X11BASE}/lib/X11/app-defaults/XTerm-static ${X11BASE}/lib/X11/app-defaults/XTerm
+ @${LN} -s ${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
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index fe9f3a72b779..b7e814b2d6fd 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -731,3 +731,11 @@ lib/X11/xkb/types/pc
lib/X11/xkb/xkbcomp
lib/X11/xman.help
lib/X11/xsm/system.xsm
+
+# xterm workaround
+bin/resize
+bin/uxterm
+bin/xterm
+lib/X11/app-defaults/UXTerm
+lib/X11/app-defaults/XTerm
+lib/X11/app-defaults/XTerm