From andy@icc.surw.chel.su Sat Mar 13 06:25:11 1999
Return-Path: <andy@icc.surw.chel.su>
Received: from icc.surw.chel.su (surw.chel.su [195.54.2.162])
	by hub.freebsd.org (Postfix) with ESMTP id 22B5414BEE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Mar 1999 06:25:03 -0800 (PST)
	(envelope-from andy@icc.surw.chel.su)
Received: (from andy@localhost)
	by icc.surw.chel.su (8.8.8/8.8.8) id RAA00597;
	Sat, 13 Mar 1999 17:24:43 +0300 (MSK)
	(envelope-from andy)
Message-Id: <199903131424.RAA00597@icc.surw.chel.su>
Date: Sat, 13 Mar 1999 17:24:43 +0300 (MSK)
From: Andrey Zakhvatov <andy@icc.surw.chel.su>
Reply-To: andy@icc.surw.chel.su
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: astro/ssystem
X-Send-Pr-Version: 3.2

>Number:         10567
>Category:       ports
>Synopsis:       Update port: astro/ssystem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 13 06:30:01 PST 1999
>Closed-Date:    Sat Mar 13 19:42:33 PST 1999
>Last-Modified:  Sat Mar 13 19:43:02 PST 1999
>Originator:     Andrey Zakhvatov
>Release:        FreeBSD 2.2.8-RELEASE i386
>Organization:
South Ural Railway ICC
>Environment:

>Description:

   This is a patch to update astro/ssystem port.


diff -Nru ssystem/Makefile ssystem-1.6/Makefile
--- ssystem/Makefile	Thu Dec 17 14:16:53 1998
+++ ssystem-1.6/Makefile	Sat Mar 13 16:35:55 1999
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	ssystem
-# Version required:			1.5
+# Version required:			1.6
 # Date created:				4 August 1998
 # Whom:					Andrey Zakhvatov
 #
 # $Id: Makefile,v 1.6 1998/12/17 09:03:34 asami Exp $
 #
 
-DISTNAME=		ssystem-1.5
+DISTNAME=		ssystem-1.6
 CATEGORIES=		astro
-MASTER_SITES=		http://www1.las.es/~amil/ssystem/ \
-			http://www.msu.edu/~kamelkev/
+MASTER_SITES=		http://www.geocities.com/SiliconValley/Station/6492/ \
+			http://www.msu.edu/user/kamelkev/
 
 MAINTAINER=		andy@icc.surw.chel.su
 
diff -Nru ssystem/files/md5 ssystem-1.6/files/md5
--- ssystem/files/md5	Tue Dec 15 02:25:41 1998
+++ ssystem-1.6/files/md5	Sat Mar 13 16:38:29 1999
@@ -1 +1 @@
-MD5 (ssystem-1.5.tar.gz) = aeb1799204a583df8b7dbdbe74099419
+MD5 (ssystem-1.6.tar.gz) = 75f90a601060ca70687cebb4b2abc1f1
diff -Nru ssystem/patches/patch-aa ssystem-1.6/patches/patch-aa
--- ssystem/patches/patch-aa	Tue Dec 15 02:26:05 1998
+++ ssystem-1.6/patches/patch-aa	Sat Mar 13 16:59:59 1999
@@ -17,9 +17,3 @@
  
  LDFLAGS= -L$(X11BASE)/lib -L$(MESADIR)/lib -L${JPEGDIR}/lib \
  	 -ljpeg -lglut -lMesaGLU -lMesaGL -lXext -lXmu -lX11 -lXi -lm
-@@ -60,4 +61,4 @@
- init.o: init.c planets.h
- positions.o: positions.c planets.h
- ssystem.o: ssystem.c planets.h
--joystick.o: joystick.c planets.h
-+joystick.o: joystick.c planets.h
diff -Nru ssystem/patches/patch-ab ssystem-1.6/patches/patch-ab
--- ssystem/patches/patch-ab	Tue Dec 15 02:26:05 1998
+++ ssystem-1.6/patches/patch-ab	Sat Mar 13 16:48:08 1999
@@ -1,11 +1,11 @@
---- init.c	Tue Dec  1 11:10:14 1998
-+++ /home/andy/tmp/wrk/init.c	Wed Dec  2 14:18:50 1998
-@@ -417,7 +417,7 @@
-    extern float speed;
-    
-    
--   sprintf(line,"%s/ssystem.conf",texturepath);
-+   sprintf(line,"%s/ssystem.conf",CONFIGDIR);
-    f=fopen(line,"rt");
-    if (f==NULL) {
- 	sprintf(line,"ssystem.conf");
+--- cfgparse.y	Wed Feb 24 13:32:29 1999
++++ /home/andy/tmp/wrk/cfgparse.y	Sat Mar 13 16:47:11 1999
+@@ -231,7 +231,7 @@
+ { 
+    char s[200];
+ 
+-   sprintf(s,"%s/ssystem.conf",texturepath);
++   sprintf(s,"%s/ssystem.conf", CONFIGDIR);
+    cfgin=fopen(s,"rt");
+    if (cfgin==NULL) {
+ 	sprintf(s,"ssystem.conf");
diff -Nru ssystem/patches/patch-ac ssystem-1.6/patches/patch-ac
--- ssystem/patches/patch-ac	Tue Dec 15 01:40:48 1998
+++ ssystem-1.6/patches/patch-ac	Sat Mar 13 16:54:44 1999
@@ -1,5 +1,5 @@
---- ssystem.c.orig	Mon Dec 14 14:31:34 1998
-+++ ssystem.c	Mon Dec 14 14:32:32 1998
+--- ssystem.c	Fri Feb 26 15:50:14 1999
++++ /home/andy/tmp/wrk/ssystem.c	Sat Mar 13 16:53:47 1999
 @@ -21,7 +21,9 @@
  #include <stdlib.h>
  #include <string.h>
@@ -11,13 +11,14 @@
  #include <malloc.h>
  #endif
  #include <time.h>
-@@ -952,6 +954,9 @@
-  int main(int argc, char *argv[])
- #endif
- {
+@@ -489,6 +491,10 @@
+    char *s="ssystem.exe";
+ 
+    argv[0]=s;
++#else
 +#ifdef __FreeBSD__
 +   fpsetmask(0);
 +#endif
- 
- #ifdef WIN32
-    int argc=1;
+ #endif   
+    glutInitWindowSize(width,height);
+    glutInit( &argc, argv);
diff -Nru ssystem/pkg/PLIST ssystem-1.6/pkg/PLIST
--- ssystem/pkg/PLIST	Tue Dec 15 02:26:05 1998
+++ ssystem-1.6/pkg/PLIST	Sat Mar 13 17:17:55 1999
@@ -6,10 +6,12 @@
 share/doc/ssystem/README
 share/doc/ssystem/README.3D
 share/doc/ssystem/TODO
+share/ssystem/asteroid.jpg
 share/ssystem/callisto.jpg
 share/ssystem/charon.jpg
 share/ssystem/dione.jpg
 share/ssystem/earth.jpg
+share/ssystem/earthcld.jpg
 share/ssystem/europa.jpg
 share/ssystem/ganymede.jpg
 share/ssystem/io.jpg
@@ -22,6 +24,7 @@
 share/ssystem/rhea.jpg
 share/ssystem/satrings.jpg
 share/ssystem/saturn.jpg
+share/ssystem/splash.jpg
 share/ssystem/stars.dat
 share/ssystem/sun.jpg
 share/ssystem/tethys.jpg


>How-To-Repeat:

>Fix:

   Please, check and apply this patch.


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: flathill 
State-Changed-When: Sat Mar 13 19:42:33 PST 1999 
State-Changed-Why:  
Committed. Thanks! 
>Unformatted:
