diff options
author | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
commit | 2a95ad9c6be52511880e6ee241b087af70706624 (patch) | |
tree | f0ac98b899382f539e1e39385f1316edd18626bd /devel | |
parent | 2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff) | |
download | pkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'devel')
-rw-r--r-- | devel/autoconf/Makefile | 4 | ||||
-rw-r--r-- | devel/cvs/Makefile | 4 | ||||
-rw-r--r-- | devel/ddd/Makefile | 4 | ||||
-rw-r--r-- | devel/gettext/Makefile | 4 | ||||
-rw-r--r-- | devel/glib/Makefile | 4 | ||||
-rw-r--r-- | devel/gmake/Makefile | 4 | ||||
-rw-r--r-- | devel/libtool/Makefile | 4 |
7 files changed, 8 insertions, 20 deletions
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 45d2b21a07a..df5f2f354db 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 1999/01/06 16:30:46 frueauf Exp $ +# $NetBSD: Makefile,v 1.20 1999/02/20 22:48:25 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp # @@ -11,8 +11,6 @@ HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html DEPENDS= m4-1.4:../../devel/m4 -CONFLICTS= autoconf-* - USE_PERL5= yes GNU_CONFIGURE= yes diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 8b981615d74..8c5ad20ce70 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 1999/01/19 09:18:52 tron Exp $ +# $NetBSD: Makefile,v 1.20 1999/02/20 22:48:26 hubertf Exp $ # DISTNAME= cvs-1.10 @@ -8,8 +8,6 @@ MASTER_SITES= ftp://download.cyclic.com/pub/${DISTNAME}/ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.cyclic.com/cvs/info.html -CONFLICTS= cvs-* - GNU_CONFIGURE= yes USE_GTEXINFO= yes diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 597244acee3..f2b549ed4b5 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/01/07 16:27:33 frueauf Exp $ +# $NetBSD: Makefile,v 1.19 1999/02/20 22:48:26 hubertf Exp $ # $FreeBSD Id: Makefile,v 1.5 1998/02/19 09:43:16 obrien Exp # @@ -14,8 +14,6 @@ HOMEPAGE= http://www.cs.tu-bs.de/softech/ddd/ DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= ddd-* - USE_MOTIF= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 66051bced71..739d3180bc8 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/12/28 20:22:24 tron Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:26 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -8,8 +8,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tron@netbsd.org -CONFLICTS= gettext-* - GNU_CONFIGURE= yes USE_LIBTOOL= yes CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 216006f0637..81583639e55 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/01/15 22:57:13 tron Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:26 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.1/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gtk.org/docs/glib_toc.html -CONFLICTS= glib-* gtk+-1.0.* +CONFLICTS= gtk+-1.0.* GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 09a2eee86e7..f10686f99f5 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1998/08/20 15:16:47 tsarna Exp $ +# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:27 hubertf Exp $ # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp # @@ -10,8 +10,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/make/make.html -CONFLICTS= gmake-3.75 gmake-3.76.1 - GNU_CONFIGURE= yes USE_GTEXINFO= yes diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 5ca449baff0..d0753ccd2ad 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/10/02 14:49:33 tv Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:27 hubertf Exp $ # DISTNAME= libtool-1.2 @@ -11,8 +11,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.profitpress.com/libtool/ -CONFLICTS= libtool-1.2 - GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" |