Sun Nov 13 17:02:20 2011 UTC ()
Drop MAKE_JOBS_SAFE=no; I think it was a local problem.


(tnn)
diff -r1.57 -r1.58 pkgsrc/devel/xulrunner/Makefile
diff -r1.55 -r1.56 pkgsrc/www/seamonkey/Makefile
cvs diff -r1.57 -r1.58 pkgsrc/devel/xulrunner/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/Makefile 2011/11/12 12:45:03 1.57
+++ pkgsrc/devel/xulrunner/Attic/Makefile 2011/11/13 17:02:20 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.57 2011/11/12 12:45:03 tnn Exp $ 1# $NetBSD: Makefile,v 1.58 2011/11/13 17:02:20 tnn Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
5CATEGORIES= devel www 5CATEGORIES= devel www
6 6
7MAINTAINER= tnn@NetBSD.org 7MAINTAINER= tnn@NetBSD.org
8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
9COMMENT= XML User Interface Language runtime environment 9COMMENT= XML User Interface Language runtime environment
10LICENSE= mpl-1.1 10LICENSE= mpl-1.1
11 11
12MOZILLA_DIR= # empty 12MOZILLA_DIR= # empty
13 13
14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in 14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
@@ -17,29 +17,26 @@ PKGCONFIG_OVERRIDE+= xulrunner/installer @@ -17,29 +17,26 @@ PKGCONFIG_OVERRIDE+= xulrunner/installer
17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in 17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in
18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-js.pc.in 18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-js.pc.in
19PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nspr.pc.in 19PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nspr.pc.in
20PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in 20PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in
21PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in 21PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in
22 22
23CONFIGURE_ARGS+= --enable-application=xulrunner 23CONFIGURE_ARGS+= --enable-application=xulrunner
24CONFIGURE_ARGS+= --enable-libxul 24CONFIGURE_ARGS+= --enable-libxul
25 25
26ALL_ENV+= MOZILLA_PKG_NAME=xulrunner 26ALL_ENV+= MOZILLA_PKG_NAME=xulrunner
27 27
28MAKE_ENV+= FREEBL_NO_DEPEND=0 28MAKE_ENV+= FREEBL_NO_DEPEND=0
29 29
30# XXX tnn 
31MAKE_JOBS_SAFE= no 
32 
33.include "mozilla-common.mk" 30.include "mozilla-common.mk"
34.include "options.mk" 31.include "options.mk"
35 32
36pre-configure: 33pre-configure:
37 cd ${WRKSRC} && autoconf 34 cd ${WRKSRC} && autoconf
38 cd ${WRKSRC}/js/src && autoconf 35 cd ${WRKSRC}/js/src && autoconf
39 cd ${WRKSRC}/nsprpub && autoconf 36 cd ${WRKSRC}/nsprpub && autoconf
40 37
41post-install: 38post-install:
42 # XXX fix the pkg-config files instead 39 # XXX fix the pkg-config files instead
43 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 40 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
44 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \ 41 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \
45 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 42 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
cvs diff -r1.55 -r1.56 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2011/11/12 16:41:43 1.55
+++ pkgsrc/www/seamonkey/Makefile 2011/11/13 17:02:20 1.56
@@ -1,40 +1,37 @@ @@ -1,40 +1,37 @@
1# $NetBSD: Makefile,v 1.55 2011/11/12 16:41:43 tnn Exp $ 1# $NetBSD: Makefile,v 1.56 2011/11/13 17:02:20 tnn Exp $
2# 2#
3 3
4DISTNAME= seamonkey-${SM_VER}.source 4DISTNAME= seamonkey-${SM_VER}.source
5PKGNAME= seamonkey-${SM_VER} 5PKGNAME= seamonkey-${SM_VER}
6SM_VER= 2.5b4 6SM_VER= 2.5b4
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.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= tnn@NetBSD.org 11MAINTAINER= tnn@NetBSD.org
12HOMEPAGE= http://www.seamonkey-project.org/ 12HOMEPAGE= http://www.seamonkey-project.org/
13COMMENT= Full-featured gecko-based browser 13COMMENT= Full-featured gecko-based browser
14 14
15WRKSRC= ${WRKDIR}/comm-beta 15WRKSRC= ${WRKDIR}/comm-beta
16MOZILLA_DIR= mozilla/ 16MOZILLA_DIR= mozilla/
17 17
18CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess 18CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess
19CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub 19CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub
20 20
21CONFIGURE_ARGS+= --enable-application=suite 21CONFIGURE_ARGS+= --enable-application=suite
22 22
23ALL_ENV+= MOZILLA_PKG_NAME=seamonkey 23ALL_ENV+= MOZILLA_PKG_NAME=seamonkey
24 24
25# XXX tnn 
26MAKE_JOBS_SAFE= no 
27 
28pre-configure: 25pre-configure:
29 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf 26 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
30 cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf 27 cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf
31 cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf 28 cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf
32 cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${CONFIGURE_ENV} autoconf 29 cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${CONFIGURE_ENV} autoconf
33 cd ${WRKSRC}/ldap/sdks/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf 30 cd ${WRKSRC}/ldap/sdks/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf
34 31
35do-build: 32do-build:
36# XXX for some reason it doesn't work unless -j is explicitly specified 33# XXX for some reason it doesn't work unless -j is explicitly specified
37 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1} 34 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
38 35
39.include "../../devel/xulrunner/mozilla-common.mk" 36.include "../../devel/xulrunner/mozilla-common.mk"
40.include "options.mk" 37.include "options.mk"