gecko: simplify WRKSRC handling

Requested by:	mat

5 files changed, 6 insertions, 14 deletions

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index af78365f822c..fe8b7782a9bf 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -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
@@ -55,8 +56,6 @@ 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}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e35aada6a388..4d9877f16278 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -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
@@ -50,8 +50,6 @@ 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}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 9eef0d6f76cb..2a50d51c3e18 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -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
@@ -37,8 +38,6 @@ BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
-WRKSRC:=	${WRKDIR}/firefox-${DISTVERSION}esr
-
 USE_GL=		gl
 USES=		pathfix shebangfix tar:xz
 SHEBANG_FILES=	xpcom/idl-parser/xpidl/xpidl.py \
diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile
index 748d164191b8..2f42bcaddad6 100644
--- a/www/palemoon/Makefile
+++ b/www/palemoon/Makefile
@@ -46,8 +46,6 @@ OPTIONS_EXCLUDE=	DTRACE INTEGER_SAMPLES JACK SNDIO TEST
 
 .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
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index aa6794ec2f54..a50d03425eb2 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -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}