diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
| commit | b71a1d488b6b45e0a968a4c149990c25b6a09215 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /x11 | |
| parent | 624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff) | |
| download | pkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.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 'x11')
73 files changed, 188 insertions, 192 deletions
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile index c63cb6fbbbf..ef91cdbe771 100644 --- a/x11/XF86Setup/Makefile +++ b/x11/XF86Setup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/10/31 20:37:47 tron Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:15 rillig Exp $ DISTNAME= XF86Setup-3.3.6 PKGREVISION= 2 @@ -20,9 +20,9 @@ USE_IMAKE= yes .if !defined(X11_RELEASE) && !defined(CHECK_X11) X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release -MAKEFLAGS+= X11_RELEASE=${X11_RELEASE} +MAKEFLAGS+= X11_RELEASE=${X11_RELEASE:Q} . if ${X11_RELEASE} == "6.4" -PKG_SKIP_REASON= "This package doesn't work with your X11 distribution." +PKG_SKIP_REASON+= "This package doesn't work with your X11 distribution." . endif .endif diff --git a/x11/XFree86-imake/Makefile b/x11/XFree86-imake/Makefile index 6f0c70e6fb4..06982f0abe0 100644 --- a/x11/XFree86-imake/Makefile +++ b/x11/XFree86-imake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/10 17:18:55 reed Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:15 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-imake-${XF_VER} @@ -35,7 +35,6 @@ post-extract: .for F in ${SYSTEMS} @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in .endfor -.undef F pre-configure: .for F in ${SYSTEMS} @@ -45,7 +44,6 @@ pre-configure: -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \ ${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf .endfor -.undef F do-build: @${TOUCH} ${WRKSRC}/config/cf/version.def diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile index dd340870e65..50775759ca0 100644 --- a/x11/XFree86-libs/Makefile +++ b/x11/XFree86-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/10/10 17:22:05 reed Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:15 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-libs-${XF_VER} @@ -16,7 +16,7 @@ CONFLICTS+= xextensions-[0-9]* CONFLICTS+= libX11-[0-9]* CONFLICTS+= libXau-[0-9]* -BUILD_DEPENDS= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake +BUILD_DEPENDS+= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake .include "../../mk/bsd.prefs.mk" @@ -35,7 +35,7 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} -SUBST_CLASSES= mkstrs +SUBST_CLASSES+= mkstrs SUBST_STAGE.mkstrs= post-patch SUBST_FILES.mkstrs= config/cf/Library.tmpl SUBST_SED.mkstrs= -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g' diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile index 59fe0ea766f..6bf0cf505bf 100644 --- a/x11/XFree86-server/Makefile +++ b/x11/XFree86-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:15 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-server-${XF_VER} @@ -25,7 +25,7 @@ XINSTALL_MAN_DIRS= programs/Xserver REPLACE_PERL= exports/lib/modules/getconfig* -SUBST_CLASSES= parser +SUBST_CLASSES+= parser SUBST_STAGE.parser= pre-install SUBST_FILES.parser= programs/Xserver/hw/xfree86/parser/Makefile SUBST_SED.parser= -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d' diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index 46ba0df05ee..f84ca40606e 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:15 rillig Exp $ # DISTNAME= XaoS-3.1 @@ -11,7 +11,7 @@ HOMEPAGE= http://xaos.theory.org/ COMMENT= Zoomable fractal rendering doodad PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS= gmake +USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-curses-driver=no diff --git a/x11/blt/Makefile b/x11/blt/Makefile index 45843879fb1..3a7775436e7 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/10/07 17:39:26 perry Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:15 rillig Exp $ # DISTNAME= BLT2.4z @@ -18,8 +18,8 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib -CONFIGURE_ENV+= X11BASE=${X11BASE} -MAKE_ENV+= CP=${CP} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} +MAKE_ENV+= CP=${CP:Q} .include "../../mk/bsd.prefs.mk" diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index ed1f312df3d..cc79f574140 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/08/27 07:33:30 grant Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:15 rillig Exp $ # DISTNAME= ebuilder-0.56d @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_TOOLS+= flex gmake MAKEFILE= GNUmakefile -MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} INSTALLATION_DIRS= bin diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo index 65467a123ac..aef70ed23b0 100644 --- a/x11/eterm/distinfo +++ b/x11/eterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2005/10/03 19:52:03 joerg Exp $ +$NetBSD: distinfo,v 1.13 2005/12/05 20:51:15 rillig Exp $ SHA1 (Eterm-0.9.3.tar.gz) = df12cb09676ca265d65b8b5ac61f1ec88d58c692 RMD160 (Eterm-0.9.3.tar.gz) = 4e9f57807f1658cf8bea90219e296f4184f31452 @@ -15,6 +15,6 @@ Size (Eterm-bg-tile.tar.gz) = 1568166 bytes SHA1 (patch-aa) = e47c20515232098f660a166af4d4c52a2f044d73 SHA1 (patch-ab) = ad802e27730e4d6451d4d64de09750811afcf7b7 SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8 -SHA1 (patch-ah) = 87c9e0e9ebd7409be7c04e0d6fe5e91510983635 +SHA1 (patch-ah) = 694d1348c05a392c193a6efa688c116c434c6e9e SHA1 (patch-ai) = a8499316ec96198ca2deceaf1838d68f36ba100d SHA1 (patch-aj) = b6782d1de8d8cd85a0e8a2fdd2a4f459bffdd8f7 diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah index 0759515cd0d..fb0b7f2efdb 100644 --- a/x11/eterm/patches/patch-ah +++ b/x11/eterm/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.4 2005/10/03 19:52:04 joerg Exp $ +$NetBSD: patch-ah,v 1.5 2005/12/05 20:51:15 rillig Exp $ --- src/utmp.c.orig Thu Jun 27 14:15:53 2002 +++ src/utmp.c Sat Dec 14 21:44:17 2002 -@@ -38,7 +38,7 @@ static const char cvs_ident[] = "$Id: ut +@@ -38,7 +38,7 @@ # endif /* don't go off end of ut_id & remember if an entry has been made */ diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 22d8763daa0..89c8f1b9464 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2005/11/25 21:23:16 wiz Exp $ +# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:15 rillig Exp $ # DISTNAME= gdm-2.8.0.5 @@ -34,9 +34,9 @@ PKG_SUPPORTED_OPTIONS= inet6 pam CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= PREFIX=${PREFIX} -CONFIGURE_ENV+= X11BASE=${X11BASE} -MAKE_ENV+= CHMOD=${CHMOD} CHOWN=${CHOWN} +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} +MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} OWN_DIRS= ${PKG_SYSCONFDIR}/dm/Sessions OWN_DIRS+= ${PKG_SYSCONFDIR}/gdm/Init diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 8210f1c0077..1b7aee48384 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2005/06/01 18:03:28 jlam Exp $ +# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:16 rillig Exp $ DISTNAME= gnome-libs-1.4.2 PKGREVISION= 4 @@ -22,13 +22,13 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --enable-gtk-doc=no \ --with-html-dir=${PREFIX}/share/doc/html \ --with-kde-datadir=${X11PREFIX}/share/kde -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} CONFIGURE_ENV+= ${CONFIGURE_ENV.db-${BDB_TYPE}} USE_PKGLOCALEDIR= YES LOCALSTATEDIR= ${VARBASE}/gnome -PLIST_SUBST+= LOCALSTATEDIR=${LOCALSTATEDIR} +PLIST_SUBST+= LOCALSTATEDIR=${LOCALSTATEDIR:Q} SUBST_CLASSES+= varbase SUBST_MESSAGE.varbase= "Fixing path to score files." diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index cee3f0a5a0c..5ace36dbe29 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2005/11/25 21:23:16 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2005/12/05 20:51:17 rillig Exp $ # DISTNAME= gnome-session-2.12.0 @@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= yes -MAKE_ENV+= REAL_GCONFTOOL="${GCONFTOOL2}" +MAKE_ENV+= REAL_GCONFTOOL=${GCONFTOOL2:Q} CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index d74273e3222..eaf4d2807bb 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2005/07/16 01:19:26 jlam Exp $ +# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:17 rillig Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 8 @@ -29,12 +29,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-xinput=xfree \ --with-native-locale=yes \ --sysconfdir=${PREFIX}/share -CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}" +CONFIGURE_ENV+= X_LDFLAGS=${X_LDFLAGS:Q} INFO_FILES= gdk.info gtk.info -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -PLIST_SUBST+= LOCALBASE=${LOCALBASE} +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q} # The following ensures that `gtk-config --libs' includes the correct linker # flags for linking the X11 libs. 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 diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile index 9928e9c91b4..78809336a09 100644 --- a/x11/gtksourceview/Makefile +++ b/x11/gtksourceview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/10/14 21:45:06 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:17 rillig Exp $ # DISTNAME= gtksourceview-1.4.2 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake perl pkg-config PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in -CONFIGURE_ARGS= --disable-build-tests +CONFIGURE_ARGS+= --disable-build-tests CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 0b064217103..d9f882b060f 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2005/11/17 04:33:20 hubertf Exp $ +# $NetBSD: Makefile,v 1.95 2005/12/05 20:51:17 rillig Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -133,8 +133,8 @@ GCC_REQD+= 2.95 . if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc") CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g} CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g} -CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} +CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} . endif # # Configure finds these but apparently they are not ready for primetime diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 7e00983b117..26f4839c7e9 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/07/30 15:45:11 tron Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:18 rillig Exp $ DISTNAME= lablgtk-1.2.7 PKGREVISION= 1 @@ -22,7 +22,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.5 USE_DOTOPT= YES .else CAMLOPT= ocamlc -MAKE_ENV+= CAMLOPT=${CAMLOPT} +MAKE_ENV+= CAMLOPT=${CAMLOPT:Q} PLIST_SRC= ${PKGDIR}/PLIST.noopt .endif diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index f72074fb374..15be4d82601 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2005/06/30 15:42:49 adam Exp $ +# $NetBSD: Makefile,v 1.83 2005/12/05 20:51:18 rillig Exp $ DISTNAME= lesstif-0.94.4 CATEGORIES= x11 @@ -24,12 +24,12 @@ CONFIGURE_ENV+= LYNX_CMD=${WRKDIR}/nonexecutable CONFIGURE_ENV+= LINKS_CMD=${WRKDIR}/nonexecutable # Work around an ICE on sparc64-1.6 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -FILES_SUBST= LOCALBASE=${LOCALBASE} -FILES_SUBST+= X11BASE=${X11BASE} +FILES_SUBST+= LOCALBASE=${LOCALBASE:Q} +FILES_SUBST+= X11BASE=${X11BASE:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= ECHO=${ECHO:Q} diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 649d48980da..d8efa625a34 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/06/27 14:08:15 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:18 rillig Exp $ PKGVER= 2.1.30 DISTNAME= openmotif${PKGVER} @@ -32,7 +32,7 @@ USE_TOOLS+= tbl DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -FILES_SUBST+= X11BASE=${X11BASE} +FILES_SUBST+= X11BASE=${X11BASE:Q} .include "../../mk/bsd.prefs.mk" diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index eb7629c9d8e..5fc9a2028c7 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/08/06 06:19:41 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/12/05 20:51:18 rillig Exp $ DISTNAME= Tk-804.027 PKGNAME= p5-Tk-804.027 @@ -11,7 +11,7 @@ MAINTAINER= shell@NetBSD.org HOMEPAGE= http://cpan.uwinnipeg.ca/htdocs/Tk/Tk.html COMMENT= Perl5 interface to Tk -BUILD_DEPENDS= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser +BUILD_DEPENDS+= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile index acb775c3d8f..f6008ddbcca 100644 --- a/x11/py-gnome2-extras/Makefile +++ b/x11/py-gnome2-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/11/25 21:23:16 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= gnome-python-extras-2.12.0 @@ -16,7 +16,7 @@ PY_PATCHPLIST= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 78eb9fe6456..8de2088c263 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/10/18 18:09:13 drochner Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= gnome-python-2.12.1 @@ -15,7 +15,7 @@ PY_PATCHPLIST= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile index 34f212000f5..005e75be796 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/10/18 18:04:24 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= pygtk-2.8.2 @@ -17,7 +17,7 @@ PY_PATCHPLIST= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in pygobject-2.0.pc.in GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= gmake pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile index 6cc91892ab1..8a82af34e1a 100644 --- a/x11/py-qt2-sip/Makefile +++ b/x11/py-qt2-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:28 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= sip-3.1 @@ -14,12 +14,12 @@ COMMENT= Tool to create Python bindings for C++ libraries USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-python=${PYTHONBIN} \ +CONFIGURE_ARGS+= --with-python=${PYTHONBIN} \ --with-qt-dir=${QTDIR} PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../lang/python/extension.mk" .include "../../x11/qt2-libs/buildlink3.mk" diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile index 1eff3f44bdb..04677b05163 100644 --- a/x11/py-qt2/Makefile +++ b/x11/py-qt2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/09/28 20:52:28 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= PyQt-3.1-Qt-2.3.1 @@ -15,12 +15,12 @@ WRKSRC= ${WRKDIR}/PyQt-3.1 USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-python=${PYTHONBIN} \ +CONFIGURE_ARGS+= --with-python=${PYTHONBIN} \ --with-qt-dir=${QTDIR} PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../lang/python/extension.mk" diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile index f81346a8264..fff2a4594f4 100644 --- a/x11/py-qt3-base/Makefile +++ b/x11/py-qt3-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/01 01:35:10 reed Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:18 rillig Exp $ # .include "../../x11/py-qt3-base/Makefile.common" @@ -7,7 +7,7 @@ PKGNAME= ${PYPKGPREFIX}-qt3-base-${PYQT_VERSION} COMMENT= Python binding for Qt3 -BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.1.2nb2 +BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb2 PLIST_SRC= ${PKGDIR}/PLIST.common .if ${OPSYS} == "Darwin" diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common index cbc2da273b0..837a2b7794f 100644 --- a/x11/py-qt3-base/Makefile.common +++ b/x11/py-qt3-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/11/22 18:52:45 drochner Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:51:18 rillig Exp $ # # XXX: when updating version, be sure to update distinfo for both @@ -24,13 +24,13 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -CONFIGURE_ARGS= -b ${PREFIX}/bin +CONFIGURE_ARGS+= -b ${PREFIX}/bin CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} PYTHON_VERSIONS_ACCEPTED= 24 23 22 21 PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile index 3166e422f7b..7b63ecfea5e 100644 --- a/x11/py-qt3-sip/Makefile +++ b/x11/py-qt3-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/11/22 18:50:30 drochner Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= sip-4.3.2 @@ -19,14 +19,14 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ -CONFIGURE_ARGS= -b ${PREFIX}/bin +CONFIGURE_ARGS+= -b ${PREFIX}/bin CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} CONFIGURE_ARGS+= -e ${PREFIX}/${PYINC} CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} PYTHON_VERSIONS_ACCEPTED= 24 23 PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile index ca5794e3f7d..f760bc71fb5 100644 --- a/x11/py-wxWidgets/Makefile +++ b/x11/py-wxWidgets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/10/04 02:31:27 minskim Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= wxPython-src-2.6.1.0 @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/} MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://wxpython.org/ -COMMENT= wxPython: Python bindings for wxWidgets +COMMENT= Python bindings for wxWidgets WRKSRC= ${WRKDIR}/wxPython-src-2.6.1.0/wxPython USE_TOOLS+= gmake pkg-config diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile index 628332700ae..797bbd2a721 100644 --- a/x11/pygtk/Makefile +++ b/x11/pygtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= pygtk-0.6.11 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.pygtk.org/ COMMENT= Python Bindings for the GTK Widget Set GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= gmake USE_LIBTOOL= yes PY_PATCHPLIST= yes diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile index ffd23541139..6f6bfc47e09 100644 --- a/x11/qt1/Makefile +++ b/x11/qt1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/01 19:21:57 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $ # DISTNAME= qt-1.44 @@ -19,8 +19,8 @@ USE_LIBTOOL= yes QTPREFIX=${PREFIX}/qt1 -MAKE_ENV= QTDIR=${WRKSRC} QTPREFIX=${QTPREFIX} -MAKE_ENV+= CXXOPTS="${CFLAGS}" +MAKE_ENV+= QTDIR=${WRKSRC:Q} QTPREFIX=${QTPREFIX:Q} +MAKE_ENV+= CXXOPTS=${CFLAGS:M*:Q} BUILD_TARGET= src PKG_OPTIONS_VAR= PKG_OPTIONS.qt1 diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile index 28313649ec6..7e2e37b56fa 100644 --- a/x11/qt2-designer/Makefile +++ b/x11/qt2-designer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/17 03:50:44 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:18 rillig Exp $ PKGNAME= qt2-designer-${QTVERSION} PKGREVISION= 3 @@ -7,7 +7,7 @@ COMMENT= Visual (WYSIWYG) QT GUI builder CONFLICTS+= qt2-designer-kde-[0-9]* -.include "../qt2-libs/Makefile.common" +.include "../../x11/qt2-libs/Makefile.common" BUILD_TARGET= sub-tools diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile index 387202ee45d..69380d3907e 100644 --- a/x11/qt2-docs/Makefile +++ b/x11/qt2-docs/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:18 rillig Exp $ # PKGNAME= qt2-docs-${QTVERSION} PKGREVISION= 3 COMMENT= Documentation for the QT C++ X GUI toolkit -.include "../qt2-libs/Makefile.common" +.include "../../x11/qt2-libs/Makefile.common" NO_CONFIGURE= yes NO_BUILD= yes diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile index 4bf58c879b9..cbcd929abf0 100644 --- a/x11/qt2-examples/Makefile +++ b/x11/qt2-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:19 rillig Exp $ # PKGNAME= qt2-examples-${QTVERSION} @@ -6,9 +6,9 @@ PKGREVISION= 3 COMMENT= QT2 Tutorial, example code and HTML documentation -.include "../qt2-libs/Makefile.common" +.include "../../x11/qt2-libs/Makefile.common" -CONFIGURE_ENV+= QTDIR=${QTPREFIX} +CONFIGURE_ENV+= QTDIR=${QTPREFIX:Q} do-build: @MFS="`${FIND} ${WRKSRC}/examples ${WRKSRC}/tutorial -name Makefile -print`"; \ 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/+$//} diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile index 3f2941d6c9e..dcf19fdfd11 100644 --- a/x11/qt3-docs/Makefile +++ b/x11/qt3-docs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2005/09/27 08:01:28 adam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:19 rillig Exp $ -.include "../qt3-libs/Makefile.common" +.include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-docs-${QTVERSION} COMMENT= Documentation for the QT C++ X GUI toolkit diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 39de70f7c78..e65f815aa70 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.57 2005/11/17 04:33:20 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.58 2005/12/05 20:51:19 rillig Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -32,8 +32,8 @@ CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance LIBQT?= -lqt-mt -MAKE_ENV+= QTPREFIX=${QTPREFIX} -MAKE_ENV+= QTDIR="${WRKSRC}" +MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} +MAKE_ENV+= QTDIR=${WRKSRC:Q} # avoid creating a .qt directory in the users home # directory diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index 9edf209ce3e..e54f52439ac 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/10/07 16:36:47 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2005/12/05 20:51:19 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+ @@ -42,8 +42,8 @@ MAKE_ENV+= MOC="${QTDIR}/bin/moc" #LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTDIR}/lib .if !defined(BUILD_QT3) -CONFIGURE_ENV+= QTDIR="${QTDIR}" -MAKE_ENV+= QTDIR="${QTDIR}" +CONFIGURE_ENV+= QTDIR=${QTDIR:Q} +MAKE_ENV+= QTDIR=${QTDIR:Q} .endif BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile index 4c46784a7a9..0fac60ab451 100644 --- a/x11/qt3-mysql/Makefile +++ b/x11/qt3-mysql/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2005/09/27 09:15:31 adam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:19 rillig Exp $ -.include "../qt3-libs/Makefile.common" +.include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-mysql-${QTVERSION} COMMENT= QT mysql driver diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile index 4bdca6dd923..2a86936bf52 100644 --- a/x11/qt3-psql/Makefile +++ b/x11/qt3-psql/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2005/11/01 15:20:51 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:19 rillig Exp $ -.include "../qt3-libs/Makefile.common" +.include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-psql-${QTVERSION} PKGREVISION= 1 diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile index be810f90c02..ad047ee57d6 100644 --- a/x11/qt3-qscintilla/Makefile +++ b/x11/qt3-qscintilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/06 17:49:13 drochner Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:19 rillig Exp $ # DISTNAME= qscintilla-1.65-gpl-1.6 @@ -18,7 +18,7 @@ BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools USE_TOOLS+= gmake USE_LIBTOOL= yes -MAKE_ENV+= QTPREFIX=${QTDIR} +MAKE_ENV+= QTPREFIX=${QTDIR:Q} do-configure: (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro) diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index ce21b73cb73..55cedc82f55 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/09/27 07:47:27 adam Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:19 rillig Exp $ .include "../../mk/bsd.prefs.mk" # XXX: hack - work round an ICE with GCC 3.3 on sparc @@ -6,7 +6,7 @@ GCC_REQD+= 3.4 .endif -.include "../qt3-libs/Makefile.common" +.include "../../x11/qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} COMMENT= QT GUI (WYSIWYG) builder and other tools diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index d39d87252ae..84518302996 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/17 03:50:44 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $ DISTNAME= qwt-0.3.0 PKGREVISION= 2 @@ -13,7 +13,7 @@ USE_X11BASE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} CONFLICTS= qwtlib-[0-9]* diff --git a/x11/ruby-tcltklib/tcltkversion.mk b/x11/ruby-tcltklib/tcltkversion.mk index 1d470bb897a..d5583188d85 100644 --- a/x11/ruby-tcltklib/tcltkversion.mk +++ b/x11/ruby-tcltklib/tcltkversion.mk @@ -1,6 +1,6 @@ -# $NetBSD: tcltkversion.mk,v 1.1 2004/11/27 14:50:12 taca Exp $ -.ifndef _RUBY_TCLTKVERSION_MK +# $NetBSD: tcltkversion.mk,v 1.2 2005/12/05 20:51:19 rillig Exp $ +.if !defined(_RUBY_TCLTKVERSION_MK) _RUBY_TCLTKVERSION_MK= # defined TCL_VERSION?= 8.4 diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile index 40fee1c12f3..b6048239c5b 100644 --- a/x11/tk83/Makefile +++ b/x11/tk83/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/05 03:27:55 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:19 rillig Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -23,7 +23,7 @@ SUBST_FILES.tk834= unix/tkConfig.sh SUBST_SED.tk834+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|" SUBST_SED.tk834+= -e "s|${WRKSRC}|${PREFIX}/include/tk|" -MAKE_ENV+= TOUCH="${TOUCH}" +MAKE_ENV+= TOUCH=${TOUCH:Q} USE_LIBTOOL= yes TEST_TARGET= test diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile index 87e9acb8e1a..4a353b8f323 100644 --- a/x11/tkinfo/Makefile +++ b/x11/tkinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/17 03:50:44 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:19 rillig Exp $ DISTNAME= tkinfo-2.8 CATEGORIES= x11 @@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://math-www.uni-paderborn.de/~axel/tkinfo/ COMMENT= Tk script to read and display GNU "info" files -DEPENDS= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk NO_BUILD= yes diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 5e23e9fafe4..9190fe161d3 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/23 22:01:26 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $ DISTNAME= wdm-1.25 PKGREVISION= 6 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-gfx-incs=${BUILDLINK_DIR}/include/WINGs CONFIGURE_ARGS+= --with-gfx-libs=${BUILDLINK_DIR}/lib CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log CONFIGURE_ARGS+= --with-runlockdir=${VARBASE}/run -CONFIGURE_ENV+= SYSTEM_SHELL="${SH}" +CONFIGURE_ENV+= SYSTEM_SHELL=${SH:Q} RCD_SCRIPTS= wdm diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common index af3d4f8f0eb..239e7d23fa9 100644 --- a/x11/wxGTK/Makefile.common +++ b/x11/wxGTK/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/10/04 01:47:32 minskim Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/12/05 20:51:19 rillig Exp $ # DISTNAME= wxGTK-2.6.2 @@ -23,8 +23,8 @@ CONFIGURE_ARGS+= --with-libpng=sys CONFIGURE_ARGS+= --with-libtiff=sys CONFIGURE_ARGS+= --with-opengl CONFIGURE_ARGS+= --with-zlib=sys -CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} -MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common index 497e18f82ad..8499617ffba 100644 --- a/x11/wxGTK24/Makefile.common +++ b/x11/wxGTK24/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/08/10 20:56:30 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:19 rillig Exp $ # DISTNAME= wxGTK-2.4.2 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-libjpeg=sys CONFIGURE_ARGS+= --with-zlib=sys CONFIGURE_ARGS+= --with-libpng=sys CONFIGURE_ARGS+= --with-libtiff=sys -CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile index 92562d214eb..43e0f79ac4f 100644 --- a/x11/wxhaskell/Makefile +++ b/x11/wxhaskell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/10/11 01:03:57 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:19 rillig Exp $ DISTNAME= wxhaskell-src-0.9.4 PKGNAME= ${DISTNAME:S/-src//} @@ -16,7 +16,7 @@ USE_TOOLS+= gmake WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} MAKEFILE= makefile -MAKE_FLAGS= X11BASE=${X11BASE} +MAKE_FLAGS+= X11BASE=${X11BASE:Q} pre-configure: cd ${WRKSRC}; ./configure --prefix=${PREFIX} --with-opengl diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile index 9e9e67f8681..07464400885 100644 --- a/x11/xdesktopwaves/Makefile +++ b/x11/xdesktopwaves/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:32 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:19 rillig Exp $ # DISTNAME= xdesktopwaves-1.1 @@ -11,8 +11,8 @@ COMMENT= Simulates water waves on the X Windows desktop USE_DIRS+= xdg-1.1 -MAKE_FLAGS+= CFLAGS="${CFLAGS}" -MAKE_FLAGS+= LFLAGS="${LDFLAGS}" +MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q} +MAKE_FLAGS+= LFLAGS=${LDFLAGS:M*:Q} INSTALLATION_DIRS= bin man/man1 share/doc/xdesktopwaves diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index 75441276443..076db2620d3 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.54 2005/12/05 20:51:20 rillig Exp $ # DISTNAME= xforms-1.0-release @@ -15,7 +15,7 @@ COMMENT= Graphical user interface toolkit for X Window System USE_IMAKE= YES -MAKE_ENV= DEPEND_DEFINES="${CPPFLAGS}" +MAKE_ENV= DEPEND_DEFINES=${CPPFLAGS:M*:Q} SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo index b2418cc4a80..e8b76c836ec 100644 --- a/x11/xforms/distinfo +++ b/x11/xforms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2005/11/07 14:41:20 joerg Exp $ +$NetBSD: distinfo,v 1.17 2005/12/05 20:51:20 rillig Exp $ SHA1 (xforms-1.0-release.tgz) = e25a31351c52472de88352388cf879512b20fc62 RMD160 (xforms-1.0-release.tgz) = 18ccbff4df5e0e3786341a5ab4f8af6e2fd4fd92 @@ -9,5 +9,5 @@ SHA1 (patch-ac) = 55c32e091b1da5441e4c652d3e4a002202a6d076 SHA1 (patch-ad) = 324100fb05e723fbaa92126e279074860c842f1b SHA1 (patch-ae) = ba8b68d7e886311cb2fbfe4e0a45e975e7790821 SHA1 (patch-af) = f3fdbbb2a103505e6f18608f0c3882cc1d264b00 -SHA1 (patch-ag) = 3dde38a74cbbb1943eefd78f3df56a8de3c0f74f +SHA1 (patch-ag) = 447c24ad912a65af5f93b393579516a900a10c4e SHA1 (patch-ah) = 45129394ca29063443548d961c7954ea12cc435f diff --git a/x11/xforms/patches/patch-ag b/x11/xforms/patches/patch-ag index 4aac4f8a6fb..6fa2d1f5d81 100644 --- a/x11/xforms/patches/patch-ag +++ b/x11/xforms/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2005/10/10 12:11:47 joerg Exp $ +$NetBSD: patch-ag,v 1.2 2005/12/05 20:51:20 rillig Exp $ --- lib/errmsg.c.orig 2005-07-22 18:01:01.000000000 +0000 +++ lib/errmsg.c -@@ -51,7 +51,10 @@ char *id_errm = "$Id: errmsg.c,v 0.80 19 +@@ -51,7 +51,10 @@ #include "forms.h" #include "ulib.h" diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile index d2dfe623cf7..d0c7ef7286a 100644 --- a/x11/xjman/Makefile +++ b/x11/xjman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/10/23 22:03:21 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:20 rillig Exp $ DISTNAME= xjman-0.5 CATEGORIES= japanese x11 @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/man/ja_JP.eucJP USE_X11BASE= yes PLIST_SRC= ${WRKDIR}/PLIST XJMANDIR= man/ja_JP.EUC -MAKE_ENV+= XJMANDIR=${XJMANDIR} +MAKE_ENV+= XJMANDIR=${XJMANDIR:Q} NO_CONFIGURE= yes diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile index 503b7f0880c..761d97f8154 100644 --- a/x11/xlockmore-lite/Makefile +++ b/x11/xlockmore-lite/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2004/11/27 00:15:23 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:20 rillig Exp $ -.include "../xlockmore/Makefile.common" +.include "../../x11/xlockmore/Makefile.common" PKGNAME= ${DISTNAME:S/-/-lite-/} COMMENT= "lite" version of xlockmore diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile index c567051ec13..1265694f1c6 100644 --- a/x11/xmms-osd/Makefile +++ b/x11/xmms-osd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2004/10/03 00:18:40 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:20 rillig Exp $ # -.include "../xosd/Makefile.common" +.include "../../x11/xosd/Makefile.common" PKGNAME= ${DISTNAME:S/xosd/xmms-osd/} PKGREVISION= 1 diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile index ef56d249dd4..0347c3fa7d1 100644 --- a/x11/xorg-imake/Makefile +++ b/x11/xorg-imake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/09/13 22:51:42 reed Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:20 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-imake-${XORG_VER} @@ -38,7 +38,6 @@ post-extract: .for F in ${SYSTEMS} @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in .endfor -.undef F @${SED} -e "s|CONFIGDIRSPEC|-I${X11ROOT}/lib/X11/config|" \ ${WRKSRC}/config/util/xmkmf.cpp > \ ${WRKSRC}/config/util/xmkmf.cpp.orig @@ -54,7 +53,6 @@ pre-configure: -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \ ${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf .endfor -.undef F @( \ ${ECHO} "#define XORG_VERSION_MAJOR 6"; \ ${ECHO} "#define XORG_VERSION_MINOR 8"; \ diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index b0523c2cd0c..06aa7d9a3a9 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/11/09 01:05:06 reed Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:20 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} @@ -12,7 +12,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Libraries -BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake +BUILD_DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake .include "../../mk/bsd.prefs.mk" diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 002249a89d1..6fef7195e10 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/06/01 18:03:33 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:51:20 rillig Exp $ DISTNAME= xosd-2.2.12 CATEGORIES= x11 @@ -19,7 +19,7 @@ SHLIBTOOL_OVERRIDE= libtool-disable-static CONFIGURE_ARGS+= --disable-xinerama # Avoid an ICE on sparc64 with gcc2 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} SUBST_CLASSES+= fixme SUBST_STAGE.fixme= post-patch diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile index 042908e7fd3..2a1bf41aa08 100644 --- a/x11/xpad/Makefile +++ b/x11/xpad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:33 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:20 rillig Exp $ # DISTNAME= xpad-1.12 @@ -18,7 +18,7 @@ USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -LIBS.SunOS= -lX11 +LIBS.SunOS+= -lX11 BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED diff --git a/x11/xpaste/distinfo b/x11/xpaste/distinfo index cf7ba2793f9..77cb7f47397 100644 --- a/x11/xpaste/distinfo +++ b/x11/xpaste/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:36:25 wiz Exp $ +$NetBSD: distinfo,v 1.6 2005/12/05 20:51:20 rillig Exp $ SHA1 (xpaste-1.1.shar.gz) = 15c022ddb3e43bc25721e9185aebe5d5ef8160a2 RMD160 (xpaste-1.1.shar.gz) = 3e09e70047c244583ef689627be58618ed73abcf Size (xpaste-1.1.shar.gz) = 6144 bytes SHA1 (patch-aa) = 467ecb06be395db5222614beeaba6694eb44c1fc -SHA1 (patch-ab) = ef12cd1b9a1244fa3193298b1a00783fb984ed43 +SHA1 (patch-ab) = 5d1fec1a6f1dfb500f5bdb49b4f2e126d1e5e3ed diff --git a/x11/xpaste/patches/patch-ab b/x11/xpaste/patches/patch-ab index cd3c288b8a6..5b3904b0d7f 100644 --- a/x11/xpaste/patches/patch-ab +++ b/x11/xpaste/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2003/12/04 09:27:01 seb Exp $ +$NetBSD: patch-ab,v 1.2 2005/12/05 20:51:20 rillig Exp $ --- xpaste.c.orig 2003-11-18 07:23:53.000000000 +0000 +++ xpaste.c -@@ -18,7 +18,7 @@ static char rcsid[] = "$Id: xpaste.c,v 1 +@@ -18,7 +18,7 @@ #include <X11/Xaw/AsciiText.h> #include <X11/Xaw/Form.h> #include <X11/Xaw/Command.h> diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile index 4b04d7d904d..6e6a1b9ae54 100644 --- a/x11/xphoon/Makefile +++ b/x11/xphoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/04 00:49:33 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:20 rillig Exp $ # DISTNAME= xphoon.tar @@ -16,7 +16,7 @@ COMMENT= Set the root window to the moon in its current phase WRKSRC= ${WRKDIR}/xphoon USE_IMAKE= yes -MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS} +MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q} .include "../../mk/bsd.prefs.mk" diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index aae82eaeee9..adc986a6a42 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/06/17 03:50:45 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/12/05 20:51:20 rillig Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -15,7 +15,7 @@ PKG_VERSION= 2.4.19 USE_X11BASE= YES GNU_CONFIGURE= YES -MAKE_ENV+= VERSION=${PKG_VERSION} +MAKE_ENV+= VERSION=${PKG_VERSION:Q} CONFIGURE_ARGS+= --without-extras --disable-dmalloc --without-gnome INSTALLATION_DIRS= bin man/man1 diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index de756b00f3d..dd1eece6c3f 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.84 2005/10/07 18:43:40 wiz Exp $ +# $NetBSD: Makefile.common,v 1.85 2005/12/05 20:51:20 rillig Exp $ # DISTNAME= xscreensaver-4.22 @@ -30,11 +30,11 @@ CONFIGURE_ARGS+= --without-pam CONFIGURE_ENV+= X_PRE_LIBS=-lXt CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults" CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}" -CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}" +CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q} .if defined(PKGREVISION) CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}" .endif -CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL="${PERL5}" +CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q} DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo FILESDIR= ${.CURDIR}/../../x11/xscreensaver/files diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile index cfe0b6ed984..ea663903c2f 100644 --- a/x11/xscribble/Makefile +++ b/x11/xscribble/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/05/23 18:31:27 danw Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:20 rillig Exp $ DISTNAME= xscribble PKGNAME= xscribble-20000616 @@ -17,7 +17,7 @@ NO_INSTALL_MANPAGES= YES .if ${OPSYS} == "Darwin" SYS_LIBRARIES= -lmx -MAKE_ENV+= SYS_LIBRARIES="${SYS_LIBRARIES}" +MAKE_ENV+= SYS_LIBRARIES=${SYS_LIBRARIES:Q} .endif post-install: diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile index 3ee8567da88..53c40095ce9 100644 --- a/x11/xservers/Makefile +++ b/x11/xservers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/31 20:34:48 tron Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:20 rillig Exp $ DISTNAME= xservers-3.3.6.4 CATEGORIES= x11 @@ -19,9 +19,9 @@ USE_X11BASE= YES .if !defined(X11_RELEASE) && !defined(CHECK_X11) X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release -MAKEFLAGS+= X11_RELEASE=${X11_RELEASE} +MAKEFLAGS+= X11_RELEASE=${X11_RELEASE:Q} . if ${X11_RELEASE} == "6.3" -PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" +PKG_SKIP_REASON+= "${PKGNAME} is part of your X11 distribution" . endif .endif diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index 4c099eae5bd..8d2556fc846 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/09/28 20:52:28 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:20 rillig Exp $ DISTNAME= xview3.2p1-X11R6 PKGNAME= xview-lib-3.2.1 @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= tech-pkg@NetBSD.org COMMENT= OpenLook Toolkit libs, includes, and man pages -DEPENDS= xview-config>=3.2.1nb2:../../x11/xview-config +DEPENDS+= xview-config>=3.2.1nb2:../../x11/xview-config NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL # builds, but binaries in../xview-clients all crash diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 560acfaa138..742f6798fb9 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/20 10:58:16 wennmach Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:20 rillig Exp $ # DISTNAME= xworld-2.0 @@ -12,9 +12,9 @@ COMMENT= Earth as seen from the direction of the sun HAS_CONFIGURE= yes -CONFIGURE_ENV+= PREFIX="${PREFIX}" +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11" -CONFIGURE_ENV+= CAT="${CAT}" STRIP=strip INCLUDES="" MORELIBS="" +CONFIGURE_ENV+= CAT=${CAT:Q} STRIP=strip INCLUDES="" MORELIBS="" SUBST_CLASSES+= x11 SUBST_MESSAGE.x11= "Fixing x11 options." |