summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/xulrunner/Makefile4
-rw-r--r--devel/xulrunner/dist.mk8
2 files changed, 7 insertions, 5 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 1158e8a9c2e..83bc86f1cec 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/26 16:22:59 tron Exp $
+# $NetBSD: Makefile,v 1.36 2010/01/31 20:54:44 tnn Exp $
.include "dist.mk"
-PKGNAME= ${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//}
+PKGNAME= xulrunner-${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}
CATEGORIES= devel www
MAINTAINER= tnn@NetBSD.org
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index 35e2e37d8d5..ebc878187f7 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.5 2010/01/26 16:22:59 tron Exp $
+# $NetBSD: dist.mk,v 1.6 2010/01/31 20:54:44 tnn Exp $
#
# used by devel/nspr/Makefile
# used by devel/nss/Makefile
@@ -6,11 +6,13 @@
# used by www/firefox/Makefile
DISTNAME= firefox-${FIREFOX_VER}.source
-FIREFOX_VER= 3.5.7
+FIREFOX_VER= 3.5.${MOZ_BRANCH_MINOR}
+MOZ_BRANCH= 1.9.1
+MOZ_BRANCH_MINOR= 7
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.bz2
DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches
-WRKSRC= ${WRKDIR}/mozilla-1.9.1
+WRKSRC= ${WRKDIR}/mozilla-${MOZ_BRANCH}