Date: Thu, 7 Feb 2013 21:15:50 GMT From: Pawel Pekala <pawel@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/175937: x11-toolkits/swt-devel fix build when MOZILLA=on Message-ID: <201302072115.r17LFo6r062645@red.freebsd.org> Resent-Message-ID: <201302072120.r17LK1cU095169@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk> +OPTIONS_DEFAULT=CAIRO GNOMEVFS + +.include <bsd.port.options.mk> -.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 <bsd.port.pre.mk> + post-extract: .if ${OSVERSION} > 900044 @(cd ${WRKSRC} && /usr/bin/unzip -qo *.zip) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302072115.r17LFo6r062645>