Fix build of legacy mozilla packages and rename the PKGBASE

to facilitate coinstallation with current packages.

7 files changed, 25 insertions, 12 deletions

diff --git a/devel/xulrunner192/patches/patch-aa b/devel/xulrunner192/patches/patch-aa
index daf4a4c676b..f94d50cd3fa 100644
--- a/devel/xulrunner192/patches/patch-aa
+++ b/devel/xulrunner192/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/04/19 11:16:07 tnn Exp $
+$NetBSD: patch-aa,v 1.2 2011/08/20 13:05:50 tnn Exp $
 
 --- configure.in.orig	2009-10-16 17:13:35.000000000 +0200
 +++ configure.in
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/04/19 11:16:07 tnn Exp $
  
 +if test -n "${LIBXUL_SDK_DIR}"; then
 +    AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.])
-+    NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`"
++    NSPR_CFLAGS="-I${prefix}/include/xulrunner192/unstable `pkg-config --cflags mozilla-nspr`"
 +    NSPR_LIBS="`pkg-config --libs mozilla-nspr`"
 +    NSS_CFLAGS="`pkg-config --cflags mozilla-nss`"
 +    NSS_LIBS="`pkg-config --libs mozilla-nss`"
diff --git a/devel/xulrunner192/patches/patch-pa b/devel/xulrunner192/patches/patch-pa
index d76b56e4d3c..4646c6068dd 100644
--- a/devel/xulrunner192/patches/patch-pa
+++ b/devel/xulrunner192/patches/patch-pa
@@ -1,4 +1,4 @@
-$NetBSD: patch-pa,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-pa,v 1.2 2011/08/20 13:05:50 tnn Exp $
 
 --- xulrunner/installer/mozilla-js.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ xulrunner/installer/mozilla-js.pc.in
@@ -7,5 +7,5 @@ $NetBSD: patch-pa,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lmozjs
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lmozjs
++Libs: -Wl,-R${prefix}/lib/xulrunner192 -L${prefix}/lib/xulrunner192 -lmozjs
  Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
diff --git a/devel/xulrunner192/patches/patch-pb b/devel/xulrunner192/patches/patch-pb
index 4548c40036a..81859ade816 100644
--- a/devel/xulrunner192/patches/patch-pb
+++ b/devel/xulrunner192/patches/patch-pb
@@ -1,4 +1,4 @@
-$NetBSD: patch-pb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-pb,v 1.2 2011/08/20 13:05:50 tnn Exp $
 
 --- xulrunner/installer/libxul.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ xulrunner/installer/libxul.pc.in
@@ -7,5 +7,5 @@ $NetBSD: patch-pb,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue_s -lxul -lxpcom
++Libs: -Wl,-R${prefix}/lib/xulrunner192 -L${prefix}/lib/xulrunner192 -lxpcomglue_s -lxul -lxpcom
  Cflags: -I${includedir} %WCHAR_CFLAGS%
diff --git a/devel/xulrunner192/patches/patch-pc b/devel/xulrunner192/patches/patch-pc
index 6939bf33b12..597d4818ea9 100644
--- a/devel/xulrunner192/patches/patch-pc
+++ b/devel/xulrunner192/patches/patch-pc
@@ -1,4 +1,4 @@
-$NetBSD: patch-pc,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-pc,v 1.2 2011/08/20 13:05:50 tnn Exp $
 
 --- xulrunner/installer/libxul-embedding.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ xulrunner/installer/libxul-embedding.pc.in
@@ -7,5 +7,5 @@ $NetBSD: patch-pc,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  Description: Static library for version-independent embedding of the Mozilla runtime
  Version: %MOZILLA_VERSION%
 -Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
++Libs: -Wl,-R${prefix}/lib/xulrunner192 -L${prefix}/lib/xulrunner192 -lxpcomglue
  Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/devel/xulrunner192/patches/patch-pd b/devel/xulrunner192/patches/patch-pd
index 6ca05a12bf1..b4c0fbda9be 100644
--- a/devel/xulrunner192/patches/patch-pd
+++ b/devel/xulrunner192/patches/patch-pd
@@ -1,4 +1,4 @@
-$NetBSD: patch-pd,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-pd,v 1.2 2011/08/20 13:05:50 tnn Exp $
 
 --- xulrunner/installer/mozilla-nss.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ xulrunner/installer/mozilla-nss.pc.in
@@ -7,5 +7,5 @@ $NetBSD: patch-pd,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
++Libs: -Wl,-R${prefix}/lib/xulrunner192 -L${prefix}/lib/xulrunner192 -lsmime3 -lssl3 -lnss3 -lnssutil3
  Cflags: -I${includedir}
diff --git a/devel/xulrunner192/patches/patch-pe b/devel/xulrunner192/patches/patch-pe
new file mode 100644
index 00000000000..d5e937d8ac5
--- /dev/null
+++ b/devel/xulrunner192/patches/patch-pe
@@ -0,0 +1,13 @@
+$NetBSD: patch-pe,v 1.1 2011/08/20 13:05:50 tnn Exp $
+
+--- xulrunner/installer/Makefile.in.orig	2011-04-20 20:56:00.000000000 +0000
++++ xulrunner/installer/Makefile.in
+@@ -132,7 +132,7 @@ endif
+ 
+ install:: $(pkg_config_files)
+ 	@echo pkg_config_file: $(pkg_config_files)
+-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
++	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/$(MOZILLA_PKG_NAME)/pkgconfig
+ 
+ GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files)
+ 
diff --git a/devel/xulrunner192/patches/patch-pg b/devel/xulrunner192/patches/patch-pg
index bc31d572cc9..e80b539f515 100644
--- a/devel/xulrunner192/patches/patch-pg
+++ b/devel/xulrunner192/patches/patch-pg
@@ -1,4 +1,4 @@
-$NetBSD: patch-pg,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
+$NetBSD: patch-pg,v 1.2 2011/08/20 13:05:50 tnn Exp $
 
 --- xulrunner/installer/mozilla-nspr.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ xulrunner/installer/mozilla-nspr.pc.in
@@ -10,5 +10,5 @@ $NetBSD: patch-pg,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
 -Cflags: %FULL_NSPR_CFLAGS%
 -
 -
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread
++Libs: -Wl,-R${prefix}/lib/xulrunner192 -L${prefix}/lib/xulrunner192 -lplds4 -lplc4 -lnspr4 -pthread
 +Cflags: -I${includedir}