Fixed pkglint warnings. The warnings are mostly quoting issues, for

example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html

3 files changed, 20 insertions, 20 deletions

diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 22affd8874b..10161768208 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:19 rillig Exp $
 
 PKGNAME=	qt2-libs-${QTVERSION}
 PKGREVISION=	6
 COMMENT=	C++ X GUI toolkit
 
 
-.include "../qt2-libs/Makefile.common"
+.include "../../x11/qt2-libs/Makefile.common"
 
-CONFIGURE_ENV+=		QTDIR="${WRKSRC}"
-MAKE_ENV+=		QTDIR="${WRKSRC}"
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+CONFIGURE_ENV+=		QTDIR=${WRKSRC:Q}
+MAKE_ENV+=		QTDIR=${WRKSRC:Q}
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 
 BUILD_TARGET=		sub-src
 
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index f63dab83efc..b4a2bf61323 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/10/04 19:34:36 joerg Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:51:19 rillig Exp $
 #
 
 DISTNAME=	qt-x11-${QTVERSION}
@@ -6,7 +6,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
 
-.include "../qt2/Makefile.common"
+.include "../../x11/qt2/Makefile.common"
 
 WRKSRC=			${WRKDIR}/qt-${QTVERSION}
 HAS_CONFIGURE=		yes
@@ -22,12 +22,12 @@ CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
 QTPREFIX=		${PREFIX}/qt2
 
-MAKE_ENV+=		QTPREFIX=${QTPREFIX}
+MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
 
-MAKE_ENV+=		SYSCONF_CXXFLAGS="${CXXFLAGS}"
-MAKE_ENV+=		SYSCONF_CFLAGS="${CFLAGS}"
-MAKE_ENV+=		SYSCONF_CXXFLAGS_LIB="${CXXFLAGS}"
-MAKE_ENV+=		SYSCONF_CFLAGS_LIB="${CFLAGS}"
+MAKE_ENV+=		SYSCONF_CXXFLAGS=${CXXFLAGS:M*:Q}
+MAKE_ENV+=		SYSCONF_CFLAGS=${CFLAGS:M*:Q}
+MAKE_ENV+=		SYSCONF_CXXFLAGS_LIB=${CXXFLAGS:M*:Q}
+MAKE_ENV+=		SYSCONF_CFLAGS_LIB=${CFLAGS:M*:Q}
 
 DISTINFO_FILE=		${.CURDIR}/../../x11/qt2-libs/distinfo
 FILESDIR=		${.CURDIR}/../../x11/qt2-libs/files
@@ -41,11 +41,11 @@ CONFIGURE_ARGS+=	-platform solaris-g++
 CONFIGURE_ARGS+=	-xft -platform freebsd-g++
 .endif
 
-FILES_SUBST=		BUILDLINK_DIR=${BUILDLINK_DIR}
-FILES_SUBST+=		BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR}
-FILES_SUBST+=		LOCALBASE=${LOCALBASE}
-FILES_SUBST+=		QTDIR=${QTPREFIX}
-FILES_SUBST+=		X11BASE=${X11BASE}
+FILES_SUBST=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+FILES_SUBST+=		BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR:Q}
+FILES_SUBST+=		LOCALBASE=${LOCALBASE:Q}
+FILES_SUBST+=		QTDIR=${QTPREFIX:Q}
+FILES_SUBST+=		X11BASE=${X11BASE:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 395301dc001..4d7b9d888a1 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/12/05 20:51:19 rillig Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_LIBS_BUILDLINK3_MK:=	${QT2_LIBS_BUILDLINK3_MK}+
@@ -27,9 +27,9 @@ BUILDLINK_LIBDIRS.qt2-libs=	qt2/lib
 .include "../../graphics/png/buildlink3.mk"
 
 QTDIR=		${BUILDLINK_PREFIX.qt2-libs}/qt2
-CONFIGURE_ENV+=	QTDIR="${QTDIR}"
+CONFIGURE_ENV+=	QTDIR=${QTDIR:Q}
 CONFIGURE_ENV+=	MOC="${QTDIR}/bin/moc"
-MAKE_ENV+=	QTDIR="${QTDIR}"
+MAKE_ENV+=	QTDIR=${QTDIR:Q}
 MAKE_ENV+=	MOC="${QTDIR}/bin/moc"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}