Thu Feb 16 19:25:11 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.50 -r1.51 pkgsrc/misc/stellarium/Makefile
diff -r1.20 -r1.21 pkgsrc/misc/stellarium/distinfo
diff -r0 -r1.1 pkgsrc/misc/stellarium/patches/patch-src_core_modules_Skybright.cpp
cvs diff -r1.50 -r1.51 pkgsrc/misc/stellarium/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/stellarium/Makefile 2012/02/06 12:40:59 1.50
+++ pkgsrc/misc/stellarium/Makefile 2012/02/16 19:25:11 1.51
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.50 2012/02/06 12:40:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.51 2012/02/16 19:25:11 hans Exp $
2 2
3DISTNAME= stellarium-0.11.1 3DISTNAME= stellarium-0.11.1
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stellarium/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stellarium/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.stellarium.org/ 9HOMEPAGE= http://www.stellarium.org/
10COMMENT= Generate photorealistic skies with OpenGL 10COMMENT= Generate photorealistic skies with OpenGL
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_PKGLOCALEDIR= yes 
17USE_TOOLS+= gmake msgfmt perl pod2man 16USE_TOOLS+= gmake msgfmt perl pod2man
18 17
19CMAKE_ARGS+= -D FreeType2_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2 18CMAKE_ARGS+= -D FreeType2_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2
20CMAKE_ARGS+= -D FreeType2_LIBRARIES:PATH=${BUILDLINK_PREFIX.freetype2}/lib 19CMAKE_ARGS+= -D FreeType2_LIBRARIES:PATH=${BUILDLINK_PREFIX.freetype2}/lib
21CMAKE_ARGS+= -D SDLMIXER_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.SDL}/include/SDL 20CMAKE_ARGS+= -D SDLMIXER_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.SDL}/include/SDL
22 21
23SUBST_CLASSES+= mac 22SUBST_CLASSES+= mac
24SUBST_MESSAGE.mac= Disabling Mac OS X paths. 23SUBST_MESSAGE.mac= Disabling Mac OS X paths.
25SUBST_FILES.mac= src/core/StelFileMgr.cpp 24SUBST_FILES.mac= src/core/StelFileMgr.cpp
26SUBST_STAGE.mac= pre-configure 25SUBST_STAGE.mac= pre-configure
27SUBST_SED.mac= -e 's,Q_OS_MAC,Q_XX_MAC,' 26SUBST_SED.mac= -e 's,Q_OS_MAC,Q_XX_MAC,'
28 27
29.include "../../audio/SDL_mixer/buildlink3.mk" 28.include "../../audio/SDL_mixer/buildlink3.mk"
cvs diff -r1.20 -r1.21 pkgsrc/misc/stellarium/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/stellarium/distinfo 2011/11/19 17:30:36 1.20
+++ pkgsrc/misc/stellarium/distinfo 2012/02/16 19:25:11 1.21
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.20 2011/11/19 17:30:36 jakllsch Exp $ 1$NetBSD: distinfo,v 1.21 2012/02/16 19:25:11 hans Exp $
2 2
3SHA1 (stellarium-0.11.1.tar.gz) = e721a9cef0c736354c477fdb25cce607a9a3b52e 3SHA1 (stellarium-0.11.1.tar.gz) = e721a9cef0c736354c477fdb25cce607a9a3b52e
4RMD160 (stellarium-0.11.1.tar.gz) = 5e6a1c6fd2822cfa5391aff67f17610723d834f7 4RMD160 (stellarium-0.11.1.tar.gz) = 5e6a1c6fd2822cfa5391aff67f17610723d834f7
5Size (stellarium-0.11.1.tar.gz) = 45681904 bytes 5Size (stellarium-0.11.1.tar.gz) = 45681904 bytes
6SHA1 (patch-aa) = e5c3968a2d8bde8a651cf87d0b5d99a3f01680b0 6SHA1 (patch-aa) = e5c3968a2d8bde8a651cf87d0b5d99a3f01680b0
7SHA1 (patch-ab) = e7e1042cb674462f43fbb7c6ad5b023e62b54a59 7SHA1 (patch-ab) = e7e1042cb674462f43fbb7c6ad5b023e62b54a59
8SHA1 (patch-ac) = e9436d4f9f34127f176931dda4665ddc5d6f8bfa 8SHA1 (patch-ac) = e9436d4f9f34127f176931dda4665ddc5d6f8bfa
9SHA1 (patch-ad) = 5e4912f60fd74a868933e4afe27a67ddb73514a8 9SHA1 (patch-ad) = 5e4912f60fd74a868933e4afe27a67ddb73514a8
10SHA1 (patch-ae) = d033aabef7777ad8c7593d067620c7cdd1a8b998 10SHA1 (patch-ae) = d033aabef7777ad8c7593d067620c7cdd1a8b998
 11SHA1 (patch-src_core_modules_Skybright.cpp) = 9e5649bb5f764e426554c328c31a3b34838879e3
File Added: pkgsrc/misc/stellarium/patches/Attic/patch-src_core_modules_Skybright.cpp
--- src/core/modules/Skybright.cpp.orig	2011-07-02 15:22:18.000000000 +0200
+++ src/core/modules/Skybright.cpp	2011-11-01 17:14:24.676826514 +0100
@@ -29,6 +29,8 @@
 #include "Skybright.hpp"
 #include "StelUtils.hpp"
 
+#undef FS
+
 Skybright::Skybright() : SN(1.f)
 {
 	setDate(2003, 8, 0);