diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/freetype-lib/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/freetype-utils/Makefile | 5 | ||||
-rw-r--r-- | graphics/gdk-pixbuf-gnome/Makefile | 10 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/gqview/Makefile | 4 | ||||
-rw-r--r-- | graphics/imlib/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/jpeg/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/lcms/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/libungif/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/mng/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/netpbm/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/png/buildlink.mk | 9 | ||||
-rw-r--r-- | graphics/tiff/buildlink.mk | 9 |
13 files changed, 58 insertions, 51 deletions
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk index b419cf82d20..49990046fc1 100644 --- a/graphics/freetype-lib/buildlink.mk +++ b/graphics/freetype-lib/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:55 jlam Exp $ # # This Makefile fragment is included by packages that use freetype. # # To use this Makefile fragment, simply: # -# (1) Optionally define FREETYPE_REQD to the version of freetype desired. +# (1) Optionally define BUILDLINK_DEPENDS.freetype to the dependency pattern +# for the version of freetype desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(FREETYPE_BUILDLINK_MK) FREETYPE_BUILDLINK_MK= # defined -FREETYPE_REQD?= 1.3.1 -DEPENDS+= freetype-lib>=${FREETYPE_REQD}:../../graphics/freetype-lib +BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1 +DEPENDS+= ${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib BUILDLINK_PREFIX.freetype= ${LOCALBASE} BUILDLINK_FILES.freetype= include/freetype/* diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index b7b45bf05d6..75958625e64 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2001/05/28 03:16:44 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/06/23 19:26:55 jlam Exp $ PKGNAME= freetype-utils-${FT_VERS} - COMMENT= Utilities for manipulating TrueType fonts -FREETYPE_REQD= ${FT_VERS} +BUILDLINK_DEPENDS.freetype= freetype>=${FT_VERS} USE_X11= # defined CONFIGURE_ARGS+= --with-x diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile index 20142f3c424..55a66c2c7c6 100644 --- a/graphics/gdk-pixbuf-gnome/Makefile +++ b/graphics/gdk-pixbuf-gnome/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2001/06/18 20:49:01 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/23 19:26:55 jlam Exp $ .include "../gdk-pixbuf/Makefile.common" PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/} - COMMENT= the GNOME image loading library GNOME canvas support add-on CONFLICTS+= gdk-pixbuf<0.10.1 -GDK_PIXBUF_REQD= 0.10.1 - -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../x11/gnome-libs/buildlink.mk" +BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.10.1 # Fix config scripts by removing buildlink directory references. post-build: @@ -38,4 +34,6 @@ do-install: ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \ ${INSTALL_TARGET} +.include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../x11/gnome-libs/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk index 4f4361ab0e4..24d307c53db 100644 --- a/graphics/gdk-pixbuf/buildlink.mk +++ b/graphics/gdk-pixbuf/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/06/16 19:53:09 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:55 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf. # # To use this Makefile fragment, simply: # -# (1) Optionally define GDK_PIXBUF_REQD to the version of gdk-pixbuf desired. +# (1) Optionally define BUILDLINK_DEPENDS.gkd-pixbuf to the dependency version +# for the version of gdk-pixbuf desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(GDK_PIXBUF_BUILDLINK_MK) GDK_PIXBUF_BUILDLINK_MK= # defined -GDK_PIXBUF_REQD?= 0.8.0nb1 -DEPENDS+= gdk-pixbuf>=${GDK_PIXBUF_REQD}:../../graphics/gdk-pixbuf +BUILDLINK_DEPENDS.gkd-pixbuf?= gdk-pixbuf>=0.8.0nb1 +DEPENDS+= ${BUILDLINK_DEPENDS.gkd-pixbuf}:../../graphics/gdk-pixbuf BUILDLINK_PREFIX.gdk-pixbuf= ${X11PREFIX} BUILDLINK_FILES.gdk-pixbuf= include/gdk-pixbuf/* diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 6f4fda8109e..53ac6fc75a1 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/06/18 21:48:52 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/06/23 19:26:56 jlam Exp $ # DISTNAME= gqview-0.10.1 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -GDK_PIXBUF_REQD= 0.9.0 +BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0 .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk index fd33045f373..165ce4fabfe 100644 --- a/graphics/imlib/buildlink.mk +++ b/graphics/imlib/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:18 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $ # # This Makefile fragment is included by packages that use imlib. # # To use this Makefile fragment, simply: # -# (1) Optionally define IMLIB_REQD to the version of imlib desired. +# (1) Optionally define BUILDLINK_DEPENDS.imlib to the dependency pattern +# for the version of imlib desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(IMLIB_BUILDLINK_MK) IMLIB_BUILDLINK_MK= # defined -IMLIB_REQD?= 1.9.8 -DEPENDS+= imlib>=${IMLIB_REQD}:../../graphics/imlib +BUILDLINK_DEPENDS.imlib?= imlib>=1.9.8 +DEPENDS+= ${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib BUILDLINK_PREFIX.imlib= ${X11PREFIX} BUILDLINK_FILES.imlib= include/gdk_imlib.h diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk index 31c665a77ac..c8d59f0f976 100644 --- a/graphics/jpeg/buildlink.mk +++ b/graphics/jpeg/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:56 jlam Exp $ # # This Makefile fragment is included by packages that use libjpeg. # # To use this Makefile fragment, simply: # -# (1) Optionally define JPEG_REQD to the version of libjpeg desired. +# (1) Optionally define BUILDLINK_DEPENDS.jpeg to the dependency pattern +# for the version of libjpeg desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(JPEG_BUILDLINK_MK) JPEG_BUILDLINK_MK= # defined -JPEG_REQD?= 6 -DEPENDS+= jpeg>=${JPEG_REQD}:../../graphics/jpeg +BUILDLINK_DEPENDS.jpeg?= jpeg-6b +DEPENDS+= ${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg BUILDLINK_PREFIX.jpeg= ${LOCALBASE} BUILDLINK_FILES.jpeg= include/jconfig.h diff --git a/graphics/lcms/buildlink.mk b/graphics/lcms/buildlink.mk index 4bbccfecd0d..01e06f60be8 100644 --- a/graphics/lcms/buildlink.mk +++ b/graphics/lcms/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/06/22 16:39:00 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $ # # This Makefile fragment is included by packages that use lcms. # # To use this Makefile fragment, simply: # -# (1) Optionally define LCMS_REQD to the version of lcms desired. +# (1) Optionally define BUILDLINK_DEPENDS.lcms to the dependency pattern +# for the version of lcms desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(LCMS_BUILDLINK_MK) LCMS_BUILDLINK_MK= # defined -LCMS_REQD?= 1.06 -DEPENDS+= lcms>=${LCMS_REQD}:../../graphics/lcms +BUILDLINK_DEPENDS.lcms?= lcms>=1.06 +DEPENDS+= ${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms BUILDLINK_PREFIX.lcms= ${LOCALBASE} BUILDLINK_FILES.lcms= include/lcms/* diff --git a/graphics/libungif/buildlink.mk b/graphics/libungif/buildlink.mk index e36adb3673e..6f2b9e011dd 100644 --- a/graphics/libungif/buildlink.mk +++ b/graphics/libungif/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:19 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $ # # This Makefile fragment is included by packages that use libungif. # # To use this Makefile fragment, simply: # -# (1) Optionally define LIBUNGIF_REQD to the version of libungif desired. +# (1) Optionally define BUILDLINK_DEPENDS.libungif to the dependency pattern +# for the version of libungif desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(LIBUNGIF_BUILDLINK_MK) LIBUNGIF_BUILDLINK_MK= # defined -LIBUNGIF_REQD?= 4.1.0 -DEPENDS+= libungif>=${LIBUNGIF_REQD}:../../graphics/libungif +BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0 +DEPENDS+= ${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif BUILDLINK_PREFIX.libungif= ${LOCALBASE} BUILDLINK_FILES.libungif= include/gif_lib.h diff --git a/graphics/mng/buildlink.mk b/graphics/mng/buildlink.mk index 10cf7e52192..ba0dd7b3488 100644 --- a/graphics/mng/buildlink.mk +++ b/graphics/mng/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/06/22 16:46:51 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:57 jlam Exp $ # # This Makefile fragment is included by packages that use mng. # # To use this Makefile fragment, simply: # -# (1) Optionally define MNG_REQD to the version of mng desired. +# (1) Optionally define BUILDLINK_DEPENDS.mng to the dependency pattern +# for the version of mng desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(MNG_BUILDLINK_MK) MNG_BUILDLINK_MK= # defined -MNG_REQD?= 1.0.0 -DEPENDS+= mng>=${MNG_REQD}:../../graphics/mng +BUILDLINK_DEPENDS.mng?= mng>=1.0.0 +DEPENDS+= ${BUILDLINK_DEPENDS.mng}:../../graphics/mng BUILDLINK_PREFIX.mng= ${LOCALBASE} BUILDLINK_FILES.mng= include/libmng.h diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk index 2752a67b496..27de7b8f594 100644 --- a/graphics/netpbm/buildlink.mk +++ b/graphics/netpbm/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/06/16 19:23:19 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:57 jlam Exp $ # # This Makefile fragment is included by packages that use netpbm. # # To use this Makefile fragment, simply: # -# (1) Optionally define NETPBM_REQD to the version of netpbm desired. +# (1) Optionally define BUILDLINK_DEPENDS.netpbm to the dependency pattern +# for the version of netpbm desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(NETPBM_BUILDLINK_MK) NETPBM_BUILDLINK_MK= # defined -NETPBM_REQD?= 9.7 -DEPENDS+= netpbm>=${NETPBM_REQD}:../../graphics/netpbm +BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7 +DEPENDS+= ${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm BUILDLINK_PREFIX.netpbm= ${LOCALBASE} BUILDLINK_FILES.netpbm= include/pbm.h diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk index b36119507b4..266fff55ecb 100644 --- a/graphics/png/buildlink.mk +++ b/graphics/png/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:36 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $ # # This Makefile fragment is included by packages that use libpng. # # To use this Makefile fragment, simply: # -# (1) Optionally define PNG_REQD to the version of libpng desired. +# (1) Optionally define BUILDLINK_DEPENDS.png to the dependency pattern +# for the version of libpng desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(PNG_BUILDLINK_MK) PNG_BUILDLINK_MK= # defined -PNG_REQD?= 1.0.11 -DEPENDS+= png>=${PNG_REQD}:../../graphics/png +BUILDLINK_DEPENDS.png?= png>=1.0.11 +DEPENDS+= ${BUILDLINK_DEPENDS.png}:../../graphics/png BUILDLINK_PREFIX.png= ${LOCALBASE} BUILDLINK_FILES.png= include/png.h diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk index a428e8be831..27c7a916105 100644 --- a/graphics/tiff/buildlink.mk +++ b/graphics/tiff/buildlink.mk @@ -1,10 +1,11 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:37 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $ # # This Makefile fragment is included by packages that use libtiff. # # To use this Makefile fragment, simply: # -# (1) Optionally define TIFF_REQD to the version of libtiff desired. +# (1) Optionally define BUILDLINK_DEPENDS.tiff to the dependency pattern +# for the version of libtiff desired. # (2) Include this Makefile fragment in the package Makefile, # (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header # search path, and @@ -14,8 +15,8 @@ .if !defined(TIFF_BUILDLINK_MK) TIFF_BUILDLINK_MK= # defined -TIFF_REQD?= 3.5.4 -DEPENDS+= tiff>=${TIFF_REQD}:../../graphics/tiff +BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4 +DEPENDS+= ${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff BUILDLINK_PREFIX.tiff= ${LOCALBASE} BUILDLINK_FILES.tiff= include/tiff.h |