From b71a1d488b6b45e0a968a4c149990c25b6a09215 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Mon, 5 Dec 2005 20:49:47 +0000
Subject: 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
---
 x11/gtk2/Makefile   |  6 +++---
 x11/gtk2/modules.mk | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'x11/gtk2')

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 6d003c15717..0d875d47b6a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2005/11/29 17:44:50 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2005/12/05 20:51:17 rillig Exp $
 #
 
 DISTNAME=		gtk+-2.8.8
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV+=		ac_cv_header_X11_extensions_Xinerama_h=no
 CONFIGURE_ENV+=		ac_cv_lib_Xinerama_XineramaQueryExtension=no
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE=	gdk-2.0-uninstalled.pc.in
@@ -58,7 +58,7 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/themes\/Default$$/ \
 				{ print "@unexec $${RMDIR} %D/" $$2 \
 				  " 2>/dev/null || $${TRUE}"; next; }
 
-SUBST_CLASSES=		pthread
+SUBST_CLASSES+=		pthread
 SUBST_STAGE.pthread=	pre-configure
 SUBST_MESSAGE.pthread=	"Fixing pthread flags."
 SUBST_SED.pthread=	-e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk
index b073c745f0e..825ab5e8c2b 100644
--- a/x11/gtk2/modules.mk
+++ b/x11/gtk2/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.9 2004/06/20 20:12:20 jmmv Exp $
+# $NetBSD: modules.mk,v 1.10 2005/12/05 20:51:17 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -22,8 +22,8 @@ GTK2_LOADERS=		YES
 .endif
 
 .if defined(GTK2_IMMODULES) && !empty(GTK2_IMMODULES:M[Yy][Ee][Ss])
-FILES_SUBST+=		GTK_IMMODULES_DB="${GTK_IMMODULES_DB}"
-FILES_SUBST+=		GTK_QUERY_IMMODULES="${GTK_QUERY_IMMODULES}"
+FILES_SUBST+=		GTK_IMMODULES_DB=${GTK_IMMODULES_DB:Q}
+FILES_SUBST+=		GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q}
 GTK_IMMODULES_DB=	${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gtk.immodules
 INSTALL_EXTRA_TMPL+=	../../x11/gtk2/files/immodules.tmpl
 DEINSTALL_EXTRA_TMPL+=	../../x11/gtk2/files/immodules.tmpl
@@ -31,8 +31,8 @@ USE_PKGINSTALL=		YES
 .endif
 
 .if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss])
-FILES_SUBST+=		GDK_PIXBUF_LOADERS_DB="${GDK_PIXBUF_LOADERS_DB}"
-FILES_SUBST+=		GDK_PIXBUF_QUERY_LOADERS="${GDK_PIXBUF_QUERY_LOADERS}"
+FILES_SUBST+=		GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
+FILES_SUBST+=		GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
 GDK_PIXBUF_LOADERS_DB=	${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gdk-pixbuf.loaders
 INSTALL_EXTRA_TMPL+=	../../x11/gtk2/files/loaders.tmpl
 DEINSTALL_EXTRA_TMPL+=	../../x11/gtk2/files/loaders.tmpl
-- 
cgit v1.2.3