diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-04-14 18:55:43 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-04-14 18:55:43 +0000 |
| commit | aa82d74ce0f5b032d58d7227852a71242668c844 (patch) | |
| tree | 06db6374634c89416a1f50aa1ee8d3d5e1fed9db /x11 | |
| parent | Define NO_WRKSUBDIR = yes instead of setting WRKSRC = ${WRKDIR} (diff) | |
Fix installation when /usr/X11R6 is a symlink.
PR: ports/17946
Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
Notes
Notes:
svn path=/head/; revision=27540
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-h | 21 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-h | 21 |
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 \ @@\ + |