diff options
author | hira <hira@pkgsrc.org> | 2008-10-14 19:20:43 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2008-10-14 19:20:43 +0000 |
commit | a0187f3e5bcb3ff451c8ccc948b1260846ae58c0 (patch) | |
tree | dc8e3c8ab6936f428074899f3bb3aa9f6dd1ac61 /misc/openoffice2-bin | |
parent | 53eba2b00ab18815bfd04515f3e8026d851e6471 (diff) | |
download | pkgsrc-a0187f3e5bcb3ff451c8ccc948b1260846ae58c0.tar.gz |
Add conflict with openoffice3. Bump PKGREVISION.
Pointed out by wiz@.
Diffstat (limited to 'misc/openoffice2-bin')
-rw-r--r-- | misc/openoffice2-bin/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 7fcc32e0f36..959e531ec3b 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2008/06/15 12:22:52 tron Exp $ +# $NetBSD: Makefile,v 1.37 2008/10/14 19:20:43 hira Exp $ DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/} @@ -13,6 +14,7 @@ CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* CONFLICTS+= openoffice2-[0-9]* +CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* OO_VER= 2.4 |