From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 9 13:30:29 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD73E16A4CE for ; Tue, 9 Dec 2003 13:30:29 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D69143D2B for ; Tue, 9 Dec 2003 13:30:22 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9LUMFY008116 for ; Tue, 9 Dec 2003 13:30:22 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hB9LUMo9008115; Tue, 9 Dec 2003 13:30:22 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 9 Dec 2003 13:30:22 -0800 (PST) Resent-Message-Id: <200312092130.hB9LUMo9008115@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Guido Falsi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67B6716A4CE for ; Tue, 9 Dec 2003 13:25:59 -0800 (PST) Received: from mail.dada.it (mail4.dada.it [195.110.100.4]) by mx1.FreeBSD.org (Postfix) with SMTP id E73BC43D1D for ; Tue, 9 Dec 2003 13:25:52 -0800 (PST) (envelope-from mad@madpilot.net) Received: (qmail 10020 invoked from network); 9 Dec 2003 21:25:43 -0000 Received: from unknown (HELO madpilot.net) (195.110.114.197) by mail.dada.it with SMTP; 9 Dec 2003 21:25:43 -0000 Received: (qmail 7634 invoked from network); 9 Dec 2003 21:25:47 -0000 Received: from wedge.madpilot.net (192.168.13.11) by 0 with SMTP; 9 Dec 2003 21:25:47 -0000 Received: from wedge.madpilot.net (localhost.madpilot.net [127.0.0.1]) by wedge.madpilot.net (8.12.10/8.12.10) with ESMTP id hB9LPksv029492 for ; Tue, 9 Dec 2003 22:25:46 +0100 (CET) (envelope-from mad@wedge.madpilot.net) Received: (from mad@localhost) by wedge.madpilot.net (8.12.10/8.12.10/Submit) id hB9LPkif029491; Tue, 9 Dec 2003 22:25:46 +0100 (CET) (envelope-from mad) Message-Id: <200312092125.hB9LPkif029491@wedge.madpilot.net> Date: Tue, 9 Dec 2003 22:25:46 +0100 (CET) From: Guido Falsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/60090: [maintainer update] games/traindirector upgrade to 1.18i X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2003 21:30:29 -0000 >Number: 60090 >Category: ports >Synopsis: [maintainer update] games/traindirector upgrade to 1.18i >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: Tue Dec 09 13:30:21 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: update to a bugfix version. No functionality change. >How-To-Repeat: >Fix: diff -ruN follows: diff -ruN traindirector.old/Makefile traindirector/Makefile --- traindirector.old/Makefile Tue Dec 9 22:18:13 2003 +++ traindirector/Makefile Tue Dec 9 22:13:21 2003 @@ -6,9 +6,9 @@ # PORTNAME= tdir -PORTVERSION= 1.18e +PORTVERSION= 1.18i CATEGORIES= games -MASTER_SITES= http://xtsl.free.fr/118e/ +MASTER_SITES= http://xtsl.free.fr/118i/ DISTNAME= traindir-${PORTVERSION}-src WRKSRC= ${WRKDIR}/traindir-${PORTVERSION} @@ -28,7 +28,7 @@ .endfor post-patch: - ${REINPLACE_CMD} -e 's#PREFIX#$(PREFIX)#' $(WRKSRC)/setup_trdir.sh + ${REINPLACE_CMD} -e 's#PREFIX#${PREFIX}#' ${WRKSRC}/setup_trdir.sh post-configure: ${REINPLACE_CMD} -e 's,\#include \,/* include malloc.h */,' \ diff -ruN traindirector.old/distinfo traindirector/distinfo --- traindirector.old/distinfo Tue Dec 9 22:18:13 2003 +++ traindirector/distinfo Tue Dec 9 21:54:27 2003 @@ -1 +1 @@ -MD5 (traindir-1.18e-src.tar.gz) = df82dee6e32ea9951916d900984e0cc6 +MD5 (traindir-1.18i-src.tar.gz) = c3f65b2a72a1e94d738f390685c18236 diff -ruN traindirector.old/files/patch-Makefile traindirector/files/patch-Makefile --- traindirector.old/files/patch-Makefile Tue Dec 9 22:18:13 2003 +++ traindirector/files/patch-Makefile Tue Dec 9 22:01:09 2003 @@ -1,8 +1,8 @@ ---- Makefile.orig Tue Mar 25 20:50:38 2003 -+++ Makefile Mon Sep 8 12:31:58 2003 -@@ -4,8 +4,8 @@ +--- Makefile.orig Tue Dec 9 21:59:18 2003 ++++ Makefile Tue Dec 9 22:00:42 2003 +@@ -4,21 +4,21 @@ # - VERSION=1.18e + VERSION=1.18i -BINDIR=/usr/local/bin -SAMPLEDIR=/usr/local/share @@ -11,15 +11,22 @@ SHELL = /bin/sh INSTALL = install -@@ -16,9 +16,9 @@ - GLIBINC=`glib-config --cflags` - GLIBLIB=`glib-config --libs` --CFLAGS = -g ${GLIBINC} ${GTKINC} -Dunix -+CFLAGS += -g ${GLIBINC} ${GTKINC} -Dunix + +-GTKINC=`gtk-config --cflags` +-GTKLIB=`gtk-config --libs` +-GLIBINC=`glib-config --cflags` +-GLIBLIB=`glib-config --libs` ++GTKINC=`gtk12-config --cflags` ++GTKLIB=`gtk12-config --libs` ++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} + LIBS = $(GLIBLIB) $(GTKLIB) diff -ruN traindirector.old/files/patch-run.c traindirector/files/patch-run.c --- traindirector.old/files/patch-run.c Tue Dec 9 22:18:13 2003 +++ traindirector/files/patch-run.c Tue Dec 9 22:05:36 2003 @@ -1,21 +1,23 @@ ---- run.c.orig Fri Jul 18 15:53:36 2003 -+++ run.c Fri Jul 18 15:56:59 2003 -@@ -20,9 +20,13 @@ +--- 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 - int assign_ok = 1; - -@@ -56,7 +60,11 @@ +@@ -60,7 +64,11 @@ { if(i >= v->size) { printf("Bad index %d: only %d elements in vector!\n", i, v->size); @@ -27,7 +29,7 @@ } return v->ptr[i]; } -@@ -65,7 +73,11 @@ +@@ -69,7 +77,11 @@ { if(i >= v->size) { printf("Bad index %d: only %d elements in vector!\n", i, v->size); >Release-Note: >Audit-Trail: >Unformatted: