From b28e357f6ee52e603c887fc42483ea19558d4048 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 18:38:05 +0000
Subject: Merge changes in packages from the buildlink2 branch that have
 buildlink2.mk files back into the main trunk.  This provides sufficient
 buildlink2 infrastructure to start merging other packages from the buildlink2
 branch that have already been converted to use the buildlink2 framework.

---
 graphics/hermes/Makefile         |  4 ++--
 graphics/hermes/buildlink2.mk    | 19 +++++++++++++++++++
 graphics/hermes/distinfo         |  2 +-
 graphics/hermes/patches/patch-ad |  2 +-
 graphics/hermes/patches/patch-ae |  2 +-
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 graphics/hermes/buildlink2.mk

(limited to 'graphics/hermes')

diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index 33ef108ebc4..5b3fdddd543 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/07/16 14:48:03 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 18:39:09 jlam Exp $
 
 DISTNAME=		Hermes-1.3.2
 PKGREVISION=		1
@@ -11,7 +11,7 @@ COMMENT=		Library for conversion of pixel graphics
 
 WRKSRC=			${WRKDIR}/Hermes-1.3.2
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
diff --git a/graphics/hermes/buildlink2.mk b/graphics/hermes/buildlink2.mk
new file mode 100644
index 00000000000..71a0206bd08
--- /dev/null
+++ b/graphics/hermes/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:09 jlam Exp $
+
+.if !defined(HERMES_BUILDLINK2_MK)
+HERMES_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		hermes
+BUILDLINK_DEPENDS.hermes?=	Hermes>=1.3.2
+BUILDLINK_PKGSRCDIR.hermes?=	../../graphics/hermes
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.hermes=Hermes
+BUILDLINK_PREFIX.hermes_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.hermes=		include/Hermes/*
+BUILDLINK_FILES.hermes+=	lib/libHermes.*
+
+BUILDLINK_TARGETS+=	hermes-buildlink
+
+hermes-buildlink: _BUILDLINK_USE
+
+.endif	# HERMES_BUILDLINK2_MK
diff --git a/graphics/hermes/distinfo b/graphics/hermes/distinfo
index de6123fd9bd..db1d92848ee 100644
--- a/graphics/hermes/distinfo
+++ b/graphics/hermes/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/16 14:48:03 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 18:39:10 jlam Exp $
 
 SHA1 (Hermes-1.3.2.tar.gz) = d1a0edd8814ac3e9e699fd33843e60879d285083
 Size (Hermes-1.3.2.tar.gz) = 258439 bytes
diff --git a/graphics/hermes/patches/patch-ad b/graphics/hermes/patches/patch-ad
index 75a1ac8f8b2..7792a3e3205 100644
--- a/graphics/hermes/patches/patch-ad
+++ b/graphics/hermes/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/16 14:48:04 agc Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 18:39:10 jlam Exp $
 
 --- src/H_Pal.h	2002/07/16 14:39:53	1.1
 +++ src/H_Pal.h	2002/07/16 14:40:15
diff --git a/graphics/hermes/patches/patch-ae b/graphics/hermes/patches/patch-ae
index bce8e7496a6..5497625bb96 100644
--- a/graphics/hermes/patches/patch-ae
+++ b/graphics/hermes/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/16 14:48:04 agc Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 18:39:10 jlam Exp $
 
 --- src/Palette.c	2002/07/16 14:40:39	1.1
 +++ src/Palette.c	2002/07/16 14:41:06
-- 
cgit v1.2.3