From b4f920543059af038598712771c3211999ef42a6 Mon Sep 17 00:00:00 2001 From: rillig 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 --- meta-pkgs/XFree86/Makefile | 4 ++-- meta-pkgs/XFree86/Makefile.common | 36 +++++++++++++++++------------------- meta-pkgs/kde3/kde3.mk | 8 ++++---- meta-pkgs/xorg/Makefile | 4 ++-- meta-pkgs/xorg/Makefile.common | 38 ++++++++++++++++++-------------------- 5 files changed, 43 insertions(+), 47 deletions(-) (limited to 'meta-pkgs') diff --git a/meta-pkgs/XFree86/Makefile b/meta-pkgs/XFree86/Makefile index 20dd02c6988..b872440cc06 100644 --- a/meta-pkgs/XFree86/Makefile +++ b/meta-pkgs/XFree86/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/10/10 17:22:05 reed Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:37 rillig Exp $ DISTNAME= # empty PKGNAME= XFree86-${XF_VER} @@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 meta-package -DEPENDS= XFree86-imake>=4.4.0:../../x11/XFree86-imake +DEPENDS+= XFree86-imake>=4.4.0:../../x11/XFree86-imake DEPENDS+= XFree86-libs>=4.4.0:../../x11/XFree86-libs DEPENDS+= XFree86-clients>=4.4.0:../../x11/XFree86-clients DEPENDS+= XFree86-server>=4.4.0:../../x11/XFree86-server diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index e50d9b5554b..a8c90eae9b7 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/09/28 19:20:30 rillig Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:37 rillig Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -104,21 +104,21 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX} .if !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss]) -PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR} -PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB} -PLIST_SUBST+= XF86RUSH=${XF86RUSH} -PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS} -PLIST_SUBST+= LIBDRI=${LIBDRI} -PLIST_SUBST+= MAN_DIR=${MAN_DIR} -PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR} -PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX} -PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX} -PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR} -PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX} -PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR} -PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX} -PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR} -PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX} +PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q} +PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q} +PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q} +PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q} +PLIST_SUBST+= LIBDRI=${LIBDRI:Q} +PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q} +PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q} +PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q} +PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q} +PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR:Q} +PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q} +PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR:Q} +PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q} +PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR:Q} +PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q} CHECK_X11_TYPE?= yes @@ -134,7 +134,7 @@ WRKSRC?= ${WRKDIR}/xc X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX} PREPEND_PATH= ${X11ROOT}/bin # Make sure we have this in PATH :) -PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX} +PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX:Q} MESSAGE_SUBST+= X11ROOT=${X11ROOT} # @@ -204,7 +204,6 @@ post-extract: @${MV} ${WRKSRC}/config/cf/${F}.cf \ ${WRKSRC}/config/cf/${F}.cf.in . endfor -. undef F . endif @@ -220,7 +219,6 @@ pre-configure: ${WRKSRC}/config/cf/${F}.cf.in > \ ${WRKSRC}/config/cf/${F}.cf . endfor -. undef F . endif diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk index e713d74a7f3..8575a984f37 100644 --- a/meta-pkgs/kde3/kde3.mk +++ b/meta-pkgs/kde3/kde3.mk @@ -1,4 +1,4 @@ -# $NetBSD: kde3.mk,v 1.9 2005/06/01 18:03:04 jlam Exp $ +# $NetBSD: kde3.mk,v 1.10 2005/12/05 20:50:37 rillig Exp $ # # This Makefile fragment is included by packages that use the KDE3 # configure-and-build process. @@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-xinerama .endif -CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= USER_LDFLAGS=${LDFLAGS:M*:Q} LDFLAGS+= -L${QTDIR}/lib _KDE3_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include @@ -71,8 +71,8 @@ _KDE3_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include KDE_CONFIG_SITE?= ${KDEDIR}/share/kde/config.site \ ${PKG_SYSCONFDIR}/kde/config.site -CONFIGURE_ENV+= KDEDIR="${KDEDIR}" -CONFIGURE_ENV+= CONFIG_SITE="${KDE_CONFIG_SITE}" +CONFIGURE_ENV+= KDEDIR=${KDEDIR:Q} +CONFIGURE_ENV+= CONFIG_SITE=${KDE_CONFIG_SITE:Q} CONFIGURE_ENV+= kde_appsdir="${KDEDIR}/share/kde/applnk" CONFIGURE_ENV+= kde_cgidir="${KDEDIR}/kde-cgi-bin" CONFIGURE_ENV+= kde_confdir="${KDEDIR}/share/kde/config" diff --git a/meta-pkgs/xorg/Makefile b/meta-pkgs/xorg/Makefile index f19538c7590..066c81ff3a0 100644 --- a/meta-pkgs/xorg/Makefile +++ b/meta-pkgs/xorg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/08/29 18:46:42 reed Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:37 rillig Exp $ DISTNAME= # empty PKGNAME= xorg-${XORG_VER} @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org meta-package -DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake +DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake DEPENDS+= xorg-libs>=${XORG_VER}:../../x11/xorg-libs DEPENDS+= xorg-server>=${XORG_VER}:../../x11/xorg-server DEPENDS+= xorg-clients>=${XORG_VER}:../../x11/xorg-clients diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index c4ca34e9bf0..d7812ad782b 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2005/10/05 00:31:23 reed Exp $ +# $NetBSD: Makefile.common,v 1.36 2005/12/05 20:50:37 rillig Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -124,22 +124,22 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX} .if !defined(XORG_ONLY_DIRS) || empty(XORG_ONLY_DIRS:M[Yy][Ee][Ss]) -PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ} -PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR} -PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB} -PLIST_SUBST+= XF86RUSH=${XF86RUSH} -PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS} -PLIST_SUBST+= LIBDRI=${LIBDRI} -PLIST_SUBST+= MAN_DIR=${MAN_DIR} -PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR} -PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX} -PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX} -PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR} -PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX} -PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR} -PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX} -PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR} -PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX} +PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ:Q} +PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q} +PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q} +PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q} +PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q} +PLIST_SUBST+= LIBDRI=${LIBDRI:Q} +PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q} +PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q} +PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q} +PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q} +PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR:Q} +PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q} +PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR:Q} +PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q} +PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR:Q} +PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q} CHECK_X11_TYPE?= yes @@ -156,7 +156,7 @@ X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX} PREPEND_PATH+= ${X11ROOT}/bin # Make sure we have this in PATH :) EGDIR?= ${LOCALBASE}/share/examples/xorg -PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX} +PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX:Q} MESSAGE_SUBST+= X11ROOT=${X11ROOT} .if ${OPSYS} != "Darwin" @@ -269,7 +269,6 @@ post-extract: . for F in ${SYSTEMS} @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in . endfor -. undef F . endif . if !target(pre-configure) @@ -285,7 +284,6 @@ pre-configure: ${WRKSRC}/config/cf/${F}.cf.in > \ ${WRKSRC}/config/cf/${F}.cf . endfor -. undef F . endif . if !target(do-configure) -- cgit v1.2.3