From d688ce896600c1260030e4462d73d40b273bebca Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 23 Oct 2001 13:25:30 +0000 Subject: Strongly buildlinkify. --- games/xconq/Makefile | 3 ++- games/xconq/distinfo | 6 +++--- games/xconq/patches/patch-ab | 4 ++-- games/xconq/patches/patch-ac | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 109b67d7d7f..89a3e2fbbdf 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/10/23 13:18:03 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/10/23 13:25:30 jlam Exp $ DISTNAME= xconq-7.4.1 CATEGORIES= games x11 @@ -26,5 +26,6 @@ post-build: post-install: cd ${WRKSRC}/doc && ${MAKE_PROGRAM} install-info +.include "../../mk/x11.buildlink.mk" .include "../../x11/tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xconq/distinfo b/games/xconq/distinfo index 1d6b457406f..388a05df370 100644 --- a/games/xconq/distinfo +++ b/games/xconq/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:38 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/23 13:25:30 jlam Exp $ SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7 Size (xconq-7.4.1.tar.gz) = 3402832 bytes SHA1 (patch-aa) = 71ca2de62949a33068d145fd8d41246bf97a889d -SHA1 (patch-ab) = 8c7c69b453d128f9a1bf816b8946bd39b090f86e -SHA1 (patch-ac) = 2afc0dc030c8e04c4292d6842700e57f6bb5cc23 +SHA1 (patch-ab) = 05442c0ed0e07ec8d4d4d2b12365c7492ab63018 +SHA1 (patch-ac) = e254692358a983ddb4b97f71bac562a37741a842 SHA1 (patch-ad) = 2e20bd999e935eaccd2c569ca6712ff28187c244 SHA1 (patch-ae) = fc440492eac9aa6feafb31dc6ba6bfceeb5408a4 SHA1 (patch-af) = 420a6702dd189058873da4a5353ebad020bec018 diff --git a/games/xconq/patches/patch-ab b/games/xconq/patches/patch-ab index 66eb1418e13..026de8c50af 100644 --- a/games/xconq/patches/patch-ab +++ b/games/xconq/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2000/09/09 01:53:04 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2001/10/23 13:25:31 jlam Exp $ --- tcltk/Makefile.in.orig Wed Jun 14 17:02:05 2000 +++ tcltk/Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2000/09/09 01:53:04 wiz Exp $ X11_INCLUDE_FLAGS = @XINCLUDES@ -ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) -+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(LOCALBASE)/include/tcl/generic -I$(LOCALBASE)/include/tk/generic $(X11_INCLUDE_FLAGS) ++ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(BUILDLINK_DIR)/include/tcl/generic -I$(BUILDLINK_DIR)/include/tk/generic $(X11_INCLUDE_FLAGS) .c.o: $(CC) -c $(ALL_CFLAGS) $< diff --git a/games/xconq/patches/patch-ac b/games/xconq/patches/patch-ac index 95ddddc084e..1ae0fc22cb2 100644 --- a/games/xconq/patches/patch-ac +++ b/games/xconq/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2001/01/02 14:57:38 kleink Exp $ +$NetBSD: patch-ac,v 1.5 2001/10/23 13:25:31 jlam Exp $ --- x11/Makefile.in.orig Mon Jun 19 17:36:18 2000 +++ x11/Makefile.in @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.4 2001/01/02 14:57:38 kleink Exp $ LIB_RUNTIME_DIR = $(libdir) TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@ -TCL_CFLAGS = @TCLHDIR@ -+TCL_CFLAGS = -I${LOCALBASE}/include ++TCL_CFLAGS = -I${BUILDLINK_DIR}/include TCL_DEPS = TCL_DL_LIBS = @TCL_DL_LIBS@ @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.4 2001/01/02 14:57:38 kleink Exp $ # Tk stuff. TK = @TK_LIB_SPEC@ -TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@ -+TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@ ++TK_CFLAGS = -I${BUILDLINK_DIR}/include @TK_BUILD_INCLUDES@ TK_DEPS = X11_CFLAGS = @TK_XINCLUDES@ -- cgit v1.2.3