diff options
| author | bad <bad> | 2009-01-31 22:10:36 +0000 |
|---|---|---|
| committer | bad <bad> | 2009-01-31 22:10:36 +0000 |
| commit | 3bd088772d54541d0c0ee8574a50cd89c269af70 (patch) | |
| tree | ab518dd0efae7f584fd34532bd0b8fbdd8d0df77 /misc | |
| parent | 6d72a2879fd36c227d8214b2669a5d69521828c0 (diff) | |
| download | pkgsrc-3bd088772d54541d0c0ee8574a50cd89c269af70.tar.gz | |
Conflict with openoffice3-bin.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 3 | ||||
| -rw-r--r-- | misc/openoffice2/Makefile | 3 | ||||
| -rw-r--r-- | misc/openoffice3/Makefile | 3 |
3 files changed, 6 insertions, 3 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]* diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index 9f62a1bffc4..a1563ebbc69 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2009/01/26 15:39:05 hira Exp $ +# $NetBSD: Makefile,v 1.62 2009/01/31 22:10:36 bad Exp $ # OO_VER= 2.4.2 @@ -47,6 +47,7 @@ CONFLICTS+= openoffice-[0-9]* CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* CONFLICTS+= openoffice2-bin-[0-9]* +CONFLICTS+= openoffice3-bin-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64 diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 475e8de253e..2f0c6fd66be 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2009/01/31 16:54:30 hira Exp $ +# $NetBSD: Makefile,v 1.23 2009/01/31 22:10:37 bad Exp $ # OO_VER= 3.0.1 @@ -42,6 +42,7 @@ CONFLICTS+= openoffice-[0-9]* CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* CONFLICTS+= openoffice2-bin-[0-9]* +CONFLICTS+= openoffice3-bin-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* USE_DIRS+= xdg-1.1 |