diff options
| author | hira <hira> | 2007-02-27 13:52:04 +0000 |
|---|---|---|
| committer | hira <hira> | 2007-02-27 13:52:04 +0000 |
| commit | 07c6ddc31aa475381cb233aa6dcae7cfbd8fdd03 (patch) | |
| tree | ff292b452be2557a12b396d6ba6ec01fdabc6625 /misc | |
| parent | 3174a94e664d72631fe430df79a4e7c831172e3a (diff) | |
| download | pkgsrc-07c6ddc31aa475381cb233aa6dcae7cfbd8fdd03.tar.gz | |
Conflict with openoffice2. Bump PKGREVISION.
Pointed out by ghen@.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice-bin/Makefile | 5 | ||||
| -rw-r--r-- | misc/openoffice/Makefile | 5 | ||||
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index d60b1ecd3b8..602e4039e06 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:50 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2007/02/27 13:52:04 hira Exp $ PKGNAME= openoffice-bin-${OO_VER} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -24,6 +24,7 @@ NO_CONFIGURE= yes CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* +CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index cae350032f3..39c149ef19d 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2007/02/22 19:30:05 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2007/02/27 13:52:04 hira Exp $ DISTNAME= openoffice-1.1.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.5/} DISTFILES= OOo_1.1.5_src.tar.gz @@ -32,6 +32,7 @@ PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes CONFLICTS+= staroffice-[0-9]* +CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice-bin-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 7be6f62a708..7dc0ca56822 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:50 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2007/02/27 13:52:05 hira Exp $ PKGNAME= openoffice-bin-${OO_RELEASE} +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -25,6 +26,7 @@ NO_BUILD= yes CONFLICTS+= staroffice-[0-9]* CONFLICTS+= openoffice-[0-9]* +CONFLICTS+= openoffice2-[0-9]* CONFLICTS+= openoffice2-bin-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* |