Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jan 2015 13:00:34 +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: r377597 - in head/astro: stellarium stellarium-qt4
Message-ID:  <201501211300.t0LD0YDm089112@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Jan 21 13:00:33 2015
New Revision: 377597
URL: https://svnweb.freebsd.org/changeset/ports/377597
QAT: https://qat.redports.org/buildarchive/r377597/

Log:
  Reduce the differences between two ports.

Modified:
  head/astro/stellarium-qt4/Makefile
  head/astro/stellarium/Makefile

Modified: head/astro/stellarium-qt4/Makefile
==============================================================================
--- head/astro/stellarium-qt4/Makefile	Wed Jan 21 12:57:27 2015	(r377596)
+++ head/astro/stellarium-qt4/Makefile	Wed Jan 21 13:00:33 2015	(r377597)
@@ -34,7 +34,7 @@ SCRIPTING_DESC=		Scripting support
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMORE_STARS}
+.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
@@ -46,7 +46,7 @@ PLIST_SUB+=	MORE_STARS=""
 PLIST_SUB+=	MORE_STARS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MTEXTURES}
+.if ${PORT_OPTIONS:MTEXTURES} || ${.TARGETS:Mmakesum}
 MASTER_SITES+=	SF/${PORTNAME}/Extra-data-files/textures:gfx
 DISTFILES+=	textures-1K.zip:gfx
 PLIST_SUB+=	TEXTURES=""

Modified: head/astro/stellarium/Makefile
==============================================================================
--- head/astro/stellarium/Makefile	Wed Jan 21 12:57:27 2015	(r377596)
+++ head/astro/stellarium/Makefile	Wed Jan 21 13:00:33 2015	(r377597)
@@ -13,6 +13,8 @@ COMMENT=	3D photo-realistic sky renderer
 
 LICENSE=	GPLv2
 
+CONFLICTS_INSTALL=	${PORTNAME}-0.12.*
+
 USES=		cmake gettext iconv
 USE_QT5=	qmake_build buildtools_build linguisttools_build \
 		core concurrent declarative



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501211300.t0LD0YDm089112>