Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Nov 2017 22:53:33 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r454808 - in head: Mk mail/thunderbird www/firefox www/firefox-esr www/libxul www/palemoon www/seamonkey
Message-ID:  <201711232253.vANMrXPD057130@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Nov 23 22:53:32 2017
New Revision: 454808
URL: https://svnweb.freebsd.org/changeset/ports/454808

Log:
  gecko: simplify WRKSRC handling
  
  Requested by:	mat

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/libxul/Makefile   (contents, props changed)
  head/www/palemoon/Makefile   (contents, props changed)
  head/www/seamonkey/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/Mk/bsd.gecko.mk	Thu Nov 23 22:53:32 2017	(r454808)
@@ -125,7 +125,6 @@ LLD_UNSAFE=	yes
 
 MOZILLA_SUFX?=	none
 MOZSRC?=	${WRKSRC}
-WRKSRC?=	${WRKDIR}/mozilla
 PLISTF?=	${WRKDIR}/plist_files
 
 MOZ_OBJDIR?=	${WRKSRC}/obj-${ARCH:C/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/mail/thunderbird/Makefile	Thu Nov 23 22:53:32 2017	(r454808)
@@ -6,8 +6,7 @@ DISTVERSION=	52.5.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
-DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
@@ -56,7 +55,6 @@ OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3 LIGHTNING
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${PORT_OPTIONS:MLIGHTNING}

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/www/firefox-esr/Makefile	Thu Nov 23 22:53:32 2017	(r454808)
@@ -3,13 +3,14 @@
 
 PORTNAME=	firefox
 DISTVERSION=	52.5.0
-DISTVERSIONSUFFIX=esr.source
+DISTVERSIONSUFFIX=esr
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
 PKGNAMESUFFIX=	-esr
+DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -54,8 +55,6 @@ OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}esr
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/www/firefox/Makefile	Thu Nov 23 22:53:32 2017	(r454808)
@@ -3,12 +3,12 @@
 
 PORTNAME=	firefox
 DISTVERSION=	57.0
-DISTVERSIONSUFFIX=.source
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source
+DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -49,8 +49,6 @@ MOZ_OPTIONS=	--enable-application=browser \
 OPTIONS_DEFAULT=	BUNDLED_CAIRO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/www/libxul/Makefile	Thu Nov 23 22:53:32 2017	(r454808)
@@ -7,7 +7,8 @@ PORTREVISION=	9
 CATEGORIES?=	www devel
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
 		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build3/source
-DISTNAME=	firefox-${DISTVERSION}esr.source
+DISTNAME=	firefox-${DISTVERSION}esr
+DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER?=	gecko@FreeBSD.org
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
@@ -36,8 +37,6 @@ BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
 		zip:archivers/zip
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
-
-WRKSRC:=	${WRKDIR}/firefox-${DISTVERSION}esr
 
 USE_GL=		gl
 USES=		pathfix shebangfix tar:xz

Modified: head/www/palemoon/Makefile
==============================================================================
--- head/www/palemoon/Makefile	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/www/palemoon/Makefile	Thu Nov 23 22:53:32 2017	(r454808)
@@ -46,8 +46,6 @@ OPTIONS_EXCLUDE=	DTRACE INTEGER_SAMPLES JACK SNDIO TES
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
-WRKSRC:=	${WRKDIR}/${GH_PROJECT}-${DISTVERSIONFULL}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Thu Nov 23 22:34:23 2017	(r454807)
+++ head/www/seamonkey/Makefile	Thu Nov 23 22:53:32 2017	(r454808)
@@ -8,8 +8,7 @@ MOZILLA_VER=	52 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source
-DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -54,7 +53,6 @@ LDAP_DESC?=	LDAP support for Mailnews
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.options.mk>
 
-WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ! ${PORT_OPTIONS:MLDAP}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711232253.vANMrXPD057130>