summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam>2001-07-01 22:59:08 +0000
committerjlam <jlam>2001-07-01 22:59:08 +0000
commit78a90a0ff960c59ae8a549c575d012bcf479ad00 (patch)
tree3ef1155687cb5a502835019f0aab43d2945072b8 /graphics
parentfb87536c08bfd4fca578abf0f079012e2db80023 (diff)
downloadpkgsrc-78a90a0ff960c59ae8a549c575d012bcf479ad00.tar.gz
Move inclusion of bsd.buildlink.mk to start of file.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/buildlink.mk6
-rw-r--r--graphics/Mesa/buildlink.mk6
-rw-r--r--graphics/avifile/buildlink.mk6
-rw-r--r--graphics/clanlib/buildlink.mk6
-rw-r--r--graphics/freetype-lib/buildlink.mk6
-rw-r--r--graphics/freetype2/buildlink.mk6
-rw-r--r--graphics/gd/buildlink.mk6
-rw-r--r--graphics/gdk-pixbuf/buildlink.mk6
-rw-r--r--graphics/hermes/buildlink.mk6
-rw-r--r--graphics/imlib/buildlink.mk6
-rw-r--r--graphics/jpeg/buildlink.mk6
-rw-r--r--graphics/lcms/buildlink.mk6
-rw-r--r--graphics/libungif/buildlink.mk6
-rw-r--r--graphics/mng/buildlink.mk6
-rw-r--r--graphics/mpeg-lib/buildlink.mk6
-rw-r--r--graphics/netpbm/buildlink.mk6
-rw-r--r--graphics/png/buildlink.mk6
-rw-r--r--graphics/tiff/buildlink.mk6
-rw-r--r--graphics/xpm/buildlink.mk6
19 files changed, 57 insertions, 57 deletions
diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk
index 4d5cb34be71..7f137fdcdbe 100644
--- a/graphics/ImageMagick/buildlink.mk
+++ b/graphics/ImageMagick/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/23 19:24:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:21 jlam Exp $
#
# This Makefile fragment is included by packages that use ImageMagick.
#
@@ -15,6 +15,8 @@
.if !defined(IMAGEMAGICK_BUILDLINK_MK)
IMAGEMAGICK_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.ImageMagick?= ImageMagick>=5.2.8
DEPENDS+= ${BUILDLINK_DEPENDS.ImageMagick}:../../graphics/ImageMagick
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.ImageMagick}
pre-configure: ${BUILDLINK_TARGETS.ImageMagick}
ImageMagick-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # IMAGEMAGICK_BUILDLINK_MK
diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk
index a4925f5baa0..87301b46245 100644
--- a/graphics/Mesa/buildlink.mk
+++ b/graphics/Mesa/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/17 17:45:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:21 jlam Exp $
#
# This Makefile fragment is included by packages that use Mesa.
#
@@ -13,6 +13,8 @@
.if !defined(MESA_BUILDLINK_MK)
MESA_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
USE_MESA= # defined
# We double-list because we're not sure if the files are in ${X11BASE}
@@ -40,6 +42,4 @@ pre-configure: ${BUILDLINK_TARGETS.Mesa}
Mesa-x11base-buildlink: _BUILDLINK_USE
Mesa-localbase-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # MESA_BUILDLINK_MK
diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk
index 3684d6b05ae..d162342cb3f 100644
--- a/graphics/avifile/buildlink.mk
+++ b/graphics/avifile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/26 09:56:28 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:21 jlam Exp $
#
# This Makefile fragment is included by packages that use avifile.
#
@@ -15,6 +15,8 @@
.if !defined(AVIFILE_BUILDLINK_MK)
AVIFILE_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.avifile?= avifile>=0.53.5
DEPENDS+= ${BUILDLINK_DEPENDS.avifile}:../../graphics/avifile
@@ -38,6 +40,4 @@ pre-configure: ${BUILDLINK_TARGETS.avifile}
avifile-buildlink: _BUILDLINK_USE
avifile-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # AVIFILE_BUILDLINK_MK
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index 1fbf37bbbc1..97e13d8f26b 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 11:26:32 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $
#
# This Makefile fragment is included by packages that use ClanLib.
#
@@ -15,6 +15,8 @@
.if !defined(CLANLIB_BUILDLINK_MK)
CLANLIB_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4
DEPENDS+= ${BUILDLINK_DEPENDS.ClanLib}:../../graphics/clanlib
@@ -52,6 +54,4 @@ pre-configure: ${BUILDLINK_TARGETS.ClanLib}
ClanLib-buildlink: _BUILDLINK_USE
ClanLib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # CLANLIB_BUILDLINK_MK
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index 49990046fc1..05673b386bb 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:22 jlam Exp $
#
# This Makefile fragment is included by packages that use freetype.
#
@@ -15,6 +15,8 @@
.if !defined(FREETYPE_BUILDLINK_MK)
FREETYPE_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1
DEPENDS+= ${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib
@@ -30,6 +32,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.freetype}
pre-configure: ${BUILDLINK_TARGETS.freetype}
freetype-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # FREETYPE_BUILDLINK_MK
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index 881b71f9cd2..43fd6775a2b 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/26 22:02:26 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:22 jlam Exp $
#
# This Makefile fragment is included by packages that use freetype2.
#
@@ -15,6 +15,8 @@
.if !defined(FREETYPE2_BUILDLINK_MK)
FREETYPE2_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.freetype2?= freetype2>=2.0.3
DEPENDS+= ${BUILDLINK_DEPENDS.freetype2}:../../graphics/freetype2
@@ -43,6 +45,4 @@ pre-configure: ${BUILDLINK_TARGETS.freetype2}
freetype2-buildlink: _BUILDLINK_USE
freetype2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # FREETYPE2_BUILDLINK_MK
diff --git a/graphics/gd/buildlink.mk b/graphics/gd/buildlink.mk
index 42dac59df63..463d2ef1610 100644
--- a/graphics/gd/buildlink.mk
+++ b/graphics/gd/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 22:48:24 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $
#
# This Makefile fragment is included by packages that use gd.
#
@@ -15,6 +15,8 @@
.if !defined(GD_BUILDLINK_MK)
GD_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.gd?= gd>=1.8.3
DEPENDS+= ${BUILDLINK_DEPENDS.gd}:../../graphics/gd
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gd}
pre-configure: ${BUILDLINK_TARGETS.gd}
gd-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # GD_BUILDLINK_MK
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 24d307c53db..14b93d668ed 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:23 jlam Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf.
#
@@ -15,6 +15,8 @@
.if !defined(GDK_PIXBUF_BUILDLINK_MK)
GDK_PIXBUF_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.gkd-pixbuf?= gdk-pixbuf>=0.8.0nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gkd-pixbuf}:../../graphics/gdk-pixbuf
@@ -42,6 +44,4 @@ pre-configure: ${BUILDLINK_TARGETS.gdk-pixbuf}
gdk-pixbuf-buildlink: _BUILDLINK_USE
gdk-pixbuf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # GDK_PIXBUF_BUILDLINK_MK
diff --git a/graphics/hermes/buildlink.mk b/graphics/hermes/buildlink.mk
index 3a76eb05bc4..810f7a759d9 100644
--- a/graphics/hermes/buildlink.mk
+++ b/graphics/hermes/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/30 11:09:50 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:23 jlam Exp $
#
# This Makefile fragment is included by packages that use Hermes.
#
@@ -15,6 +15,8 @@
.if !defined(HERMES_BUILDLINK_MK)
HERMES_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.Hermes?= Hermes>=1.3.2
DEPENDS+= ${BUILDLINK_DEPENDS.Hermes}:../../graphics/hermes
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.Hermes}
pre-configure: ${BUILDLINK_TARGETS.Hermes}
Hermes-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # HERMES_BUILDLINK_MK
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index 165ce4fabfe..33d0ae7932a 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:23 jlam Exp $
#
# This Makefile fragment is included by packages that use imlib.
#
@@ -15,6 +15,8 @@
.if !defined(IMLIB_BUILDLINK_MK)
IMLIB_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.imlib?= imlib>=1.9.8
DEPENDS+= ${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib
@@ -50,6 +52,4 @@ pre-configure: ${BUILDLINK_TARGETS.imlib}
imlib-buildlink: _BUILDLINK_USE
imlib-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # IMLIB_BUILDLINK_MK
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index c8d59f0f976..af77b33aff6 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:24 jlam Exp $
#
# This Makefile fragment is included by packages that use libjpeg.
#
@@ -15,6 +15,8 @@
.if !defined(JPEG_BUILDLINK_MK)
JPEG_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.jpeg?= jpeg-6b
DEPENDS+= ${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.jpeg}
pre-configure: ${BUILDLINK_TARGETS.jpeg}
jpeg-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # JPEG_BUILDLINK_MK
diff --git a/graphics/lcms/buildlink.mk b/graphics/lcms/buildlink.mk
index 01e06f60be8..36e41d8f710 100644
--- a/graphics/lcms/buildlink.mk
+++ b/graphics/lcms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $
#
# This Makefile fragment is included by packages that use lcms.
#
@@ -15,6 +15,8 @@
.if !defined(LCMS_BUILDLINK_MK)
LCMS_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.lcms?= lcms>=1.06
DEPENDS+= ${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.lcms}
pre-configure: ${BUILDLINK_TARGETS.lcms}
lcms-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # LCMS_BUILDLINK_MK
diff --git a/graphics/libungif/buildlink.mk b/graphics/libungif/buildlink.mk
index 6f2b9e011dd..ef6ac61d77e 100644
--- a/graphics/libungif/buildlink.mk
+++ b/graphics/libungif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $
#
# This Makefile fragment is included by packages that use libungif.
#
@@ -15,6 +15,8 @@
.if !defined(LIBUNGIF_BUILDLINK_MK)
LIBUNGIF_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0
DEPENDS+= ${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif
@@ -29,6 +31,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libungif}
pre-configure: ${BUILDLINK_TARGETS.libungif}
libungif-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # LIBUNGIF_BUILDLINK_MK
diff --git a/graphics/mng/buildlink.mk b/graphics/mng/buildlink.mk
index ba0dd7b3488..402aa494259 100644
--- a/graphics/mng/buildlink.mk
+++ b/graphics/mng/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:24 jlam Exp $
#
# This Makefile fragment is included by packages that use mng.
#
@@ -15,6 +15,8 @@
.if !defined(MNG_BUILDLINK_MK)
MNG_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.mng?= mng>=1.0.0
DEPENDS+= ${BUILDLINK_DEPENDS.mng}:../../graphics/mng
@@ -34,6 +36,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.mng}
pre-configure: ${BUILDLINK_TARGETS.mng}
mng-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # MNG_BUILDLINK_MK
diff --git a/graphics/mpeg-lib/buildlink.mk b/graphics/mpeg-lib/buildlink.mk
index c94c2ba9460..fca2829635f 100644
--- a/graphics/mpeg-lib/buildlink.mk
+++ b/graphics/mpeg-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/06/29 22:25:06 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:25 jlam Exp $
#
# This Makefile fragment is included by packages that use mpeg.
#
@@ -15,6 +15,8 @@
.if !defined(MPEG_BUILDLINK_MK)
MPEG_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.mpeg?= mpeg>=1.2.1
DEPENDS+= ${BUILDLINK_DEPENDS.mpeg}:../../graphics/mpeg-lib
@@ -28,6 +30,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.mpeg}
pre-configure: ${BUILDLINK_TARGETS.mpeg}
mpeg-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # MPEG_BUILDLINK_MK
diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk
index 27de7b8f594..07c0ffcfc1b 100644
--- a/graphics/netpbm/buildlink.mk
+++ b/graphics/netpbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:25 jlam Exp $
#
# This Makefile fragment is included by packages that use netpbm.
#
@@ -15,6 +15,8 @@
.if !defined(NETPBM_BUILDLINK_MK)
NETPBM_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7
DEPENDS+= ${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
@@ -37,6 +39,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.netpbm}
pre-configure: ${BUILDLINK_TARGETS.netpbm}
netpbm-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # NETPBM_BUILDLINK_MK
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index 266fff55ecb..2e41ea229f0 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:25 jlam Exp $
#
# This Makefile fragment is included by packages that use libpng.
#
@@ -15,6 +15,8 @@
.if !defined(PNG_BUILDLINK_MK)
PNG_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.png?= png>=1.0.11
DEPENDS+= ${BUILDLINK_DEPENDS.png}:../../graphics/png
@@ -31,6 +33,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.png}
pre-configure: ${BUILDLINK_TARGETS.png}
png-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # PNG_BUILDLINK_MK
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index 27c7a916105..99040097329 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/06/23 19:26:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:26 jlam Exp $
#
# This Makefile fragment is included by packages that use libtiff.
#
@@ -15,6 +15,8 @@
.if !defined(TIFF_BUILDLINK_MK)
TIFF_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4
DEPENDS+= ${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff
@@ -33,6 +35,4 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.tiff}
pre-configure: ${BUILDLINK_TARGETS.tiff}
tiff-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # TIFF_BUILDLINK_MK
diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk
index 7c77b93a3b1..d5653d7272d 100644
--- a/graphics/xpm/buildlink.mk
+++ b/graphics/xpm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/17 17:54:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:26 jlam Exp $
#
# This Makefile fragment is included by packages that use xpm.
#
@@ -13,6 +13,8 @@
.if !defined(XPM_BUILDLINK_MK)
XPM_BUILDLINK_MK= # defined
+.include "../../mk/bsd.buildlink.mk"
+
USE_XPM= # defined
# We double-list because we're not sure if the files are in ${X11BASE}
@@ -38,6 +40,4 @@ pre-configure: ${BUILDLINK_TARGETS.xpm}
xpm-x11base-buildlink: _BUILDLINK_USE
xpm-localbase-buildlink: _BUILDLINK_USE
-.include "../../mk/bsd.buildlink.mk"
-
.endif # XPM_BUILDLINK_MK