From 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 29 Aug 2001 22:41:00 +0000
Subject: Use x11.buildlink.mk instead of USE_X11.  Also convert hard-coded
 references to ${X11BASE} in the header and library search paths into
 references to ${LOCALBASE}/share/x11-links.  These packages should now be
 strongly- buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
---
 graphics/clanlib/Makefile         |  3 ++-
 graphics/clanlib/distinfo         |  4 ++--
 graphics/clanlib/patches/patch-aa | 19 ++++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'graphics/clanlib')

diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 530cfc4b1c0..3f922c2184e 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/08/23 15:55:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:15 jlam Exp $
 
 DISTNAME=		ClanLib-0.4.4
 CATEGORIES=		graphics games devel x11
@@ -40,6 +40,7 @@ post-patch:
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../devel/pth/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/graphics/clanlib/distinfo b/graphics/clanlib/distinfo
index fbccd989055..8b76dc101ca 100644
--- a/graphics/clanlib/distinfo
+++ b/graphics/clanlib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/08/23 15:55:26 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/29 22:41:15 jlam Exp $
 
 SHA1 (ClanLib-0.4.4.tar.gz) = 326fb3812bd3c26cd8ecf60d8975c662674ae9a8
 Size (ClanLib-0.4.4.tar.gz) = 642836 bytes
-SHA1 (patch-aa) = 6aad55020babe8c11c44fee3c6b67157f1cf228c
+SHA1 (patch-aa) = 3c9669716944b0c1617b9020daa51599616aed5e
 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 4b6bd869c75..601ddb98ac8 100644
--- a/graphics/clanlib/patches/patch-aa
+++ b/graphics/clanlib/patches/patch-aa
@@ -1,17 +1,22 @@
-$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 @@
+$NetBSD: patch-aa,v 1.5 2001/08/29 22:41:16 jlam Exp $
+
+--- Makefile.conf.in.orig	Sun Apr  9 08:17:58 2000
++++ Makefile.conf.in
+@@ -13,7 +13,7 @@
  BIN_PREFIX = @bindir@
  TARGET_PREFIX = @libdir@/ClanLib
  
 -INCLUDE_DIRS =	-I Sources @x_includes@
-+INCLUDE_DIRS =	-I Sources @x_includes@ -I$(BUILDLINK_DIR)/include
++INCLUDE_DIRS =	-I Sources @CPPFLAGS@ @x_includes@
  
  COMP_OPTIONS =	-Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@
  
--LINK_CORE = @libs@
-+LINK_CORE = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib @libs@
+@@ -21,7 +21,7 @@
  
  OBJF_NONDYN = @objf_nondyn@
  
+-LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX)
++LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) @LDFLAGS@
+ 
+ Libs/Intermediate/%.o : %.cpp
+ 	@echo "Compiling $<"
-- 
cgit v1.2.3