Date: Fri, 20 Jan 2012 20:26:30 GMT From: Oliver Heesakkers <dev2@heesakkers.info> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/164344: [maintainer patch] astro/merkaartor: Don't use INSTALL_ICONS when Gnome not installed Message-ID: <201201202026.q0KKQURL028176@red.freebsd.org> Resent-Message-ID: <201201202030.q0KKUC74074317@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164344
>Category: ports
>Synopsis: [maintainer patch] astro/merkaartor: Don't use INSTALL_ICONS when Gnome not installed
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 20 20:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Oliver Heesakkers
>Release: 9.0-RELEASE #0
>Organization:
>Environment:
>Description:
I recently became aware that INSTALL_ICONS is set in this port that I took over. INSTALL_ICONS appears to be a very Gnome-specific instruction to ensure icons appear in Gnome's menu.
Setting INSTALL_ICONS pulls in a lot of Gnome-specific ports that are not necessary for the correct functioning of Merkaartor.
Ofcourse, if you do use Gnome, setting this would be desirable, so I set INSTALL_ICONS if ${LOCALBASE}/bin/gnome-session is present on the system
I don't know why the diff-output touches the boost line, but it doesn't look to hurt either.
>How-To-Repeat:
Start in an empty FreeBSD environment, start the Merkaartor build and watch it pull in a lot of gnome stuff
>Fix:
diff -ruN merkaartor.orig/Makefile merkaartor/Makefile
--- merkaartor.orig/Makefile 2012-01-20 21:10:31.000000000 +0100
+++ merkaartor/Makefile 2012-01-20 21:11:16.000000000 +0100
@@ -14,10 +14,10 @@
MAINTAINER= dev2@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 @@
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
QMAKEFLAGS= PREFIX=${PREFIX}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201202026.q0KKQURL028176>