From 3d1f4d8a108f742c69d89aba954a9c12f6407fab Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Sat, 13 Dec 2003 13:25:42 +0000 Subject: - Update to 1.18l PR: ports/60200 Submitted by: Guido Falsi (maintainer) --- games/traindirector/Makefile | 11 ++----- games/traindirector/distinfo | 2 +- games/traindirector/files/patch-Makefile | 20 ++++-------- games/traindirector/files/patch-field.c | 10 ------ games/traindirector/files/patch-loadsave.c | 10 ------ games/traindirector/files/patch-run.c | 43 -------------------------- games/traindirector/files/patch-setup_trdir.sh | 13 +++----- games/traindirector/files/patch-tgraph.c | 10 ------ games/traindirector/files/patch-track.c | 10 ------ games/traindirector/files/patch-track1.c | 10 ------ games/traindirector/files/patch-trsim.c | 10 ------ 11 files changed, 15 insertions(+), 134 deletions(-) delete mode 100644 games/traindirector/files/patch-field.c delete mode 100644 games/traindirector/files/patch-loadsave.c delete mode 100644 games/traindirector/files/patch-run.c delete mode 100644 games/traindirector/files/patch-tgraph.c delete mode 100644 games/traindirector/files/patch-track.c delete mode 100644 games/traindirector/files/patch-track1.c delete mode 100644 games/traindirector/files/patch-trsim.c (limited to 'games') diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile index 4015b861b5b0..424ed8ce7aaa 100644 --- a/games/traindirector/Makefile +++ b/games/traindirector/Makefile @@ -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} @@ -16,9 +16,8 @@ MAINTAINER= mad@madpilot.net COMMENT= Train controller simulation USE_GMAKE= yes -USE_XLIB= yes USE_X_PREFIX= yes -USE_GNOME= gtk12 glib12 +USE_GNOME= gtk12 USE_REINPLACE= yes post-extract: @@ -30,8 +29,4 @@ post-extract: post-patch: ${REINPLACE_CMD} -e 's#PREFIX#${PREFIX}#' ${WRKSRC}/setup_trdir.sh -post-configure: - ${REINPLACE_CMD} -e 's,\#include \,/* include malloc.h */,' \ - ${WRKSRC}/gdialog.c - .include diff --git a/games/traindirector/distinfo b/games/traindirector/distinfo index 414bade43102..73fa53a2e2cf 100644 --- a/games/traindirector/distinfo +++ b/games/traindirector/distinfo @@ -1 +1 @@ -MD5 (traindir-1.18i-src.tar.gz) = c3f65b2a72a1e94d738f390685c18236 +MD5 (traindir-1.18l-src.tar.gz) = 85c425623135225d0fed27b8d268f156 diff --git a/games/traindirector/files/patch-Makefile b/games/traindirector/files/patch-Makefile index ffda58f655ac..91052c00b16b 100644 --- a/games/traindirector/files/patch-Makefile +++ b/games/traindirector/files/patch-Makefile @@ -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 --git a/games/traindirector/files/patch-field.c b/games/traindirector/files/patch-field.c deleted file mode 100644 index c33edeebb336..000000000000 --- a/games/traindirector/files/patch-field.c +++ /dev/null @@ -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 - #include - #include --#include - #include "trsim.h" - #include "gtkui.h" - diff --git a/games/traindirector/files/patch-loadsave.c b/games/traindirector/files/patch-loadsave.c deleted file mode 100644 index 5023a172c3ff..000000000000 --- a/games/traindirector/files/patch-loadsave.c +++ /dev/null @@ -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 - #include --#include - #include - #include - #include "trsim.h" diff --git a/games/traindirector/files/patch-run.c b/games/traindirector/files/patch-run.c deleted file mode 100644 index 50b16b104f5f..000000000000 --- a/games/traindirector/files/patch-run.c +++ /dev/null @@ -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 - #include --#include -+#include - #include - #include "ask.h" - #include "trsim.h" - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include -+#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 --git a/games/traindirector/files/patch-setup_trdir.sh b/games/traindirector/files/patch-setup_trdir.sh index 33e7dcb21701..b2c7a43bee08 100644 --- a/games/traindirector/files/patch-setup_trdir.sh +++ b/games/traindirector/files/patch-setup_trdir.sh @@ -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 --git a/games/traindirector/files/patch-tgraph.c b/games/traindirector/files/patch-tgraph.c deleted file mode 100644 index 7d0a91b1fbb8..000000000000 --- a/games/traindirector/files/patch-tgraph.c +++ /dev/null @@ -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 - #include - #include --#include - #include "trsim.h" - - #define STATION_WIDTH 100 diff --git a/games/traindirector/files/patch-track.c b/games/traindirector/files/patch-track.c deleted file mode 100644 index 6542b2554d06..000000000000 --- a/games/traindirector/files/patch-track.c +++ /dev/null @@ -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 - #include --#include - #include "trsim.h" - #include "ask.h" - diff --git a/games/traindirector/files/patch-track1.c b/games/traindirector/files/patch-track1.c deleted file mode 100644 index 221f2115b5fb..000000000000 --- a/games/traindirector/files/patch-track1.c +++ /dev/null @@ -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 - #include --#include - #include "trsim.h" - #include "ask.h" - diff --git a/games/traindirector/files/patch-trsim.c b/games/traindirector/files/patch-trsim.c deleted file mode 100644 index 7605799acb2f..000000000000 --- a/games/traindirector/files/patch-trsim.c +++ /dev/null @@ -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 - #include --#include - #include - #include "ask.h" - #include "html.h" -- cgit v1.2.3