cvs commit: ports/astro/merkaartor Makefile

[Eitan Adler]

On Fri, Jan 20, 2012 at 10:16 PM, Wesley Shields <wxs at freebsd.org> wrote:
> On Sat, Jan 21, 2012 at 12:47:16AM +0000, Michael Scheidell wrote:
>> scheidell    2012-01-21 00:47:16 UTC
>>
>>   FreeBSD ports repository
>>
>>   Modified files:
>>     astro/merkaartor     Makefile
>>   Log:
>>   - Don't use INSTALL_ICONS when Gnome not installed
>>
>>   PR:             ports/164344
>>   Approved by:    gabor(mentor, implicit)
>>
>>   Revision  Changes    Path
>>   1.20      +5 -2      ports/astro/merkaartor/Makefile
>> http://cvsweb.FreeBSD.org/ports/astro/merkaartor/Makefile.diff?r1=1.19&r2=1.20
>> | --- ports/astro/merkaartor/Makefile 2011/07/03 15:49:55     1.19
>> | +++ ports/astro/merkaartor/Makefile 2012/01/21 00:47:16     1.20
>> | @@ -2,7 +2,7 @@
>> |  # Date created:        9 January 2009
>> |  # Whom:                slaven at rezic.de
>> |  #
>> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/astro/merkaartor/Makefile,v 1.19 2011/07/03 15:49:55 jlaffaye Exp $
>> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/astro/merkaartor/Makefile,v 1.20 2012/01/21 00:47:16 scheidell Exp $
>> |  #
>> |
>> |  PORTNAME=  merkaartor
>> | @@ -14,10 +14,10 @@ MASTER_SITES=   http://www.merkaartor.be/a
>> |  MAINTAINER=        dev2 at heesakkers.info
>> |  COMMENT=   An openstreetmap mapping program
>> |
>> | -BUILD_DEPENDS=     ${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
>> | -
>> |  LICENSE=   GPLv2
>> |
>> | +BUILD_DEPENDS=     ${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
>> | +
>> |  USE_BZIP2= yes
>> |  USE_LDCONFIG=      yes
>> |
>> | @@ -25,7 +25,10 @@ USE_QT_VER=      4
>> |  QT_COMPONENTS=     qmake_build uic_build moc_build rcc_build \
>> |             gui network svg webkit xml imageformats script scripttools
>> |  MAKE_JOBS_SAFE=    yes
>> | +
>> | +.if exists(${LOCALBASE}/bin/gnome-session)
>> |  INSTALLS_ICONS=    yes
>> | +.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.  What if I want it to bring in gnome?
> 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.


-- 
Eitan Adler
Source & Ports committer
X11, Bugbusting teams