summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-09-14 01:57:44 +0000
committerjlam <jlam@pkgsrc.org>2001-09-14 01:57:44 +0000
commita55945c17244691e9fc4f071007dcbbd3a8091fe (patch)
tree318ddd83e1e58b9f3648ec55a03721cc240f5d57 /x11
parentfec4edb91ac34556314c6d472b85f47e77708abc (diff)
downloadpkgsrc-a55945c17244691e9fc4f071007dcbbd3a8091fe.tar.gz
x11/lesstif12 does not conflict with the x11/openmotif package, though
lesstif does.
Diffstat (limited to 'x11')
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/lesstif/Makefile.common4
-rw-r--r--x11/lesstif12/Makefile3
3 files changed, 5 insertions, 6 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 382811e8e9a..1faf34a4f54 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2001/09/09 03:37:02 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2001/09/14 01:57:44 jlam Exp $
COMMENT= API compatible clone of the OSF/Motif toolkit
+CONFLICTS+= openmotif-[0-9]*
+
USE_BUILDLINK_ONLY= # defined
.include "Makefile.common"
diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common
index a1b03bb85d6..d145e18c04e 100644
--- a/x11/lesstif/Makefile.common
+++ b/x11/lesstif/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2001/09/09 03:37:03 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2001/09/14 01:57:44 jlam Exp $
DISTNAME= lesstif-${LESSTIF_VERSION}
LESSTIF_VERSION= 0.92.32
@@ -13,8 +13,6 @@ MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.lesstif.org/
-CONFLICTS+= openmotif-[0-9]*
-
BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf
BUILD_DEPENDS+= automake>=1.4:../../devel/automake
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile
index 54c22ecdec2..47bc8c5de45 100644
--- a/x11/lesstif12/Makefile
+++ b/x11/lesstif12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/09/09 03:37:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/14 01:57:44 jlam Exp $
PKGNAME= lesstif12-${LESSTIF_VERSION}
COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2
@@ -6,7 +6,6 @@ COMMENT= API compatible clone of the OSF/Motif toolkit, version 1.2
CONFLICTS+= lesstif-0.[0-8]*
CONFLICTS+= lesstif-0.90*
CONFLICTS+= lesstif-0.91 lesstif-0.91.[0-3]
-CONFLICTS+= openmotif-[0-9]*
USE_BUILDLINK_ONLY= # defined