Date: Wed, 2 Dec 1998 13:10:30 +0300 (MSK) From: Andrey Zakhvatov <andy@icc.surw.chel.su> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/8938: Update port: astro/ssystem Message-ID: <199812021010.NAA06726@icc.surw.chel.su>
next in thread | raw e-mail | index | archive | help
>Number: 8938 >Category: ports >Synopsis: Update port: astro/ssystem >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: Wed Dec 2 02:20:00 PST 1998 >Last-Modified: >Originator: Andrey Zakhvatov >Organization: South Ural Railway ICC >Release: FreeBSD 2.2.7-RELEASE i386 >Environment: >Description: This is a patch to update astro/ssystem port. diff -Nru ssystem/Makefile ssystem-1.5/Makefile --- ssystem/Makefile Mon Nov 2 11:14:58 1998 +++ ssystem-1.5/Makefile Wed Dec 2 16:05:36 1998 @@ -1,35 +1,39 @@ # New ports collection makefile for: ssystem -# Version required: 1.4 +# Version required: 1.5 # Date created: 4 August 1998 # Whom: Andrey Zakhvatov # # $Id: Makefile,v 1.4 1998/11/02 03:49:24 steve Exp $ # -DISTNAME= ssystem-1.4 -CATEGORIES= astro -MASTER_SITES= http://www1.las.es/~amil/ssystem/ \ - http://www.msu.edu/~kamelkev/ - -MAINTAINER= andy@icc.surw.chel.su - -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - MesaGL.14:${PORTSDIR}/graphics/Mesa3 \ - MesaGLU.14:${PORTSDIR}/graphics/Mesa3 \ - glut.3:${PORTSDIR}/graphics/Mesa3 +DISTNAME= ssystem-1.5 +CATEGORIES= astro +MASTER_SITES= http://www1.las.es/~amil/ssystem/ \ + http://www.msu.edu/~kamelkev/ +FETCH_BEFORE_ARGS= -b -USE_X_PREFIX= yes +MAINTAINER= andy@icc.surw.chel.su -FETCH_BEFORE_ARGS= -b +MAKEFILE= Makefile.FreeBSD + +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ + MesaGL.14:${PORTSDIR}/graphics/Mesa3 \ + MesaGLU.14:${PORTSDIR}/graphics/Mesa3 \ + glut.3:${PORTSDIR}/graphics/Mesa3 + +USE_X_PREFIX= yes do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/ssystem ${PREFIX}/bin @ ${MKDIR} ${PREFIX}/share/ssystem @ ${INSTALL_DATA} ${WRKSRC}/*.jpg ${PREFIX}/share/ssystem - @ ${INSTALL_DATA} ${WRKSRC}/Stars.dat ${PREFIX}/share/ssystem + @ ${INSTALL_DATA} ${WRKSRC}/stars.dat ${PREFIX}/share/ssystem + @ ${INSTALL_DATA} ${WRKSRC}/ssystem.conf ${PREFIX}/etc + +post-install: .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/ssystem -.for file in CHANGES LEEME LICENSE README TODO +.for file in CHANGES LEEME LICENSE README README.3D TODO @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ssystem .endfor .endif diff -Nru ssystem/files/md5 ssystem-1.5/files/md5 --- ssystem/files/md5 Mon Nov 2 11:14:58 1998 +++ ssystem-1.5/files/md5 Wed Dec 2 15:59:00 1998 @@ -1 +1 @@ -MD5 (ssystem-1.4.tar.gz) = b353c3af76059e92fb9a6716e5e72a94 +MD5 (ssystem-1.5.tar.gz) = aeb1799204a583df8b7dbdbe74099419 diff -Nru ssystem/patches/patch-aa ssystem-1.5/patches/patch-aa --- ssystem/patches/patch-aa Mon Nov 2 11:14:58 1998 +++ ssystem-1.5/patches/patch-aa Wed Dec 2 16:09:10 1998 @@ -1,45 +1,25 @@ ---- Makefile Sun Sep 13 10:54:34 1998 -+++ /home/andy/tmp/wrk/Makefile Wed Oct 21 17:26:14 1998 -@@ -4,16 +4,36 @@ - # Remove -DLINUXJOY if your linux kernel doesn't support joysticks or - # you're running other OS - --CC= gcc -+# C compiler -+CC?= gcc -+ -+# X Window System directory -+X11BASE?= /usr/X11R6 -+ -+# Local packages directory -+LOCALBASE?= /usr/local -+ -+# Installation directories -+PREFIX?= $(X11BASE) -+DATADIR?= ${PREFIX}/share/ssystem +--- Makefile.FreeBSD Mon Nov 30 20:07:59 1998 ++++ /home/andy/tmp/wrk/Makefile.FreeBSD Wed Dec 2 14:18:45 1998 +@@ -19,6 +19,7 @@ + # Installation directories + PREFIX?= $(X11BASE) + SDATADIR?= ${PREFIX}/share/ssystem ++CONFIGDIR?= ${PREFIX}/etc # Your Mesa base directory --MESADIR=/root/Mesa-3.0 -+MESADIR?= $(X11BASE) -+ -+# Your JPEG base directory -+JPEGDIR?= $(LOCALBASE) -+ -+CFLAGS+= -I$(X11BASE)/include -I$(MESADIR)/include -I$(JPEGDIR)/include -DDATADIR=\"${DATADIR}\" - --CFLAGS = -Wall -O6 -I$(MESADIR)/include -ffast-math -fPIC -fomit-frame-pointer \ -- -mpentium -funroll-all-loops -DLINUXJOY -+LDFLAGS= -L$(X11BASE)/lib -L$(MESADIR)/lib -L${JPEGDIR}/lib \ -+ -lm -lX11 -ljpeg -lXmu -lXi -lXext -lMesaGL -lMesaGLU -lglut - --LDFLAGS= -lX11 -L/usr/X11R6/lib -L$(MESADIR)/lib \ -- -ljpeg -lm -lXmu -lXi -lXext -lMesaGL -lMesaGLU -lglut -+# FreeBSD specific -+.ifdef PORTOBJFORMAT -+.if ${PORTOBJFORMAT} == "elf" -+LDFLAGS+= -Wl,-rpath,$(X11BASE)/lib -+.endif -+.endif - - OBJ = ssystem.o init.o positions.o joystick.o - + MESADIR?= $(X11BASE) +@@ -26,7 +27,7 @@ + # Your JPEG base directory + JPEGDIR?= $(LOCALBASE) + +-CFLAGS+= -I$(X11BASE)/include -I$(MESADIR)/include -I$(JPEGDIR)/include -DSDATADIR=\"${SDATADIR}\" ++CFLAGS+= -I$(X11BASE)/include -I$(MESADIR)/include -I$(JPEGDIR)/include -DSDATADIR=\"${SDATADIR}\" -DCONFIGDIR=\"${CONFIGDIR}\" + + 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.5/patches/patch-ab --- ssystem/patches/patch-ab Mon Nov 2 11:14:58 1998 +++ ssystem-1.5/patches/patch-ab Wed Dec 2 16:07:37 1998 @@ -1,23 +1,11 @@ ---- init.c Sun Sep 13 14:05:35 1998 -+++ /home/andy/tmp/wrk/init.c Thu Oct 22 18:47:15 1998 -@@ -15,7 +15,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <math.h> -+#ifdef __FreeBSD__ -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - #include <time.h> - #include "jpeglib.h" - #include <setjmp.h> -@@ -57,7 +61,7 @@ - GLfloat stars[NUMSTARS][4]; - double days,timefactor=1/(24.0*60.0); /* iterarion = 1 minute */ - int SLICES=20,STACKS=20; --char texturepath[100]="."; -+char texturepath[100]=DATADIR; - static void InitSun(void),InitMercury(void),InitVenus(void),InitEarth(void), - InitMars(void),InitJupiter(void),InitSaturn(void),InitUranus(void), - InitNeptune(void),InitPluto(void),InitStars(void); +--- 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"); diff -Nru ssystem/pkg/PLIST ssystem-1.5/pkg/PLIST --- ssystem/pkg/PLIST Thu Aug 6 17:57:50 1998 +++ ssystem-1.5/pkg/PLIST Wed Dec 2 16:06:24 1998 @@ -1,10 +1,11 @@ bin/ssystem +etc/ssystem.conf share/doc/ssystem/CHANGES share/doc/ssystem/LEEME share/doc/ssystem/LICENSE share/doc/ssystem/README +share/doc/ssystem/README.3D share/doc/ssystem/TODO -share/ssystem/Stars.dat share/ssystem/callisto.jpg share/ssystem/charon.jpg share/ssystem/dione.jpg @@ -21,6 +22,7 @@ share/ssystem/rhea.jpg share/ssystem/satrings.jpg share/ssystem/saturn.jpg +share/ssystem/stars.dat share/ssystem/sun.jpg share/ssystem/tethys.jpg share/ssystem/titan.jpg >How-To-Repeat: >Fix: Please, check and apply this patch. Also, take a look at strange "floating point exception" error. I don't know what to deal with it. >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?199812021010.NAA06726>