diff options
| author | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
| commit | b4f920543059af038598712771c3211999ef42a6 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /meta-pkgs/XFree86 | |
| parent | 5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff) | |
| download | pkgsrc-b4f920543059af038598712771c3211999ef42a6.tar.gz | |
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
Diffstat (limited to 'meta-pkgs/XFree86')
| -rw-r--r-- | meta-pkgs/XFree86/Makefile | 4 | ||||
| -rw-r--r-- | meta-pkgs/XFree86/Makefile.common | 36 |
2 files changed, 19 insertions, 21 deletions
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 |