diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index dcebeaa78ff..028ab9948a3 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.20 2010/12/15 16:01:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2011/07/03 18:49:17 ajacoutot Exp $ COMMENT= free open source planetarium -DISTNAME= stellarium-0.10.6 +DISTNAME= stellarium-0.11.0 CATEGORIES= astro x11 @@ -31,7 +31,10 @@ RUN_DEPENDS= net/curl \ CONFIGURE_STYLE=cmake CONFIGURE_ENV= HOME=${WRKDIR} -USE_GROFF = Yes +CONFIGURE_ARGS= -Wno-dev + +USE_GROFF= Yes + PORTHOME= ${WRKDIR} NO_REGRESS= Yes diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo index 4cb04ea0888..6b81e706e2e 100644 --- a/astro/stellarium/distinfo +++ b/astro/stellarium/distinfo @@ -1,5 +1,5 @@ -MD5 (stellarium-0.10.6.tar.gz) = 2qtJUp8K127+hxtjmseSlQ== -RMD160 (stellarium-0.10.6.tar.gz) = MboakEKYSTnxNRlcMfFfCiACEIU= -SHA1 (stellarium-0.10.6.tar.gz) = so900UXIllbZ95uGq+ACl6NVnO8= -SHA256 (stellarium-0.10.6.tar.gz) = RlQxa0iPVqmvjNwtD1dZb+wtnkUPAg2yK1F1AwhIFx0= -SIZE (stellarium-0.10.6.tar.gz) = 37523469 +MD5 (stellarium-0.11.0.tar.gz) = WkRHZh/N6r6HMNyiCBNn2w== +RMD160 (stellarium-0.11.0.tar.gz) = VoTp/7ueSsEU4di19wJHgaLo2LM= +SHA1 (stellarium-0.11.0.tar.gz) = 4NcpPhdawwK0XShJqCqMD6fjyj4= +SHA256 (stellarium-0.11.0.tar.gz) = 2+30fdB0T7Ml1n1j0SeRAb5/QlmvKl6AJ/EHIBLdJYc= +SIZE (stellarium-0.11.0.tar.gz) = 38161018 diff --git a/astro/stellarium/patches/patch-CMakeLists_txt b/astro/stellarium/patches/patch-CMakeLists_txt index 1d07fbf7cd1..28f7159e028 100644 --- a/astro/stellarium/patches/patch-CMakeLists_txt +++ b/astro/stellarium/patches/patch-CMakeLists_txt @@ -1,6 +1,6 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.3 2010/12/15 16:01:45 ajacoutot Exp $ ---- CMakeLists.txt.orig Sun Dec 5 17:31:01 2010 -+++ CMakeLists.txt Wed Dec 15 16:37:26 2010 +$OpenBSD: patch-CMakeLists_txt,v 1.4 2011/07/03 18:49:17 ajacoutot Exp $ +--- CMakeLists.txt.orig Sat Jul 2 15:22:18 2011 ++++ CMakeLists.txt Sun Jul 3 19:26:14 2011 @@ -33,8 +33,8 @@ ENDIF() @@ -12,7 +12,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2010/12/15 16:01:45 ajacoutot Exp $ ELSE() SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fexceptions -fident -mthreads") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-promo -fexceptions -fident -mthreads") -@@ -150,12 +150,12 @@ IF (BUILD_STATIC_PLUGINS) +@@ -161,12 +161,12 @@ IF (BUILD_STATIC_PLUGINS) ## Library for loading FITS image files FIND_PATH(CFITSIO_INCLUDE_DIR fitsio.h /usr/include @@ -27,7 +27,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2010/12/15 16:01:45 ajacoutot Exp $ /opt/local/lib DOC "cfitsio link options") SET(QT_USE_QTXML TRUE) # For VirGO we also need QtXml module -@@ -194,12 +194,12 @@ IF(ENABLE_NLS) +@@ -210,12 +210,12 @@ IF(ENABLE_NLS) PATHS /usr/include /sw/include diff --git a/astro/stellarium/patches/patch-src_core_modules_ConstellationMgr_cpp b/astro/stellarium/patches/patch-src_core_modules_ConstellationMgr_cpp index 5845b8584e2..25269a68a3b 100644 --- a/astro/stellarium/patches/patch-src_core_modules_ConstellationMgr_cpp +++ b/astro/stellarium/patches/patch-src_core_modules_ConstellationMgr_cpp @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_core_modules_ConstellationMgr_cpp,v 1.2 2010/12/15 16:01:45 ajacoutot Exp $ +$OpenBSD: patch-src_core_modules_ConstellationMgr_cpp,v 1.3 2011/07/03 18:49:17 ajacoutot Exp $ From pkgsrc: -prefix uses of "exception" with "std::" to avoid conflict with a similar definition in new "boost". ---- src/core/modules/ConstellationMgr.cpp.orig Sun Dec 5 17:31:00 2010 -+++ src/core/modules/ConstellationMgr.cpp Wed Dec 15 16:35:33 2010 -@@ -411,7 +411,7 @@ void ConstellationMgr::loadLinesAndArt(const QString & +--- src/core/modules/ConstellationMgr.cpp.orig Sat Jul 2 15:22:18 2011 ++++ src/core/modules/ConstellationMgr.cpp Sun Jul 3 19:26:14 2011 +@@ -419,7 +419,7 @@ void ConstellationMgr::loadLinesAndArt(const QString & { texturePath = StelFileMgr::findFile(QString("textures/")+texfile); } diff --git a/astro/stellarium/pkg/PLIST b/astro/stellarium/pkg/PLIST index 9e331506e16..07e5970613d 100644 --- a/astro/stellarium/pkg/PLIST +++ b/astro/stellarium/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2010/12/15 16:01:45 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.8 2011/07/03 18:49:17 ajacoutot Exp $ @bin bin/stellarium @man man/man1/stellarium.1 share/applications/stellarium.desktop @@ -256,6 +256,8 @@ share/stellarium/data/ssystem.ini share/stellarium/data/stellarium.ico share/stellarium/landscapes/ share/stellarium/landscapes/garching/ +share/stellarium/landscapes/garching/description.en.utf8 +share/stellarium/landscapes/garching/description.ru.utf8 share/stellarium/landscapes/garching/garching-gl1.png share/stellarium/landscapes/garching/garching-gl2.png share/stellarium/landscapes/garching/garching-gl3.png @@ -263,6 +265,8 @@ share/stellarium/landscapes/garching/garching-gl4.png share/stellarium/landscapes/garching/garching-ground3.png share/stellarium/landscapes/garching/landscape.ini share/stellarium/landscapes/guereins/ +share/stellarium/landscapes/guereins/description.en.utf8 +share/stellarium/landscapes/guereins/description.ru.utf8 share/stellarium/landscapes/guereins/guereins1.png share/stellarium/landscapes/guereins/guereins2.png share/stellarium/landscapes/guereins/guereins3.png @@ -274,6 +278,8 @@ share/stellarium/landscapes/guereins/guereins8.png share/stellarium/landscapes/guereins/guereinsb.png share/stellarium/landscapes/guereins/landscape.ini share/stellarium/landscapes/hurricane/ +share/stellarium/landscapes/hurricane/description.en.utf8 +share/stellarium/landscapes/hurricane/description.ru.utf8 share/stellarium/landscapes/hurricane/hurricane1.png share/stellarium/landscapes/hurricane/hurricane2.png share/stellarium/landscapes/hurricane/hurricane3.png @@ -285,12 +291,18 @@ share/stellarium/landscapes/hurricane/hurricane8.png share/stellarium/landscapes/hurricane/hurricaneb.png share/stellarium/landscapes/hurricane/landscape.ini share/stellarium/landscapes/mars/ +share/stellarium/landscapes/mars/description.en.utf8 +share/stellarium/landscapes/mars/description.ru.utf8 share/stellarium/landscapes/mars/landscape.ini share/stellarium/landscapes/mars/mars.png share/stellarium/landscapes/moon/ share/stellarium/landscapes/moon/apollo17.png +share/stellarium/landscapes/moon/description.en.utf8 +share/stellarium/landscapes/moon/description.ru.utf8 share/stellarium/landscapes/moon/landscape.ini share/stellarium/landscapes/ocean/ +share/stellarium/landscapes/ocean/description.en.utf8 +share/stellarium/landscapes/ocean/description.ru.utf8 share/stellarium/landscapes/ocean/landscape.ini share/stellarium/landscapes/ocean/ocean1.png share/stellarium/landscapes/ocean/ocean2.png @@ -302,9 +314,13 @@ share/stellarium/landscapes/ocean/ocean7.png share/stellarium/landscapes/ocean/ocean8.png share/stellarium/landscapes/ocean/ocean9.png share/stellarium/landscapes/saturn/ +share/stellarium/landscapes/saturn/description.en.utf8 +share/stellarium/landscapes/saturn/description.ru.utf8 share/stellarium/landscapes/saturn/landscape.ini share/stellarium/landscapes/saturn/saturn-256.png share/stellarium/landscapes/trees/ +share/stellarium/landscapes/trees/description.en.utf8 +share/stellarium/landscapes/trees/description.ru.utf8 share/stellarium/landscapes/trees/landscape.ini share/stellarium/landscapes/trees/trees_512.png share/stellarium/nebulae/ @@ -682,6 +698,7 @@ share/stellarium/stars/default/stars_3_1v0_0.cat share/stellarium/stars/default/stars_hip_cids_0v0_0.cat share/stellarium/stars/default/stars_hip_sp_0v0_0.cat share/stellarium/textures/ +share/stellarium/textures/amalthea.png share/stellarium/textures/ariel.png share/stellarium/textures/callisto.png share/stellarium/textures/deimos.png @@ -694,6 +711,7 @@ share/stellarium/textures/europa.png share/stellarium/textures/fog.png share/stellarium/textures/fogridge.png share/stellarium/textures/ganymede.png +share/stellarium/textures/gcl.png share/stellarium/textures/halo.png share/stellarium/textures/haloLune.png share/stellarium/textures/hyperion.png @@ -711,11 +729,14 @@ share/stellarium/textures/neb.png share/stellarium/textures/neptune.png share/stellarium/textures/nomap.png share/stellarium/textures/oberon.png +share/stellarium/textures/ocl.png share/stellarium/textures/phobos.png share/stellarium/textures/planet-indicator.png +share/stellarium/textures/pnb.png share/stellarium/textures/pointeur2.png share/stellarium/textures/pointeur4.png share/stellarium/textures/pointeur5.png +share/stellarium/textures/proteus.png share/stellarium/textures/rhea.png share/stellarium/textures/saturn.png share/stellarium/textures/saturn_rings_radial.png @@ -724,6 +745,7 @@ share/stellarium/textures/sun.png share/stellarium/textures/tethys.png share/stellarium/textures/titan.png share/stellarium/textures/titania.png +share/stellarium/textures/triton.png share/stellarium/textures/umbriel.png share/stellarium/textures/uranus.png share/stellarium/textures/venus.png