[pkgsrc/trunk]: pkgsrc/devel/xulrunner Fix GRE registration. Should fix PR pk...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/150ee9429048
branches:  trunk
changeset: 397346:150ee9429048
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Aug 10 13:13:42 2009 +0000

description:
Fix GRE registration. Should fix PR pkg/41866. PKGREVISION++

diffstat:

 devel/xulrunner/Makefile |  14 +++++++++++---
 devel/xulrunner/PLIST    |   3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r 2ab140928d5f -r 150ee9429048 devel/xulrunner/Makefile
--- a/devel/xulrunner/Makefile  Mon Aug 10 12:15:57 2009 +0000
+++ b/devel/xulrunner/Makefile  Mon Aug 10 13:13:42 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2009/08/10 00:27:49 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/10 13:13:42 tnn Exp $
 #
 
 DISTNAME=      xulrunner-${XULRUNNER_VER}-source
 PKGNAME=       ${DISTNAME:S/-source//}
 XULRUNNER_VER= 1.9.1.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=xulrunner/releases/${XULRUNNER_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
@@ -59,7 +59,15 @@
 CONFIGURE_ARGS+=       --disable-crashreporter
 
 ALL_ENV+=              MOZILLA_PKG_NAME=xulrunner
-INSTALL_ENV+=          SKIP_GRE_REGISTRATION=defined
+
+SUBST_CLASSES+=                        fix-paths
+SUBST_STAGE.fix-paths=         pre-configure
+SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
+SUBST_FILES.fix-paths=         xpcom/build/nsXPCOMPrivate.h
+SUBST_FILES.fix-paths+=                xulrunner/app/nsRegisterGREUnix.cpp
+SUBST_FILES.fix-paths+=                xulrunner/installer/Makefile.in
+SUBST_FILES.fix-paths+=                extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
+SUBST_SED.fix-paths=           -e 's,/etc/gre.d,${PREFIX}/lib/xulrunner/gre.d,g'
 
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../lang/python/application.mk"
diff -r 2ab140928d5f -r 150ee9429048 devel/xulrunner/PLIST
--- a/devel/xulrunner/PLIST     Mon Aug 10 12:15:57 2009 +0000
+++ b/devel/xulrunner/PLIST     Mon Aug 10 13:13:42 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/08/09 21:05:01 tnn Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/08/10 13:13:42 tnn Exp $
 bin/xulrunner
 include/xulrunner/stable/base64.h
 include/xulrunner/stable/blapit.h
@@ -2372,6 +2372,7 @@
 lib/xulrunner/dependentlibs.list
 lib/xulrunner/dictionaries/en-US.aff
 lib/xulrunner/dictionaries/en-US.dic
+lib/xulrunner/gre.d/${PKGVERSION}.system.conf
 lib/xulrunner/greprefs/all.js
 lib/xulrunner/greprefs/security-prefs.js
 lib/xulrunner/greprefs/xpinstall.js