diff options
| author | mjl <mjl> | 2000-10-30 10:13:56 +0000 |
|---|---|---|
| committer | mjl <mjl> | 2000-10-30 10:13:56 +0000 |
| commit | 3b5d0edb8824961f2c305dd7afe5d0bbec362d84 (patch) | |
| tree | 0c80033c30d779a3865212d2a0885eb05cd07298 /x11 | |
| parent | d91adfefcc5595e3287facc18ed18ec2453a06b1 (diff) | |
| download | pkgsrc-3b5d0edb8824961f2c305dd7afe5d0bbec362d84.tar.gz | |
Add conflict openmotif<->lesstif, as noted by tron@netbsd.org.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/lesstif12/Makefile | 3 | ||||
| -rw-r--r-- | x11/openmotif/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile index d0583497e68..489f958209b 100644 --- a/x11/lesstif12/Makefile +++ b/x11/lesstif12/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2000/10/23 19:45:26 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2000/10/30 10:13:56 mjl Exp $ PKGNAME= lesstif12-${LESSTIF_VERSION} CONFLICTS+= lesstif-0.[0-8]* CONFLICTS+= lesstif-0.90* CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3] +CONFLICTS+= openmotif-* CONFIGURE_ARGS+= --enable-build-12 CONFIGURE_ARGS+= --disable-build-20 diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 78106de9b60..73beedcc6cf 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,5 +1,5 @@ # $OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp $ -# $NetBSD: Makefile,v 1.2 2000/10/29 23:16:46 mjl Exp $ +# $NetBSD: Makefile,v 1.3 2000/10/30 10:13:56 mjl Exp $ PKGVER= 2.1.30 DISTNAME= openmotif${PKGVER} @@ -18,6 +18,7 @@ PATCH_DIST_STRIP=-p1 MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.opengroup.org/openmotif/ +CONFLICTS+= lesstif-* DIST_SUBDIR= openmotif WRKSRC= ${WRKDIR}/motif USE_X11BASE= yes |