diff options
| author | leot <leot@pkgsrc.org> | 2016-01-06 21:42:27 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2016-01-06 21:42:27 +0000 |
| commit | 05237d045cc66b7a882f8d97a06ce690fc390867 (patch) | |
| tree | 080cd339c8ee969129f40fd67c74182dc1c568a0 /x11 | |
| parent | 18e8be9bfe322104d8fddaf8f8be0823cb055105 (diff) | |
| download | pkgsrc-05237d045cc66b7a882f8d97a06ce690fc390867.tar.gz | |
Update CONFLICTS.
x11/Xaw3d no longer exists in pkgsrc (hi wiz@! :)) and so Xaw-Xpm now conflicts
with libXaw3d and viceversa.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xaw-Xpm/Makefile | 4 | ||||
| -rw-r--r-- | x11/libXaw3d/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index 7360c5069b2..420d256afdf 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2012/10/29 05:06:06 asau Exp $ +# $NetBSD: Makefile,v 1.32 2016/01/06 21:42:27 leot Exp $ # DISTNAME= Xaw-XPM-1.1 @@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.zip.com.au/~bb/XawXpm/ COMMENT= Enhanced 3-D widgets based on the Athena Widget set and Xaw3d -CONFLICTS= Xaw3d-[0-9]* +CONFLICTS= libXaw3d-[0-9]* WRKSRC= ${WRKDIR}/XawXpm USE_IMAKE= YES diff --git a/x11/libXaw3d/Makefile b/x11/libXaw3d/Makefile index 8ce9a2ddc13..ab0ee7b75fb 100644 --- a/x11/libXaw3d/Makefile +++ b/x11/libXaw3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/07/08 12:00:25 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2016/01/06 21:42:27 leot Exp $ # DISTNAME= libXaw3d-1.6.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= X 3D Athena Widget Set #LICENSE= x11 # AND others -CONFLICTS+= Xaw3d-[0-9]* +CONFLICTS+= Xaw-Xpm-[0-9]* GNU_CONFIGURE= yes USE_LIBTOOL= yes |