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 /graphics | |
| 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 'graphics')
70 files changed, 166 insertions, 173 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index bbc125d3c28..b44ea8c25e5 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.132 2005/11/29 08:51:17 adam Exp $ +# $NetBSD: Makefile,v 1.133 2005/12/05 20:50:18 rillig Exp $ .include "Makefile.common" @@ -21,8 +21,8 @@ PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in GCC_REQD+= 2.95.3 -PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER} -PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER} +PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q} +PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q} .include "options.mk" diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index b79a3e649d1..af28d4a9af7 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/10/29 01:34:39 minskim Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:19 rillig Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -6,7 +6,7 @@ COMMENT= OpenGL examples and Demos PATCHDIR= ${.CURDIR}/patches DISTINFO_FILE= ${.CURDIR}/distinfo -.include "../Mesa/Makefile.common" +.include "../../graphics/Mesa/Makefile.common" USE_LANGUAGES= c c++ MAKE_FLAGS+= LIB_DEP="" diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 46b34f65c6c..8183ddd1042 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.41 2005/11/08 16:41:30 tv Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:19 rillig Exp $ PKGNAME= MesaLib-${MESA_VERSION} PKGREVISION= 3 COMMENT= Graphics library similar to SGI's OpenGL -.include "../Mesa/Makefile.common" +.include "../../graphics/Mesa/Makefile.common" INSTLIBS= ${WRKSRC}/src/mesa/libGL.la \ ${WRKSRC}/src/glw/libGLw.la \ diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile index e7446a91f7f..d73ea5c57d1 100644 --- a/graphics/PanoTools/Makefile +++ b/graphics/PanoTools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:57 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:19 rillig Exp $ # DISTNAME= PanoTools @@ -81,7 +81,7 @@ EMULSUBDIR= .endif EMULDIR= ${PREFIX}/${EMULSUBDIR} -PLIST_SUBST+= EMULSUBDIR="${EMULSUBDIR}" +PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk index 2c9b100ffb5..067ceab5beb 100644 --- a/graphics/aalib-x11/buildlink3.mk +++ b/graphics/aalib-x11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/06/01 18:02:54 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 20:50:19 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AALIB_X11_BUILDLINK3_MK:= ${AALIB_X11_BUILDLINK3_MK}+ @@ -19,8 +19,8 @@ BUILDLINK_TRANSFORM.aalib-x11+= -e "s|/aalib-x11.h|/aalib.h|g" BUILDLINK_TRANSFORM+= l:aa:aa-x11 AALIB_CONFIG= ${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config -CONFIGURE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}" -MAKE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}" +CONFIGURE_ENV+= AALIB_CONFIG=${AALIB_CONFIG:Q} +MAKE_ENV+= AALIB_CONFIG=${AALIB_CONFIG:Q} .endif # AALIB_X11_BUILDLINK3_MK .include "../../mk/x11.buildlink3.mk" diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile index c53600a0fef..feefc3c428d 100644 --- a/graphics/barcode/Makefile +++ b/graphics/barcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/03/18 14:44:58 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:19 rillig Exp $ # DISTNAME= barcode-0.98 @@ -10,7 +10,7 @@ HOMEPAGE= http://ar.linux.it/software/barcode/ COMMENT= Create bar codes as EPS (program and library) GNU_CONFIGURE= YES -MAKE_ENV+= AWK="${AWK}" +MAKE_ENV+= AWK=${AWK:Q} INFO_FILES= barcode.info diff --git a/graphics/cambevao/Makefile b/graphics/cambevao/Makefile index a972205962f..119cb188611 100644 --- a/graphics/cambevao/Makefile +++ b/graphics/cambevao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:01 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:19 rillig Exp $ # DISTNAME= cambevao-2.2 @@ -10,7 +10,7 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://core.de/~coto/projects/cambevao/ COMMENT= Grabs images as jpg from bktr and ov511+ based USB webcams -MAKE_ENV= prefix=${PREFIX} +MAKE_ENV+= prefix=${PREFIX:Q} RCD_SCRIPTS= cambevao USE_PKGINSTALL= yes diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile index 32e51c81547..0f691e04f02 100644 --- a/graphics/cdlabelgen/Makefile +++ b/graphics/cdlabelgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:10 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:19 rillig Exp $ DISTNAME= cdlabelgen-2.7.0 CATEGORIES= graphics @@ -12,8 +12,8 @@ COMMENT= Generate frontcards and traycards for CDs USE_TOOLS+= perl:run USE_LANGUAGES= # empty -MAKE_ENV+= SED="${SED}" -MAKE_ENV+= MV="${MV}" +MAKE_ENV+= SED=${SED:Q} +MAKE_ENV+= MV=${MV:Q} post-extract: cd ${WRKSRC} && ${CHMOD} go+r * diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile index 767d5971ba8..78f8c5f4c8a 100644 --- a/graphics/dia-python/Makefile +++ b/graphics/dia-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/01/20 18:50:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:19 rillig Exp $ # DIA_SUBPKG= -python @@ -7,7 +7,7 @@ DIA_SUBPKG= -python COMMENT+= (Python plugin) CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-python/--with-python/g} -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_PATCH_SCRIPTS= po-checktrans.py PYTHON_PATCH_SCRIPTS+= plug-ins/python/gtkcons.py diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile index d78e854bd5c..72308d9ef1d 100644 --- a/graphics/dx/Makefile +++ b/graphics/dx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/25 00:11:31 kristerw Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/05 20:50:19 rillig Exp $ DISTNAME= dx-4.3.2 PKGREVISION= 3 @@ -13,7 +13,7 @@ USE_X11BASE= yes USE_TOOLS+= gmake lex sh GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-javadx -CONFIGURE_ENV+= bsh_path="${TOOLS_SH}" +CONFIGURE_ENV+= bsh_path=${TOOLS_SH:Q} # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 0b2b408ef11..266c4d26462 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:19 rillig Exp $ # DISTNAME= exiv2-0.6.1 @@ -10,7 +10,7 @@ HOMEPAGE= http://home.arcor.de/ahuggel/exiv2/ COMMENT= Image metadata manipulation USE_LANGUAGES= c c++ -GCC_REQD= 3.3 +GCC_REQD+= 3.3 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 8faae31aee6..837db29170e 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:55 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:19 rillig Exp $ # DISTNAME= freeglut-2.2.0 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-replace-glut +CONFIGURE_ARGS+= --disable-replace-glut .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 66e3d4e3a98..bff29e4069a 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2005/09/28 21:55:32 rillig Exp $ +# $NetBSD: Makefile.common,v 1.31 2005/12/05 20:50:19 rillig Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -12,13 +12,13 @@ CONFLICTS= freetype-1.[12]* PKG_INSTALLATION_TYPES= overwrite pkgviews -BUILD_USES_MSGFMT= # defined +BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes -USE_LIBTOOL= # defined +USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale DISTINFO_FILE= ${.CURDIR}/../../graphics/freetype-lib/distinfo diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index f75f54b6b6d..b1f1485d6a6 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:55 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:19 rillig Exp $ -.include "../freetype-lib/Makefile.common" +.include "../../graphics/freetype-lib/Makefile.common" PKGNAME= freetype-utils-${FT_VERS} PKGREVISION= 1 diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 5fc1ff840c8..476ad67ad33 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/11/19 14:11:30 rillig Exp $ +# $NetBSD: Makefile,v 1.49 2005/12/05 20:50:19 rillig Exp $ DISTNAME= freetype-2.1.10 PKGNAME= freetype2-2.1.10 @@ -23,14 +23,14 @@ GNU_CONFIGURE= yes CONFIGURE_DIRS= ${WRKSRC}/builds/unix BUILD_DIRS= ${WRKSRC} CONFIGURE_ARGS+= --includedir=${PREFIX}/include -CONFIGURE_ENV+= ac_cv_path_GREP="${GREP}" ac_cv_path_EGREP="${EGREP}" +CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q} PKGCONFIG_OVERRIDE= builds/unix/freetype2.in .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" -PKG_OPTIONS_VAR+= PKG_OPTIONS.freetype2 +PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2 PKG_SUPPORTED_OPTIONS= truetype .include "../../mk/bsd.options.mk" diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 2b46ec4e69e..d4b1e981f5c 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2004/10/03 00:14:50 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2005/12/05 20:50:20 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+ @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.freetype2?= ../../graphics/freetype2 BUILDLINK_INCDIRS.freetype2?= include/freetype2 FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config -CONFIGURE_ENV+= FREETYPE_CONFIG="${FREETYPE_CONFIG}" +CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q} .endif # FREETYPE2_BUILDLINK3_MK diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index ba3f06c9793..375ec965358 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2005/11/26 09:40:49 salo Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:20 rillig Exp $ # .include "Makefile.common" -PKGNAME= ${DISTNAME} PKGREVISION= 6 COMMENT= The GNOME image loading library diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index 4e535115acc..47204ffdd7d 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.43 2005/06/01 18:02:55 jlam Exp $ +# $NetBSD: Makefile.common,v 1.44 2005/12/05 20:50:20 rillig Exp $ DISTNAME= gdk-pixbuf-${VER}.0 CATEGORIES= graphics devel @@ -18,7 +18,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= path_rgb_txt="${X11BASE}/lib/X11/rgb.txt" -PLIST_SUBST+= LOCALBASE=${LOCALBASE} +PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q} DISTINFO_FILE= ${.CURDIR}/../gdk-pixbuf/distinfo PATCHDIR= ${.CURDIR}/../gdk-pixbuf/patches diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile index 816ff02561e..e6ba6abde5a 100644 --- a/graphics/gfract/Makefile +++ b/graphics/gfract/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:17 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:20 rillig Exp $ # DISTNAME= gfract-0.30 @@ -15,7 +15,7 @@ BUILD_TARGET= gfract PKG_INSTALLATION_TYPES= overwrite pkgviews -SUBST_CLASSES= prefix +SUBST_CLASSES+= prefix SUBST_MESSAGE.prefix= "Fixing prefix." SUBST_STAGE.prefix= post-extract SUBST_FILES.prefix= main.cpp diff --git a/graphics/gimp-warp-sharp/Makefile b/graphics/gimp-warp-sharp/Makefile index 26a25d4c528..09c70495ba2 100644 --- a/graphics/gimp-warp-sharp/Makefile +++ b/graphics/gimp-warp-sharp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:58 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:20 rillig Exp $ DISTNAME= warp-sharp PKGNAME= gimp-${DISTNAME}-1.4 @@ -10,7 +10,7 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.home.unix-ag.org/simon/gimp/warp-sharp.html COMMENT= Image sharpening script for GIMP -DEPENDS= gimp>=2.0:../../graphics/gimp +DEPENDS+= gimp>=2.0:../../graphics/gimp WRKSRC= ${WRKDIR} NO_CONFIGURE= yes diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile index 49681f1ac31..2c3ec2ce205 100644 --- a/graphics/gimp1-base/Makefile +++ b/graphics/gimp1-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/23 18:58:30 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:20 rillig Exp $ # DISTNAME= gimp-1.2.5 @@ -41,8 +41,8 @@ CONFIGURE_ENV+= GAP_DECODE_MPEG="gap_decode_mpeg" # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -MAKE_ENV+= X11BASE=${X11BASE} -PLIST_SUBST+= LOCALBASE=${LOCALBASE} +MAKE_ENV+= X11BASE=${X11BASE:Q} +PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q} .include "options.mk" diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index b5d7c679abc..722ddef370a 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/06/07 14:21:42 minskim Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:20 rillig Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= GLU polygon tessellation facility for Mesa CONFLICTS+= Mesa-glx-[0-9]* CONFLICTS+= Mesa<3.2.1 -.include "../Mesa/Makefile.common" +.include "../../graphics/Mesa/Makefile.common" USE_LANGUAGES= c c++ diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index efc30287705..e1fef6c21e5 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/06/07 14:31:48 minskim Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:20 rillig Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} PKGREVISION= 3 @@ -7,7 +7,7 @@ COMMENT= GLUT Graphics library similar to SGI's OpenGL CONFLICTS+= Mesa-glx-[0-9]* CONFLICTS+= Mesa<3.2.1 -.include "../Mesa/Makefile.common" +.include "../../graphics/Mesa/Makefile.common" BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION} BUILDLINK_DEPENDS.glu+= glu>=${MESA_VERSION} diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile index 1133af77500..94ff7816b9d 100644 --- a/graphics/gnome-icon-theme/Makefile +++ b/graphics/gnome-icon-theme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/10/12 21:46:31 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:20 rillig Exp $ # DISTNAME= gnome-icon-theme-2.12.1 @@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in -BUILDLINK_DEPENDS.hicolor-icon-theme= hicolor-icon-theme>=0.5 +BUILDLINK_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk index d20f3a4a69c..4a971b5f147 100644 --- a/graphics/gnome-icon-theme/buildlink3.mk +++ b/graphics/gnome-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/07/16 19:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/12/05 20:50:20 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_ICON_THEME_BUILDLINK3_MK:= ${GNOME_ICON_THEME_BUILDLINK3_MK}+ @@ -27,7 +27,6 @@ dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/gnome-icon-theme/PLIST | \ PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \ { print "@comment in gnome-icon-theme: " $$0; next; } . endfor -. undef d . undef dirs .endif # GNOME_ICON_THEME_BUILDLINK3_MK diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 5172b708d94..a4ec0dc57d5 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/11/19 07:36:35 minskim Exp $ +# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:20 rillig Exp $ DISTNAME= graphviz-2.6 PKGREVISION= 1 @@ -30,9 +30,9 @@ PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter .endif -CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH} -CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH} -CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} +CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} +CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} +CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q} # build fails when PHP and/or Ruby are also installed CONFIGURE_ENV+= ac_cv_prog_PHP= CONFIGURE_ENV+= ac_cv_prog_RUBY= diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index d10db0d7020..295296228ef 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/05/06 13:47:41 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2005/12/05 20:50:20 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+ @@ -22,7 +22,6 @@ dirs!= ${GREP} "^@dirrm" ${.CURDIR}/../../graphics/hicolor-icon-theme/PLIST | \ PRINT_PLIST_AWK+= /^@dirrm ${d:S/\//\\\//g}$$/ \ { print "@comment in hicolor-icon-theme: " $$0; next; } . endfor -. undef d . undef dirs .endif # HICOLOR_ICON_THEME_BUILDLINK3_MK diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile index 9d16c92c43b..fdbd2e3d148 100644 --- a/graphics/iGMT/Makefile +++ b/graphics/iGMT/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/11/28 06:41:20 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:20 rillig Exp $ DISTNAME= igmt_v1.2 PKGNAME= iGMT-1.2 @@ -19,7 +19,7 @@ DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick WRKSRC= ${WRKDIR}/igmt_1.2 NO_BUILD= yes -USE_TOOLS= gs:run +USE_TOOLS+= gs:run GMT_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= GMT_PREFIX=GMT EVAL_PREFIX+= TK_PREFIX=tk diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 16cd2687901..08e27821ab0 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.95 2005/12/05 20:50:20 rillig Exp $ DISTNAME= imlib-1.9.15 PKGREVISION= 2 @@ -20,7 +20,7 @@ UNLIMIT_RESOURCES= datasize CPPFLAGS+= -DENABLE_NLS CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" -CONFIGURE_ENV+= X_LDFLAGS="${X_LDFLAGS}" +CONFIGURE_ENV+= X_LDFLAGS=${X_LDFLAGS:Q} CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" PKG_SYSCONFSUBDIR= imlib diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index c9528b55970..2e6d577b021 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:18 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:20 rillig Exp $ DISTNAME= imlib2-1.2.0 PKGREVISION= 3 @@ -15,7 +15,7 @@ GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= imlib2.pc.in -LIBS.SunOS= -lm +LIBS.SunOS+= -lm .include "options.mk" diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index d5c60d606cd..cdd009856be 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/12/04 13:51:38 uebayasi Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:20 rillig Exp $ DISTNAME= inkscape-0.43 CATEGORIES= graphics @@ -13,7 +13,7 @@ COMMENT= Scalable Vector Graphics (SVG) editor BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv .endif -GCC_REQD= 3.0 +GCC_REQD+= 3.0 USE_DIRS+= xdg-1.1 USE_LANGUAGES= c c++ USE_LIBTOOL= yes diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile index 8ee4200b02a..f19de7d91ea 100644 --- a/graphics/jpeg2ps/Makefile +++ b/graphics/jpeg2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/17 04:49:47 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:21 rillig Exp $ # DISTNAME= jpeg2ps-1.9 @@ -10,9 +10,9 @@ HOMEPAGE= http://www.pdflib.com/products/more/jpeg2ps/ COMMENT= Convert jpeg images to PostScript level 2 or 3 -RESTRICTED= may not be sold -NO_SRC_ON_CD= ${RESTRICTED} -NO_BIN_ON_CD= ${RESTRICTED} +RESTRICTED= "may not be sold" +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} INSTALLATION_DIRS= bin man/man1 diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile index b4ed740a1be..437bb4ba5eb 100644 --- a/graphics/kbarcode/Makefile +++ b/graphics/kbarcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:21 rillig Exp $ DISTNAME= kbarcode-1.8.1 PKGREVISION= 2 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes DEPENDS+= barcode-[0-9]*:../../graphics/barcode # Works only with KDE 3.3.x -BUILDLINK_DEPENDS.kdelibs= kdelibs>=3.3.0 +BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.3.0 .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 66b9df17412..be4cc3244d9 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/11/28 06:41:21 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:21 rillig Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} CATEGORIES= graphics @@ -9,7 +9,7 @@ COMMENT= Graphics programs for the KDE integrated X11 desktop USE_DIRS+= xdg-1.1 USE_TOOLS+= gs:run -BUILDLINK_DEPENDS.lcms= lcms>=1.12 +BUILDLINK_DEPENDS.lcms+= lcms>=1.12 REPLACE_PERL= kghostview/update-to-xt-names.pl diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index c7ef63348fb..48f1cafdbf0 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:05 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:21 rillig Exp $ DISTNAME= lcms-1.14 CATEGORIES= graphics @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --without-tiff CONFIGURE_ARGS+= --without-zlib # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} PKGCONFIG_OVERRIDE= lcms.pc.in diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index dc7010ec514..98212ee49ed 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/28 19:21:02 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:21 rillig Exp $ # DISTNAME= libcaca-0.9 @@ -14,7 +14,7 @@ COMMENT= Graphics library that outputs text instead of pixels, in colour USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-Q]-* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-* .include "options.mk" @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --disable-doc .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Linux" -LDFLAGS= -ldl +LDFLAGS+= -ldl .endif .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile index ce57f3783c1..3d447a1f4cc 100644 --- a/graphics/libgdgeda/Makefile +++ b/graphics/libgdgeda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:05 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:21 rillig Exp $ # DISTNAME= libgdgeda-2.0.15 @@ -12,7 +12,7 @@ COMMENT= Modified version of the gd packages for use with gEDA PKG_INSTALLATION_TYPES= overwrite pkgviews -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb2 GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile index c64d49a5792..431be3013f2 100644 --- a/graphics/libungif/Makefile +++ b/graphics/libungif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/11/05 13:32:36 adrianp Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:21 rillig Exp $ DISTNAME= libungif-4.1.3 PKGREVISION= 3 @@ -18,7 +18,7 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-x +CONFIGURE_ARGS+= --without-x CONFIGURE_ENV+= ac_cv_lib_X11_main=no DOCDIR= ${PREFIX}/share/doc/libungif diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile index 5638eb3ec43..5f677c74e30 100644 --- a/graphics/lprof/Makefile +++ b/graphics/lprof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/16 12:36:58 gdt Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:21 rillig Exp $ # DISTNAME= lprof-1.10.1 @@ -12,8 +12,8 @@ COMMENT= ICC Profile generation tool (for IT8.7 targets) USE_TOOLS+= gmake -MAKE_ENV+= BASEDIR=${PREFIX} QTDIR=${PREFIX}/qt3 -MAKE_ENV+= LDFLAGS="${LDFLAGS}" +MAKE_ENV+= BASEDIR=${PREFIX:Q} QTDIR=${PREFIX}/qt3 +MAKE_ENV+= LDFLAGS=${LDFLAGS:M*:Q} BUILDLINK_DEPMETHOD.qt3-tools= build diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index 699037c40d2..360aefdd3dc 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/07/16 01:19:11 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:21 rillig Exp $ DISTNAME= magicpoint-1.10a PKGREVISION= 7 @@ -26,7 +26,7 @@ PKG_SUGGESTED_OPTIONS= xft2 CONFIGURE_ARGS+= --enable-freetype-charset16 CONFIGURE_ARGS+= --enable-locale CONFIGURE_ARGS+= --enable-gif -CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} CONFIGURE_ENV+= mgp_cv_path_perl=${TOOLS_PERL5:Q} MGP_RENDERING_ENGINES= freetype graphics/freetype-lib \ diff --git a/graphics/mayavi/Makefile b/graphics/mayavi/Makefile index 883f3bad1b7..afc4058e5fa 100644 --- a/graphics/mayavi/Makefile +++ b/graphics/mayavi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/10/06 18:08:15 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:21 rillig Exp $ # DISTNAME= MayaVi-1.5 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://mayavi.sourceforge.net/ COMMENT= Scientific data visualizer written in Python -DEPENDS= vtk-python>=4.2:../../graphics/vtk-python +DEPENDS+= vtk-python>=4.2:../../graphics/vtk-python PY_PATCHPLIST= yes PYDISTUTILSPKG= yes diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 23ff49ddcd4..33c77232a10 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.126 2005/10/19 09:30:08 adam Exp $ +# $NetBSD: Makefile,v 1.127 2005/12/05 20:50:21 rillig Exp $ DISTNAME= netpbm-10.30 CATEGORIES= graphics @@ -14,16 +14,16 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= bash:run gmake lex perl INSTALL_TARGET= install-dev install-run -MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \ - pkgdir="${STAGEDIR}" +MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \ + pkgdir=${STAGEDIR:Q} MAKEFILE= GNUmakefile PLIST_SRC= ${WRKDIR}/PLIST_STAGE REPLACE_PERL= editor/ppmfade editor/ppmshadow editor/pnmquant \ generator/ppmrainbow manweb editor/pnmflip editor/ppmquant STAGEDIR= ${WRKDIR}/staging -LIBS.SunOS= -lsocket -lnsl -MAKE_ENV+= NETWORKLD="${LIBS}" +LIBS.SunOS+= -lsocket -lnsl +MAKE_ENV+= NETWORKLD=${LIBS:M*:Q} # Several of the netpbm shell scripts use bashisms, so force using # bash for all of the shell scripts. @@ -47,7 +47,7 @@ MAKE_ENV+= BUILD_FIASCO=N .endif MAKE_ENV+= JASPERLIB="${LDFLAGS} -ljasper" -MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:Q} +MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:M*:Q} .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk index 90cd6498a43..0afe5dd841a 100644 --- a/graphics/netpbm/hacks.mk +++ b/graphics/netpbm/hacks.mk @@ -1,6 +1,6 @@ -# $NetBSD: hacks.mk,v 1.1 2005/01/24 20:48:05 tv Exp $ +# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:21 rillig Exp $ -.ifndef NETPBM_HACKS_MK +.if !defined(NETPBM_HACKS_MK) NETPBM_HACKS_MK= # defined ### [historic : ???] diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile index 8a6e6d78596..6f280bd2f41 100644 --- a/graphics/ns-cult3d/Makefile +++ b/graphics/ns-cult3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/11/02 15:55:19 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:21 rillig Exp $ # DISTNAME= Cult3D_NS4_5.2b1 @@ -20,7 +20,7 @@ CHECK_SHLIBS= no CRYPTO= yes do-install: - ${MKDIR} ${PREFIX}/lib/netscape + ${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/netscape cd ${WRKSRC} ; ${ECHO} ${PREFIX}/lib/netscape | ./install.sh ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ns-cult3d.txt diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile index 271ee60f200..55c1e5e94e6 100644 --- a/graphics/nvtv/Makefile +++ b/graphics/nvtv/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:43 reed Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:21 rillig Exp $ -PKGNAME= ${DISTNAME} PKGREVISION= 2 .include "Makefile.common" diff --git a/graphics/nvtv/Makefile.common b/graphics/nvtv/Makefile.common index 379a6ad2be2..dc4886924f0 100644 --- a/graphics/nvtv/Makefile.common +++ b/graphics/nvtv/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:07 tv Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:21 rillig Exp $ DISTNAME= nvtv-0.4.7 CATEGORIES= graphics @@ -8,7 +8,7 @@ MAINTAINER= cube@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/nv-tv-out/ COMMENT= Tool to manipulate TV-Out settings on NVidia cards -ONLY_FOR_PLATFORM= *-i386 +ONLY_FOR_PLATFORM= *-*-i386 GNU_CONFIGURE= YES RCD_SCRIPTS= nvtvd diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index 5eea5c8c88f..b5938a4f38e 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/11/24 19:02:52 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:21 rillig Exp $ DISTNAME= GD-2.30 PKGNAME= p5-${DISTNAME} @@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.gd+= gd>=2.0.28 PERL5_PACKLIST= auto/GD/.packlist PERL5_OPTIONS+= threads -MAKE_ENV+= GD_LIBS="${LDFLAGS}" +MAKE_ENV+= GD_LIBS=${LDFLAGS:M*:Q} MAKE_PARAMS+= -lib_gd_path=${BUILDLINK_PREFIX.gd} .include "../../graphics/gd/buildlink3.mk" diff --git a/graphics/php-exif/Makefile b/graphics/php-exif/Makefile index 620002cc597..b4991a1b3a3 100644 --- a/graphics/php-exif/Makefile +++ b/graphics/php-exif/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:07 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:22 rillig Exp $ MODNAME= exif CATEGORIES+= graphics -PKGREVISION= # empty COMMENT= PHP extension to extract information from EXIF headers diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index e9cd7d11a1f..7dfc77bcbdb 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:07 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $ MODNAME= gd -PKGREVISION= # empty CATEGORIES+= graphics COMMENT= PHP extension for GD graphics library diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile index 10d69f85ed9..24cebcf3255 100644 --- a/graphics/phpsview/Makefile +++ b/graphics/phpsview/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/10/16 12:47:24 jdolecek Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= pwc-9.0.2 PKGNAME= phpsview-${DISTNAME:C/.*-//} -PKGREVISION= # empty CATEGORIES= graphics x11 MASTER_SITES= http://www.smcc.demon.nl/webcam/ diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 2cc5239e3e0..8118bdadb51 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:22 rillig Exp $ DISTNAME= pixmap2.6 PKGNAME= pixmap-2.6.4 @@ -18,8 +18,8 @@ COMMENT= Pixmap editor based on XPM library WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= YES -MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}" -MAKE_ENV+= MOTIFBASE="${MOTIFBASE}" +MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:M*:Q} +MAKE_ENV+= MOTIFBASE=${MOTIFBASE:Q} .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/graphics/ploticus-examples/Makefile b/graphics/ploticus-examples/Makefile index 2eff3acbbb2..c3b0222e931 100644 --- a/graphics/ploticus-examples/Makefile +++ b/graphics/ploticus-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:57 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= plnode141 @@ -14,7 +14,7 @@ COMMENT= Examples for the ploticus data plotting suite NO_CONFIGURE= YES NO_BUILD= YES -DIST_SUBDIR= ${PKGNAME:S/-examples//} +DIST_SUBDIR= ${PKGNAME_NOREV:S/-examples//} EXDIR= ${PREFIX}/share/examples/ploticus .include "../../mk/x11.buildlink3.mk" diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 178b96cb5a8..356fec2b010 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2005/11/04 11:58:54 rillig Exp $ +# $NetBSD: Makefile,v 1.72 2005/12/05 20:50:22 rillig Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -25,15 +25,15 @@ LIBPNG_SO_MAJOR= 3 LIBPNG_SO_MINOR= 2 MAKEFILE= scripts/makefile.std -MAKE_ENV+= REALCC="${CC}" -MAKE_ENV+= LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR} -MAKE_ENV+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR} +MAKE_ENV+= REALCC=${CC:Q} +MAKE_ENV+= LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR:Q} +MAKE_ENV+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR:Q} INSTALLATION_DIRS= include lib/pkgconfig man/man3 man/man5 PKGCONFIG_OVERRIDE= scripts/libpng.pc.in -SUBST_CLASSES= pc +SUBST_CLASSES+= pc SUBST_STAGE.pc= post-patch SUBST_FILES.pc= scripts/libpng.pc.in SUBST_SED.pc= -e 's,@PREFIX@,${PREFIX},' diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 556e6b38a50..eee0e97a13f 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/11/18 14:15:03 adam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:22 rillig Exp $ DISTNAME= povray-3.6.1 PKGREVISION= 2 @@ -13,7 +13,7 @@ COMMENT= Persistence of Vision Ray Tracer LICENSE= povray-license -BUILDLINK_DEPENDS.zlib= zlib>=1.2.1 +BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1 USE_LANGUAGES= c c++ USE_PKGINSTALL= yes diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile index 1b4634e315d..6517d443cbc 100644 --- a/graphics/py-gdchart/Makefile +++ b/graphics/py-gdchart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:58 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= gdchart-py-0.6 @@ -12,12 +12,12 @@ HOMEPAGE= http://athani.pair.com/msteed/software/gdchart/ COMMENT= Python interface to GDChart USE_TOOLS+= gmake -MAKE_ENV= GD_INCLUDE=${LOCALBASE}/include \ +MAKE_ENV+= GD_INCLUDE=${LOCALBASE}/include \ GDCHART_INCLUDE=${LOCALBASE}/include \ PYTHON_INCLUDE=${LOCALBASE}/${PYINC} \ HAVE_LIBFREETYPE=1 \ - LOCALBASE=${LOCALBASE} -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} + LOCALBASE=${LOCALBASE:Q} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} MODULE_FILES= chart.py gdchart.so EXAMPLE_FILES= test.html test.py CHANGES EXAMPLE_DIR= ${PREFIX}/share/examples/${PYPKGPREFIX}-gdchart diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile index 4c16845cd6f..f7eaff79653 100644 --- a/graphics/py-gimp/Makefile +++ b/graphics/py-gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= pygimp-1.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.daa.com.au/~james/pygimp/ COMMENT= Python interface to the GIMP GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile index 250a8985bbf..7bc74c9925a 100644 --- a/graphics/py-imagingtk/Makefile +++ b/graphics/py-imagingtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/10/12 14:48:44 drochner Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= Imaging-1.1.5 @@ -12,10 +12,10 @@ COMMENT= Tk support for the Python Imaging Library (PIL) DIST_SUBDIR= python PYDISTUTILSPKG= yes -BUILDLINK_DEPENDS.python20= python20>=2.0.1nb4 +BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb4 PY_PATCHPLIST= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile index 1b3c0027d69..ba50982a873 100644 --- a/graphics/radiance/Makefile +++ b/graphics/radiance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:57 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= rad3R6P1 @@ -44,10 +44,10 @@ PKGSRC_ARCH= 3 PLIST_SUBST+= USE_GL="" .endif -MAKE_ENV+= MV="${MV}" RM="${RM}" CP="${CP}" \ - INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - RANLIB="${RANLIB}" AR="${AR}" +MAKE_ENV+= MV=${MV:Q} RM=${RM:Q} CP=${CP:Q} \ + INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} \ + INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \ + RANLIB=${RANLIB:Q} AR=${AR:Q} do-configure: .for patchee in ${PATCHEES} diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile index faba742df46..c34ce820143 100644 --- a/graphics/s10sh/Makefile +++ b/graphics/s10sh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:59 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= s10sh-0.2.0 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.kyuzz.org/antirez/s10sh COMMENT= USB/serial userspace driver for Canon PowerShot cameras HAS_CONFIGURE= yes -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} INSTALLATION_DIRS= bin diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common index 9004844b8f3..f466764d2a5 100644 --- a/graphics/sane-backends/Makefile.common +++ b/graphics/sane-backends/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/09/27 09:29:56 wiz Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:50:22 rillig Exp $ CATEGORIES?= graphics MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \ @@ -13,10 +13,10 @@ SANE_MAJOR?= 1 SANE_MINOR?= 0 SANE_MICRO?= 16 SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO} -PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR} -PLIST_SUBST+= SANE_MINOR=${SANE_MINOR} -PLIST_SUBST+= SANE_MICRO=${SANE_MICRO} -PLIST_SUBST+= SANE_VERSION=${SANE_VERSION} +PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR:Q} +PLIST_SUBST+= SANE_MINOR=${SANE_MINOR:Q} +PLIST_SUBST+= SANE_MICRO=${SANE_MICRO:Q} +PLIST_SUBST+= SANE_VERSION=${SANE_VERSION:Q} CONFLICTS+= sane<=1.0.3 diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 708de2ced1f..c031715a598 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:22 rillig Exp $ -.include "../sane-backends/Makefile.common" +.include "../../graphics/sane-backends/Makefile.common" DISTNAME= sane-frontends-${SANE_VERSION} PKGREVISION= 1 @@ -8,7 +8,7 @@ SANE_MICRO= 13 COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc -BUILDLINK_DEPENDS.sane= sane-backends>=${SANE_VERSION} +BUILDLINK_DEPENDS.sane+= sane-backends>=${SANE_VERSION} USE_X11BASE= YES diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 9929cbcc520..0f875d43fbf 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:57 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= scigraphica-0.8.0 @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-readline-include-path=${BUILDLINK_PREFIX.readline}/inclu CONFIGURE_ARGS+= --with-readline-path=${BUILDLINK_PREFIX.readline}/lib CONFIGURE_ARGS+= --with-termcap-include-path=${BUILDLINK_PREFIX.readline}/include CONFIGURE_ARGS+= --with-termcap-path=${BUILDLINK_PREFIX.readline}/lib -CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN} +CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN:Q} USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile index 48feae0b918..3af10e6c162 100644 --- a/graphics/tuxpaint/Makefile +++ b/graphics/tuxpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:07 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:22 rillig Exp $ # DISTNAME= tuxpaint-0.9.14 @@ -22,13 +22,13 @@ BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.4 CONFLICTS+= tuxpaint-stamps<2003.12.23 -MAKE_ENV+= CONFDIR="${PKG_SYSCONFDIR}" CP="${CP}" CHMOD="${CHMOD}" +MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR:Q} CP=${CP:Q} CHMOD=${CHMOD:Q} EGDIR= ${PREFIX}/share/examples/tuxpaint CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf # this uses iconv and png functions directly, so link against them # explicitly. -MAKE_ENV+= LIBS="${LIBS}" +MAKE_ENV+= LIBS=${LIBS:M*:Q} LIBS+= -liconv LIBS+= -lpng diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index 8d6f1823c8a..6485f5784b1 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:58 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:23 rillig Exp $ DISTNAME= urt PKGNAME= urt-3.1b1 @@ -19,7 +19,7 @@ EXTRACT_ONLY= urt-3.1b.tar.Z WRKSRC= ${WRKDIR} USE_LIBTOOL= yes CONFIGURE_SCRIPT=./Configure -CONFIGURE_ARGS= config/urt +CONFIGURE_ARGS+= config/urt HAS_CONFIGURE= yes MAKEFILE= makefile BUILD_TARGET= diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile index a7d35592860..55d8f503eea 100644 --- a/graphics/vid/Makefile +++ b/graphics/vid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:59 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:23 rillig Exp $ # DISTNAME= vid-1.0.1 @@ -14,7 +14,7 @@ BUILD_TARGET= vid DOCDIR= share/doc/${PKGBASE} -PLIST_SUBST+= DOCDIR=${DOCDIR} +PLIST_SUBST+= DOCDIR=${DOCDIR:Q} INSTALLATION_DIRS= bin diff --git a/graphics/vtk-python/Makefile b/graphics/vtk-python/Makefile index 6b1626bcaec..df132a6ac6a 100644 --- a/graphics/vtk-python/Makefile +++ b/graphics/vtk-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:46 recht Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:23 rillig Exp $ # PKGNAME= vtk-python-${VTKDIST_VERSION} @@ -38,7 +38,7 @@ post-install: ${RM} -f ${PREFIX}/bin/vtkpython ${LN} -s ${PYTHONBIN} ${PREFIX}/bin/vtkpython -DEPENDS= vtk>=${VTK_VERSION}:../../graphics/vtk +DEPENDS+= vtk>=${VTK_VERSION}:../../graphics/vtk .include "../../graphics/vtk/Makefile.vtkdist" diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile index 1627eae0d20..626863fe4fd 100644 --- a/graphics/wmphoto/Makefile +++ b/graphics/wmphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/11/03 22:12:35 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:23 rillig Exp $ # DISTNAME= wmphoto-0.3a @@ -12,7 +12,7 @@ COMMENT= Dock-app that can show you a photo BUILD_DIRS= wmphoto USE_X11BASE= YES USE_TOOLS+= gmake -MAKE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} +MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmphoto diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 00857315458..56408cf4b21 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/09/06 14:53:36 adam Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:23 rillig Exp $ DISTNAME= xpaint-2.7.8 CATEGORIES= graphics x11 @@ -11,10 +11,10 @@ COMMENT= Simple paint program USE_IMAKE= yes USE_TOOLS+= gmake -MAKE_ENV+= XMKMF="${XMKMF}" +MAKE_ENV+= XMKMF=${XMKMF:Q} BUILD_TARGET= xaw3dg -SUBST_CLASSES= foo +SUBST_CLASSES+= foo SUBST_STAGE.foo= pre-configure SUBST_FILES.foo= Local.config configure SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \ diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo index 688f80fb09b..f3cabc059ea 100644 --- a/graphics/xpaint/distinfo +++ b/graphics/xpaint/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2005/09/07 14:10:16 adam Exp $ +$NetBSD: distinfo,v 1.17 2005/12/05 20:50:23 rillig Exp $ SHA1 (xpaint-2.7.8.tar.bz2) = 5573996f293838abd892faaa73a31239c03f9b9a RMD160 (xpaint-2.7.8.tar.bz2) = edf4cdd5ee3f2af1d49eb4bb6618fc2dc3c138ff @@ -8,5 +8,5 @@ SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556 SHA1 (patch-ac) = 78ba5e1c2b0bb5e9abfd12783454d5b30499d5f0 SHA1 (patch-ad) = dc12b553353bb5f8e70251ace8bf874c13aaa24f SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263 -SHA1 (patch-af) = b2338fb83ef693a02645012a9d2a2b0eb46daa52 +SHA1 (patch-af) = 3ad4c245351ff63f1a8c989fcc77cbb51af9b275 SHA1 (patch-ag) = 5191cb57084a746fec33dec105a8fe1750c6d8ae diff --git a/graphics/xpaint/patches/patch-af b/graphics/xpaint/patches/patch-af index 5c6c2f7a0a0..d17b3401049 100644 --- a/graphics/xpaint/patches/patch-af +++ b/graphics/xpaint/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.11 2005/09/07 14:10:16 adam Exp $ +$NetBSD: patch-af,v 1.12 2005/12/05 20:50:23 rillig Exp $ --- Local.config.orig 2005-04-30 21:33:14.000000000 +0000 +++ Local.config -@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2 +@@ -9,7 +9,7 @@ XCOMM Local customization DESTDIR = |