OpenSDE Packages Database (without history before r20070)
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.

83 lines
2.5 KiB

  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../netpbm/shared_files-fix.patch
  5. # Copyright (C) 2004 - 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. --- netpbm-10.25/buildtools/installnetpbm.pl 2003-11-05 23:35:37.000000000 +0100
  17. +++ netpbm-10.25-t2/buildtools/installnetpbm.pl 2004-10-18 17:46:15.739386208 +0200
  18. @@ -146,13 +146,12 @@
  19. if (`cp --version 2>/dev/null` =~ m/GNU/) {
  20. # It's GNU Cp -- we have options galore, and they're readable.
  21. - $cpCommand = "cp --recursive --preserve --no-dereference";
  22. + $cpCommand = "cp --preserve --no-dereference";
  23. } else {
  24. # This works on Cp from "4th Berkeley Distribution", July 1994.
  25. # Mac OSX has this.
  26. - # -R means recursive with no dereferencing of symlinks
  27. # -p means preserve attributes
  28. - $cpCommand = "cp -R -p";
  29. + $cpCommand = "cp -p -d";
  30. }
  31. return($cpCommand);
  32. }
  33. @@ -734,6 +733,28 @@
  34. +sub installManPages($$) {
  35. +
  36. + my ($srcdir, $dstdir) = @_;
  37. +
  38. + if (! -d ($dstdir)) {
  39. + my $succeeded = mkdir($dstdir, 0777);
  40. +
  41. + if (!$succeeded) {
  42. + print("Unable to create directory '$dstdir'. " .
  43. + "Error=$ERRNO\n");
  44. + return;
  45. + }
  46. + }
  47. +
  48. + my $rc = system("$cpCommand $srcdir/* $dstdir/");
  49. +
  50. + if ($rc != 0) {
  51. + print("copy of man pages from $srcdir to $dstdir failed.\n");
  52. + print("cp exit code is $rc\n");
  53. + }
  54. +}
  55. +
  56. sub installManPage($$$) {
  57. @@ -745,16 +766,11 @@
  58. print("Installing man pages...\n");
  59. - my $rc = system("$cpCommand $pkgdir/man/* $manDir/");
  60. + installManPages("$pkgdir/man/man1", "$manDir/man1");
  61. + installManPages("$pkgdir/man/man3", "$manDir/man3");
  62. + installManPages("$pkgdir/man/man5", "$manDir/man5");
  63. - if ($rc != 0) {
  64. - print("copy of man pages from $pkgdir/man to $manDir failed.\n");
  65. - print("cp exit code is $rc\n");
  66. - } else {
  67. - print("done.\n");
  68. - }
  69. -
  70. - print("\n");
  71. + print("done\n");
  72. removeObsoleteManPage($manDir);