diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 4 | ||||
| -rw-r--r-- | www/lynx/Makefile | 4 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 4 | ||||
| -rw-r--r-- | www/squid-current/Makefile | 8 | ||||
| -rw-r--r-- | www/squid/Makefile | 7 | ||||
| -rw-r--r-- | www/wwwoffle/Makefile | 4 | ||||
| -rw-r--r-- | www/zope/Makefile | 4 |
7 files changed, 8 insertions, 27 deletions
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 |