From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 7 21:20:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E521A1C4 for ; Thu, 7 Feb 2013 21:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id CACABE98 for ; Thu, 7 Feb 2013 21:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r17LK1QG095170 for ; Thu, 7 Feb 2013 21:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r17LK1cU095169; Thu, 7 Feb 2013 21:20:01 GMT (envelope-from gnats) Resent-Date: Thu, 7 Feb 2013 21:20:01 GMT Resent-Message-Id: <201302072120.r17LK1cU095169@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pawel Pekala Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 082C4B93 for ; Thu, 7 Feb 2013 21:15:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id D4F89E37 for ; Thu, 7 Feb 2013 21:15:50 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r17LFo1o062646 for ; Thu, 7 Feb 2013 21:15:50 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r17LFo6r062645; Thu, 7 Feb 2013 21:15:50 GMT (envelope-from nobody) Message-Id: <201302072115.r17LFo6r062645@red.freebsd.org> Date: Thu, 7 Feb 2013 21:15:50 GMT From: Pawel Pekala To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/175937: x11-toolkits/swt-devel fix build when MOZILLA=on X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2013 21:20:02 -0000 >Number: 175937 >Category: ports >Synopsis: x11-toolkits/swt-devel fix build when MOZILLA=on >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 07 21:20:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Pawel Pekala >Release: 10.0-CURRENT >Organization: >Environment: FreeBSD blaviken.slowicza.org 10.0-CURRENT FreeBSD 10.0-CURRENT #4: Sat Feb 2 10:36:19 CET 2013 corn@blaviken.slowicza.org:/usr/obj/usr/src/sys/BLAVIKEN64 amd64 >Description: When MOZILLA options is turned on build fails: http://people.freebsd.org/~pawel/buildlogs/swt-devel-3.7.1_1,1.log Attached patch fixes build and converts port to OptionsNG. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/x11-toolkits/swt-devel/Makefile x11-toolkits/swt-devel/Makefile --- /usr/ports/x11-toolkits/swt-devel/Makefile 2012-12-10 14:48:09.000000000 +0100 +++ x11-toolkits/swt-devel/Makefile 2013-02-07 22:03:12.000000000 +0100 @@ -39,26 +39,28 @@ NO_WRKSUBDIR= yes -OPTIONS= CAIRO "Cairo Support" on \ - GNOMEVFS "Gnome VFS Support" on \ - MOZILLA "Gecko Browser Support" off +OPTIONS_DEFINE= CAIRO GNOMEVFS MOZILLA +GNOMEVFS_DESC= Gnome VFS support +MOZILLA_DESC= Gecko browser support -.include +OPTIONS_DEFAULT=CAIRO GNOMEVFS + +.include -.if defined(WITH_CAIRO) -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +.if ${PORT_OPTIONS:MCAIRO} +LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo PLIST_FILES+= lib/libswt-cairo-gtk-%%BUILD%%.so MAKE_CAIRO= make_cairo .endif -.if defined(WITH_GNOMEVFS) +.if ${PORT_OPTIONS:MGNOMEVFS} USE_GNOME+= gnomevfs2 libgnome libgnomeui PLIST_FILES+= lib/libswt-gnome-gtk-%%BUILD%%.so MAKE_GNOME= make_gnome .endif -.if defined(WITH_MOZILLA) -USE_MOZILLA= libxul +.if ${PORT_OPTIONS:MMOZILLA} +USE_GECKO= libxul19 PLIST_FILES+= lib/libswt-xulrunner-gtk-%%BUILD%%.so MAKE_MOZILLA= make_xulrunner .endif @@ -76,6 +78,8 @@ DIST_EXT= gtk-linux-x86 .endif +.include + post-extract: .if ${OSVERSION} > 900044 @(cd ${WRKSRC} && /usr/bin/unzip -qo *.zip) >Release-Note: >Audit-Trail: >Unformatted: