From owner-svn-ports-all@freebsd.org Tue Mar 29 16:18:00 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 EA7EFAE2C11; Tue, 29 Mar 2016 16:18:00 +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 956A014BB; Tue, 29 Mar 2016 16:18:00 +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 u2TGHxNO070061; Tue, 29 Mar 2016 16:17:59 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2TGHxUt070060; Tue, 29 Mar 2016 16:17:59 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201603291617.u2TGHxUt070060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 29 Mar 2016 16:17:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412124 - head/astro/stellarium-qt4 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.21 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: Tue, 29 Mar 2016 16:18:01 -0000 Author: danfe Date: Tue Mar 29 16:17:59 2016 New Revision: 412124 URL: https://svnweb.freebsd.org/changeset/ports/412124 Log: - Reduce the diffs with `astro/stellarium', by using some option helpers and clarifying LICENSE (GPLv2+) - Drop currently no-op attempt of in-place patching 's|std::free|::free|' Modified: head/astro/stellarium-qt4/Makefile Modified: head/astro/stellarium-qt4/Makefile ============================================================================== --- head/astro/stellarium-qt4/Makefile Tue Mar 29 16:05:47 2016 (r412123) +++ head/astro/stellarium-qt4/Makefile Tue Mar 29 16:17:59 2016 (r412124) @@ -12,7 +12,7 @@ EXTRACT_ONLY= ${_DISTFILES:Nstars_*.cat} MAINTAINER= danfe@FreeBSD.org COMMENT= 3D photo-realistic sky renderer (planetarium) -LICENSE= GPLv2 +LICENSE= GPLv2+ CONFLICTS_INSTALL= ${PORTNAME}-0.13.* PORTSCOUT= limit:^0\.12\. # track only 0.12.x (legacy) @@ -23,7 +23,7 @@ USE_QT4= moc_build rcc_build uic_build q PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= MORE_STARS TEXTURES MULTIMEDIA SCRIPTING DOCS +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 @@ -67,20 +67,17 @@ 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} +post-install-MORE_STARS-on: ${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default -.endif -.if ${PORT_OPTIONS:MTEXTURES} + +post-install-TEXTURES-on: (cd ${WRKDIR} && for f in *.png; do \ new=`${STAT} -f '%z' $$f` ; \ existing=`${STAT} -qf '%z' \ @@ -93,7 +90,8 @@ post-install: done) @${REINPLACE_CMD} -e '1410s|nomap|vesta|' \ ${STAGEDIR}${DATADIR}/data/ssystem.ini -.endif + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}