From 258d5ec12fdd9f7ae86b524efa3be01b7aa41e9f Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Thu, 11 Aug 2011 16:07:47 +0000
Subject: - Fix build if build is done in the same make invocation with make
 config [1] - Remove dependency on unneeded QT components

Reported by:	glebius [1]
---
 astro/josm/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/astro/josm/Makefile b/astro/josm/Makefile
index f463b539340..0c0617bb763 100644
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -39,8 +39,7 @@ OPTIONS=	WEBKIT_IMAGE "Build webkit-image (needed for Yahoo imagery)" on
 PLIST_FILES+=	bin/webkit-image
 
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui imageformats moc_build network script \
-		rcc_build uic_build webkit
+QT_COMPONENTS=	corelib gui webkit moc_build
 
 do-build:
 	cd ${WRKSRC} && \
@@ -49,7 +48,9 @@ do-build:
 		${DISTDIR}/${WEBKITIMG_SRC} -o ${WEBKITIMG} -lQtCore -lQtWebKit \
 		-lQtGui
 .else
-NO_BUILD=	yes
+# setting NO_BUILD here won't work
+do-build:
+	@${DO_NADA}
 .endif
 
 do-install:
-- 
cgit