Sun Jun 7 22:32:55 2020 UTC ()
seamonkey: use correct mozilla-common, missed commit...


(nia)
diff -r1.214 -r1.215 pkgsrc/www/seamonkey/Makefile
cvs diff -r1.214 -r1.215 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2020/06/02 08:24:58 1.214
+++ pkgsrc/www/seamonkey/Makefile 2020/06/07 22:32:55 1.215
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.214 2020/06/02 08:24:58 adam Exp $ 1# $NetBSD: Makefile,v 1.215 2020/06/07 22:32:55 nia Exp $
2 2
3DISTNAME= seamonkey-${SM_VER}.source 3DISTNAME= seamonkey-${SM_VER}.source
4PKGNAME= seamonkey-${SM_VER:S/b/beta/} 4PKGNAME= seamonkey-${SM_VER:S/b/beta/}
5PKGREVISION= 2 5PKGREVISION= 2
6SM_VER= 2.53.2 6SM_VER= 2.53.2
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.seamonkey-project.org/ 12HOMEPAGE= https://www.seamonkey-project.org/
13COMMENT= Full-featured gecko-based browser 13COMMENT= Full-featured gecko-based browser
14LICENSE= mpl-2.0 14LICENSE= mpl-2.0
@@ -17,27 +17,28 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/.source/ @@ -17,27 +17,28 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/.source/
17MOZILLA_DIR= mozilla/ 17MOZILLA_DIR= mozilla/
18PLIST_SRC+= ${PLIST_SRC_DFLT} 18PLIST_SRC+= ${PLIST_SRC_DFLT}
19USE_LANGUAGES+= c c++ 19USE_LANGUAGES+= c c++
20USE_TOOLS+= unzip pax 20USE_TOOLS+= unzip pax
21 21
22NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/seamonkey 22NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/seamonkey
23NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/seamonkey-bin 23NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/seamonkey-bin
24 24
25GCC_REQD+= 6 25GCC_REQD+= 6
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28.include "options.mk" 28.include "options.mk"
29# See mozilla/config/milestone.txt 29# See mozilla/config/milestone.txt
30.include "../../www/firefox60/mozilla-common.mk" 30#.include "../../www/firefox60/mozilla-common.mk"
 31.include "mozilla-common.mk"
31 32
32# Workaround to fix pixman.h detection 33# Workaround to fix pixman.h detection
33CFLAGS+= -I${BUILDLINK_PREFIX.pixman}/include/pixman-1 34CFLAGS+= -I${BUILDLINK_PREFIX.pixman}/include/pixman-1
34 35
35CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess 36CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess
36CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub 37CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub
37 38
38CONFIGURE_ARGS+= --enable-application=suite 39CONFIGURE_ARGS+= --enable-application=suite
39 40
40ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE} 41ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE}
41 42
42LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} 43LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
43 44