Enable installation of pkgconfig files in mozilla-gtk2. This requires a

new patch to fix paths to includes and libs.
Bump PKGREVISION of mozilla-gtk2 to 1.

6 files changed, 39 insertions, 5 deletions

diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index 1209000e015..7ac213a900f 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/17 06:42:08 taya Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/05 17:29:06 jmmv Exp $
 
 MOZILLA=	mozilla-gtk2
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.6
+PKGREVISION=	1
 EXTRACT_SUFX=	.tar.bz2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/mozilla-gtk2/PLIST b/www/mozilla-gtk2/PLIST
index 16b0b42ef99..3018e2177b5 100644
--- a/www/mozilla-gtk2/PLIST
+++ b/www/mozilla-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/17 06:42:11 taya Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 17:29:06 jmmv Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -124,6 +124,14 @@ lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
 @comment end DSO
+@comment begin PKGCONFIG
+lib/pkgconfig/mozilla-gtkmozembed.pc
+lib/pkgconfig/mozilla-js.pc
+lib/pkgconfig/mozilla-nspr.pc
+lib/pkgconfig/mozilla-nss.pc
+lib/pkgconfig/mozilla-plugin.pc
+lib/pkgconfig/mozilla-xpcom.pc
+@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/LICENSE
 lib/${MOZILLA}/README.txt
diff --git a/www/mozilla-gtk2/distinfo b/www/mozilla-gtk2/distinfo
index ad3855e7b63..4aca1568abe 100644
--- a/www/mozilla-gtk2/distinfo
+++ b/www/mozilla-gtk2/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/02/01 13:05:23 taya Exp $
+$NetBSD: distinfo,v 1.3 2004/02/05 17:29:06 jmmv Exp $
 
 SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35
 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes
+SHA1 (patch-aa) = 03f158fe673a54b8060d541c80f9ebda2977afc5
 SHA1 (patch-ab) = 3abad84d0768de60f845f26c61cc2629a6e25ce3
 SHA1 (patch-ac) = 4cddfd0bfc8acd97db3b974289a79c9ae41c9edf
 SHA1 (patch-ad) = 5408db4b7585dcf5855f64a342cc721a23aec449
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index a5bab55ba16..cf597dc1822 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2004/02/04 22:23:46 abs Exp $
+# $NetBSD: Makefile.common,v 1.31 2004/02/05 17:29:06 jmmv Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -58,6 +58,8 @@ CONFIGURE_ARGS+= --enable-default-toolkit=gtk
 # NetBSD-*-m68k builds, but "regchrome" dumps core.
 NOT_FOR_PLATFORM=	NetBSD-1.4.*-* NetBSD-*-m68k
 
+MAKE_ENV+=	MOZILLA_PKG_NAME=${MOZILLA}
+
 MOZ_LIBDIR=	${PREFIX}/lib/${MOZILLA}
 MAKE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
 CONFIGURE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index e8d40960426..315464a22c3 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.48 2004/02/01 13:04:17 taya Exp $
+$NetBSD: distinfo,v 1.49 2004/02/05 17:29:06 jmmv Exp $
 
 SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35
 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes
+SHA1 (patch-aa) = 03f158fe673a54b8060d541c80f9ebda2977afc5
 SHA1 (patch-ab) = 3abad84d0768de60f845f26c61cc2629a6e25ce3
 SHA1 (patch-ac) = 4cddfd0bfc8acd97db3b974289a79c9ae41c9edf
 SHA1 (patch-ad) = 5408db4b7585dcf5855f64a342cc721a23aec449
diff --git a/www/mozilla/patches/patch-aa b/www/mozilla/patches/patch-aa
new file mode 100644
index 00000000000..eda14614031
--- /dev/null
+++ b/www/mozilla/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.25 2004/02/05 17:29:06 jmmv Exp $
+
+--- config/autoconf.mk.in.orig	2003-10-30 22:11:05.000000000 +0100
++++ config/autoconf.mk.in
+@@ -29,13 +29,13 @@ MOZILLA_VERSION = @MOZILLA_VERSION@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/mozilla-$(MOZILLA_VERSION)
++includedir	= @includedir@/$(MOZILLA_PKG_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/mozilla-$(MOZILLA_VERSION)
++idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
+ 
+-mozappdir	= $(libdir)/mozilla-$(MOZILLA_VERSION)
++mozappdir	= $(libdir)/$(MOZILLA_PKG_NAME)
+ mredir		= $(libdir)/mre/mre-$(MOZILLA_VERSION)
+ mrelibdir	= $(mredir)/lib
+