mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

90 lines
3.3 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/avm/vobcopy/notinlocal.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -ruN vobcopy-0.5.14/Makefile vobcopy-0.5.14-new/Makefile
  20. --- vobcopy-0.5.14/Makefile 2004-11-22 20:11:49.000000000 +0100
  21. +++ vobcopy-0.5.14-new/Makefile 2005-05-23 09:44:08.000000000 +0200
  22. @@ -6,7 +6,7 @@
  23. #PREFIX += /usr/local
  24. #BINDIR = ${PREFIX}/bin
  25. #MANDIR = ${PREFIX}/man
  26. -PREFIX += /usr/local
  27. +PREFIX += /usr
  28. BINDIR = ${PREFIX}/bin
  29. MANDIR = ${PREFIX}/man
  30. LFS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
  31. diff -ruN vobcopy-0.5.14/configure.sh vobcopy-0.5.14-new/configure.sh
  32. --- vobcopy-0.5.14/configure.sh 2004-11-22 20:10:37.000000000 +0100
  33. +++ vobcopy-0.5.14-new/configure.sh 2005-05-23 09:44:51.000000000 +0200
  34. @@ -48,7 +48,7 @@
  35. fi
  36. if [ "$1" != "${1%help}" ]; then
  37. - echo "--prefix=PREFIX install architecture-independent files in PREFIX [/usr/local]"
  38. + echo "--prefix=PREFIX install architecture-independent files in PREFIX [/usr]"
  39. echo "--bindir=DIR user executables in DIR [PREFIX/bin]"
  40. echo "--mandir=DIR man documentation in DIR [PREFIX/bin]"
  41. echo "--with-dvdread-libs=DIR directory where dvdread lib (dvd_reader.h) is installed"
  42. @@ -61,7 +61,7 @@
  43. if [ -z $prefix_provided ]
  44. then
  45. - prefix=/usr/local
  46. + prefix=/usr
  47. fi
  48. if [ -z $mandir_provided ]
  49. @@ -79,7 +79,7 @@
  50. if [ -z $libs_dir_provided ]
  51. then
  52. - if [ ! -e /usr/local/include/dvdread ]; then
  53. + if [ ! -e /usr/include/dvdread ]; then
  54. if [ ! -e /usr/include/dvdread ]; then #muss hier das then hin??
  55. echo "Do you have libdvdread installed? I (the script) can't
  56. find it"
  57. @@ -95,8 +95,8 @@
  58. fi
  59. else
  60. echo "libdvdread found"
  61. - libs_dir=/usr/local/
  62. -# libs_dir=/usr/local/include
  63. + libs_dir=/usr/
  64. +# libs_dir=/usr/include
  65. fi
  66. else
  67. # Remove the following if...fi if the program complains about non-existing
  68. @@ -134,7 +134,7 @@
  69. # `sysctl -n kern.osreldate 2> /dev/null` -lt 500041 ]; then
  70. if [ `uname -s` = FreeBSD ]; then
  71. if [ `sysctl -n kern.osreldate 2> /dev/null` -lt 500041 ]; then
  72. - LDFLAGS="LDFLAGS += -ldvdread -L/usr/local/lib -lgnugetopt"
  73. + LDFLAGS="LDFLAGS += -ldvdread -L/usr/lib -lgnugetopt"
  74. else
  75. LDFLAGS="LDFLAGS += -ldvdread -L$libs_dir/lib"
  76. fi
  77. @@ -155,7 +155,7 @@
  78. #below here are variable definitions. They get substituted in the (CC) and
  79. #stuff places.
  80. CC ?= gcc
  81. -#PREFIX += /usr/local
  82. +#PREFIX += /usr
  83. #BINDIR = \${PREFIX}/bin
  84. #MANDIR = \${PREFIX}/man
  85. PREFIX += $prefix