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 | |
| parent | 2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff) | |
| download | pkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz | |
Fix CONFLICTS (remove redundancy, mostly)
103 files changed, 108 insertions, 313 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 02a34704d22..7f7a622fc9f 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/10/14 21:51:14 tron Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:24 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/20 08:18:40 tg Exp # @@ -10,8 +10,6 @@ MASTER_SITES= http://www.muraroa.demon.co.uk/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.muraroa.demon.co.uk/ -CONFLICTS= bzip2-0.1p2 - .if exists(/usr/bin/bzip2) IGNORE= "is part of your NetBSD distribution" .endif diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index b5fbb7618d5..922a823e2a4 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/01/09 01:26:09 tron Exp $ +# $NetBSD: Makefile,v 1.19 1999/02/20 22:48:24 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp # @@ -11,8 +11,6 @@ DISTFILES= unzip540.tar.gz MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cdrom.com/pub/infozip/ -CONFLICTS= unzip-* - MAKEFILE= unix/Makefile ALL_TARGET= unzips # we do not use USE_ZLIB because of unknown bugs in 5.40's use of libz diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index 6abbe7e764a..1f744b7c339 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/11/12 23:03:39 frueauf Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:24 hubertf Exp $ # DISTNAME= mikmod-3.0.3 @@ -12,8 +12,6 @@ HOMEPAGE= http://www.freenet.tlh.fl.us/~amstpi/mikmod.html DEPENDS+= ncurses-1.9.9g:../../devel/ncurses -CONFLICTS= mikmod-2.14 - USE_GMAKE= yes .include "../../mk/bsd.prefs.mk" diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index 3e40777e823..acef9c3151b 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/11/05 06:35:24 mycroft Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:24 hubertf Exp $ # DISTNAME= xmcd-2.4 @@ -10,8 +10,6 @@ HOMEPAGE= http://sunsite.unc.edu/~cddb/xmcd/index.html DEPENDS+= ncurses-1.9.9g:../../devel/ncurses -CONFLICTS= xmcd-2.3 - USE_MOTIF= yes USE_IMAKE= yes IS_INTERACTIVE= yes # asks a lot of questions diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index 1e11073499f..c79a993fe01 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/11/24 22:38:06 tron Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:25 hubertf Exp $ # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp # @@ -10,8 +10,6 @@ MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.leo.org/~doering/mgetty/index.html -CONFLICTS= mgetty-1.1.16 - WRKSRC= ${WRKDIR}/${PKGNAME} INFO_FILES= mgetty.info diff --git a/corba/ORBit/Makefile b/corba/ORBit/Makefile index 10ac827d453..30dab890a31 100644 --- a/corba/ORBit/Makefile +++ b/corba/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/01/16 12:05:09 tron Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:25 hubertf Exp $ # DISTNAME= ORBit-0.3.90 @@ -12,8 +12,6 @@ HOMEPAGE= http://www.gnome.org/ DEPENDS+= glib-1.1.12:../../devel/glib DEPENDS+= gindent-1.9.1:../../devel/gindent -CONFLICTS= ORBit-* - GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 6bac0d8bfc0..4efb9187b57 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1999/02/04 21:35:01 frueauf Exp $ +# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:25 hubertf Exp $ # # note: if updated, update shlib version number in patch-aa @@ -10,8 +10,6 @@ MASTER_SITES= ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.21/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.tcx.se/ -CONFLICTS= mysql-3.21.31 mysql-3.21.32a mysql-3.21.33 - NO_CDROM= "Restrictive license." MYSQL_DATADIR?= /var/mysql diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile index b660e062433..6582e60b5ee 100644 --- a/databases/py-mysql/Makefile +++ b/databases/py-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/12/18 00:42:39 tsarna Exp $ +# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:25 hubertf Exp $ DISTNAME= MySQLmodule-1.4 PKGNAME= py-mysql-1.4 @@ -13,8 +13,6 @@ HOMEPAGE= http://snail.earthlight.co.nz/projects.html DEPENDS+= python-1.5.1:../../lang/python \ mysql>=3.21:../../databases/mysql -CONFLICTS= py-mysql-1.1 - EXTRACT_ONLY= MySQLmodule-1.4${EXTRACT_SUFX} ALL_TARGET= default 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}" diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 57439d9a036..b0ade126161 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 1999/02/04 14:54:25 frueauf Exp $ +# $NetBSD: Makefile,v 1.25 1999/02/20 22:48:27 hubertf Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html -CONFLICTS= emacs-20.2 - GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+=--with-pop --with-x --with-x-toolkit=lucid diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile index df0f6f4bdaf..e185ad44d8b 100644 --- a/editors/hexedit/Makefile +++ b/editors/hexedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/02/06 20:32:43 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:27 hubertf Exp $ # DISTNAME= hexedit-1.1.0 @@ -12,8 +12,6 @@ HOMEPAGE= http://www.chez.com/prigaux/hexedit.html DEPENDS+= ncurses-1.9.9g:../../devel/ncurses -CONFLICTS= hexedit-* - GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-L${PREFIX}/lib" INSTALL=/usr/bin/install diff --git a/editors/pico/Makefile b/editors/pico/Makefile index f3b909d4723..091b739becf 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/11/13 15:56:24 tv Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:28 hubertf Exp $ # DISTNAME= pine4.05 @@ -11,8 +11,6 @@ HOMEPAGE= http://www.washington.edu/pine/ USE_LIBTOOL= yes -CONFLICTS= pico-2.9 pine-3.96 pico-3.0 pine-4.02 pico-3.2 - do-build: cd ${WRKSRC} && ./build neb CC="${LIBTOOL} ${CC}" PREFIX=${PREFIX} diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile index 270ec039bcc..da5959a9703 100644 --- a/editors/xemacs20/Makefile +++ b/editors/xemacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 1999/01/20 16:56:00 hubertf Exp $ +# $NetBSD: Makefile,v 1.39 1999/02/20 22:48:28 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp # @@ -23,8 +23,6 @@ DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= gdbm-1.7.3:../../databases/gdbm -CONFLICTS+= xemacs-20.3 - NOT_FOR_ARCHS= alpha mips #fails purespace dumping HAS_CONFIGURE= yes diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index ac44ff730fa..cf3db325b06 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1999/01/30 23:18:46 agc Exp $ +# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:28 hubertf Exp $ DISTNAME= Wine-981211 PKGNAME= wine-981211 @@ -13,8 +13,6 @@ HOMEPAGE= http://www.winehq.com/ DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= wine-980[26]* - USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-dll diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index b801dd9b424..42a7bb9997a 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 1999/01/30 23:18:46 agc Exp $ +# $NetBSD: Makefile,v 1.29 1999/02/20 22:48:28 hubertf Exp $ # DISTNAME= xmame-0.34b8.1 @@ -12,9 +12,6 @@ HOMEPAGE= http://xmame.retrogames.com/ DEPENDS= unzip-5.40:../../archivers/unzip DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1 \ - xmame-0.34b2.1 xmame-0.34b2.2 xmame-0.34b5.2 - NOT_FOR_ARCHS= alpha #gcc lossage USE_X11BASE= yes diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index bfb993f9b62..a555d522402 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:46 agc Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:29 hubertf Exp $ # DISTNAME= unix02b4 @@ -13,8 +13,6 @@ HOMEPAGE= http://internetter.com/titan/mess/ DEPENDS= unzip-5.40:../../archivers/unzip DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= xmess-0.1 - NOT_FOR_ARCHS= alpha #gcc lossage USE_X11BASE= yes diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile index a16eebce38f..d0327fc4d69 100644 --- a/games/angband-tty/Makefile +++ b/games/angband-tty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/12/31 15:19:13 tv Exp $ +# $NetBSD: Makefile,v 1.3 1999/02/20 22:48:29 hubertf Exp $ # DISTNAME= angband-283 @@ -8,8 +8,6 @@ MASTER_SITES= ftp://export.andrew.cmu.edu/angband/Source/ MAINTAINER= root@garbled.net -CONFLICTS= angband-x11-* - WRKSRC= ${WRKDIR}/${DISTNAME}/src MAKEFILE= Makefile.std ALL_TARGET= angband diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index bd347f48561..5dcbe062d0a 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/12/26 21:33:32 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:29 hubertf Exp $ # DISTNAME= freeciv-1.7.2 @@ -10,8 +10,6 @@ HOMEPAGE= http://www.freeciv.org/index.html DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= freeciv-1.6.3 freeciv-1.6.5 freeciv-1.6.6 - USE_IMAKE= YES NO_INSTALL_MANPAGES= YES diff --git a/games/xblast/Makefile b/games/xblast/Makefile index 1b5e542746a..c2fb6ea3ed5 100644 --- a/games/xblast/Makefile +++ b/games/xblast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/11/10 08:34:55 garbled Exp $ +# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:29 hubertf Exp $ # DISTNAME= xblast-2.6.beta-sound @@ -13,8 +13,6 @@ HOMEPAGE= http://www.ikp.uni-koeln.de/~vogel/xblast/xblast.html BUILD_DEPENDS+= wish8.0:../../x11/tk80 BUILD_DEPENDS+= tclsh8.0:../../lang/tcl80 -CONFLICTS= xblast-2.2 - USE_IMAKE= yes WRKSRC= ${WRKDIR}/XBlast-2.6.beta diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 0ee1cf2e72b..01d386feb13 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 1999/01/02 20:57:28 tron Exp $ +# $NetBSD: Makefile,v 1.34 1999/02/20 22:48:29 hubertf Exp $ # DISTNAME= ImageMagick-4.1.7 @@ -13,8 +13,6 @@ DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= tiff-3.4:../../graphics/tiff -CONFLICTS= ImageMagick-* - pre-configure: .if exists(/usr/lib/libbz2.a) @echo >${WRKSRC}/bzlib.tmpl "#define HasBZLIB" diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index db34150475b..553d1e2874f 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:50 agc Exp $ +# $NetBSD: Makefile,v 1.23 1999/02/20 22:48:30 hubertf Exp $ # DISTNAME= MesaLib-3.0 @@ -13,8 +13,6 @@ DISTFILES= MesaLib-${MESA_VERSION}${EXTRACT_SUFX} \ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.ssec.wisc.edu/~brianp/Mesa.html -CONFLICTS= Mesa-2.4 Mesa-2.6 - NOT_FOR_ARCHS= alpha #gcc lossage WRKSRC= ${WRKDIR}/${PKGNAME} diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index d8a75836eae..eaf2c13146a 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/08/20 15:17:00 tsarna Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:30 hubertf Exp $ # DISTNAME= fly-1.6.1 @@ -10,8 +10,6 @@ HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html DEPENDS+= gd-1.3:../../graphics/gd -CONFLICTS= fly-1.6.0 - pre-install: ${MKDIR} ${PREFIX}/share/doc/fly ${MKDIR} ${PREFIX}/share/examples/fly diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 1a13a10c074..086b60f0715 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1999/01/30 23:18:50 agc Exp $ +# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:30 hubertf Exp $ # DISTNAME= imlib-1.9.0 @@ -16,8 +16,6 @@ DEPENDS+= tiff-3.4:../../graphics/tiff DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= giflib-3.0:../../graphics/giflib -CONFLICTS= imlib-* - USE_X11BASE= yes USE_LIBTOOL= yes USE_GMAKE= yes diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 54b5ad3b96c..415357f2d16 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/11/30 18:58:09 tv Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:30 hubertf Exp $ # DISTNAME= jpegsrc.v6b @@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.ijg.org/ -CONFLICTS= jpeg-6a - USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index dd3c11054a9..b8062ad42a3 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/11/11 06:28:40 garbled Exp $ +# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:30 hubertf Exp $ DISTNAME= magicpoint-1.04a PKGNAME= mgp-1.04a @@ -8,8 +8,6 @@ MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/ MAINTAINER= root@garbled.net HOMEPAGE= http://www.Mew.org/mgp/ -CONFLICTS= mgp-1.03a - GNU_CONFIGURE= yes USE_IMAKE= yes diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 6562ebd1bea..93ace2d3734 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 1999/01/10 23:52:15 tron Exp $ +# $NetBSD: Makefile,v 1.24 1999/02/20 22:48:31 hubertf Exp $ # DISTNAME= netpbm @@ -18,8 +18,6 @@ DEPENDS+= tiff-3.4:../../graphics/tiff DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png-1.0.2:../../graphics/png -CONFLICTS= netpbm-* - WRKSRC= ${WRKDIR}/netpbm MAKE_ENV += PREFIX=${PREFIX} MANCP="${INSTALL_MAN}" NO_CONFIGURE= yes diff --git a/graphics/png/Makefile b/graphics/png/Makefile index f8c7cd6eab7..f27b31bf8fb 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:01 tsarna Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:31 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp # @@ -12,8 +12,6 @@ HOMEPAGE= http://www.cdrom.com/pub/png/ USE_LIBTOOL= yes -CONFLICTS= png-0.96 - MAKEFILE= scripts/makefile.std .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index 081f9c904d4..c9de23278e9 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/01/24 12:02:17 frueauf Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:31 hubertf Exp $ # DISTNAME= tgif-4.0.9 @@ -9,8 +9,6 @@ MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \ MAINTAINER= mcmahill@alum.mit.edu HOMEPAGE= http://bourbon.cs.umd.edu:8001/tgif/tgif.html -CONFLICTS= tgif-* - USE_IMAKE= yes post-patch:: diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 1bf7e0fc955..42565dafcc4 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1998/10/15 19:51:07 agc Exp $ +# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:31 hubertf Exp $ # DISTNAME= xfig.3.2.2 @@ -16,8 +16,6 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d -CONFLICTS= xfig-3.2 - USE_IMAKE= yes post-install: diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index b20aa91d331..2a6c1d07a1d 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/12/20 15:09:30 frueauf Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:31 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp # @@ -15,8 +15,6 @@ DEPENDS+= tiff-3.4:../../graphics/tiff DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png-1.0.2:../../graphics/png -CONFLICTS= xpaint-2.5 - USE_IMAKE= yes pre-configure: diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index 55abe784905..97fffa27924 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:51 agc Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:32 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp # @@ -12,8 +12,6 @@ HOMEPAGE= http://www.foolabs.com/xpdf/ DEPENDS= xpm-3.4k:../../graphics/xpm -CONFLICTS= xpdf-0.7a - GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" CONFIGURE_ARGS= --with-gzip diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index c2a59e1350d..af3882c105f 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1998/08/20 15:17:03 tsarna Exp $ +# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:32 hubertf Exp $ # DISTNAME= xpm-3.4k @@ -8,8 +8,6 @@ MASTER_SITES= ftp://avahi.inria.fr/pub/xpm/ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html -CONFLICTS= xpm-3.4j - USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 5ea94a1436e..7bd9d1781f8 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/01/31 23:37:28 tron Exp $ +# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $ DISTNAME= clispsrc-19990108 PKGNAME= clisp-19990108 @@ -8,8 +8,6 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= mjl@emsi.priv.at HOMEPAGE= http://clisp.cons.org/~haible/clisp.html -CONFLICTS= clisp-* - NOT_FOR_ARCHS= alpha # severe LP64 problems MIRROR_DISTFILE= no diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 3462d8cb241..7645f80cc78 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/11/15 21:28:08 frueauf Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:32 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= perry@piermont.com HOMEPAGE= http://www.gnu.org/software/guile/guile.html -CONFLICTS= guile-1.2 - USE_LIBTOOL= yes GNU_CONFIGURE= YES CONFIGURE_ENV= CPPFLAGS="-Dunix" \ diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index 1363fea765c..feeaee2da0c 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/02/05 16:33:34 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $ DISTNAME= jdk1.1.6 PKGNAME= jdk-1.1.6 @@ -19,8 +19,6 @@ ONLY_FOR_ARCHS= i386 NO_CONFIGURE= yes NO_BUILD= yes -CONFLICTS= jdk-* - do-install: ${RM} ${WRKSRC}/README.NetBSD.orig -${MKDIR} ${PREFIX}/java diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index 1e42d26d4b9..f4b52beedc9 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1998/12/08 23:19:49 frueauf Exp $ +# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:33 hubertf Exp $ # DISTNAME= kaffe-1.0.b3 @@ -12,8 +12,6 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= giflib-3.0:../../graphics/giflib -CONFLICTS= kaffe-0.9.2 kaffe-1.0.b1 kaffe-1.0.b2 - ONLY_FOR_ARCHS= arm32 i386 m68k mips* sparc NOT_FOR_ARCHS= alpha #assembler problems diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile index 190333dd208..216ac109f09 100644 --- a/lang/moscow_ml/Makefile +++ b/lang/moscow_ml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/12/07 11:11:40 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:33 hubertf Exp $ # DISTNAME= mos14src @@ -13,8 +13,6 @@ HOMEPAGE= http://www.dina.kvl.dk/~sestoft/mosml.html BUILD_DEPENDS+= perl:../../lang/perl5 -CONFLICTS= moscow_ml-1.42 - ALL_TARGET= clean world post-install: diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile index 280afbe9e9e..91bf4b68c18 100644 --- a/lang/scheme48/Makefile +++ b/lang/scheme48/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1999/01/19 14:16:45 jonb Exp $ +# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:33 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1997/08/27 19:31:37 jmacd Exp # @@ -10,8 +10,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.neci.nj.nec.com/homepages/kelsey/ -CONFLICTS= scheme48-0.46 scheme48-0.51 - NOT_FOR_ARCHS= alpha # *severe* problems. Bus error, alignment GNU_CONFIGURE= yes diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 1eb5501a894..b6a6d2eec2d 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 1999/02/03 13:00:18 frueauf Exp $ +# $NetBSD: Makefile,v 1.38 1999/02/20 22:48:33 hubertf Exp $ # DISTNAME= fetchmail-4.7.7 @@ -10,8 +10,6 @@ MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://sagan.earthspace.net/~esr/fetchmail/ -CONFLICTS= fetchmail-* - GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="${CFLAGS}" diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index e5bf7ed2def..cbea3588411 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/02/08 23:31:59 tron Exp $ +# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:34 hubertf Exp $ # DISTNAME= imap-4.5 @@ -14,8 +14,6 @@ USE_LIBTOOL= yes INST_PROG= ${LIBTOOL} ${INSTALL_PROGRAM} INST_LIB= ${LIBTOOL} ${INSTALL_DATA} -CONFLICTS= imap-uw-* - MESSAGE_FILE= ${WRKDIR}/.MESSAGE do-configure: diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 94061e0d9e1..d714ed1b204 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/02/12 18:32:38 tron Exp $ +# $NetBSD: Makefile,v 1.19 1999/02/20 22:48:34 hubertf Exp $ DISTNAME= mutt-${MUTT_VERSION} CATEGORIES= mail @@ -13,8 +13,6 @@ HOMEPAGE= http://www.mutt.org/ DEPENDS+= ncurses-1.9.9g:../../devel/ncurses -CONFLICTS= mutt-* - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-curses=${PREFIX} --with-exec-shell=/bin/ksh \ --with-docdir=${PREFIX}/share/doc/mutt diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index 80904e7cba1..215b0d87779 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1998/08/20 15:17:10 tsarna Exp $ +# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:34 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.math.gatech.edu/pub/nmh/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.math.gatech.edu/nmh/ -CONFLICTS= nmh-0.17 nmh-0.22 nmh-0.23 nmh-0.24 nmh-0.25 nmh-0.26 - # Mail Transport Agent - either "smtp" or "sendmail" NMH_MTA?= smtp diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 91070a35bf3..7b7400aeba4 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 1998/11/13 16:32:37 tv Exp $ +# $NetBSD: Makefile,v 1.28 1999/02/20 22:48:34 hubertf Exp $ # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp # @@ -13,8 +13,6 @@ HOMEPAGE= http://www.washington.edu/pine/ # This pkg doesn't build pico or libpico; the pico pkg does that part. DEPENDS= pico-3.4:../../editors/pico -CONFLICTS= pine-3.96 pine-4.00 pine-4.02 - do-configure: ${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig ${SED} -e 's@/usr/local/lib/@${PREFIX}/etc/@' \ diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 007fadf3706..7a93047683f 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1998/09/08 22:15:21 tron Exp $ +# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:34 hubertf Exp $ # DISTNAME= qpopper2.53 @@ -10,8 +10,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= mellon@fugue.com HOMEPAGE= http://eudora.qualcomm.com/freeware/qpop.html -CONFLICTS= qpopper2.41beta1 qpopper-2.5 qpopper-2.52 - MIRROR_DISTFILE= no GNU_CONFIGURE= yes diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile index 413d630c3cd..568d623dd9a 100644 --- a/mail/wmmail/Makefile +++ b/mail/wmmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/02/02 10:34:40 tron Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:35 hubertf Exp $ DISTNAME= WMMail.app-0.62 PKGNAME= wmmail-0.62 @@ -11,8 +11,6 @@ HOMEPAGE= http://www.eecg.utoronto.ca/~chanb/wmmail.html BUILD_DEPENDS+= automake:../../devel/automake DEPENDS+= windowmaker-0.51.0:../../x11/windowmaker -CONFLICTS= wmmail-* - USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/math/R/Makefile b/math/R/Makefile index c9823bc4032..000c89c7252 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/01/14 13:57:04 frueauf Exp $ +# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:35 hubertf Exp $ # DISTNAME= R-0.63.1 @@ -22,8 +22,6 @@ DEPENDS+= f2c-19980913:../../lang/f2c .endif DEPENDS+= readline-2.2:../../devel/readline -CONFLICTS= R-0.63.0 - USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-readline --with-x diff --git a/math/abs/Makefile b/math/abs/Makefile index 06842c925b0..2b07dd00f06 100644 --- a/math/abs/Makefile +++ b/math/abs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:52 agc Exp $ +# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:35 hubertf Exp $ # DISTNAME= abs-src-0.5 @@ -11,8 +11,6 @@ HOMEPAGE= http://www.ping.be/bertin/abs.shtml DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= abs-0.4 - USE_X11BASE= yes do-install: diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile index 42b68b142d4..6949f0f9f32 100644 --- a/math/xlispstat/Makefile +++ b/math/xlispstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:52 agc Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:35 hubertf Exp $ # FreeBSD Id: Makefile,v 1.7 1998/08/20 07:35:21 asami Exp # @@ -10,8 +10,6 @@ MASTER_SITES= ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.stat.umn.edu/~luke/xls/xlsinfo/xlsinfo.html -CONFLICTS= xlispstat-3.52.5 - GNU_CONFIGURE= yes USE_X11BASE= yes diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index b5c19e47e56..1bf57e2c576 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:52 agc Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:35 hubertf Exp $ # DISTNAME= rat-3.0.28 @@ -10,8 +10,6 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ DEPENDS+= tk-8.0p2:../../x11/tk80 -CONFLICTS= rat-3.0.24 - RESTRICTED= "Contains DES encryption" MIRROR_DISTFILE=no USE_GMAKE= yes diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index b93fe05af0c..8ca0dd5634a 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/01/30 23:18:52 agc Exp $ +# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:36 hubertf Exp $ # DISTNAME= sdr-2.5.8 @@ -10,8 +10,6 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/ DEPENDS+= tk-8.0p2:../../x11/tk80 -CONFLICTS= sdr-2.4a7mmrz - MIRROR_DISTFILE= no WRKSRC= ${WRKDIR}/sdr USE_GMAKE= yes diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 469ae834bb5..ff7875aa35b 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/11/30 17:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:36 hubertf Exp $ # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ MAINTAINER= hubertf@netbsd.org -CONFLICTS= screen-3.7.[24] - GNU_CONFIGURE= yes INFO_FILES= screen.info diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 10ac827d453..30dab890a31 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/01/16 12:05:09 tron Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:25 hubertf Exp $ # DISTNAME= ORBit-0.3.90 @@ -12,8 +12,6 @@ HOMEPAGE= http://www.gnome.org/ DEPENDS+= glib-1.1.12:../../devel/glib DEPENDS+= gindent-1.9.1:../../devel/gindent -CONFLICTS= ORBit-* - GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index 9afd03e1661..ec1f0a2df1f 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/11/04 17:25:12 mycroft Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:36 hubertf Exp $ # DISTNAME= arpwatch-2.1a4 @@ -8,8 +8,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= bouyer@netbsd.org -CONFLICTS= arpwatch-2.0.2 - GNU_CONFIGURE= yes post-install: diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 7340597103d..5372f02ad58 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1998/11/26 23:34:13 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:36 hubertf Exp $ # DISTNAME= rsync-2.2.1 @@ -11,8 +11,6 @@ MASTER_SITES= ftp://samba.anu.edu.au/pub/rsync/ \ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://samba.anu.edu.au/rsync/ -CONFLICTS= rsync-1.6.9 rsync-2.0.18 rsync-2.1.0 rsync-2.1.1 - GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" diff --git a/net/samba/Makefile b/net/samba/Makefile index a2a5b6e6f82..895c0bd93ff 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1999/02/18 11:50:06 bouyer Exp $ +# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:37 hubertf Exp $ DISTNAME= samba-2.0.2 CATEGORIES= net @@ -7,8 +7,6 @@ MASTER_SITES= ftp://ftp.samba.org/pub/samba/ MAINTAINER= bouyer@netbsd.org HOMEPAGE= http://www.samba.org/ -CONFLICTS= samba-1.* samba-2.0.0beta* samba-2.0.0 - WRKSRC= ${WRKDIR}/${DISTNAME}/source GNU_CONFIGURE= yes diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index d45fe619356..dc1f2fcf23e 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/10/07 20:17:20 agc Exp $ +# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:37 hubertf Exp $ # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp # @@ -11,8 +11,6 @@ MASTER_SITES= ftp://ftp.ece.ucdavis.edu/pub/snmp/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ece.ucdavis.edu/ucd-snmp/ -CONFLICTS= ucd-snmp-3.4 ucd-snmp-3.5 - GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-defaults diff --git a/net/wget/Makefile b/net/wget/Makefile index efcd3d85c97..6d4830c8a11 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1999/01/06 05:19:21 hubertf Exp $ +# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:37 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/wget/wget.html -CONFLICTS= wget-1.4.5 wget-1.5.0 wget-1.5.1 wget-1.5.2 - GNU_CONFIGURE= yes INFO_FILES= wget.info diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile index 98bb8298082..f6f01887bcd 100644 --- a/net/wu-ftpd/Makefile +++ b/net/wu-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/02/14 15:27:50 rh Exp $ +# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:37 hubertf Exp $ # FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp # # REMINDER: to use ftpaccess(5) you need to specify -a in command line, @@ -15,8 +15,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.academ.com/academ/wu-ftpd/ -CONFLICTS= wu-ftpd* - MAKE_ENV+= INSTALL="${INSTALL}" MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" diff --git a/net/zircon/Makefile b/net/zircon/Makefile index f6d97b59aca..f8f54e416da 100644 --- a/net/zircon/Makefile +++ b/net/zircon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/02/03 13:00:18 frueauf Exp $ +# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:37 hubertf Exp $ # DISTNAME= zircon-1.18.210 @@ -10,8 +10,6 @@ HOMEPAGE= http://catless.ncl.ac.uk/Programs/Zircon/ DEPENDS+= tk-8.0p2:../../x11/tk80 -CONFLICTS= zircon-* - IS_INTERACTIVE= yes NO_BUILD= yes diff --git a/news/suck/Makefile b/news/suck/Makefile index 635ee94f5f1..43618d3a740 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/10/16 21:08:26 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:38 hubertf Exp $ # DISTNAME= suck-3.10.1 @@ -10,8 +10,6 @@ MASTER_SITES+= ftp://tsx-11.mit.edu/pub/linux/sources/sbin/ MAINTAINER= root@garbled.net HOMEPAGE= http://home.att.net/~bobyetman/ -CONFLICTS= suck-3.9.3 suck-3.9.4 - HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${LOCALBASE} diff --git a/pkgtools/pkglibtool/Makefile b/pkgtools/pkglibtool/Makefile index 981c4cc6bcc..0a98557efe1 100644 --- a/pkgtools/pkglibtool/Makefile +++ b/pkgtools/pkglibtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/02/14 21:14:04 tron Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:38 hubertf Exp $ # DISTNAME= libtool-1.2 @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.profitpress.com/libtool/ -CONFLICTS= libtool-1.2 pkglibtool-* +CONFLICTS= pkglibtool-* GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 0388d21c6d7..3b9eaa63fbb 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1999/02/19 01:02:14 tv Exp $ +# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:38 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp # @@ -11,8 +11,6 @@ HOMEPAGE= http://www-inf.enst.fr/~demaille/a2ps/ DEPENDS= papersize-1.0:../../print/papersize -CONFLICTS= a2ps-[AL]* - STRIP= GNU_CONFIGURE= yes CONFIGURE_ENV+= LPR=lpr diff --git a/print/enscript/Makefile b/print/enscript/Makefile index f7e5747e913..fd44eb78808 100644 --- a/print/enscript/Makefile +++ b/print/enscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/02/19 00:45:23 tv Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:39 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/27 08:10:30 tg Exp # @@ -11,8 +11,6 @@ HOMEPAGE= http://www.ngs.fi/mtr/genscript/ DEPENDS+= papersize-1.0:../../print/papersize -CONFLICTS= enscript-[AL]* - GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile index d016556f89d..fb818bea9a2 100644 --- a/print/ghostscript5/Makefile +++ b/print/ghostscript5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 1999/01/04 21:44:47 frueauf Exp $ +# $NetBSD: Makefile,v 1.32 1999/02/20 22:48:39 hubertf Exp $ # DISTNAME= ghostscript-5.50 @@ -17,8 +17,6 @@ BUILD_DEPENDS= ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jp unzip:../../archivers/unzip DEPENDS= png-1.0.2:../../graphics/png -CONFLICTS= ghostscript-5.10 - EXTRACT_ONLY= ${GS_SOURCES} WRKSRC= ${WRKDIR}/gs5.50 MAKEFILE= unix-gcc.mak diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index 18c124f66f6..0342f93bae3 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/11/11 11:28:02 agc Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:39 hubertf Exp $ DISTNAME= magicfilter-1.2 CATEGORIES= print @@ -13,8 +13,6 @@ DEPENDS+= a2ps-4.10.3:../../print/a2ps \ teTeX-0.4p8:../../print/teTeX \ papersize-1.0:../../print/papersize -CONFLICTS= magicfilter-A4-1.2 magicfilter-Letter-1.2 - USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/print/psutils/Makefile b/print/psutils/Makefile index 3ceec0139e8..c4ceea2f76b 100644 --- a/print/psutils/Makefile +++ b/print/psutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1998/11/10 14:08:16 agc Exp $ +# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:42 hubertf Exp $ # FreeBSD Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp # @@ -14,8 +14,6 @@ DEPENDS+= papersize-1.0:../../print/papersize WRKSRC= ${WRKDIR}/psutils USE_PERL5= yes -CONFLICTS+= psutils-A4-1.17 psutils-Letter-1.17 - .include "../../mk/bsd.prefs.mk" PAPERSIZE?= A4 diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 4401d66a5e2..aaa5ad31b53 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/08/27 13:46:00 garbled Exp $ +# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:42 hubertf Exp $ # DISTNAME= transfig.3.2.1 @@ -13,8 +13,6 @@ MAINTAINER= root@garbled.net DEPENDS+= xpm-3.4k:../../graphics/xpm DEPENDS+= jpeg-6b:../../graphics/jpeg -CONFLICTS= transfig-3.2 - USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 9f06d00955f..544157a134c 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 1999/02/03 22:44:10 wrstuden Exp $ +# $NetBSD: Makefile,v 1.40 1999/02/20 22:48:42 hubertf Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -11,8 +11,6 @@ MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.cs.hut.fi/ssh/ -CONFLICTS= ssh-1.2.22 ssh-1.2.23 ssh-1.2.25 - RESTRICTED= "Crypto; export-controlled" MIRROR_DISTFILE= no IS_INTERACTIVE= YES diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile index 93049c50091..c46f0fbf8f5 100644 --- a/security/ssleay/Makefile +++ b/security/ssleay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/12/03 17:29:58 tv Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:42 hubertf Exp $ # DISTNAME= SSLeay-0.9.0b @@ -11,8 +11,6 @@ MASTER_SITES= ftp://psych.psy.uq.oz.au/pub/Crypto/SSL/ MAINTAINER= explorer@netbsd.org HOMEPAGE= http://www.psy.uq.oz.au/~ftp/Crypto/ -CONFLICTS= SSLeay-* - NOT_FOR_ARCHS= alpha *64 USE_PERL5= yes diff --git a/security/sudo/Makefile b/security/sudo/Makefile index cfd3add2e0d..231cf2f8dad 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/12/14 10:25:50 frueauf Exp $ +# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp # @@ -12,8 +12,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.courtesan.com/courtesan/products/sudo/ -CONFLICTS= sudo-1.5.3 sudo-1.5.4p1 sudo-1.5.6p2 - GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-C2 --with-skey --with-nbsdops --disable-path-info diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index c33cc2fd0df..0268421b077 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1999/01/14 14:52:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp # @@ -18,8 +18,6 @@ DISTFILES= bash-${V}.tar.gz bash-doc-${DV}.tar.gz MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/bash/bash.html -CONFLICTS= bash-2.02 - GNU_CONFIGURE= yes USE_GTEXINFO= yes diff --git a/sysutils/addnerd/Makefile b/sysutils/addnerd/Makefile index 0f17083b13f..9cf84e55c0b 100644 --- a/sysutils/addnerd/Makefile +++ b/sysutils/addnerd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/12/31 21:21:53 marc Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:43 hubertf Exp $ # DISTNAME= addnerd-1.6 @@ -8,8 +8,6 @@ MASTER_SITES= http://www.westley.demon.co.uk/src/ MAINTAINER= agc@netbsd.org HOMEPAGE= http://www.westley.demon.co.uk/software.html -CONFLICTS= addnerd-1.5 - GNU_CONFIGURE= yes .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index 1aec90033dd..4854c8893be 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 1999/02/17 02:46:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.24 1999/02/20 22:48:43 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp # @@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html -CONFLICTS= cdrecord-* - USE_GMAKE= yes post-configure: diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile index a27cdcd519d..17ee7f06699 100644 --- a/sysutils/mkisofs/Makefile +++ b/sysutils/mkisofs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/11/13 01:44:50 frueauf Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:43 hubertf Exp $ # DISTNAME= mkisofs-1.11.3 @@ -8,8 +8,6 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://andante.jic.com/mkisofs.html -CONFLICTS= mkisofs-1.11 - NOT_FOR_ARCHS= alpha #gcc lossage GNU_CONFIGURE= yes diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index da346ff2715..7fa24d242d3 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 1999/02/17 00:16:55 bgrayson Exp $ +# $NetBSD: Makefile,v 1.25 1999/02/20 22:48:44 hubertf Exp $ # DISTNAME= xosview-1.7.0.b @@ -9,8 +9,6 @@ MASTER_SITES= http://www.ece.utexas.edu/~bgrayson/xosview/ \ MAINTAINER= bgrayson@ece.utexas.edu HOMEPAGE= http://lore.ece.utexas.edu/~bgrayson/xosview.html -CONFLICTS= xosview-* - HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} USE_X11BASE= yes diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile index 49a3db689e6..6f27e2b74d1 100644 --- a/textproc/rman/Makefile +++ b/textproc/rman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:29 tsarna Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:44 hubertf Exp $ # FreeBSD Id: Makefile,v 1.17 1997/12/08 15:45:27 tg Exp # @@ -10,8 +10,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= packages@netbsd.org HOMEPAGE= http://http.cs.berkeley.edu/~phelps/tcltk/ -CONFLICTS= rman-3.0.5 - RESTRICTED= "Permission to incorporate this software into commercial products is needed." NO_CDROM= "License required" diff --git a/www/apache/Makefile b/www/apache/Makefile index 55daa8911c6..2c469bb4670 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 1998/12/07 16:20:39 tv Exp $ +# $NetBSD: Makefile,v 1.29 1999/02/20 22:48:44 hubertf Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -21,7 +21,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= cjs@netbsd.org HOMEPAGE= http://www.apache.org/ -CONFLICTS= apache-1.3.[012] apache-*modssl-* apache-1.3.3.[01] +CONFLICTS= apache-*modssl-* SSL_DISTNAME= mod_ssl-2.1.3-1.3.3 diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 4a13f0e1325..2185588e58d 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1999/01/23 12:41:13 frueauf Exp $ +# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:45 hubertf Exp $ # DISTNAME= lynx2-8-1 @@ -12,8 +12,6 @@ HOMEPAGE= http://sol.slcc.edu/lynx/ DEPENDS+= libslang-1.2.2:../../devel/libslang -CONFLICTS= lynx-* - GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-screen=slang --with-zlib --libdir="${PREFIX}/etc" # see if PASSIVE_FETCH is defined in /etc/mk.conf. If so compile diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 156775045e5..3936b711fb4 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 1999/02/01 11:39:45 frueauf Exp $ +# $NetBSD: Makefile,v 1.22 1999/02/20 22:48:45 hubertf Exp $ # DISTNAME= mozilla-19981008 @@ -16,8 +16,6 @@ USE_GMAKE= yes USE_PERL5= yes USE_MOTIF= yes -CONFLICTS= mozilla-* - MOZ_OBJDIR= ${OPSYS}${OS_VERSION}_OPT.OBJ MOZ_LIBDIR= ${PREFIX}/lib/mozilla diff --git a/www/squid-current/Makefile b/www/squid-current/Makefile index 48f2439e1db..6dfca811ace 100644 --- a/www/squid-current/Makefile +++ b/www/squid-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/02/19 16:08:45 christos Exp $ +# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:45 hubertf Exp $ # DISTNAME= squid-2.1.PATCH2 @@ -20,12 +20,6 @@ PATCHFILES=squid-2.1.PATCH2-clientHandleIMSReply-leak.patch MAINTAINER= bad@netbsd.org HOMEPAGE= http://squid.nlanr.net/Squid/ -CONFLICTS= squid-1.1.21 \ - squid-2.0.PRE1 \ - squid-2.0.RELEASE \ - squid-2.0.PATCH1 \ - squid-2.0.PATCH2 - GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=/etc \ --localstatedir=/var/squid diff --git a/www/squid/Makefile b/www/squid/Makefile index 085c6defd7a..8d293b45926 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/01/29 19:26:37 bad Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:45 hubertf Exp $ # DISTNAME= squid-2.0.PATCH2 @@ -12,11 +12,6 @@ MASTER_SITES= \ ftp://ftp.net.lut.ac.uk/squid/squid-2/ EXTRACT_SUFX= -src.tar.gz -CONFLICTS= squid-1.1.21 \ - squid-2.0.PRE1 \ - squid-2.0.RELEASE \ - squid-2.0.PATCH1 - MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://squid.nlanr.net/Squid/ diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index a2267a58832..4b66a8c322b 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/08/20 15:17:32 tsarna Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:46 hubertf Exp $ DISTNAME= wwwoffle-2.2 CATEGORIES= www @@ -9,8 +9,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= magick@bundy.lip.owl.de HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/ -CONFLICTS= wwwoffle-2.1c - USE_GMAKE= yes NO_CONFIGURE= yes diff --git a/www/zope/Makefile b/www/zope/Makefile index 0b44bef97c2..3511dc6f000 100644 --- a/www/zope/Makefile +++ b/www/zope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/12/23 07:04:22 tsarna Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:46 hubertf Exp $ # DISTNAME= Zope-1.9.0-src @@ -11,8 +11,6 @@ HOMEPAGE= http://www.zope.org/ DEPENDS+= python-1.5.1:../../lang/python -CONFLICTS= zope-1.9b1 zope-1.9.0b2 - PLIST_SRC= ${WRKDIR}/.PLIST_SRC ZOPEDIR= ${PREFIX}/zope diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile index 78a3b3a8ddb..1a7810b379a 100644 --- a/x11/XF86Setup/Makefile +++ b/x11/XF86Setup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/01/22 21:10:01 tron Exp $ +# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:46 hubertf Exp $ DISTNAME= XF86Setup-3.3.3.1 CATEGORIES= x11 @@ -11,8 +11,6 @@ HOMEPAGE= http://www.xfree86.org/ BUILD_DEPENDS+= ${TCLLIB}:../../lang/tcl80 \ ${TKLIB}:../../x11/tk80 -CONFLICTS= XF86Setup-* - TCLLIB= ${LOCALBASE}/lib/libtcl80.a TKLIB= ${LOCALBASE}/lib/libtk80.a diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile index 690cb351429..661ca7b51e6 100644 --- a/x11/Xaw-Xpm/Makefile +++ b/x11/Xaw-Xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/09/13 19:35:05 garbled Exp $ +# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:46 hubertf Exp $ # DISTNAME= Xaw-Xpm-1.1 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.zip.com.au/~bb/XawXpm/ DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= Xaw3d-1.3 Xaw3d-1.5 +CONFLICTS= Xaw3d-* USE_IMAKE= yes diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index ce5b488244c..fe8f4e6320b 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1998/07/15 10:45:35 agc Exp $ +# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:46 hubertf Exp $ # DISTNAME= Xaw3d-1.5 @@ -8,7 +8,7 @@ MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3 MAINTAINER= tron@netbsd.org -CONFLICTS= Xaw-Xpm-1.1 Xaw3d-1.3 +CONFLICTS= Xaw-Xpm-* USE_IMAKE= yes WRKSRC= ${WRKDIR}/xc/lib/Xaw3d diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile index d081114f606..91b1e63cdc9 100644 --- a/x11/afterstep/Makefile +++ b/x11/afterstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:55 agc Exp $ +# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:46 hubertf Exp $ DISTNAME= AfterStep-1.6.0 PKGNAME= afterstep-1.6.0 @@ -15,8 +15,6 @@ DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= rplay-3.2.0b6:../../audio/rplay DEPENDS+= asclock-11:../../x11/asclock -CONFLICTS= afterstep-* - USE_X11BASE= yes GNU_CONFIGURE= yes diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile index 4e48b457485..86f73a1c2c6 100644 --- a/x11/asclock/Makefile +++ b/x11/asclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:55 agc Exp $ +# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:47 hubertf Exp $ # DISTNAME= asclock @@ -11,8 +11,6 @@ MAINTAINER= hubertf@netbsd.org DEPENDS+= xpm-3.4k:../../graphics/xpm -CONFLICTS= asclock-10 - # Choose language from: # 1) english [DEFAULT] # 2) german diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 95514700f6a..256ea3b225a 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1999/01/30 23:18:56 agc Exp $ +# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:47 hubertf Exp $ # DISTNAME= gnome-libs-0.99.3 @@ -15,8 +15,6 @@ DEPENDS+= ORBit-0.3.90:../../corba/ORBit NOT_FOR_ARCHS= alpha # problems with gtk -CONFLICTS= gnome-libs-* - GNU_CONFIGURE= yes USE_X11BASE= yes USE_GMAKE= yes diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 3f3b97afca3..b7fb96ec06b 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 1999/01/30 23:18:56 agc Exp $ +# $NetBSD: Makefile,v 1.27 1999/02/20 22:48:47 hubertf Exp $ DISTNAME= gtk+-1.1.12 CATEGORIES= x11 @@ -14,8 +14,6 @@ DEPENDS+= gettext-0.10.35:../../devel/gettext DEPENDS+= glib-1.1.12:../../devel/glib BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5 -CONFLICTS= gtk+-* - USE_LIBTOOL= yes USE_X11BASE= yes USE_GMAKE= yes diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 9353e33aa22..14a6a4454d3 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 1999/01/30 23:18:57 agc Exp $ +# $NetBSD: Makefile,v 1.37 1999/02/20 22:48:47 hubertf Exp $ # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp # @@ -10,8 +10,6 @@ MASTER_SITES= ftp://linux.gt.ed.net/pub/linux/libs/lesstif/srcdist/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.lesstif.org/ -CONFLICTS= lesstif-* - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_X11BASE= yes diff --git a/x11/qt/Makefile b/x11/qt/Makefile index b36a4073e8b..e79e905b5e3 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 1999/01/30 23:18:57 agc Exp $ +# $NetBSD: Makefile,v 1.24 1999/02/20 22:48:47 hubertf Exp $ # DISTNAME= qt-1.42 @@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.troll.no/qt/source/ \ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.troll.no/products/qt.html -CONFLICTS= qt-* - USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index da8ce013b37..16fdc662da6 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/02/15 19:30:33 tron Exp $ +# $NetBSD: Makefile,v 1.23 1999/02/20 22:48:47 hubertf Exp $ DISTNAME= WindowMaker-0.51.0 PKGNAME= windowmaker-0.51.0 @@ -18,8 +18,6 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= tiff-3.4:../../graphics/tiff -CONFLICTS= windowmaker-* - USE_LIBTOOL= yes USE_X11BASE= yes GNU_CONFIGURE= yes diff --git a/x11/wmthemes/Makefile b/x11/wmthemes/Makefile index b6a153e9b8f..0c74c6e90e7 100644 --- a/x11/wmthemes/Makefile +++ b/x11/wmthemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/02/02 10:27:55 tron Exp $ +# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:48 hubertf Exp $ DISTNAME= wmthemes-0.51.x CATEGORIES= x11 @@ -11,8 +11,6 @@ HOMEPAGE= http://wm.themes.org/ DEPENDS+= windowmaker-0.51.0:../../x11/windowmaker -CONFLICTS= wm-themes-* wmthemes-* - USE_X11BASE= yes NO_BUILD= yes NO_CONFIGURE= yes diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index e80c151915e..7d8276c0ce6 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:58 agc Exp $ +# $NetBSD: Makefile,v 1.23 1999/02/20 22:48:48 hubertf Exp $ # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp # @@ -12,9 +12,6 @@ HOMEPAGE= http://www.tux.org/~bagleyd/xlockmore.html DEPENDS+= xpm-3.4k:../../graphics/xpm DEPENDS+= Mesa-3.0:../../graphics/Mesa -CONFLICTS= xlockmore-4.07 xlockmore-4.08 xlockmore-4.09 xlockmore-4.10 \ - xlockmore-4.11 - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \ --without-editres --without-dtsaver --without-rplay \ diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 364c5e6a316..07c8b6657d9 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 1999/01/30 23:18:58 agc Exp $ +# $NetBSD: Makefile,v 1.20 1999/02/20 22:48:48 hubertf Exp $ # DISTNAME= xscreensaver-3.07 @@ -12,8 +12,6 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d DEPENDS+= Mesa-3.0:../../graphics/Mesa -CONFLICTS= xscreensaver-* - GNU_CONFIGURE= yes CONFIGURE_ARGS+=--without-shadow --with-zippy=/usr/games/fortune \ --enable-subdir=${PREFIX}/libexec/xscreensaver diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile index a09c5b45583..0a8496d6daa 100644 --- a/x11/xwrits/Makefile +++ b/x11/xwrits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:58 agc Exp $ +# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:48 hubertf Exp $ DISTNAME= xwrits-2.7.3 CATEGORIES= x11 @@ -7,8 +7,6 @@ MASTER_SITES= http://www.lcdf.org/~eddietwo/xwrits/ MAINTAINER= mcmahill@alum.mit.edu HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/ -CONFLICTS= xwrits-* - USE_X11BASE= YES GNU_CONFIGURE= YES |