Date: Sat, 21 Jan 2012 00:32:47 -0500 From: Eitan Adler <eadler@freebsd.org> To: Wesley Shields <wxs@freebsd.org> Cc: Michael Scheidell <scheidell@freebsd.org>, cvs-ports@freebsd.org, gabor@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/astro/merkaartor Makefile Message-ID: <CAF6rxgmgFayVQw64TNtj4e4QJCUHs%2B=8YFFODPp=GmnGG1hdMw@mail.gmail.com> In-Reply-To: <20120121031649.GA89853@atarininja.org> References: <201201210047.q0L0lGNH027714@repoman.freebsd.org> <20120121031649.GA89853@atarininja.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jan 20, 2012 at 10:16 PM, Wesley Shields <wxs@freebsd.org> wrote: > On Sat, Jan 21, 2012 at 12:47:16AM +0000, Michael Scheidell wrote: >> scheidell =C2=A0 =C2=A02012-01-21 00:47:16 UTC >> >> =C2=A0 FreeBSD ports repository >> >> =C2=A0 Modified files: >> =C2=A0 =C2=A0 astro/merkaartor =C2=A0 =C2=A0 Makefile >> =C2=A0 Log: >> =C2=A0 - Don't use INSTALL_ICONS when Gnome not installed >> >> =C2=A0 PR: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ports/164344 >> =C2=A0 Approved by: =C2=A0 =C2=A0gabor(mentor, implicit) >> >> =C2=A0 Revision =C2=A0Changes =C2=A0 =C2=A0Path >> =C2=A0 1.20 =C2=A0 =C2=A0 =C2=A0+5 -2 =C2=A0 =C2=A0 =C2=A0ports/astro/me= rkaartor/Makefile >> http://cvsweb.FreeBSD.org/ports/astro/merkaartor/Makefile.diff?r1=3D1.19= &r2=3D1.20 >> | --- ports/astro/merkaartor/Makefile 2011/07/03 15:49:55 =C2=A0 =C2=A0 = 1.19 >> | +++ ports/astro/merkaartor/Makefile 2012/01/21 00:47:16 =C2=A0 =C2=A0 = 1.20 >> | @@ -2,7 +2,7 @@ >> | =C2=A0# Date created: =C2=A0 =C2=A0 =C2=A0 =C2=A09 January 2009 >> | =C2=A0# Whom: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0s= laven@rezic.de >> | =C2=A0# >> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/astro/merkaartor/Mak= efile,v 1.19 2011/07/03 15:49:55 jlaffaye Exp $ >> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/astro/merkaartor/Mak= efile,v 1.20 2012/01/21 00:47:16 scheidell Exp $ >> | =C2=A0# >> | >> | =C2=A0PORTNAME=3D =C2=A0merkaartor >> | @@ -14,10 +14,10 @@ MASTER_SITES=3D =C2=A0 http://www.merkaartor.be/a >> | =C2=A0MAINTAINER=3D =C2=A0 =C2=A0 =C2=A0 =C2=A0dev2@heesakkers.info >> | =C2=A0COMMENT=3D =C2=A0 An openstreetmap mapping program >> | >> | -BUILD_DEPENDS=3D =C2=A0 =C2=A0 ${LOCALBASE}/include/boost/concept_che= ck.hpp:${PORTSDIR}/devel/boost-libs >> | - >> | =C2=A0LICENSE=3D =C2=A0 GPLv2 >> | >> | +BUILD_DEPENDS=3D =C2=A0 =C2=A0 ${LOCALBASE}/include/boost/concept_che= ck.hpp:${PORTSDIR}/devel/boost-libs >> | + >> | =C2=A0USE_BZIP2=3D yes >> | =C2=A0USE_LDCONFIG=3D =C2=A0 =C2=A0 =C2=A0yes >> | >> | @@ -25,7 +25,10 @@ USE_QT_VER=3D =C2=A0 =C2=A0 =C2=A04 >> | =C2=A0QT_COMPONENTS=3D =C2=A0 =C2=A0 qmake_build uic_build moc_build r= cc_build \ >> | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 gui network svg webkit xml i= mageformats script scripttools >> | =C2=A0MAKE_JOBS_SAFE=3D =C2=A0 =C2=A0yes >> | + >> | +.if exists(${LOCALBASE}/bin/gnome-session) >> | =C2=A0INSTALLS_ICONS=3D =C2=A0 =C2=A0yes >> | +.endif > > Isn't there a better way to do this? > > As it stands now, if I don't have gnome-session then this port will not > bring in the gnome stuff for me. =C2=A0What if I want it to bring in gnom= e? > There is no way for this port to conditionally bring in gnome for me. If > it sees I already have gnome it will honor that but there is no way for > me to say "I don't have gnome, but please bring in the necessary parts > and register dependencies for me". In addition, what if I have GNOME on the box I'm building on but would like to build a port for a box without GNOME? Automagical dependencies should be avoided. --=20 Eitan Adler Source & Ports committer X11, Bugbusting teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgmgFayVQw64TNtj4e4QJCUHs%2B=8YFFODPp=GmnGG1hdMw>