aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2000-04-15 02:55:43 +0800
committerjmz <jmz@FreeBSD.org>2000-04-15 02:55:43 +0800
commitea453765942de5d3548bb8468bde85602542b12e (patch)
treee3bfa6b607d8e005c44b2084575932e32d2101f7 /x11
parent1c236df780a7bd97c1defec27a4739a2301010f9 (diff)
downloadfreebsd-ports-gnome-ea453765942de5d3548bb8468bde85602542b12e.tar.gz
freebsd-ports-gnome-ea453765942de5d3548bb8468bde85602542b12e.tar.zst
freebsd-ports-gnome-ea453765942de5d3548bb8468bde85602542b12e.zip
Fix installation when /usr/X11R6 is a symlink.
PR: ports/17946 Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-libraries/files/patch-h21
-rw-r--r--x11/XFree86-4/files/patch-h21
2 files changed, 42 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-h b/x11/XFree86-4-libraries/files/patch-h
new file mode 100644
index 000000000000..e6ab4a06e81c
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-h
@@ -0,0 +1,21 @@
+--- config/cf/Imake.rules.orig Wed Mar 8 00:54:17 2000
++++ config/cf/Imake.rules Wed Apr 12 18:00:00 2000
+@@ -1437,7 +1437,7 @@
+ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
+ @MakeFlagsToShellFlags(i,set +e); \ @@\
+ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
+- RELPATH=`echo opath/cdir | \ @@\
++ RELPATH=`cd opath/cdir; pwd | \ @@\
+ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
+ cd Concat($(DESTDIR),opath/cdir); \ @@\
+ if [ -d rdir -a ! -h rdir ]; then \ @@\
+@@ -1484,7 +1484,7 @@
+ MakeDir(Concat($(DESTDIR),npath)) @@\
+ @MakeFlagsToShellFlags(i,set +e); \ @@\
+ if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
+- RELPATH=`echo opath | \ @@\
++ RELPATH=`cd opath; pwd | \ @@\
+ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
+ cd Concat($(DESTDIR),opath); \ @@\
+ if [ -f lfile -a ! -h lfile ]; then \ @@\
+
diff --git a/x11/XFree86-4/files/patch-h b/x11/XFree86-4/files/patch-h
new file mode 100644
index 000000000000..e6ab4a06e81c
--- /dev/null
+++ b/x11/XFree86-4/files/patch-h
@@ -0,0 +1,21 @@
+--- config/cf/Imake.rules.orig Wed Mar 8 00:54:17 2000
++++ config/cf/Imake.rules Wed Apr 12 18:00:00 2000
+@@ -1437,7 +1437,7 @@
+ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
+ @MakeFlagsToShellFlags(i,set +e); \ @@\
+ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
+- RELPATH=`echo opath/cdir | \ @@\
++ RELPATH=`cd opath/cdir; pwd | \ @@\
+ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
+ cd Concat($(DESTDIR),opath/cdir); \ @@\
+ if [ -d rdir -a ! -h rdir ]; then \ @@\
+@@ -1484,7 +1484,7 @@
+ MakeDir(Concat($(DESTDIR),npath)) @@\
+ @MakeFlagsToShellFlags(i,set +e); \ @@\
+ if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
+- RELPATH=`echo opath | \ @@\
++ RELPATH=`cd opath; pwd | \ @@\
+ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
+ cd Concat($(DESTDIR),opath); \ @@\
+ if [ -f lfile -a ! -h lfile ]; then \ @@\
+