Date: Sat, 13 Dec 2003 02:47:30 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60200: [maintainer update] games/traindirector upgrade to 1.18l Message-ID: <200312130147.hBD1lU6V077216@wedge.madpilot.net> Resent-Message-ID: <200312130150.hBD1oEBi046667@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60200 >Category: ports >Synopsis: [maintainer update] games/traindirector upgrade to 1.18l >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 12 17:50:14 PST 2003 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 5.2-RC i386 >Organization: none >Environment: System: FreeBSD wedge.madpilot.net 5.2-RC FreeBSD 5.2-RC #0: Mon Dec 8 22:24:24 CET 2003 root@wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386 >Description: further update to 1.18l. claims native support for FreeBSD. in fact many patches were removed. removed files(mainly fixed malloc.h includes): files/patch-field.c files/patch-loadsave.c files/patch-run.c files/patch-tgraph.c files/patch-track.c files/patch-track1.c files/patch-trsim.c >How-To-Repeat: >Fix: diff -ruN traindirector.old/Makefile traindirector/Makefile --- traindirector.old/Makefile Sat Dec 13 02:37:51 2003 +++ traindirector/Makefile Sat Dec 13 02:34:16 2003 @@ -6,9 +6,9 @@ # PORTNAME= tdir -PORTVERSION= 1.18i +PORTVERSION= 1.18l CATEGORIES= games -MASTER_SITES= http://xtsl.free.fr/118i/ +MASTER_SITES= http://xtsl.free.fr/118l/ DISTNAME= traindir-${PORTVERSION}-src WRKSRC= ${WRKDIR}/traindir-${PORTVERSION} diff -ruN traindirector.old/distinfo traindirector/distinfo --- traindirector.old/distinfo Sat Dec 13 02:37:51 2003 +++ traindirector/distinfo Sat Dec 13 02:32:02 2003 @@ -1 +1 @@ -MD5 (traindir-1.18i-src.tar.gz) = c3f65b2a72a1e94d738f390685c18236 +MD5 (traindir-1.18l-src.tar.gz) = 85c425623135225d0fed27b8d268f156 diff -ruN traindirector.old/files/patch-Makefile traindirector/files/patch-Makefile --- traindirector.old/files/patch-Makefile Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-Makefile Sat Dec 13 02:35:09 2003 @@ -1,18 +1,16 @@ ---- Makefile.orig Tue Dec 9 21:59:18 2003 -+++ Makefile Tue Dec 9 22:00:42 2003 -@@ -4,21 +4,21 @@ - # - VERSION=1.18i +--- Makefile.orig Sat Dec 13 02:34:25 2003 ++++ Makefile Sat Dec 13 02:33:16 2003 +@@ -7,15 +7,15 @@ + + VERSION=1.18l -BINDIR=/usr/local/bin -SAMPLEDIR=/usr/local/share +BINDIR=$(PREFIX)/bin +SAMPLEDIR=$(PREFIX)/share - SHELL = /bin/sh INSTALL = install - -GTKINC=`gtk-config --cflags` -GTKLIB=`gtk-config --libs` -GLIBINC=`glib-config --cflags` @@ -22,11 +20,5 @@ +GLIBINC=`glib12-config --cflags` +GLIBLIB=`glib12-config --libs` --CFLAGS = -g $(GLIBINC) $(GTKINC) -Dunix #-static -+CFLAGS += -g $(GLIBINC) $(GTKINC) -Dunix #-static - --CC = cc -+CC ?= cc - - LIBS = $(GLIBLIB) $(GTKLIB) + CFLAGS += -g $(GLIBINC) $(GTKINC) #-static diff -ruN traindirector.old/files/patch-field.c traindirector/files/patch-field.c --- traindirector.old/files/patch-field.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-field.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- field.c.orig Mon Sep 8 04:53:57 2003 -+++ field.c Mon Sep 8 04:54:03 2003 -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> --#include <malloc.h> - #include "trsim.h" - #include "gtkui.h" - diff -ruN traindirector.old/files/patch-loadsave.c traindirector/files/patch-loadsave.c --- traindirector.old/files/patch-loadsave.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-loadsave.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- loadsave.c.orig Fri Jul 18 15:53:00 2003 -+++ loadsave.c Fri Jul 18 15:53:07 2003 -@@ -20,7 +20,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - #include <memory.h> - #include <string.h> - #include "trsim.h" diff -ruN traindirector.old/files/patch-run.c traindirector/files/patch-run.c --- traindirector.old/files/patch-run.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-run.c Thu Jan 1 01:00:00 1970 @@ -1,43 +0,0 @@ ---- run.c.orig Tue Dec 9 22:02:20 2003 -+++ run.c Tue Dec 9 22:04:51 2003 -@@ -20,11 +20,15 @@ - - #include <stdio.h> - #include <string.h> --#include <malloc.h> -+#include <stdlib.h> - #include <math.h> - #include "ask.h" - #include "trsim.h" - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #define HOMAN_030330 - #define MERGE_TRAINS 1 - -@@ -60,7 +64,11 @@ - { - if(i >= v->size) { - printf("Bad index %d: only %d elements in vector!\n", i, v->size); -+#if (defined(BSD) && (BSD >= 199103)) -+ abort(); -+#else - abort(0); -+#endif - } - return v->ptr[i]; - } -@@ -69,7 +77,11 @@ - { - if(i >= v->size) { - printf("Bad index %d: only %d elements in vector!\n", i, v->size); -+#if (defined(BSD) && (BSD >= 199103)) -+ abort(); -+#else - abort(0); -+#endif - } - return v->flags[i]; - } diff -ruN traindirector.old/files/patch-setup_trdir.sh traindirector/files/patch-setup_trdir.sh --- traindirector.old/files/patch-setup_trdir.sh Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-setup_trdir.sh Sat Dec 13 02:37:01 2003 @@ -1,5 +1,5 @@ ---- setup_trdir.sh.orig Thu Sep 19 17:28:00 2002 -+++ setup_trdir.sh Mon Sep 8 12:50:55 2003 +--- setup_trdir.sh.orig Sat Dec 13 02:34:25 2003 ++++ setup_trdir.sh Sat Dec 13 02:36:42 2003 @@ -6,9 +6,9 @@ # edit the folowing line # @@ -12,7 +12,7 @@ ##################################################################" echo "*********************************" echo "* Traindirector Installation *" -@@ -16,25 +16,29 @@ +@@ -16,25 +16,26 @@ echo echo "Making traindir samples directory....." echo @@ -26,11 +26,9 @@ -cp $SAMPLE/traindir/* $TDHOMEDIR -cp $SAMPLE/traindir/tdicons/*.* $ICONDIR -+#little hack. It works anyway. +cp -R $SAMPLE/traindir/* $TDHOMEDIR -+#cp $SAMPLE/traindir/tdicons/*.* $ICONDIR echo - echo "Creating start-traindir script......" + echo "Creating startup script......" echo echo "#!/bin/sh" > start-traindir echo "# Startup file for traindirector" >> start-traindir @@ -43,9 +41,8 @@ chmod 0775 start-traindir echo "Installation complete" --echo "You can run ~/start-traindir in a X console" +-echo "You can run ~/start-traindir from a X console" \ No newline at end of file -+#echo "You can run ./start-traindir in a X console" +echo "a script file 'start-traindir' has been created in the current" +echo "directory. You can launch it to start the simulation, or move it" +echo "to your user's bin directory if you want." diff -ruN traindirector.old/files/patch-tgraph.c traindirector/files/patch-tgraph.c --- traindirector.old/files/patch-tgraph.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-tgraph.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- tgraph.c.orig Fri Jul 18 15:57:50 2003 -+++ tgraph.c Fri Jul 18 15:57:58 2003 -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> --#include <malloc.h> - #include "trsim.h" - - #define STATION_WIDTH 100 diff -ruN traindirector.old/files/patch-track.c traindirector/files/patch-track.c --- traindirector.old/files/patch-track.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-track.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- track.c.orig Fri Jul 18 15:58:30 2003 -+++ track.c Fri Jul 18 15:58:39 2003 -@@ -20,7 +20,6 @@ - - #include <stdio.h> - #include <string.h> --#include <malloc.h> - #include "trsim.h" - #include "ask.h" - diff -ruN traindirector.old/files/patch-track1.c traindirector/files/patch-track1.c --- traindirector.old/files/patch-track1.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-track1.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- track1.c.orig Fri Jul 18 15:59:04 2003 -+++ track1.c Fri Jul 18 15:59:11 2003 -@@ -20,7 +20,6 @@ - - #include <stdio.h> - #include <string.h> --#include <malloc.h> - #include "trsim.h" - #include "ask.h" - diff -ruN traindirector.old/files/patch-trsim.c traindirector/files/patch-trsim.c --- traindirector.old/files/patch-trsim.c Sat Dec 13 02:37:51 2003 +++ traindirector/files/patch-trsim.c Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ ---- trsim.c.orig Fri Jul 18 15:59:50 2003 -+++ trsim.c Fri Jul 18 15:59:58 2003 -@@ -20,7 +20,6 @@ - - #include <stdio.h> - #include <string.h> --#include <malloc.h> - #include <stdlib.h> - #include "ask.h" - #include "html.h" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312130147.hBD1lU6V077216>