diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/buildlink.mk | 7 | ||||
| -rw-r--r-- | graphics/avifile-devel/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/avifile/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/clanlib/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/freetype2/buildlink.mk | 5 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf-gnome/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/imlib/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/imlib2/buildlink.mk | 4 |
9 files changed, 31 insertions, 9 deletions
diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk index 15639638210..9ca5440b434 100644 --- a/graphics/ImageMagick/buildlink.mk +++ b/graphics/ImageMagick/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/08/23 21:32:32 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:47 jlam Exp $ # # This Makefile fragment is included by packages that use ImageMagick. # @@ -42,10 +42,15 @@ BUILDLINK_CONFIG.magick= \ ${BUILDLINK_PREFIX.ImageMagick}/bin/Magick-config BUILDLINK_CONFIG_WRAPPER.magick= \ ${BUILDLINK_DIR}/bin/Magick-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.magick}|${BUILDLINK_CONFIG.magick}|g" + BUILDLINK_CONFIG.magickpp= \ ${BUILDLINK_PREFIX.ImageMagick}/bin/Magick++-config BUILDLINK_CONFIG_WRAPPER.magickpp= \ ${BUILDLINK_DIR}/bin/Magick++-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.magickpp}|${BUILDLINK_CONFIG.magickpp}|g" .if defined(USE_CONFIG_WRAPPER) MAGICK_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.magick} diff --git a/graphics/avifile-devel/buildlink.mk b/graphics/avifile-devel/buildlink.mk index b7328aef98e..5d961d10fda 100644 --- a/graphics/avifile-devel/buildlink.mk +++ b/graphics/avifile-devel/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/08/24 03:51:06 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:47 jlam Exp $ # # This Makefile fragment is included by packages that use avifile-devel. # @@ -33,6 +33,8 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.avifile} BUILDLINK_CONFIG.avifile= ${BUILDLINK_PREFIX.avifile}/bin/avifile-config BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.avifile}|${BUILDLINK_CONFIG.avifile}|g" .if defined(USE_CONFIG_WRAPPER) AVIFILE_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.avifile} diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk index 308cca66aef..7e0fbedf699 100644 --- a/graphics/avifile/buildlink.mk +++ b/graphics/avifile/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:09 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:48 jlam Exp $ # # This Makefile fragment is included by packages that use avifile. # @@ -32,6 +32,8 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.avifile} BUILDLINK_CONFIG.avifile= ${BUILDLINK_PREFIX.avifile}/bin/avifile-config BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.avifile}|${BUILDLINK_CONFIG.avifile}|g" .if defined(USE_CONFIG_WRAPPER) AVIFILE_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.avifile} diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk index a6f14e19057..c0277b9a946 100644 --- a/graphics/clanlib/buildlink.mk +++ b/graphics/clanlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/08/23 20:22:57 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:48 jlam Exp $ # # This Makefile fragment is included by packages that use ClanLib. # @@ -46,6 +46,8 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.ClanLib} BUILDLINK_CONFIG.ClanLib= ${BUILDLINK_PREFIX.ClanLib}/bin/clanlib-config BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.ClanLib}|${BUILDLINK_CONFIG.ClanLib}|g" .if defined(USE_CONFIG_WRAPPER) CLANLIB_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.ClanLib} diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk index 19f80e2c58f..9fba134a929 100644 --- a/graphics/freetype2/buildlink.mk +++ b/graphics/freetype2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.11 2001/08/17 21:14:11 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:49 jlam Exp $ # # This Makefile fragment is included by packages that use freetype2. # @@ -82,6 +82,9 @@ freetype2-buildlink-config: fi .endif # _NEED_FREETYPE2 +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.freetype2}|${BUILDLINK_CONFIG.freetype2}|g" + .if defined(USE_CONFIG_WRAPPER) FREETYPE_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.freetype2} CONFIGURE_ENV+= FREETYPE_CONFIG="${FREETYPE_CONFIG}" diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk index f334048af5e..f4743686bfe 100644 --- a/graphics/gdk-pixbuf-gnome/buildlink.mk +++ b/graphics/gdk-pixbuf-gnome/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/10/01 06:57:25 rh Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:49 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf-gnome. # @@ -36,6 +36,8 @@ BUILDLINK_CONFIG.gdk-pixbuf-gnome= \ ${BUILDLINK_PREFIX.gdk-pixbuf-gnome}/lib/gnomecanvaspixbufConf.sh BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gnome= \ ${BUILDLINK_DIR}/lib/gnomecanvaspixbufConf.sh +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gnome}|${BUILDLINK_CONFIG.gdk-pixbuf-gnome}|g" .if defined(USE_CONFIG_WRAPPER) GDK_PIXBUF_GNOME_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf-gnome} diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk index da46cae504f..b48d4df187c 100644 --- a/graphics/gdk-pixbuf/buildlink.mk +++ b/graphics/gdk-pixbuf/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2001/09/22 18:41:26 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:50 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf. # @@ -39,6 +39,8 @@ BUILDLINK_CONFIG.gdk-pixbuf= \ ${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf= \ ${BUILDLINK_DIR}/bin/gdk-pixbuf-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}|${BUILDLINK_CONFIG.gdk-pixbuf}|g" .if defined(USE_CONFIG_WRAPPER) GDK_PIXBUF_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf} diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk index caa9bd9db48..f41abd1162c 100644 --- a/graphics/imlib/buildlink.mk +++ b/graphics/imlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:12 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:50 jlam Exp $ # # This Makefile fragment is included by packages that use imlib. # @@ -44,6 +44,8 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.imlib} BUILDLINK_CONFIG.imlib= ${BUILDLINK_PREFIX.imlib}/bin/imlib-config BUILDLINK_CONFIG_WRAPPER.imlib= ${BUILDLINK_DIR}/bin/imlib-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.imlib}|${BUILDLINK_CONFIG.imlib}|g" .if defined(USE_CONFIG_WRAPPER) IMLIB_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.imlib} diff --git a/graphics/imlib2/buildlink.mk b/graphics/imlib2/buildlink.mk index 73864db9384..72b6a4661b1 100644 --- a/graphics/imlib2/buildlink.mk +++ b/graphics/imlib2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2001/08/16 10:49:52 rh Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:50 jlam Exp $ # # This Makefile fragment is included by packages that use imlib2. # @@ -41,6 +41,8 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.imlib2} BUILDLINK_CONFIG.imlib2= ${BUILDLINK_PREFIX.imlib2}/bin/imlib2-config BUILDLINK_CONFIG_WRAPPER.imlib2= ${BUILDLINK_DIR}/bin/imlib2-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.imlib2}|${BUILDLINK_CONFIG.imlib2}|g" .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) IMLIB2_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.imlib2} |