From owner-svn-ports-all@freebsd.org Fri Aug 5 07:49:19 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7D58BAF3A5; Fri, 5 Aug 2016 07:49:19 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92FF01172; Fri, 5 Aug 2016 07:49:19 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u757nI3X048844; Fri, 5 Aug 2016 07:49:18 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u757nI1I048842; Fri, 5 Aug 2016 07:49:18 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201608050749.u757nI1I048842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 5 Aug 2016 07:49:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419670 - head/astro/stellarium X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2016 07:49:19 -0000 Author: danfe Date: Fri Aug 5 07:49:18 2016 New Revision: 419670 URL: https://svnweb.freebsd.org/changeset/ports/419670 Log: - Install official PDF User Guide as part of the documentation (version number is hardcoded as it is not always in sync with the PORTVERSION) - Make telescope control plugin (and Qt5SerialPort dependency) optional - Remove enforced distfiles checksum recalculation added in r377577: it turned out that updating distinfo manually is easier and a lot faster - Replace some options imperative (explicit) handling with helper knobs - Do not install high resolution textures by default, since they do not have their prime meridians recalibrated yet while stock textures have Discussed with: Alexander Wolf (upstream) Modified: head/astro/stellarium/Makefile head/astro/stellarium/distinfo Modified: head/astro/stellarium/Makefile ============================================================================== --- head/astro/stellarium/Makefile Fri Aug 5 07:40:36 2016 (r419669) +++ head/astro/stellarium/Makefile Fri Aug 5 07:49:18 2016 (r419670) @@ -3,10 +3,11 @@ PORTNAME= stellarium PORTVERSION= 0.15.0 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat} +EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat:N*.pdf} MAINTAINER= danfe@FreeBSD.org COMMENT= 3D photo-realistic sky renderer (planetarium) @@ -17,21 +18,35 @@ CONFLICTS_INSTALL= ${PORTNAME}-qt4-0.12. USES= cmake gettext USE_QT5= qmake_build buildtools_build linguisttools_build \ - concurrent core gui network opengl printsupport \ - serialport widgets + concurrent core gui network opengl printsupport widgets -PORTDOCS= AUTHORS ChangeLog README +PORTDOCS= AUTHORS ChangeLog README stellarium_user_guide-0.15.0-1.pdf + +OPTIONS_DEFINE= DOCS MORE_STARS MULTIMEDIA SCRIPTING TEXTURES \ + TELESCOPE +OPTIONS_DEFAULT= MULTIMEDIA SCRIPTING TELESCOPE -OPTIONS_DEFINE= DOCS MORE_STARS MULTIMEDIA SCRIPTING TEXTURES -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 SCRIPTING_DESC= Scripting support +TELESCOPE_DESC= Telescope control plugin + +DOCS_MASTER_SITES= SF/${PORTNAME}/Stellarium-user-guide/0.15.0-1:ug +DOCS_DISTFILES= stellarium_user_guide-0.15.0-1.pdf:ug + +TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx +TEXTURES_DISTFILES= textures-1K.zip:gfx + +MULTIMEDIA_USE= QT5=multimedia +MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF + +TELESCOPE_USE= QT5=serialport +TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF .include -.if ${PORT_OPTIONS:MMORE_STARS} || ${.TARGETS:Mmakesum} +.if ${PORT_OPTIONS:MMORE_STARS} . for i in 4 5 6 7 8 MASTER_SITES+= SF/${PORTNAME}/Extra-data-files/stars${i}:stars${i} . endfor @@ -43,17 +58,6 @@ PLIST_SUB+= MORE_STARS="" 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 -.endif - -.if ${PORT_OPTIONS:MMULTIMEDIA} -USE_QT5+= multimedia -.else -CMAKE_ARGS+= -DENABLE_MEDIA:BOOL=OFF -.endif - .if ${PORT_OPTIONS:MSCRIPTING} USE_QT5+= script PLIST_SUB+= SCRIPTS="" @@ -62,6 +66,9 @@ CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF PLIST_SUB+= SCRIPTS="@comment " .endif +post-extract-DOCS-on: + @${LN} -sf ${_DISTDIR}/stellarium_user_guide-0.15.0-1.pdf ${WRKSRC} + post-patch: @${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's,-Testscene,&_ground,' \ Modified: head/astro/stellarium/distinfo ============================================================================== --- head/astro/stellarium/distinfo Fri Aug 5 07:40:36 2016 (r419669) +++ head/astro/stellarium/distinfo Fri Aug 5 07:49:18 2016 (r419670) @@ -1,5 +1,7 @@ SHA256 (stellarium-0.15.0.tar.gz) = 74d0e3a69fcbaf1c6278f601a44497fd3e9f2de7dfa11a60197d3afb68288746 SIZE (stellarium-0.15.0.tar.gz) = 147160785 +SHA256 (stellarium_user_guide-0.15.0-1.pdf) = 264d437a1afc0742f5bbadf37115d8cd2b41ac462daf1516657c091955c9217e +SIZE (stellarium_user_guide-0.15.0-1.pdf) = 16155822 SHA256 (stars_4_1v0_1.cat) = 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979 SIZE (stars_4_1v0_1.cat) = 17040932 SHA256 (stars_5_2v0_1.cat) = c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164