fix nonsense in conflicts.
This commit is contained in:
parent
58e8548081
commit
97ff07965a
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2010/09/12 17:58:51 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2010/09/26 07:42:03 espie Exp $
|
||||
|
||||
VERSION= 1.8.1.19
|
||||
REVISION-main= 5
|
||||
REVISION-devel= 5
|
||||
REVISION-main= 6
|
||||
REVISION-devel= 6
|
||||
DIRECTORY= xulrunner
|
||||
|
||||
SO_VERSION= 2.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-devel,v 1.1.1.1 2009/07/27 21:36:03 martynas Exp $
|
||||
@comment $OpenBSD: PLIST-devel,v 1.2 2010/09/26 07:42:03 espie Exp $
|
||||
@option no-default-conflict
|
||||
@conflict xulrunner-devel->=1.8.1,<1.8.2
|
||||
@conflict xulrunner-devel->=1.8,<1.9
|
||||
@pkgpath devel/xulrunner,-devel
|
||||
lib/pkgconfig/
|
||||
lib/pkgconfig/xulrunner-embedding.pc
|
||||
|
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2009/07/27 21:36:03 martynas Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2010/09/26 07:42:03 espie Exp $
|
||||
@option no-default-conflict
|
||||
@conflict xulrunner->=1.8.1,<1.8.2
|
||||
@conflict xulrunner->=1.8,<1.9
|
||||
@pkgpath devel/xulrunner,-main
|
||||
@unexec xulrunner --unregister-global
|
||||
%%SHARED%%
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2010/09/19 19:23:16 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2010/09/26 07:42:03 espie Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
|
||||
|
||||
@ -9,6 +9,8 @@ DIRECTORY= xulrunner1.9
|
||||
MOZILLA_PROJECT= xulrunner1.9
|
||||
DISTNAME= mozilla-1.9.2
|
||||
DISTFILES= firefox-${FFX_VERSION}.source.tar.bz2
|
||||
REVISION-main= 0
|
||||
REVISION-devel= 0
|
||||
|
||||
MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${FFX_VERSION}/source/
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-devel,v 1.9 2010/09/12 17:58:51 landry Exp $
|
||||
@comment $OpenBSD: PLIST-devel,v 1.10 2010/09/26 07:42:03 espie Exp $
|
||||
@option no-default-conflict
|
||||
@conflict xulrunner-devel->=1.9,<1.9.1
|
||||
@conflict xulrunner-devel->=1.9
|
||||
%%jit%%
|
||||
%%amd64%%
|
||||
lib/pkgconfig/libxul-embedding.pc
|
||||
|
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.6 2010/09/12 17:58:51 landry Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.7 2010/09/26 07:42:03 espie Exp $
|
||||
@option no-default-conflict
|
||||
@conflict xulrunner->=1.9,<1.9.1
|
||||
@conflict xulrunner->=1.9
|
||||
@unexec xulrunner1.9 --unregister-global
|
||||
bin/${MOZILLA_PROJECT}
|
||||
${MOZILLA_PROJECT}/
|
||||
|
Loading…
Reference in New Issue
Block a user