Fixed the separation of CONFIGURE_SCRIPT and CONFIG_SHELL.

7 files changed, 21 insertions, 16 deletions

diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index 81365b83841..b9d0c13af6d 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/17 20:43:23 rillig Exp $
 #
 
 DISTNAME=		pyao-0.81
@@ -15,7 +15,8 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	${PYTHONBIN} config_unix.py
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
 .include "../../audio/libao/buildlink3.mk"
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index a3a9a7fe3ad..9d12b9fe596 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:26:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/17 20:43:23 rillig Exp $
 #
 
 DISTNAME=		pymad-0.5.4
@@ -14,7 +14,8 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	${PYTHONBIN} config_unix.py
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index c66557925a3..449462bd0e9 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/17 20:43:23 rillig Exp $
 #
 
 DISTNAME=		pyogg-1.3
@@ -15,7 +15,8 @@ PYDISTUTILSPKG=		yes
 PY_PATCHPLIST=		yes
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	${PYTHONBIN} config_unix.py
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
 .include "../../lang/python/extension.mk"
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 86f7895f9f8..1b88c038037 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/17 20:43:23 rillig Exp $
 #
 
 DISTNAME=		pyvorbis-1.3
@@ -15,7 +15,8 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	${PYTHONBIN} config_unix.py
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
 .include "../../audio/py-ogg/buildlink3.mk"
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 0f55953aed6..fdeba8e0342 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/03/08 19:43:45 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2007/03/17 20:43:24 rillig Exp $
 
 DISTNAME=	pilotmgr-1.109
 CATEGORIES=	comms
@@ -17,9 +17,11 @@ HAS_CONFIGURE=		YES
 NO_BUILD=		YES
 USE_TOOLS+=		perl:run
 
+CONFIGURE_ENV+=		PERL=${LOCALBASE}/bin/perl
+CONFIGURE_ENV+=		WRKDIR=${WRKDIR}
+CONFIG_SHELL=		perl
+CONFIGURE_SCRIPT=	Setup.pl
 CONFIGURE_ARGS+=	</dev/null
-CONFIGURE_ENV+=		PERL="${LOCALBASE}/bin/perl" WRKDIR=${WRKDIR:Q}
-CONFIGURE_SCRIPT=	perl Setup.pl
 
 PM_PERL_DIR=	${PREFIX}/lib/${DISTNAME:C/-.*$//}
 PM_DOC_DIR=	${PREFIX}/share/doc/${DISTNAME:C/-.*$//}
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 20c95ac368f..31106ca56f2 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:59 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/03/17 20:43:24 rillig Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
@@ -16,8 +16,9 @@ CONFLICTS=		elm-[0-9]*
 
 WRKSRC=			${WRKDIR}/elm2.4.ME+.93
 HAS_CONFIGURE=		YES
-CONFIGURE_SCRIPT=	ksh ./Configure
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes
+CONFIG_SHELL=		ksh
+CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-S
 
 INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/nls
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index c960ce6ad93..7508b0cf6a7 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/01/15 16:19:43 joerg Exp $
+# $NetBSD: Makefile,v 1.61 2007/03/17 20:43:23 rillig Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
 MAINTAINER=	adam@NetBSD.org
@@ -28,8 +28,6 @@ UNLIMIT_RESOURCES=	datasize
 
 BUILDLINK_PASSTHRU_DIRS+=	${QTPREFIX}
 
-PKGCONFIG_OVERRIDE=	lib/qt-mt.pc
-
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin