Index: head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp =================================================================== --- head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp (revision 386381) +++ head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp (nonexistent) @@ -1,27 +0,0 @@ ---- src/core/StelFileMgr.cpp.orig 2014-10-11 11:24:38 UTC -+++ src/core/StelFileMgr.cpp -@@ -84,7 +84,23 @@ void StelFileMgr::init() - qWarning() << "WARNING: could not locate installation directory"; - } - -- screenshotDir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation); -+ // Wasn't set path to screenshots directory via --screenshot-dir? -+ if (screenshotDir.isEmpty()) -+ { -+ QString screenshotDirSuffix = "/Stellarium"; -+ if (!QDesktopServices::storageLocation(QDesktopServices::PicturesLocation).isEmpty()) -+ screenshotDir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation).append(screenshotDirSuffix); -+ else -+ screenshotDir = userDir.append(screenshotDirSuffix); -+ } -+ try -+ { -+ makeSureDirExistsAndIsWritable(screenshotDir); -+ } -+ catch (std::runtime_error &e) -+ { -+ qDebug("Error: cannot create screenshot directory: %s", e.what()); -+ } - } - - Property changes on: head/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp =================================================================== --- head/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp (revision 386381) +++ head/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp (nonexistent) @@ -1,18 +0,0 @@ ---- src/core/modules/Planet.cpp.orig 2014-10-11 11:24:38 UTC -+++ src/core/modules/Planet.cpp -@@ -879,13 +879,13 @@ Vec3d Planet::getHeliocentricPos(Vec3d p - // } - // } - Vec3d pos = p; -- const Planet* ourParent = &(*parent); -+ const Planet* ourParent = parent.data(); - const Planet* parentsParent; - // int i = 0; - if (NULL != ourParent) - { - // const Planet* const parentsParent = &(*(ourParent->parent)); -- while (NULL != (parentsParent = &(*(ourParent->parent)))) -+ while (NULL != (parentsParent = ourParent->parent.data())) - { - pos += ourParent->eclipticPos; - ourParent = parentsParent; Property changes on: head/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt =================================================================== --- head/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt (revision 386381) +++ head/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- doc/CMakeLists.txt.orig 2014-10-11 11:24:38 UTC -+++ doc/CMakeLists.txt -@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND( - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 - ) - --IF(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|NetBSD|OpenBSD)" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") -+IF(${CMAKE_SYSTEM_NAME} MATCHES "(DragonFly|FreeBSD|NetBSD|OpenBSD)" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION man/man1) - ELSE(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|NetBSD|OpenBSD)" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION share/man/man1) Property changes on: head/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/astro/stellarium-qt4/Makefile =================================================================== --- head/astro/stellarium-qt4/Makefile (revision 386381) +++ head/astro/stellarium-qt4/Makefile (revision 386382) @@ -1,102 +1,100 @@ # Created by: Jean-Yves Lefort # $FreeBSD$ PORTNAME= stellarium -PORTVERSION= 0.12.5 -PORTREVISION= 1 +PORTVERSION= 0.12.6 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION} PKGNAMESUFFIX= -qt4 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat} MAINTAINER= danfe@FreeBSD.org COMMENT= 3D photo-realistic sky renderer (planetarium) LICENSE= GPLv2 CONFLICTS_INSTALL= ${PORTNAME}-0.13.* PORTSCOUT= limit:^0\.12\. # track only 0.12.x (legacy) USES= cmake gettext iconv USE_QT4= moc_build rcc_build uic_build qmake_build \ corelib gui network opengl -INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README OPTIONS_DEFINE= MORE_STARS TEXTURES MULTIMEDIA SCRIPTING DOCS OPTIONS_DEFAULT= MULTIMEDIA SCRIPTING TEXTURES MORE_STARS_DESC= Install extra star catalogs (1.0GB) TEXTURES_DESC= Install better quality textures MULTIMEDIA_DESC= Sound and video support (via Phonon) SCRIPTING_DESC= Scripting support .include .if ${PORT_OPTIONS:MMORE_STARS} || ${.TARGETS:Mmakesum} . for i in 4 5 6 7 8 MASTER_SITES+= SF/${PORTNAME}/Extra-data-files/stars${i}:stars${i} . endfor DISTFILES+= stars_4_1v0_1.cat:stars4 stars_5_2v0_1.cat:stars5 \ stars_6_2v0_1.cat:stars6 stars_7_2v0_1.cat:stars7 \ stars_8_2v0_1.cat:stars8 PLIST_SUB+= MORE_STARS="" .else PLIST_SUB+= MORE_STARS="@comment " .endif .if ${PORT_OPTIONS:MTEXTURES} || ${.TARGETS:Mmakesum} MASTER_SITES+= SF/${PORTNAME}/Extra-data-files/textures:gfx DISTFILES+= textures-1K.zip:gfx PLIST_SUB+= TEXTURES="" .else PLIST_SUB+= TEXTURES="@comment " .endif .if ${PORT_OPTIONS:MMULTIMEDIA} USE_QT4+= phonon .else CMAKE_ARGS+= -DENABLE_SOUND:BOOL=OFF .endif .if ${PORT_OPTIONS:MSCRIPTING} USE_QT4+= script PLIST_SUB+= SCRIPTS="" .else CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF PLIST_SUB+= SCRIPTS="@comment " .endif post-patch: .SILENT ${REINPLACE_CMD} -e 's|std::free|::free|' \ ${WRKSRC}/src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp # Avoid picking up the wrong `fixx11h.h' (`x11/kdelibs3' port installs one # that does not handle FontChange) ${GREP} -Rl --null fixx11h\\.h ${WRKSRC}/src ${WRKSRC}/plugins | \ ${XARGS} -0 ${REINPLACE_CMD} -e 's/fixx11h\.h/fixx11qt4h.h/' cd ${WRKSRC}/src/core/external && ${MV} fixx11h.h fixx11qt4h.h post-install: .if ${PORT_OPTIONS:MMORE_STARS} ${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default .endif .if ${PORT_OPTIONS:MTEXTURES} (cd ${WRKDIR} && for f in *.png; do \ new=`${STAT} -f '%z' $$f` ; \ existing=`${STAT} -qf '%z' \ ${STAGEDIR}${DATADIR}/textures/$$f || \ ${ECHO_CMD} 0` ; \ ${TEST} $$new -gt $$existing || continue ; \ ${ECHO_CMD} "-- Replacing texture: $$f\ (has larger file size or missing)" ; \ ${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/textures ; \ done) @${REINPLACE_CMD} -e '1410s|nomap|vesta|' \ ${STAGEDIR}${DATADIR}/data/ssystem.ini .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/astro/stellarium-qt4/distinfo =================================================================== --- head/astro/stellarium-qt4/distinfo (revision 386381) +++ head/astro/stellarium-qt4/distinfo (revision 386382) @@ -1,14 +1,14 @@ -SHA256 (stellarium-0.12.5.tar.gz) = 15fbc0f12f25e4dbf7eb360c422987ca312201e3b41e6eadba028f1af9174559 -SIZE (stellarium-0.12.5.tar.gz) = 107604546 +SHA256 (stellarium-0.12.6.tar.gz) = c16bf8076d568a05d913f10c9942837dfb1a6758444d7ebbce474c34ec50f447 +SIZE (stellarium-0.12.6.tar.gz) = 107604772 SHA256 (stars_4_1v0_1.cat) = 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979 SIZE (stars_4_1v0_1.cat) = 17040932 SHA256 (stars_5_2v0_1.cat) = c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164 SIZE (stars_5_2v0_1.cat) = 42580300 SHA256 (stars_6_2v0_1.cat) = 5794c7cd035f52d25608e9a2bd40c35f1d65f0327ef80c87fde93ef4047fc555 SIZE (stars_6_2v0_1.cat) = 148352404 SHA256 (stars_7_2v0_1.cat) = 4d812c078f03d01c9b24bacedf6e688a4382d92468bab2aba2b96a9a0358a406 SIZE (stars_7_2v0_1.cat) = 305710678 SHA256 (stars_8_2v0_1.cat) = f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a2f4a800cac482 SIZE (stars_8_2v0_1.cat) = 559068934 SHA256 (textures-1K.zip) = 3622b73e9cfb65ba537072b0ed3b5ef92951e70878ace7557931d841c5bb3bec SIZE (textures-1K.zip) = 20216182