From owner-freebsd-ports Thu Sep 28 15:20:30 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9874337B42C for ; Thu, 28 Sep 2000 15:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id PAA97200; Thu, 28 Sep 2000 15:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from bugg.strangled.net (c705742-a.htfdw1.ct.home.com [24.2.137.94]) by hub.freebsd.org (Postfix) with ESMTP id 463E737B42C for ; Thu, 28 Sep 2000 15:15:50 -0700 (PDT) Received: (from bugg@localhost) by bugg.strangled.net (8.9.3/8.9.3) id SAA75932; Thu, 28 Sep 2000 18:15:50 -0400 (EDT) (envelope-from bugg) Message-Id: <200009282215.SAA75932@bugg.strangled.net> Date: Thu, 28 Sep 2000 18:15:50 -0400 (EDT) From: bugg@bugg.strangled.net Reply-To: bugg@bugg.strangled.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21630: Update games/KnightCap to respect env Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21630 >Category: ports >Synopsis: Update of games/KnightCap to recognize CC/CFLAGS/X11BASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 28 15:20:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Dan Papasian >Release: FreeBSD 4.0-20000625-STABLE i386 >Organization: >Environment: N/A >Description: Update games/KnightCap to recognize CC/CFLAGS/X11BASE >How-To-Repeat: N/A >Fix: Apply this patch: diff -urN /usr/ports/games/KnightCap/Makefile games/KnightCap/Makefile --- /usr/ports/games/KnightCap/Makefile Thu Aug 3 21:11:31 2000 +++ games/KnightCap/Makefile Wed Aug 9 03:06:28 2000 @@ -15,15 +15,15 @@ MAINTAINER= bugg@bugg.strangled.net +WRKSRC= ${WRKDIR}/Export USE_MESA= yes ALL_TARGET= KnightCap -WRKSRC= ${WRKDIR}/Export do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/KnightCap ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/KnightCap ${PREFIX}/bin .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/KnightCap - @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/KnightCap + @${MKDIR} ${PREFIX}/share/doc/KnightCap + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/KnightCap .endif .include diff -urN /usr/ports/games/KnightCap/patches/patch-aa games/KnightCap/patches/patch-aa --- /usr/ports/games/KnightCap/patches/patch-aa Sat Jul 8 04:24:58 2000 +++ games/KnightCap/patches/patch-aa Thu Aug 10 04:52:03 2000 @@ -1,38 +1,51 @@ ---- Makefile.orig Tue Jun 20 21:19:26 2000 -+++ Makefile Tue Jun 20 21:19:30 2000 -@@ -5,8 +5,8 @@ - CC = gcc +--- Makefile.orig Mon May 18 08:09:21 1998 ++++ Makefile Wed Aug 9 04:55:31 2000 +@@ -2,11 +2,11 @@ + + # what C compiler? It better be Ansi-C. Use gcc if you have it. + # you may find that KnightCap is very slow if you don't use gcc +-CC = gcc ++CC ?= gcc # What compiler switches do you want? These ones work well with gcc --#OPT = -O2 -fshort-enums -Wall + #OPT = -O2 -fshort-enums -Wall -OPT = -g -fshort-enums -Wall -+#OPT = -O3 -fomit-frame-pointer -fshort-enums -Wall -DCPU=686 +# OPT = -g -fshort-enums -Wall # If you don't have gcc then perhaps try this instead. You only need # the null definition for inline if your C compiler doesn't know about -@@ -27,25 +27,22 @@ - GLUT_LIBS = -L$(GLUT)/lib/glut -lglut +@@ -21,23 +21,23 @@ + # display (or you don't have OpenGL and Glut libraries) + # If you do have these libs then make sure the first three + # lines point at the right places +-MESA = /usr/local/Mesa-2.1 +-GLUT = /usr/local/Mesa-2.1/glut-3.2 +-X11 = /usr/X11R6 +-GLUT_LIBS = -L$(GLUT)/lib/glut -lglut ++MESA = ${X11BASE} ++GLUT = ${X11BASE} ++X11 = ${X11BASE} ++GLUT_LIBS = -L$(GLUT)/lib -lglut MESA_LIBS = -L$(MESA)/lib -lMesaGLU -lMesaGL -lm XLIBS = -L$(X11)/lib -lXmu -lXt -lXext -lX11 -lXi -DISPLAYFLAGS = -I$(MESA)/include -I$(GLUT) -DRENDERED_DISPLAY=1 -+DISPLAYFLAGS = -I/usr/X11R6/include -I$(MESA)/include -I$(GLUT) -DRENDERED_DISPLAY=1 ++DISPLAYFLAGS = -I$(X11)/include -I$(MESA)/include -I$(GLUT)/include -DRENDERED_DISPLAY= 1 --# comment out the following line if you don't want KnightCap's --# evaluation function learning turned on. + # comment out the following line if you don't want KnightCap's + # evaluation function learning turned on. -LEARNFLAGS = -DLEARN_EVAL=1 ++#LEARNFLAGS = -DLEARN_EVAL=1 # you shouldn't need to edit anything below this line. Unless # something goes wrong. INCLUDE = $(DISPLAYFLAGS) -CFLAGS = $(OPT) $(INCLUDE) $(LEARNFLAGS) -+CFLAGS = $(OPT) $(INCLUDE) #-DLEARN_EVAL=1 ++CFLAGS += $(OPT) $(INCLUDE) $(LEARNFLAGS) --LIBS = $(GLUT_LIBS) $(MESA_LIBS) $(XLIBS) -+LIBS = $(GLUT_LIBS) $(MESA_LIBS) $(XLIBS) -lm + LIBS = $(GLUT_LIBS) $(MESA_LIBS) $(XLIBS) - TARGET = KnightCap +@@ -45,7 +45,7 @@ OBJS = knightcap.o trackball.o move.o util.o generate.o eval.o movement.o \ ordering.o hash.o board.o log.o prog.o timer.o ics.o display.o \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message