diff options
| author | hira <hira> | 2008-10-14 19:20:43 +0000 |
|---|---|---|
| committer | hira <hira> | 2008-10-14 19:20:43 +0000 |
| commit | 55ed09ab6ca5b7d536da6b481b79974d68e3bcda (patch) | |
| tree | dc8e3c8ab6936f428074899f3bb3aa9f6dd1ac61 /misc | |
| parent | aa6522c65c85a38e26584ba8ed1dab270f45dd02 (diff) | |
| download | pkgsrc-55ed09ab6ca5b7d536da6b481b79974d68e3bcda.tar.gz | |
Add conflict with openoffice3. Bump PKGREVISION.
Pointed out by wiz@.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice2/Makefile | 5 |
2 files changed, 6 insertions, 3 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 diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index c05b1f5e707..e1f50e39c95 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2008/10/02 17:57:45 joerg Exp $ +# $NetBSD: Makefile,v 1.52 2008/10/14 19:20:43 hira Exp $ # OO_VER= 2.4.1 -PKGREVISION= 3 +PKGREVISION= 4 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice2-${OO_VER} CATEGORIES= misc @@ -44,6 +44,7 @@ PTHREAD_AUTO_VARS= yes CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* +CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* CONFLICTS+= openoffice2-bin-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* |