Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Dec 1999 16:05:28 +0300 (MSK)
From:      Andrey Zakhvatov <andy@icc.surw.chel.su>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/15646: Update port: games/gltron
Message-ID:  <199912231305.QAA50418@icc.surw.chel.su>

next in thread | raw e-mail | index | archive | help

>Number:         15646
>Category:       ports
>Synopsis:       Update port: games/gltron
>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 Dec 23 05:10:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Zakhvatov
>Release:        FreeBSD 3.3-RELEASE i386
>Organization:
South Ural Railway ICC
>Environment:

>Description:

   This is a patch to update games/gltron port.


diff -Nru gltron/Makefile gltron-0.46/Makefile
--- gltron/Makefile	Wed Aug 25 14:15:21 1999
+++ gltron-0.46/Makefile	Thu Dec 23 15:42:29 1999
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gltron
-# Version required:			0.43
+# Version required:			0.46
 # Date created:				24 July 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD: ports/games/gltron/Makefile,v 1.3 1999/08/25 07:03:55 cpiazza Exp $
 #
 
-DISTNAME=	glTron-0.43
-PKGNAME=	gltron-0.43
+DISTNAME=	glTron-0.46
+PKGNAME=	gltron-0.46
 CATEGORIES=	games
 MASTER_SITES=	http://www.ards.net/Andreas/
 
diff -Nru gltron/files/md5 gltron-0.46/files/md5
--- gltron/files/md5	Wed Aug 25 14:15:21 1999
+++ gltron-0.46/files/md5	Thu Dec 23 15:42:34 1999
@@ -1 +1 @@
-MD5 (glTron-0.43.tar.gz) = f1b0cb19e7394a97118ef9d240268e11
+MD5 (glTron-0.46.tar.gz) = faeaddeba285a46c8773a8307f60392a
diff -Nru gltron/patches/patch-aa gltron-0.46/patches/patch-aa
--- gltron/patches/patch-aa	Wed Aug 25 14:15:22 1999
+++ gltron-0.46/patches/patch-aa	Thu Dec 23 15:57:14 1999
@@ -1,23 +1,28 @@
---- Makefile	Sun Aug 22 23:00:24 1999
-+++ /home/andy/tmp/wrk/Makefile	Mon Aug 23 10:22:43 1999
-@@ -1,10 +1,11 @@
+--- Makefile	Sun Oct  3 17:27:05 1999
++++ /home/andy/tmp/wrk/Makefile	Thu Dec 23 15:57:00 1999
+@@ -1,13 +1,13 @@
  # Makefile for gltron
  
 -XLIBS = -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm
 +XLIBS = -L$(X11BASE)/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm
  
--GL_LIBS = -lMesaGL -lMesaGLU -lglut $(XLIBS)
-+GL_LIBS = -lMesaGL -lMesaGLU -lglut
+ GL_LIBS = -lMesaGL -lMesaGLU -lglut
+ 
+ SNDLIBS = `libmikmod-config --cflags` `libmikmod-config --libs`
  
 -CC = gcc
-+CFLAGS+= -I$(X11BASE)/include
+-COMPILE = -c -pedantic -Wall -g
 +CC ?= gcc
- DEBUG = -g -pedantic
- # RELEASE = -O2 -pedantic crashes (why?)
- RELEASE = -pedantic
-@@ -15,4 +16,4 @@
- 	$(CC) $(DEBUG) -o gltron gltron.c $(GL_LIBS) $(XLIBS)
- 
- gltron: gltron.c gltron.h gltron_tex.h gltron_wall.h
--	$(CC) $(RELEASE) -o gltron gltron.c $(GL_LIBS) $(XLIBS)
-+	$(CC) $(CFLAGS) -o gltron gltron.c $(GL_LIBS) $(XLIBS)
++COMPILE = $(CFLAGS) -I$(X11BASE)/include -c
+ DEBUG = -g
+ RELEASE = -O2
+ 
+@@ -22,7 +22,7 @@
+ fragments: character.o computer.o texture.o input.o settings.o
+ 
+ gltron: gltron_source fragments
+-	$(CC) $(RELEASE) -o gltron $(OBJ) $(GL_LIBS) $(XLIBS)
++	$(CC) -o gltron $(OBJ) $(GL_LIBS) $(XLIBS)
+ 
+ gltron_source: gltron.c gltron.h globals.h
+ 	$(CC) $(COMPILE) gltron.c
diff -Nru gltron/patches/patch-ab gltron-0.46/patches/patch-ab
--- gltron/patches/patch-ab	Sun Aug  1 08:17:36 1999
+++ gltron-0.46/patches/patch-ab	Thu Jan  1 03:00:00 1970
@@ -1,23 +0,0 @@
---- gltron.c.orig	Sun Aug  1 21:03:53 1999
-+++ gltron.c	Sun Aug  1 21:03:56 1999
-@@ -17,6 +17,9 @@
- */
- 
- #include "gltron.h"
-+#ifdef __FreeBSD__
-+#include <floatingpoint.h>
-+#endif
- 
- void setCol(int x, int y) {
-   int offset, mask;
-@@ -657,6 +660,10 @@
-   };
-     
-   int win_id;
-+
-+#ifdef __FreeBSD__
-+  fpsetmask(0);
-+#endif
- 
-   glutInit(&argc, argv);
-   glutInitWindowSize(WIN_WIDTH, WIN_HEIGHT);


>How-To-Repeat:

>Fix:

   Please, check and apply this patch.


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912231305.QAA50418>