Fix a few more paste-o's.

10 files changed, 26 insertions, 24 deletions

diff --git a/chat/kicq/Makefile b/chat/kicq/Makefile
index dd5c3d14fc9..be8fe3d6635 100644
--- a/chat/kicq/Makefile
+++ b/chat/kicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/05 09:00:54 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/07 05:16:40 fredb Exp $
 
 DISTNAME=		kicq-1.0.0
 CATEGORIES=		chat kde
@@ -7,7 +7,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kicq/}
 MAINTAINER=		magick@bundy.lip.owl.de
 HOMEPAGE=		http://kicq.sourceforge.net/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 DEPENDS+=		icqlib>=1.0.0:../../chat/icqlib
 DEPENDS+=		kdebase-1.1.2:../../x11/kdebase
 
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 359b97dd9ec..02d8f55bc4c 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/05 09:00:55 tron Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/07 05:16:39 fredb Exp $
 #
 
 DISTNAME=	SDL-1.1.6
@@ -8,8 +8,8 @@ MASTER_SITES=	http://www.libsdl.org/release/
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.libsdl.org/
 
-BUILD_DEPENDS+= ${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+= ${LOCALBASE}/bin/${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake
 DEPENDS+=	pth>=1.3.5:../../devel/pth
 #DEPENDS+=	unproven-pthreads>=0.16
 DEPENDS+=	esound>=0.2.18:../../audio/esound
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 9418fbd4590..489edb80393 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/05 09:00:56 tron Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/07 05:16:39 fredb Exp $
 #
 
 DISTNAME=		latestCDK
@@ -11,7 +11,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.vexus.ca/CDK.html
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 0e12d7b0cd0..23881f9b3f4 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/05 09:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/07 05:16:39 fredb Exp $
 #
 
 DISTNAME=	Squeak2.7-src
@@ -10,7 +10,7 @@ DISTFILES=	Squeak2.7-src.tar.gz Squeak2.7.image.gz Squeak2.7.changes.gz SqueakV2
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.squeak.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
 DIST_SUBDIR=	squeak
 EXTRACT_ONLY=	Squeak2.7-src.tar.gz
@@ -19,7 +19,8 @@ USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
 
 ALL_TARGET=	squeak
-MAKE_ENV+=	LIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
+
+CONFIGURE_ARGS+=	--debug
 
 pre-configure:
 	cd ${WRKSRC}/conf; ${LOCALBASE}/bin/autoconf
@@ -27,7 +28,8 @@ pre-configure:
 do-install:
 	${MKDIR} ${PREFIX}/share/squeak
 	${INSTALL_PROGRAM} ${WRKSRC}/`${WRKSRC}/conf/config.guess`/squeak ${PREFIX}/bin
-	for f in Squeak2.7.changes Squeak2.7.image SqueakV2.sources ; do		\
+	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${PREFIX}/share/squeak
+	for f in Squeak2.7.changes Squeak2.7.image SqueakV2.sources ; do	\
 		${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/$$f.gz > ${PREFIX}/share/squeak/$$f; \
 	done
 
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 0db20ea4017..156f3eeea1a 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2001/02/05 09:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.83 2001/02/07 05:16:39 fredb Exp $
 #
 
 DISTNAME=       fetchmail-5.6.0
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.tuxedo.org/~esr/fetchmail/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
 
 USE_LIBINTL=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 0bb3084a7a2..902d697a440 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2001/02/05 09:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.64 2001/02/07 05:16:39 fredb Exp $
 
 DISTNAME=	mutt-1.2.5i
 CATEGORIES=	mail
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.mutt.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
 BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 
 USE_LIBINTL=	YES
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 4e380eb0b79..7932f47c818 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/05 09:01:00 tron Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/07 05:16:40 fredb Exp $
 #
 
 DISTNAME=	pspp-0.3.0
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://franz.stat.wisc.edu/pub/PSPP/ \
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/pspp/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 
 GNU_CONFIGURE=	yes
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index da1b1a5df46..6e473907e99 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/02/05 09:01:00 tron Exp $
+# $NetBSD: Makefile,v 1.36 2001/02/07 05:16:40 fredb Exp $
 #
 
 DISTNAME=		vatsrc-4.0b2
@@ -10,7 +10,7 @@ MASTER_SITES=		ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
 MAINTAINER=		mycroft@netbsd.org
 HOMEPAGE=		http://www-nrg.ee.lbl.gov/vat/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 DEPENDS+=		tk-8.3.2:../../x11/tk
 DEPENDS+=		gsm-1.0.10:../../audio/gsm
 
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index eb92c089e13..add899a684b 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/05 09:01:00 tron Exp $
+# $NetBSD: Makefile,v 1.16 2001/02/07 05:16:40 fredb Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
 #
 
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
 MAINTAINER=	is@netbsd.org
 HOMEPAGE=	http://www-nrg.ee.lbl.gov/vic/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 DEPENDS+=	tk-8.3.2:../../x11/tk
 
 GNU_CONFIGURE=	yes
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 046102b90ef..18a634f12f6 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/05 09:01:05 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/07 05:16:40 fredb Exp $
 
 DISTNAME=		WindowMaker-0.62.1
 PKGNAME=		windowmaker-0.62.1
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.windowmaker.org/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
 BUILD_DEPENDS+=		gettextize:../../devel/gettext
 DEPENDS+=		libproplist-0.10.*:../../devel/libproplist
 DEPENDS+=		libungif-*:../../graphics/libungif