diff options
| author | bad <bad@pkgsrc.org> | 2009-01-31 22:10:36 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2009-01-31 22:10:36 +0000 |
| commit | d82b7e4e9ca0a5d1ae8166097d00f23efb7a8ce9 (patch) | |
| tree | ab518dd0efae7f584fd34532bd0b8fbdd8d0df77 /misc/openoffice2-bin/Makefile | |
| parent | fad663194f32424ad40686679ad529ed5434b3f0 (diff) | |
| download | pkgsrc-d82b7e4e9ca0a5d1ae8166097d00f23efb7a8ce9.tar.gz | |
Conflict with openoffice3-bin.
Diffstat (limited to 'misc/openoffice2-bin/Makefile')
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 9e7c65f802b..b84087085d5 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2009/01/31 21:56:32 bad Exp $ +# $NetBSD: Makefile,v 1.39 2009/01/31 22:10:36 bad Exp $ DISTNAME= openoffice2-bin # overridden below PKGNAME= openoffice2-bin-${OO_RELEASE} @@ -12,6 +12,7 @@ COMMENT= Integrated office productivity suite (binary pkg) CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* +CONFLICTS+= openoffice3-bin-[0-9]* CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* |