From 5640be627d8cc5ca036740a7cdcfb4b0862b8fbd Mon Sep 17 00:00:00 2001 From: landry Date: Tue, 27 Apr 2010 16:08:21 +0000 Subject: [PATCH] @comment back xulrunner-{plugin,js,gtkmozembed}.pc, they conflict with the ones in xulrunner/1.8,-devel. Spotted by naddy@. --- devel/xulrunner/1.9/Makefile | 4 ++-- devel/xulrunner/1.9/pkg/PLIST-devel | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/xulrunner/1.9/Makefile b/devel/xulrunner/1.9/Makefile index a42e9ac80b2..f60e4b17627 100644 --- a/devel/xulrunner/1.9/Makefile +++ b/devel/xulrunner/1.9/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2010/04/24 16:08:01 landry Exp $ +# $OpenBSD: Makefile,v 1.7 2010/04/27 16:08:21 landry Exp $ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 VERSION= 1.9.1.7 -#PATCHLEVEL= p0 +PATCHLEVEL= p0 DIRECTORY= xulrunner1.9 DISTNAME= mozilla-1.9.1 DISTFILES= xulrunner-${VERSION}.source.tar.bz2 diff --git a/devel/xulrunner/1.9/pkg/PLIST-devel b/devel/xulrunner/1.9/pkg/PLIST-devel index 66d388cbd91..fb10405606d 100644 --- a/devel/xulrunner/1.9/pkg/PLIST-devel +++ b/devel/xulrunner/1.9/pkg/PLIST-devel @@ -1,12 +1,12 @@ -@comment $OpenBSD: PLIST-devel,v 1.2 2010/04/24 16:08:01 landry Exp $ +@comment $OpenBSD: PLIST-devel,v 1.3 2010/04/27 16:08:21 landry Exp $ @option no-default-conflict @conflict xulrunner-devel->=1.9,<1.9.1 lib/pkgconfig/libxul-embedding.pc lib/pkgconfig/libxul.pc lib/pkgconfig/xulrunner-gtkmozembed-embedding.pc -lib/pkgconfig/xulrunner-gtkmozembed.pc -lib/pkgconfig/xulrunner-js.pc -lib/pkgconfig/xulrunner-plugin.pc +@comment lib/pkgconfig/xulrunner-gtkmozembed.pc +@comment lib/pkgconfig/xulrunner-js.pc +@comment lib/pkgconfig/xulrunner-plugin.pc xulrunner1.9/idl/ xulrunner1.9/idl/XPCIDispatch.idl xulrunner1.9/idl/domstubs.idl