Date: Fri, 22 Jun 2018 22:21:29 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473091 - in head/Mk: . Uses Message-ID: <201806222221.w5MMLTXJ036469@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Fri Jun 22 22:21:29 2018 New Revision: 473091 URL: https://svnweb.freebsd.org/changeset/ports/473091 Log: bsd.gecko.mk / USES=gecko : remove expired libxul support. Tested with "make index" Modified: head/Mk/Uses/gecko.mk head/Mk/bsd.gecko.mk Modified: head/Mk/Uses/gecko.mk ============================================================================== --- head/Mk/Uses/gecko.mk Fri Jun 22 22:18:53 2018 (r473090) +++ head/Mk/Uses/gecko.mk Fri Jun 22 22:21:29 2018 (r473091) @@ -6,8 +6,7 @@ # # Feature: gecko # Usage: USES=gecko or USES=gecko:ARGS -# Valid ARGS: libxul, firefox, seamonkey, thunderbird -# in case the first argument is not libxul +# Valid ARGS: firefox, seamonkey, thunderbird # The following arguments are available # - build: also add the dependency as a build # dependency @@ -18,24 +17,10 @@ .if !defined(_INCLUDE_USES_GECKO_MK) _INCLUDE_USES_GECKO_MK= yes -.if empty(gecko_ARGS) -gecko_ARGS= libxul -.endif - _GECKO_VERSION= ${gecko_ARGS:M[0-9][0-9]*} -.if ${gecko_ARGS:Mlibxul} -# Compat with older versions -GECKO= libxul -GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config -XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl -XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` +.if ${gecko_ARGS:Mfirefox} -BUILD_DEPENDS+= libxul>=45:www/libxul -RUN_DEPENDS+= libxul>=45:www/libxul - -.elif ${gecko_ARGS:Mfirefox} - _GECKO_DEFAULT_VERSION= 60 _GECKO_VERSIONS= 60 61 _GECKO_TYPE= firefox @@ -78,7 +63,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:C/\..*// 52_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:mail/thunderbird .else -IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird +IGNORE= Unknown type of gecko dependency you may specify either firefox, seamonkey or thunderbird .endif .if defined(_GECKO_TYPE) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Fri Jun 22 22:18:53 2018 (r473090) +++ head/Mk/bsd.gecko.mk Fri Jun 22 22:21:29 2018 (r473091) @@ -89,9 +89,7 @@ USE_XORG= x11 xcomposite xdamage xext xfixes xrender x HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes -.if ${MOZILLA} != "libxul" BUNDLE_LIBS= yes -.endif .if ${MOZILLA_VER:R:R} >= 49 USES+= compiler:c++14-lang
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806222221.w5MMLTXJ036469>