From 0d2e70627bf2aaaf773e776abf4c26b365127241 Mon Sep 17 00:00:00 2001
From: martynas <martynas@openbsd.org>
Date: Fri, 29 Aug 2008 01:16:47 +0000
Subject: [PATCH] libxul-embedding -> xulrunner-embedding, since apps (liferea)
 think that it's xulrunner 1.9, if libxul-embedding is detected.

---
 devel/xulrunner/Makefile                               | 10 +++++-----
 .../{libxul-embedding.pc => xulrunner-embedding.pc}    |  4 ++--
 devel/xulrunner/pkg/PLIST-devel                        |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename devel/xulrunner/files/{libxul-embedding.pc => xulrunner-embedding.pc} (64%)

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 1fecd963419..80b66e1e488 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2008/08/26 18:05:23 martynas Exp $
+# $OpenBSD: Makefile,v 1.28 2008/08/29 01:16:47 martynas Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
 
@@ -8,8 +8,8 @@ COMMENT-devel=	devel files for Gecko
 VER=		1.8.1.16
 DISTNAME=	mozilla
 PKGNAME=	xulrunner-${VER}
-PKGNAME-main=	xulrunner-${VER}p2
-PKGNAME-devel=	xulrunner-devel-${VER}p2
+PKGNAME-main=	xulrunner-${VER}p3
+PKGNAME-devel=	xulrunner-devel-${VER}p3
 SO_VERSION=	2.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
@@ -134,8 +134,8 @@ do-install:
 	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
 	${INSTALL_DATA} ${WRKBUILD}/build/unix/*.pc \
-		${FILESDIR}/libxul-embedding.pc ${PREFIX}/lib/pkgconfig
+		${FILESDIR}/xulrunner-embedding.pc ${PREFIX}/lib/pkgconfig
 	@perl -pi -e 's|!!PREFIX!!|${TRUEPREFIX}|g; s|!!VERSION!!|${VER}|g' \
-		${PREFIX}/lib/pkgconfig/libxul-embedding.pc
+		${PREFIX}/lib/pkgconfig/xulrunner-embedding.pc
 
 .include <bsd.port.mk>
diff --git a/devel/xulrunner/files/libxul-embedding.pc b/devel/xulrunner/files/xulrunner-embedding.pc
similarity index 64%
rename from devel/xulrunner/files/libxul-embedding.pc
rename to devel/xulrunner/files/xulrunner-embedding.pc
index 9bb3b5540ff..6f468082b60 100644
--- a/devel/xulrunner/files/libxul-embedding.pc
+++ b/devel/xulrunner/files/xulrunner-embedding.pc
@@ -3,8 +3,8 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/xulrunner
 includedir=${prefix}/xulrunner/include
 
-Name: libxul-embedding
+Name: xulrunner-embedding
 Description: Static library for version-independent embedding of the Mozilla runtime
 Version: !!VERSION!!
 Libs: -L${libdir} -lxpcomglue
-Cflags: -DXPCOM_GLUE -I${includedir} -fshort-wchar
+Cflags: -DXPCOM_GLUE -I${includedir} -I${includedir}/xpcom -I${includedir}/string -I${includedir}/gtkembedmoz
diff --git a/devel/xulrunner/pkg/PLIST-devel b/devel/xulrunner/pkg/PLIST-devel
index 00a849e8e16..2ea5ba7f215 100644
--- a/devel/xulrunner/pkg/PLIST-devel
+++ b/devel/xulrunner/pkg/PLIST-devel
@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST-devel,v 1.8 2008/08/26 18:05:23 martynas Exp $
+@comment $OpenBSD: PLIST-devel,v 1.9 2008/08/29 01:16:47 martynas Exp $
 @conflict xulrunner-<1.8.0.4p0
 lib/pkgconfig/
+lib/pkgconfig/xulrunner-embedding.pc
 lib/pkgconfig/xulrunner-gtkmozembed.pc
 lib/pkgconfig/xulrunner-js.pc
 @comment lib/pkgconfig/xulrunner-nspr.pc
 @comment lib/pkgconfig/xulrunner-nss.pc
-lib/pkgconfig/libxul-embedding.pc
 lib/pkgconfig/xulrunner-plugin.pc
 lib/pkgconfig/xulrunner-xpcom.pc
 xulrunner/idl/