Revert previous commit related to PR 34065, and fixed by another method,

rename conflict function name 'printf' to 'myprintf'.

5 files changed, 112 insertions, 10 deletions

diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo
index fe5b2a9f139..e3360fd6dcd 100644
--- a/misc/celestia/distinfo
+++ b/misc/celestia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/12/13 03:37:50 obache Exp $
+$NetBSD: distinfo,v 1.15 2006/12/13 16:45:42 obache Exp $
 
 SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
 RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
@@ -6,13 +6,15 @@ Size (celestia-1.4.1.tar.gz) = 23966886 bytes
 SHA1 (patch-aa) = af449be4f92d3bc7e45feebd612f7d6b47299798
 SHA1 (patch-ab) = e749cc8a8bd9be9dd10b4f53e6d7878875a2aa57
 SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90
-SHA1 (patch-ad) = f7d9d5c3d80385eaba721045ea619f15fa3af326
+SHA1 (patch-ad) = 175d8df4eb58aa24c548ba14dee5c5ae1f240e41
 SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c
 SHA1 (patch-af) = 124f115719badb0d057cc324ac0455253e25022d
 SHA1 (patch-ag) = e5300a702a92f3f35f07b34726d80cd825c1a759
-SHA1 (patch-ah) = dc8ec0acbbfb9a1e4afe25f4b7054bc05cb98c7f
+SHA1 (patch-ah) = 90f20cbbf4a8f187ea39de23f0e5b13aa4e10fb6
 SHA1 (patch-ai) = d5abfae0b4c4395572f22b6fdd1e7ad7bda4032f
 SHA1 (patch-aj) = 1ef7a10260a3b1476392c4cae17081ab0e7771b4
 SHA1 (patch-ak) = 20506d8b2f7c8c9ff778e0844dc999b0e497d644
 SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245
 SHA1 (patch-am) = 34a83573294e6ca41d817a19aef3e7d3e4f14945
+SHA1 (patch-an) = 80bd712a8ae3f4dee0d908882deadbe2ad319abf
+SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99
diff --git a/misc/celestia/patches/patch-ad b/misc/celestia/patches/patch-ad
index 45cd61c9a3e..eac06f900fe 100644
--- a/misc/celestia/patches/patch-ad
+++ b/misc/celestia/patches/patch-ad
@@ -1,7 +1,84 @@
-$NetBSD: patch-ad,v 1.3 2006/02/17 23:46:40 adam Exp $
+$NetBSD: patch-ad,v 1.4 2006/12/13 16:45:42 obache Exp $
 
---- src/celestia/celestiacore.cpp.orig	2006-02-08 10:03:15.000000000 +0100
+--- src/celestia/celestiacore.cpp.orig	2006-02-08 09:03:15.000000000 +0000
 +++ src/celestia/celestiacore.cpp
+@@ -2577,16 +2577,16 @@ static void displayAngle(Overlay& overla
+ 
+     if (degrees > 0)
+     {
+-        overlay.printf("%d%s %02d' %.1f\"",
++        overlay.myprintf("%d%s %02d' %.1f\"",
+                         degrees, UTF8_DEGREE_SIGN, minutes, seconds);
+     }
+     else if (minutes > 0)
+     {
+-        overlay.printf("%02d' %.1f\"", minutes, seconds);
++        overlay.myprintf("%02d' %.1f\"", minutes, seconds);
+     }
+     else
+     {
+-        overlay.printf("%.1f\"", seconds);
++        overlay.myprintf("%.1f\"", seconds);
+     }
+ }
+ 
+@@ -2625,7 +2625,7 @@ static void displayApparentMagnitude(Ove
+         overlay << _("Absolute magnitude: ");
+     }
+ 
+-    overlay.printf("%.1f\n", appMag);
++    overlay.myprintf("%.1f\n", appMag);
+ }
+ 
+ static void displayAcronym(Overlay& overlay, char* s)
+@@ -2665,7 +2665,7 @@ static void displayStarInfo(Overlay& ove
+         return;
+     }
+ 
+-    overlay.printf(_("Abs (app) mag: %.2f (%.2f)\n"),
++    overlay.myprintf(_("Abs (app) mag: %.2f (%.2f)\n"),
+                    star.getAbsoluteMagnitude(),
+                    astro::absToAppMag(star.getAbsoluteMagnitude(),
+                                       (float) distance));
+@@ -2687,7 +2687,7 @@ static void displayStarInfo(Overlay& ove
+     if (detail > 1)
+     {
+         overlay << _("Surface temp: ") << SigDigitNum(star.getTemperature(), 3) << " K\n";
+-        overlay.printf(_("Radius: %.2f Rsun\n"), star.getRadius() / 696000.0f);
++        overlay.myprintf(_("Radius: %.2f Rsun\n"), star.getRadius() / 696000.0f);
+ 
+         overlay << _("Rotation period: ");
+         float period = star.getRotationElements().period;
+@@ -2782,7 +2782,7 @@ static void displayPlanetInfo(Overlay& o
+             float appMag = body.getApparentMagnitude(*sun,
+                                                      bodyPos - Point3d(0, 0, 0),
+                                                      viewVec);
+-            overlay.printf(_("Apparent mag: %.2f\n"), appMag);
++            overlay.myprintf(_("Apparent mag: %.2f\n"), appMag);
+ #endif
+         }
+     }
+@@ -3140,9 +3140,9 @@ void CelestiaCore::renderOverlay()
+ 
+         // Field of view
+         float fov = radToDeg(sim->getActiveObserver()->getFOV());
+-        overlay->printf(_("FOV: "));
++        overlay->myprintf(_("FOV: "));
+         displayAngle(*overlay, fov);
+-        overlay->printf(" (%.2f%s)\n", views[activeView]->zoom,
++        overlay->myprintf(" (%.2f%s)\n", views[activeView]->zoom,
+                         UTF8_MULTIPLICATION_SIGN);
+         overlay->endText();
+         glPopMatrix();
+@@ -3341,7 +3341,7 @@ void CelestiaCore::renderOverlay()
+             movieCapture->getFrameRate();
+         int min = (int) (sec / 60);
+         sec -= min * 60.0f;
+-        overlay->printf("%3d:%05.2f", min, sec);
++        overlay->myprintf("%3d:%05.2f", min, sec);
+         glPopMatrix();
+ 
+         glPushMatrix();
 @@ -3547,7 +3547,7 @@ bool CelestiaCore::initSimulation(const 
      }
      else
diff --git a/misc/celestia/patches/patch-ah b/misc/celestia/patches/patch-ah
index 1ac6c39acfa..043d6138d38 100644
--- a/misc/celestia/patches/patch-ah
+++ b/misc/celestia/patches/patch-ah
@@ -1,15 +1,12 @@
-$NetBSD: patch-ah,v 1.3 2006/12/13 03:37:50 obache Exp $
+$NetBSD: patch-ah,v 1.4 2006/12/13 16:45:42 obache Exp $
 
 --- src/celutil/util.h.orig	2006-01-17 21:28:30.000000000 +0100
 +++ src/celutil/util.h
-@@ -28,6 +28,10 @@
+@@ -28,6 +28,7 @@
  #ifdef _WIN32
  #define _(s) s
  #else
 +#include <libintl.h>
-+#ifdef printf
-+#undef printf
-+#endif
  #define _(s) gettext(s)
  #endif
  
diff --git a/misc/celestia/patches/patch-an b/misc/celestia/patches/patch-an
new file mode 100644
index 00000000000..8ef7d95710b
--- /dev/null
+++ b/misc/celestia/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2006/12/13 16:45:42 obache Exp $
+
+--- src/celengine/overlay.cpp.orig	2005-07-19 20:30:54.000000000 +0000
++++ src/celengine/overlay.cpp
+@@ -173,7 +173,7 @@ void Overlay::print(char* s)
+ }
+ 
+ 
+-void Overlay::printf(const char* format, ...)
++void Overlay::myprintf(const char* format, ...)
+ {
+     va_list args;
+     va_start(args, format);
diff --git a/misc/celestia/patches/patch-ao b/misc/celestia/patches/patch-ao
new file mode 100644
index 00000000000..720e325f1d9
--- /dev/null
+++ b/misc/celestia/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2006/12/13 16:45:42 obache Exp $
+
+--- src/celengine/overlay.h.orig	2004-01-03 20:30:42.000000000 +0000
++++ src/celengine/overlay.h
+@@ -63,7 +63,7 @@ class Overlay : public std::ostream
+     void print(wchar_t);
+     void print(char);
+     void print(char*);
+-    void printf(const char*, ...);
++    void myprintf(const char*, ...);
+     
+ 
+  private: