Date: Mon, 12 Jan 2015 16:22:16 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376837 - in head/astro: stellarium stellarium-qt4 Message-ID: <201501121622.t0CGMGq5095638@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Jan 12 16:22:16 2015 New Revision: 376837 URL: https://svnweb.freebsd.org/changeset/ports/376837 QAT: https://qat.redports.org/buildarchive/r376837/ Log: Allow to install optional high-resolution textures; these are supported by 0.12.x versions and first two of 0.13.x; have to revisit it upon update to 0.13.2 (coming soon). Modified: head/astro/stellarium-qt4/Makefile head/astro/stellarium-qt4/distinfo head/astro/stellarium-qt4/pkg-plist head/astro/stellarium/Makefile head/astro/stellarium/distinfo Modified: head/astro/stellarium-qt4/Makefile ============================================================================== --- head/astro/stellarium-qt4/Makefile Mon Jan 12 16:17:14 2015 (r376836) +++ head/astro/stellarium-qt4/Makefile Mon Jan 12 16:22:16 2015 (r376837) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY:= ${DISTFILES} +EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat\:stars?} PKGNAMESUFFIX= -qt4 MAINTAINER= danfe@FreeBSD.org @@ -22,9 +22,10 @@ INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= MORE_STARS MULTIMEDIA SCRIPTING DOCS +OPTIONS_DEFINE= MORE_STARS HR_TEXTURES MULTIMEDIA SCRIPTING DOCS OPTIONS_DEFAULT= MULTIMEDIA SCRIPTING MORE_STARS_DESC= Install extra star catalogs (1.0GB) +HR_TEXTURES_DESC= Install high-resolution textures MULTIMEDIA_DESC= Sound and video support (via Phonon) SCRIPTING_DESC= Scripting support @@ -42,6 +43,14 @@ PLIST_SUB+= MORE_STARS="" PLIST_SUB+= MORE_STARS="@comment " .endif +.if ${PORT_OPTIONS:MHR_TEXTURES} +MASTER_SITES+= SF/${PORTNAME}/textures:gfx +DISTFILES+= textures-1K.zip:gfx milkyway.zip:gfx # yes, in this order +PLIST_SUB+= TEXTURES="" +.else +PLIST_SUB+= TEXTURES="@comment " +.endif + .if ${PORT_OPTIONS:MMULTIMEDIA} USE_QT4+= phonon .else @@ -69,6 +78,9 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default .endif +.if ${PORT_OPTIONS:MHR_TEXTURES} + ${INSTALL_DATA} ${WRKDIR}/*.png ${STAGEDIR}${DATADIR}/textures +.endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/astro/stellarium-qt4/distinfo ============================================================================== --- head/astro/stellarium-qt4/distinfo Mon Jan 12 16:17:14 2015 (r376836) +++ head/astro/stellarium-qt4/distinfo Mon Jan 12 16:22:16 2015 (r376837) @@ -10,3 +10,7 @@ SHA256 (stars_7_2v0_1.cat) = 4d812c078f0 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 +SHA256 (milkyway.zip) = cffc11d22a1e0596e8d01800f54627a67a3ebcc745e5d138819e40d247aaa0d1 +SIZE (milkyway.zip) = 6389431 Modified: head/astro/stellarium-qt4/pkg-plist ============================================================================== --- head/astro/stellarium-qt4/pkg-plist Mon Jan 12 16:17:14 2015 (r376836) +++ head/astro/stellarium-qt4/pkg-plist Mon Jan 12 16:22:16 2015 (r376837) @@ -765,8 +765,12 @@ man/man1/stellarium.1.gz %%DATADIR%%/stars/default/stars_hip_sp_0v0_0.cat %%DATADIR%%/textures/amalthea.png %%DATADIR%%/textures/ariel.png +%%TEXTURES%%%%DATADIR%%/textures/bianca.png %%DATADIR%%/textures/callisto.png %%DATADIR%%/textures/charon.png +%%TEXTURES%%%%DATADIR%%/textures/comet.png +%%TEXTURES%%%%DATADIR%%/textures/cometComa.png +%%TEXTURES%%%%DATADIR%%/textures/cometTail.png %%DATADIR%%/textures/corona.png %%DATADIR%%/textures/deimos.png %%DATADIR%%/textures/dione.png @@ -775,15 +779,20 @@ man/man1/stellarium.1.gz %%DATADIR%%/textures/earth_cmap.png %%DATADIR%%/textures/earthmap.png %%DATADIR%%/textures/enceladus.png +%%TEXTURES%%%%DATADIR%%/textures/epimetheus.png +%%TEXTURES%%%%DATADIR%%/textures/eros.png %%DATADIR%%/textures/europa.png %%DATADIR%%/textures/fog.png %%DATADIR%%/textures/fogridge.png %%DATADIR%%/textures/ganymede.png +%%TEXTURES%%%%DATADIR%%/textures/gaspra.png %%DATADIR%%/textures/halo.png %%DATADIR%%/textures/haloLune.png %%DATADIR%%/textures/hyperion.png %%DATADIR%%/textures/iapetus.png +%%TEXTURES%%%%DATADIR%%/textures/ida.png %%DATADIR%%/textures/io.png +%%TEXTURES%%%%DATADIR%%/textures/janus.png %%DATADIR%%/textures/jupiter.png %%DATADIR%%/textures/logo24bits.png %%DATADIR%%/textures/lune.png @@ -793,6 +802,7 @@ man/man1/stellarium.1.gz %%DATADIR%%/textures/mimas.png %%DATADIR%%/textures/miranda.png %%DATADIR%%/textures/moon.png +%%TEXTURES%%%%DATADIR%%/textures/moon_normals.png %%DATADIR%%/textures/neb.png %%DATADIR%%/textures/neb_dif.png %%DATADIR%%/textures/neb_gal.png @@ -805,11 +815,13 @@ man/man1/stellarium.1.gz %%DATADIR%%/textures/nomap.png %%DATADIR%%/textures/oberon.png %%DATADIR%%/textures/phobos.png +%%TEXTURES%%%%DATADIR%%/textures/phoebe.png %%DATADIR%%/textures/planet-indicator.png %%DATADIR%%/textures/pluto.png %%DATADIR%%/textures/pointeur2.png %%DATADIR%%/textures/pointeur4.png %%DATADIR%%/textures/pointeur5.png +%%TEXTURES%%%%DATADIR%%/textures/prometheus.png %%DATADIR%%/textures/proteus.png %%DATADIR%%/textures/rhea.png %%DATADIR%%/textures/saturn.png @@ -817,6 +829,7 @@ man/man1/stellarium.1.gz %%DATADIR%%/textures/star16x16.png %%DATADIR%%/textures/sun.png %%DATADIR%%/textures/tethys.png +%%TEXTURES%%%%DATADIR%%/textures/telescope.png %%DATADIR%%/textures/titan.png %%DATADIR%%/textures/titania.png %%DATADIR%%/textures/triton.png @@ -824,6 +837,8 @@ man/man1/stellarium.1.gz %%DATADIR%%/textures/uranus.png %%DATADIR%%/textures/uranus_rings.png %%DATADIR%%/textures/venus.png +%%TEXTURES%%%%DATADIR%%/textures/vesta.png +%%TEXTURES%%%%DATADIR%%/textures/zenith.png share/applications/stellarium.desktop share/icons/hicolor/16x16/apps/stellarium.png share/icons/hicolor/32x32/apps/stellarium.png Modified: head/astro/stellarium/Makefile ============================================================================== --- head/astro/stellarium/Makefile Mon Jan 12 16:17:14 2015 (r376836) +++ head/astro/stellarium/Makefile Mon Jan 12 16:22:16 2015 (r376837) @@ -6,7 +6,7 @@ PORTVERSION= 0.13.1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY:= ${DISTFILES} +EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat\:stars?} MAINTAINER= danfe@FreeBSD.org COMMENT= 3D photo-realistic sky renderer (planetarium) @@ -20,9 +20,10 @@ INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= MORE_STARS MULTIMEDIA DOCS +OPTIONS_DEFINE= MORE_STARS HR_TEXTURES MULTIMEDIA DOCS OPTIONS_DEFAULT= MULTIMEDIA MORE_STARS_DESC= Install extra star catalogs (1.0GB) +HR_TEXTURES_DESC= Install high-resolution textures MULTIMEDIA_DESC= Sound and video support .include <bsd.port.options.mk> @@ -39,6 +40,11 @@ PLIST_SUB+= MORE_STARS="" PLIST_SUB+= MORE_STARS="@comment " .endif +.if ${PORT_OPTIONS:MHR_TEXTURES} +MASTER_SITES+= SF/${PORTNAME}/textures:gfx +DISTFILES+= textures-1K.zip:gfx milkyway.zip:gfx # yes, in this order +.endif + .if ${PORT_OPTIONS:MMULTIMEDIA} USE_QT5+= multimedia .else @@ -53,6 +59,9 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default .endif +.if ${PORT_OPTIONS:MHR_TEXTURES} + ${INSTALL_DATA} ${WRKDIR}/*.png ${STAGEDIR}${DATADIR}/textures +.endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/astro/stellarium/distinfo ============================================================================== --- head/astro/stellarium/distinfo Mon Jan 12 16:17:14 2015 (r376836) +++ head/astro/stellarium/distinfo Mon Jan 12 16:22:16 2015 (r376837) @@ -10,3 +10,7 @@ SHA256 (stars_7_2v0_1.cat) = 4d812c078f0 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 +SHA256 (milkyway.zip) = cffc11d22a1e0596e8d01800f54627a67a3ebcc745e5d138819e40d247aaa0d1 +SIZE (milkyway.zip) = 6389431
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501121622.t0CGMGq5095638>