Date: Thu, 22 Oct 1998 16:31:37 +0400 (MSD) From: Andrey Zakhvatov <andy@icc.surw.chel.su> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/8407: Update port: astro/ssystem Message-ID: <199810221231.QAA00688@icc.surw.chel.su>
next in thread | raw e-mail | index | archive | help
>Number: 8407 >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: Thu Oct 22 05:40:00 PDT 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.4/Makefile --- ssystem/Makefile Sun Sep 27 11:24:32 1998 +++ ssystem-1.4/Makefile Thu Oct 22 20:24:03 1998 @@ -1,14 +1,15 @@ # New ports collection makefile for: ssystem -# Version required: 1.3 +# Version required: 1.4 # Date created: 4 August 1998 # Whom: Andrey Zakhvatov # # $Id: Makefile,v 1.3 1998/09/26 23:34:33 steve Exp $ # -DISTNAME= ssystem-1.3 +DISTNAME= ssystem-1.4 CATEGORIES= astro -MASTER_SITES= http://www1.las.es/~amil/ssystem/ +MASTER_SITES= http://www1.las.es/~amil/ssystem/ \ + http://www.msu.edu/~kamelkev/ MAINTAINER= andy@icc.surw.chel.su @@ -17,7 +18,7 @@ MesaGLU.14:${PORTSDIR}/graphics/Mesa3 \ glut.3:${PORTSDIR}/graphics/Mesa3 -USE_X11= yes +USE_X_PREFIX= yes do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/ssystem ${PREFIX}/bin diff -Nru ssystem/files/md5 ssystem-1.4/files/md5 --- ssystem/files/md5 Thu Aug 6 18:57:50 1998 +++ ssystem-1.4/files/md5 Mon Oct 19 21:02:39 1998 @@ -1 +1 @@ -MD5 (ssystem-1.3.tar.gz) = e43299591e5851cd224cf612e170d1c2 +MD5 (ssystem-1.4.tar.gz) = b353c3af76059e92fb9a6716e5e72a94 diff -Nru ssystem/patches/patch-aa ssystem-1.4/patches/patch-aa --- ssystem/patches/patch-aa Sun Sep 27 11:24:33 1998 +++ ssystem-1.4/patches/patch-aa Wed Oct 21 17:28:15 1998 @@ -1,29 +1,44 @@ ---- Makefile.orig Sat Jul 25 18:16:42 1998 -+++ Makefile Thu Sep 24 19:48:23 1998 -@@ -4,16 +4,22 @@ +--- 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 -+#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 # Your Mesa base directory -MESADIR=/root/Mesa-3.0 -+MESADIR=${X11BASE} ++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 -+# Data directory -+PREFIX?=${X11BASE} -+DATADIR=${PREFIX}/share/ssystem ++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 \ -+CFLAGS+= -I$(MESADIR)/include -I$(LOCALBASE)/include -DDATADIR=\"${DATADIR}\" -+ -+LDFLAGS= -lX11 -L${X11BASE}/lib -L$(MESADIR)/lib -L$(LOCALBASE)/lib \ - -ljpeg -lm -lXmu -lXi -lXext -lMesaGL -lMesaGLU -lglut +- -ljpeg -lm -lXmu -lXi -lXext -lMesaGL -lMesaGLU -lglut ++# FreeBSD specific ++.ifdef PORTOBJFORMAT +.if ${PORTOBJFORMAT} == "elf" -+LDFLAGS+= -Wl,-rpath,${X11BASE}/lib ++LDFLAGS+= -Wl,-rpath,$(X11BASE)/lib ++.endif +.endif OBJ = ssystem.o init.o positions.o joystick.o diff -Nru ssystem/patches/patch-ab ssystem-1.4/patches/patch-ab --- ssystem/patches/patch-ab Thu Aug 6 14:57:00 1998 +++ ssystem-1.4/patches/patch-ab Thu Oct 22 18:48:07 1998 @@ -1,9 +1,21 @@ ---- init.c Sat Jul 25 23:16:42 1998 -+++ /home/andy/tmp/wrk/init.c Mon Aug 3 18:05:11 1998 -@@ -57,7 +57,7 @@ +--- 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=12,STACKS=12; + int SLICES=20,STACKS=20; -char texturepath[100]="."; +char texturepath[100]=DATADIR; static void InitSun(void),InitMercury(void),InitVenus(void),InitEarth(void), diff -Nru ssystem/pkg/DESCR ssystem-1.4/pkg/DESCR --- ssystem/pkg/DESCR Thu Aug 6 14:57:00 1998 +++ ssystem-1.4/pkg/DESCR Thu Oct 22 20:27:45 1998 @@ -1,5 +1,6 @@ -ssystem is an OpenGL Solar System simulator. Only the Sun, the nine -planets, and a few major satellites are included. Background stars are +ssystem is an OpenGL Solar System simulator with Sun, nine +planets, and a few major satellites. Background stars are also included. http://www1.las.es/~amil/ssystem +http://www.msu.edu/~kamelkev >How-To-Repeat: >Fix: Please, check and apply this patch. >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?199810221231.QAA00688>