o add buildlink.mk file for use by other packages

o convert to use buildlink.mk files

4 files changed, 67 insertions, 13 deletions

diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index adb1ba375b4..17c51f44110 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/05/22 09:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/06/30 11:26:31 zuntum Exp $
 
 DISTNAME=		ClanLib-0.4.4
 CATEGORIES=		graphics games devel x11
@@ -8,18 +8,12 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanlib.org/
 COMMENT=		The ClanLib Game SDK
 
-DEPENDS+=		Hermes>=1.3:../../graphics/hermes
-DEPENDS+=		png>=1.0.11:../../graphics/png
-DEPENDS+=		pth-*:../../devel/pth
-
+USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		yes
-USE_MESA=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_PERL5=		yes
 
-LDFLAGS+=		-L${LOCALBASE}/lib
-CFLAGS+=		-I${LOCALBASE}/include/Hermes
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-asm386
 .else
@@ -34,7 +28,6 @@ CONFIGURE_ARGS+=	--disable-ggi
 CONFIGURE_ARGS+=	--disable-vidmode
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"# CC='cc ${CFLAGS} ${LDFLAGS}'
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=		X11BASE="${X11BASE}"
 
 post-patch:
@@ -42,6 +35,10 @@ post-patch:
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "../../graphics/hermes/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/Mesa/buildlink.mk"
+.include "../../devel/pth/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
new file mode 100644
index 00000000000..1fbf37bbbc1
--- /dev/null
+++ b/graphics/clanlib/buildlink.mk
@@ -0,0 +1,57 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/06/30 11:26:32 zuntum Exp $
+#
+# This Makefile fragment is included by packages that use ClanLib.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.ClanLib to the dependency pattern
+#     for the version of ClanLib 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
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(CLANLIB_BUILDLINK_MK)
+CLANLIB_BUILDLINK_MK=	# defined
+
+BUILDLINK_DEPENDS.ClanLib?=	ClanLib>=0.4.4
+DEPENDS+=	${BUILDLINK_DEPENDS.ClanLib}:../../graphics/clanlib
+
+BUILDLINK_PREFIX.ClanLib=	${X11BASE}
+BUILDLINK_FILES.ClanLib=	lib/libclancore.*
+BUILDLINK_FILES.ClanLib+=	lib/ClanLib/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/*.h
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/Core/*/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/GL/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/GUI/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/Lua/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/MIDI/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/MPEG/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/Magick/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/MikMod/*
+BUILDLINK_FILES.ClanLib+=	include/ClanLib/png/*
+
+.include "../../graphics/hermes/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/Mesa/buildlink.mk"
+.include "../../devel/pth/buildlink.mk"
+
+BUILDLINK_TARGETS.ClanLib=	ClanLib-buildlink
+BUILDLINK_TARGETS.ClanLib+=	ClanLib-buildlink-config-wrapper
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.ClanLib}
+
+BUILDLINK_CONFIG.ClanLib=	${LOCALBASE}/bin/clanlib-config
+BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config
+
+.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+CONFIGURE_ENV+=			CLANLIB_CONFIG="${BUILDLINK_CONFIG_WRAPPER.ClanLib}"
+.endif
+
+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/clanlib/distinfo b/graphics/clanlib/distinfo
index e6106678b27..505ac3b0061 100644
--- a/graphics/clanlib/distinfo
+++ b/graphics/clanlib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/05/11 14:12:10 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2001/06/30 11:26:32 zuntum Exp $
 
 SHA1 (ClanLib-0.4.4.tar.gz) = 326fb3812bd3c26cd8ecf60d8975c662674ae9a8
 Size (ClanLib-0.4.4.tar.gz) = 642836 bytes
-SHA1 (patch-aa) = 80882e6b178238572a07f70a5222691f79209059
+SHA1 (patch-aa) = 6aad55020babe8c11c44fee3c6b67157f1cf228c
 SHA1 (patch-ab) = 38acc42d60694482b61853fb14e0460a437a1653
 SHA1 (patch-ac) = 383a03b0ecca44a6d3397184d6022a0bb91882da
 SHA1 (patch-ad) = ea6da825d77090177c2c5c73362fc5caa80181f3
diff --git a/graphics/clanlib/patches/patch-aa b/graphics/clanlib/patches/patch-aa
index 2d7407f736d..4b6bd869c75 100644
--- a/graphics/clanlib/patches/patch-aa
+++ b/graphics/clanlib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/12/15 03:13:05 garbled Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/30 11:26:32 zuntum Exp $
 --- Makefile.conf.in.orig	Thu Dec 14 19:27:08 2000
 +++ Makefile.conf.in	Thu Dec 14 19:28:06 2000
 @@ -13,11 +13,11 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.3 2000/12/15 03:13:05 garbled Exp $
  TARGET_PREFIX = @libdir@/ClanLib
  
 -INCLUDE_DIRS =	-I Sources @x_includes@
-+INCLUDE_DIRS =	-I Sources @x_includes@ -I$(LOCALBASE)/include
++INCLUDE_DIRS =	-I Sources @x_includes@ -I$(BUILDLINK_DIR)/include
  
  COMP_OPTIONS =	-Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@