patch-misc_d_start_sh 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. $OpenBSD: patch-misc_d_start_sh,v 1.2 2008/10/28 12:09:05 jasper Exp $
  2. --- misc_d/start.sh.orig Sat Feb 5 08:26:39 2000
  3. +++ misc_d/start.sh Tue Oct 28 13:06:18 2008
  4. @@ -26,7 +26,7 @@
  5. # along with this program; if not, write to the Free Software
  6. # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  7. #
  8. -PATH=${PATH}:/sbin:/usr/sbin:/bin:/usr/bin:/etc
  9. +PATH=${PATH}:/sbin:/usr/sbin:/bin:/usr/bin
  10. export PATH
  11. if [ -z "$XMCD_LIBDIR" ]
  12. @@ -35,62 +35,12 @@ then
  13. export XMCD_LIBDIR
  14. fi
  15. -XFILESEARCHPATH=$XMCD_LIBDIR/%T/%N%S:$XFILESEARCHPATH
  16. +XFILESEARCHPATH=@PREFIX@/lib/X11/%T/%N%S:$XFILESEARCHPATH
  17. XUSERFILESEARCHPATH=$HOME/.xmcdcfg/%N%S:$XUSERFILESEARCHPATH
  18. -XKEYSYMDB=$XMCD_LIBDIR/app-defaults/XKeysymDB
  19. +XKEYSYMDB=@X11BASE@/lib/X11/XKeysymDB
  20. -PROG=`(basename $0) 2>/dev/null`
  21. +PROG=`basename $0 2>/dev/null`
  22. -SYS=`(uname -s) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
  23. -MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
  24. -REL=`(uname -r) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ ]/_/g'`
  25. -
  26. -# Platform-specific handling
  27. -if [ "$SYS" = FreeBSD ]
  28. -then
  29. - # Differentiate between FreeBSD versions
  30. - REL=`echo "$REL" | sed 's/\..*$//'`
  31. - SYS=${SYS}_${REL}
  32. -elif [ "$SYS" = SunOS ]
  33. -then
  34. - # Differentiate between SunOS 4.x and Solaris
  35. - case "$REL" in
  36. - 4.*)
  37. - ;;
  38. - 5.*)
  39. - SYS=Solaris
  40. - ;;
  41. - *)
  42. - SYS=Solaris
  43. - ;;
  44. - esac
  45. -elif [ -x /bin/i386 -o -x /sbin/i386 ] && i386
  46. -then
  47. - case "$REL" in
  48. - 3.2)
  49. - # SCO UNIX/Open Desktop
  50. - if (uname -X | fgrep "Release = 3.2") >/dev/null 2>&1
  51. - then
  52. - SYS=SCO_SV
  53. - fi
  54. - ;;
  55. - 4.*)
  56. - # UNIX SVR4.x
  57. - SYS=${SYS}_${REL}
  58. - ;;
  59. - 5)
  60. - # UNIX SVR5
  61. - SYS=${SYS}_${REL}
  62. - ;;
  63. - 5.*)
  64. - # UNIX SVR5.x
  65. - SYS=${SYS}_${REL}
  66. - ;;
  67. - *)
  68. - ;;
  69. - esac
  70. -fi
  71. -
  72. export XFILESEARCHPATH XUSERFILESEARCHPATH XKEYSYMDB
  73. -exec $XMCD_LIBDIR/bin-${SYS}-${MACH}/$PROG ${1+"$@"}
  74. +exec @PREFIX@/libexec/xmcd/$PROG ${1+"$@"}