From owner-svn-ports-all@FreeBSD.ORG Wed Jan 14 14:20:21 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81154248; Wed, 14 Jan 2015 14:20:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6CA89825; Wed, 14 Jan 2015 14:20:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0EEKLdt013882; Wed, 14 Jan 2015 14:20:21 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0EEKLcN013880; Wed, 14 Jan 2015 14:20:21 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201501141420.t0EEKLcN013880@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 14 Jan 2015 14:20:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377019 - in head/astro: stellarium 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.18-1 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: Wed, 14 Jan 2015 14:20:21 -0000 Author: danfe Date: Wed Jan 14 14:20:20 2015 New Revision: 377019 URL: https://svnweb.freebsd.org/changeset/ports/377019 QAT: https://qat.redports.org/buildarchive/r377019/ Log: Use more neutral way to describe optional textures, since different people may adhere to different definitions of "high-resolution". Modified: head/astro/stellarium-qt4/Makefile head/astro/stellarium/Makefile Modified: head/astro/stellarium-qt4/Makefile ============================================================================== --- head/astro/stellarium-qt4/Makefile Wed Jan 14 13:54:02 2015 (r377018) +++ head/astro/stellarium-qt4/Makefile Wed Jan 14 14:20:20 2015 (r377019) @@ -24,10 +24,10 @@ INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= MORE_STARS HR_TEXTURES MULTIMEDIA SCRIPTING DOCS -OPTIONS_DEFAULT= MULTIMEDIA SCRIPTING HR_TEXTURES +OPTIONS_DEFINE= MORE_STARS TEXTURES MULTIMEDIA SCRIPTING DOCS +OPTIONS_DEFAULT= MULTIMEDIA SCRIPTING TEXTURES MORE_STARS_DESC= Install extra star catalogs (1.0GB) -HR_TEXTURES_DESC= Install high-resolution textures +TEXTURES_DESC= Install better quality textures MULTIMEDIA_DESC= Sound and video support (via Phonon) SCRIPTING_DESC= Scripting support @@ -45,7 +45,7 @@ PLIST_SUB+= MORE_STARS="" PLIST_SUB+= MORE_STARS="@comment " .endif -.if ${PORT_OPTIONS:MHR_TEXTURES} +.if ${PORT_OPTIONS:MTEXTURES} MASTER_SITES+= SF/${PORTNAME}/textures:gfx DISTFILES+= textures-1K.zip:gfx PLIST_SUB+= TEXTURES="" @@ -81,7 +81,7 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default .endif -.if ${PORT_OPTIONS:MHR_TEXTURES} +.if ${PORT_OPTIONS:MTEXTURES} (cd ${WRKDIR} && for f in *.png; do \ new=`${STAT} -f '%z' $$f` ; \ existing=`${STAT} -qf '%z' \ Modified: head/astro/stellarium/Makefile ============================================================================== --- head/astro/stellarium/Makefile Wed Jan 14 13:54:02 2015 (r377018) +++ head/astro/stellarium/Makefile Wed Jan 14 14:20:20 2015 (r377019) @@ -20,10 +20,10 @@ INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= MORE_STARS HR_TEXTURES MULTIMEDIA DOCS +OPTIONS_DEFINE= MORE_STARS TEXTURES MULTIMEDIA DOCS OPTIONS_DEFAULT= MULTIMEDIA MORE_STARS_DESC= Install extra star catalogs (1.0GB) -HR_TEXTURES_DESC= Install high-resolution textures +TEXTURES_DESC= Install better quality textures MULTIMEDIA_DESC= Sound and video support .include @@ -40,7 +40,7 @@ PLIST_SUB+= MORE_STARS="" PLIST_SUB+= MORE_STARS="@comment " .endif -.if ${PORT_OPTIONS:MHR_TEXTURES} +.if ${PORT_OPTIONS:MTEXTURES} MASTER_SITES+= SF/${PORTNAME}/textures:gfx DISTFILES+= textures-1K.zip:gfx .endif @@ -59,14 +59,14 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/stars_[45678]_[12]v0_1.cat \ ${STAGEDIR}${DATADIR}/stars/default .endif -.if ${PORT_OPTIONS:MHR_TEXTURES} +.if ${PORT_OPTIONS:MTEXTURES} (cd ${WRKDIR} && for f in *.png; do \ new=`${STAT} -f '%z' $$f` ; \ existing=`${STAT} -f '%z' \ ${STAGEDIR}${DATADIR}/textures/$$f` ; \ ${TEST} $$new -gt $$existing || continue ; \ ${ECHO_CMD} "-- Replacing texture: $$f\ - (has larger file size)" ; \ + (has larger file size: $$new vs. $$existing)" ; \ ${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/textures ; \ done) .endif