Don't use references to temporary objects.

12 files changed, 87 insertions, 35 deletions

diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo
index 6020cc27518..a4f1e213106 100644
--- a/misc/celestia/distinfo
+++ b/misc/celestia/distinfo
@@ -1,28 +1,29 @@
-$NetBSD: distinfo,v 1.20 2011/11/25 22:08:29 joerg Exp $
+$NetBSD: distinfo,v 1.21 2012/07/03 17:40:35 joerg Exp $
 
 SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
 RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
 Size (celestia-1.4.1.tar.gz) = 23966886 bytes
 SHA1 (patch-aa) = 04bfea9e2a83a4c9fbd3917e378b5812699ccbe9
 SHA1 (patch-ab) = dae3c86ab56b5f9db11f6fc09184ebb4f7b1ec31
-SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90
+SHA1 (patch-ac) = 481e726b978b636f3574d5a842c274804b808369
 SHA1 (patch-ad) = 175d8df4eb58aa24c548ba14dee5c5ae1f240e41
-SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c
+SHA1 (patch-ae) = bb8e66ba94ff1305ded59f5740a4937c78c0f06b
 SHA1 (patch-af) = 124f115719badb0d057cc324ac0455253e25022d
 SHA1 (patch-ag) = e5300a702a92f3f35f07b34726d80cd825c1a759
 SHA1 (patch-ah) = 0c4a61b1906095e258cdcc61c54d4174620986af
 SHA1 (patch-ai) = d5abfae0b4c4395572f22b6fdd1e7ad7bda4032f
-SHA1 (patch-aj) = 1ef7a10260a3b1476392c4cae17081ab0e7771b4
-SHA1 (patch-ak) = 20506d8b2f7c8c9ff778e0844dc999b0e497d644
-SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245
-SHA1 (patch-am) = 34a83573294e6ca41d817a19aef3e7d3e4f14945
+SHA1 (patch-aj) = 7ce19f00912b1d56e1641b6c7c07910931709865
+SHA1 (patch-ak) = 8218d30082883dee4be13f5da3eabf74ebd949ec
+SHA1 (patch-al) = 1fff49adf00c67dfd99bd79700336fd3d6186e63
+SHA1 (patch-am) = 6cfa8ebc978ec35203613f26c3606ed1fb787b60
 SHA1 (patch-an) = 089ecfe539186f20191595c79bcf84cb37daffef
 SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99
 SHA1 (patch-ap) = 768ada9965afdbcfa8f797a9627ad90cb0b920b0
 SHA1 (patch-aq) = fdc7b7f0ff04672f93af144f41e09751b4de0c1a
-SHA1 (patch-src_celengine_console.cpp) = 2b813ef144bb98ef35fb9d19489373d9af8eb384
-SHA1 (patch-src_celengine_galaxy.cpp) = 2da22768d9a015361d9c5c601f82d91a03cb6daf
-SHA1 (patch-src_celengine_stardb.cpp) = ac31a0cba37f5b5d446624a40faffd4e55cea0f4
-SHA1 (patch-src_celestia_eclipsefinder.cpp) = 676cd48a631097619a2abfd78ae6bd235869a75d
-SHA1 (patch-src_celestia_url.cpp) = b06360d001c2738ead2494dcb05e2cec092ed5dc
-SHA1 (patch-src_celmath_mathlib.h) = 11f402fb9ccb9d0dc8f3f887d854b753e3318a17
+SHA1 (patch-src_celengine_console.cpp) = c837f465aa4c8ad67211d883af6157bcfa89dc55
+SHA1 (patch-src_celengine_galaxy.cpp) = 26cff89cb98757a1ea4f5d2727bacf76b82179cb
+SHA1 (patch-src_celengine_stardb.cpp) = 43d1998fcdd0116db43267b334533ec5fa3dfc72
+SHA1 (patch-src_celengine_vecgl.h) = fbb6982731fdb7bd3561a091fe8c4910b55a4071
+SHA1 (patch-src_celestia_eclipsefinder.cpp) = 0ee3adf6dcf8393b8dbb708fad9d09d6fe9aaf5a
+SHA1 (patch-src_celestia_url.cpp) = 895af96b6476d528e7e87ec1fc7e81d41ff94ec0
+SHA1 (patch-src_celmath_mathlib.h) = 0a0ba369cc1a0593f36bad23cec1ba9200f3737e
diff --git a/misc/celestia/patches/patch-aj b/misc/celestia/patches/patch-aj
index 8528710b8d1..894bd6379e4 100644
--- a/misc/celestia/patches/patch-aj
+++ b/misc/celestia/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2006/02/17 23:46:40 adam Exp $
+$NetBSD: patch-aj,v 1.3 2012/07/03 17:40:36 joerg Exp $
 
---- src/celestia/glutmain.cpp.orig	2005-07-19 22:30:59.000000000 +0200
+--- src/celestia/glutmain.cpp.orig	2005-07-19 20:30:59.000000000 +0000
 +++ src/celestia/glutmain.cpp
 @@ -521,7 +521,7 @@ int main(int argc, char* argv[])
      // Set the simulation starting time to the current system time
diff --git a/misc/celestia/patches/patch-ak b/misc/celestia/patches/patch-ak
index a20686db065..15fc0be7fc7 100644
--- a/misc/celestia/patches/patch-ak
+++ b/misc/celestia/patches/patch-ak
@@ -1,10 +1,13 @@
-$NetBSD: patch-ak,v 1.1 2006/06/14 12:37:53 markd Exp $
+$NetBSD: patch-ak,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celestia/Makefile.in.orig	2006-06-13 00:08:44.000000000 +1200
+--- src/celestia/Makefile.in.orig	2006-02-15 21:53:43.000000000 +0000
 +++ src/celestia/Makefile.in
-@@ -300,7 +300,7 @@ INCLUDES = -I..
+@@ -298,9 +298,9 @@ SUBDIRS = res $(am__append_1) $(am__appe
+ bin_PROGRAMS = celestia
+ INCLUDES = -I..
  
- localedir = $(datadir)/locale
+-localedir = $(datadir)/locale
++localedir = /usr/pkg/share/locale
  @ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
 -@ENABLE_KDE_TRUE@                  $(LIBSOCKET) kde/libkdegui.a
 +@ENABLE_KDE_TRUE@                  $(LIBSOCKET) $(LIBINTL) kde/libkdegui.a
diff --git a/misc/celestia/patches/patch-al b/misc/celestia/patches/patch-al
index 7ac0301d678..5cdaf99ee3e 100644
--- a/misc/celestia/patches/patch-al
+++ b/misc/celestia/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2006/06/14 12:37:53 markd Exp $
+$NetBSD: patch-al,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celestia/kde/doc/celestia/Makefile.in.orig	2006-02-16 10:53:43.000000000 +1300
+--- src/celestia/kde/doc/celestia/Makefile.in.orig	2006-02-15 21:53:43.000000000 +0000
 +++ src/celestia/kde/doc/celestia/Makefile.in
 @@ -642,7 +642,7 @@ install-docs: docs-am install-nls
  	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/; \
diff --git a/misc/celestia/patches/patch-am b/misc/celestia/patches/patch-am
index 4f2a11257ed..f5894408d49 100644
--- a/misc/celestia/patches/patch-am
+++ b/misc/celestia/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2006/12/12 19:31:37 joerg Exp $
+$NetBSD: patch-am,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celutil/unixdirectory.cpp.orig	2006-12-12 16:52:18.000000000 +0000
+--- src/celutil/unixdirectory.cpp.orig	2005-03-05 13:56:14.000000000 +0000
 +++ src/celutil/unixdirectory.cpp
 @@ -7,11 +7,19 @@
  // as published by the Free Software Foundation; either version 2
diff --git a/misc/celestia/patches/patch-src_celengine_console.cpp b/misc/celestia/patches/patch-src_celengine_console.cpp
index e6c9bf29faf..6b838b2735c 100644
--- a/misc/celestia/patches/patch-src_celengine_console.cpp
+++ b/misc/celestia/patches/patch-src_celengine_console.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_celengine_console.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-src_celengine_console.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celengine/console.cpp.orig	2011-11-25 16:12:42.000000000 +0000
+--- src/celengine/console.cpp.orig	2005-07-19 20:30:54.000000000 +0000
 +++ src/celengine/console.cpp
 @@ -9,6 +9,7 @@
  
diff --git a/misc/celestia/patches/patch-src_celengine_galaxy.cpp b/misc/celestia/patches/patch-src_celengine_galaxy.cpp
index 44bb7d71591..73edcfae053 100644
--- a/misc/celestia/patches/patch-src_celengine_galaxy.cpp
+++ b/misc/celestia/patches/patch-src_celengine_galaxy.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_celengine_galaxy.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-src_celengine_galaxy.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celengine/galaxy.cpp.orig	2011-11-25 16:20:46.000000000 +0000
+--- src/celengine/galaxy.cpp.orig	2005-12-05 05:42:43.000000000 +0000
 +++ src/celengine/galaxy.cpp
 @@ -311,8 +311,8 @@ void Galaxy::renderGalaxyEllipsoid(const
      float discSizeInPixels = pixelSize * getRadius() / offset.length();
diff --git a/misc/celestia/patches/patch-src_celengine_stardb.cpp b/misc/celestia/patches/patch-src_celengine_stardb.cpp
index ea3dd15e379..41609e975f5 100644
--- a/misc/celestia/patches/patch-src_celengine_stardb.cpp
+++ b/misc/celestia/patches/patch-src_celengine_stardb.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_celengine_stardb.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-src_celengine_stardb.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celengine/stardb.cpp.orig	2011-11-25 16:27:06.000000000 +0000
+--- src/celengine/stardb.cpp.orig	2005-11-18 07:53:39.000000000 +0000
 +++ src/celengine/stardb.cpp
 @@ -10,6 +10,7 @@
  #include <cmath>
diff --git a/misc/celestia/patches/patch-src_celengine_vecgl.h b/misc/celestia/patches/patch-src_celengine_vecgl.h
new file mode 100644
index 00000000000..ca9bbcf63f4
--- /dev/null
+++ b/misc/celestia/patches/patch-src_celengine_vecgl.h
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_celengine_vecgl.h,v 1.1 2012/07/03 17:40:36 joerg Exp $
+
+--- src/celengine/vecgl.h.orig	2012-07-03 14:48:42.000000000 +0000
++++ src/celengine/vecgl.h
+@@ -89,17 +89,20 @@ inline void glScale(const Vec3f& v)
+ 
+ inline void glLightDirection(GLenum light, const Vec3f& dir)
+ {
+-    glLightfv(light, GL_POSITION, &(Vec4f(dir.x, dir.y, dir.z, 0.0f).x));
++    Vec4f t(dir.x, dir.y, dir.z, 0.0f);
++    glLightfv(light, GL_POSITION, &t.x);
+ }
+ 
+ inline void glLightPosition(GLenum light, const Point3f& pos)
+ {
+-    glLightfv(light, GL_POSITION, &(Vec4f(pos.x, pos.y, pos.z, 1.0f).x));
++    Vec4f t(pos.x, pos.y, pos.z, 1.0f);
++    glLightfv(light, GL_POSITION, &t.x);
+ }
+ 
+ inline void glLightColor(GLenum light, GLenum which, const Vec3f& color)
+ {
+-    glLightfv(light, which, &(Vec4f(color.x, color.y, color.z, 1.0f).x));
++    Vec4f t(color.x, color.y, color.z, 1.0f);
++    glLightfv(light, which, &t.x);
+ }
+ 
+ inline void glLightColor(GLenum light, GLenum which, const Vec4f& color)
+@@ -109,15 +112,15 @@ inline void glLightColor(GLenum light, G
+ 
+ inline void glLightColor(GLenum light, GLenum which, const Color& color)
+ {
++    Vec4f t(color.red(), color.green(), color.blue(), color.alpha());
+     glLightfv(light, which,
+-              &(Vec4f(color.red(), color.green(), color.blue(), color.alpha()).x));
++              &t.x);
+ }
+ 
+ inline void glAmbientLightColor(const Color& color)
+ {
+-    glLightModelfv(GL_LIGHT_MODEL_AMBIENT,
+-                   &(Vec4f(color.red(), color.green(), color.blue(),
+-                           color.alpha()).x));
++    Vec4f t(color.red(), color.green(), color.blue(), color.alpha());
++    glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &t.x);
+ }
+ 
+ #endif // _VECGL_H_
diff --git a/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp b/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp
index c5543ec477e..2360af26c46 100644
--- a/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp
+++ b/misc/celestia/patches/patch-src_celestia_eclipsefinder.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_celestia_eclipsefinder.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-src_celestia_eclipsefinder.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celestia/eclipsefinder.cpp.orig	2011-11-25 16:35:03.000000000 +0000
+--- src/celestia/eclipsefinder.cpp.orig	2004-09-09 06:34:50.000000000 +0000
 +++ src/celestia/eclipsefinder.cpp
 @@ -10,6 +10,7 @@
  // as published by the Free Software Foundation; either version 2
diff --git a/misc/celestia/patches/patch-src_celestia_url.cpp b/misc/celestia/patches/patch-src_celestia_url.cpp
index f54569ce0db..f364ce46ff3 100644
--- a/misc/celestia/patches/patch-src_celestia_url.cpp
+++ b/misc/celestia/patches/patch-src_celestia_url.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_celestia_url.cpp,v 1.1 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-src_celestia_url.cpp,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celestia/url.cpp.orig	2011-11-25 16:35:25.000000000 +0000
+--- src/celestia/url.cpp.orig	2005-11-18 08:00:39.000000000 +0000
 +++ src/celestia/url.cpp
 @@ -15,6 +15,7 @@
   *                                                                         *
diff --git a/misc/celestia/patches/patch-src_celmath_mathlib.h b/misc/celestia/patches/patch-src_celmath_mathlib.h
index bf970d3de48..c24dd461bf9 100644
--- a/misc/celestia/patches/patch-src_celmath_mathlib.h
+++ b/misc/celestia/patches/patch-src_celmath_mathlib.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_celmath_mathlib.h,v 1.1 2011/11/25 22:08:30 joerg Exp $
+$NetBSD: patch-src_celmath_mathlib.h,v 1.2 2012/07/03 17:40:36 joerg Exp $
 
---- src/celmath/mathlib.h.orig	2011-11-25 16:18:13.000000000 +0000
+--- src/celmath/mathlib.h.orig	2002-03-12 04:58:25.000000000 +0000
 +++ src/celmath/mathlib.h
 @@ -11,7 +11,7 @@
  #define _MATHLIB_H_