diff options
| author | rh <rh> | 2003-01-22 22:46:33 +0000 |
|---|---|---|
| committer | rh <rh> | 2003-01-22 22:46:33 +0000 |
| commit | ed1e2edfd6cdac69f7b10f1c7d3700b009a6424c (patch) | |
| tree | e1c4334ceea0c90cdfd151c1666e5db4c2a052fd /misc | |
| parent | 0906f2ad3900bb6df60e13cceea8d83e00286bbe (diff) | |
| download | pkgsrc-ed1e2edfd6cdac69f7b10f1c7d3700b009a6424c.tar.gz | |
Minor nitpick: put each package into a separate CONFLICTS+= line.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice-linux/Makefile | 5 | ||||
| -rw-r--r-- | misc/openoffice/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile index e61fa12aeb9..59b0d86f88e 100644 --- a/misc/openoffice-linux/Makefile +++ b/misc/openoffice-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/01/22 21:57:25 mrauch Exp $ +# $NetBSD: Makefile,v 1.2 2003/01/22 22:46:33 rh Exp $ DISTNAME= OOo_1.0.2_LinuxIntel_install PKGNAME= openoffice-linux-1.0.2 @@ -13,7 +13,8 @@ COMMENT= Integrated office productivity suite (binary pkg) NO_CONFIGURE= # defined WRKSRC= ${WRKDIR}/install/ -CONFLICTS= staroffice-[0-9]* openoffice-[0-9]* +CONFLICTS+= staroffice-[0-9]* +CONFLICTS+= openoffice-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386 diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 4978045ee1e..b2c255d7584 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2003/01/22 22:43:40 rh Exp $ +# $NetBSD: Makefile,v 1.33 2003/01/22 22:46:34 rh Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -48,7 +48,8 @@ USE_X11= # defined USE_GMAKE= # defined PKG_JVMS_ACCEPTED= sun-jdk13 -CONFLICTS= staroffice-[0-9]* openoffice-linux-[0-9]* +CONFLICTS+= staroffice-[0-9]* +CONFLICTS+= openoffice-linux-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.5.3*-i386 NetBSD-1.5Z?-i386 \ NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386 |