From 6e976875ad9e7496b55dd7eb94a69d31d31cf77e Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 9 Sep 2000 01:53:03 +0000 Subject: Update to use tcl/tk-8.3.2. Addresses pkg/10956. --- games/xconq/Makefile | 11 ++++++----- games/xconq/files/patch-sum | 6 +++--- games/xconq/patches/patch-ab | 6 +++--- games/xconq/patches/patch-ac | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 27662e7408c..09e0164051a 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/08/31 07:26:23 kleink Exp $ +# $NetBSD: Makefile,v 1.4 2000/09/09 01:53:03 wiz Exp $ DISTNAME= xconq-7.3.3 CATEGORIES= games x11 @@ -7,15 +7,16 @@ MASTER_SITES= ftp://sources.redhat.com/pub/xconq/ MAINTAINER= kleink@netbsd.org HOMEPAGE= http://sources.redhat.com/xconq/ -DEPENDS+= tcl-8.0.5:../../lang/tcl80 -DEPENDS+= tk-8.0.5:../../x11/tk80 +DEPENDS+= tcl-8.3.2:../../lang/tcl +DEPENDS+= tk-8.3.2:../../x11/tk USE_X11BASE= YES USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-tclconfig=${LOCALBASE}/lib/tcl8.0 \ - --with-tkconfig=${LOCALBASE}/lib/tk8.0 \ +CONFIGURE_ARGS+= --with-tclconfig=${LOCALBASE}/lib \ + --with-tkconfig=${LOCALBASE}/lib \ --enable-alternate-scoresdir=/var/games/xconq/scores +MAKE_ENV+= LOCALBASE="${LOCALBASE}" INFO_FILES= hacking.info xcdesign.info xconq.info diff --git a/games/xconq/files/patch-sum b/games/xconq/files/patch-sum index 2ba8b7cc698..b665ff3262b 100644 --- a/games/xconq/files/patch-sum +++ b/games/xconq/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.2 2000/08/31 07:26:23 kleink Exp $ +$NetBSD: patch-sum,v 1.3 2000/09/09 01:53:03 wiz Exp $ MD5 (patch-aa) = 7e8ab17b8c65059c7b2d4a58c029b46d -MD5 (patch-ab) = 54ec3629d6e681b6bf6d39a76dca3714 -MD5 (patch-ac) = b97f668fe078156601d84811574277c9 +MD5 (patch-ab) = d08df8f64544b021ddfea3ba50ac26a5 +MD5 (patch-ac) = 0e82d38d6852da6d0183d417f907b5e6 MD5 (patch-ad) = 74658bc3a1587b2bfd0752864a1fbd60 MD5 (patch-ae) = 1563f3454d12157cdcf2cea342f2beae MD5 (patch-af) = 4e9a27c6efdace8e98540b161aabea27 diff --git a/games/xconq/patches/patch-ab b/games/xconq/patches/patch-ab index fcb3679d431..66eb1418e13 100644 --- a/games/xconq/patches/patch-ab +++ b/games/xconq/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2000/08/31 07:26:23 kleink Exp $ +$NetBSD: patch-ab,v 1.3 2000/09/09 01:53:04 wiz Exp $ --- tcltk/Makefile.in.orig Wed Jun 14 17:02:05 2000 -+++ tcltk/Makefile.in Mon Aug 28 08:41:25 2000 ++++ tcltk/Makefile.in @@ -95,7 +95,7 @@ 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$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0 ++ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(LOCALBASE)/include/tcl/generic -I$(LOCALBASE)/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 66d4bdd0c4c..b8c55cebbed 100644 --- a/games/xconq/patches/patch-ac +++ b/games/xconq/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2000/08/31 07:26:23 kleink Exp $ +$NetBSD: patch-ac,v 1.3 2000/09/09 01:53:04 wiz Exp $ --- x11/Makefile.in.orig Mon Jun 19 17:36:18 2000 -+++ x11/Makefile.in Thu Aug 31 07:57:43 2000 ++++ x11/Makefile.in @@ -25,10 +25,10 @@ krnsrcdir = $(srcdir)/../kernel @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.2 2000/08/31 07:26:23 kleink Exp $ LIB_RUNTIME_DIR = $(libdir) TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@ -TCL_CFLAGS = @TCLHDIR@ -+TCL_CFLAGS = -I$(LOCALBASE)/include/tcl8.0 ++TCL_CFLAGS = -I${LOCALBASE}/include TCL_DEPS = TCL_DL_LIBS = @TCL_DL_LIBS@ @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.2 2000/08/31 07:26:23 kleink Exp $ # Tk stuff. TK = @TK_LIB_SPEC@ -TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@ -+TK_CFLAGS = -I$(LOCALBASE)/include/tk8.0 ++TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@ TK_DEPS = X11_CFLAGS = @TK_XINCLUDES@ -- cgit v1.2.3