From owner-svn-ports-head@FreeBSD.ORG  Wed Jan 21 13:00:34 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 D6E78C71;
 Wed, 21 Jan 2015 13:00:34 +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 C24E7CAF;
 Wed, 21 Jan 2015 13:00:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0LD0YRi089114;
 Wed, 21 Jan 2015 13:00:34 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0LD0YDm089112;
 Wed, 21 Jan 2015 13:00:34 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201501211300.t0LD0YDm089112@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 21 Jan 2015 13:00:34 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2015 13:00:35 -0000

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