From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 7 13:40:08 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1623A106568D for ; Sun, 7 Sep 2008 13:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DEAC48FC16 for ; Sun, 7 Sep 2008 13:40:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m87De7gk027486 for ; Sun, 7 Sep 2008 13:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m87De7mT027485; Sun, 7 Sep 2008 13:40:07 GMT (envelope-from gnats) Resent-Date: Sun, 7 Sep 2008 13:40:07 GMT Resent-Message-Id: <200809071340.m87De7mT027485@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, Artem Naluzhnyy Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 749F9106564A for ; Sun, 7 Sep 2008 13:36:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 5A9728FC14 for ; Sun, 7 Sep 2008 13:36:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m87Dao3n079163 for ; Sun, 7 Sep 2008 13:36:50 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m87DaoWd079162; Sun, 7 Sep 2008 13:36:50 GMT (envelope-from nobody) Message-Id: <200809071336.m87DaoWd079162@www.freebsd.org> Date: Sun, 7 Sep 2008 13:36:50 GMT From: Artem Naluzhnyy To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/127178: [patch] games/traindirector: update to 3.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2008 13:40:08 -0000 >Number: 127178 >Category: ports >Synopsis: [patch] games/traindirector: update to 3.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Sep 07 13:40:07 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Artem Naluzhnyy >Release: >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff -ruN traindirector.bak/Makefile traindirector/Makefile --- traindirector.bak/Makefile 2008-06-18 21:33:06.000000000 +0300 +++ traindirector/Makefile 2008-09-07 04:56:56.000000000 +0300 @@ -6,28 +6,32 @@ # PORTNAME= traindirector -PORTVERSION= 1.19c -PORTREVISION= 4 +PORTVERSION= 3.5 CATEGORIES= games -MASTER_SITES= http://xtsl.free.fr/119c/ -DISTNAME= traindir-${PORTVERSION}-src +MASTER_SITES= http://www.backerstreet.com/traindir/ +DISTNAME= tdir35src MAINTAINER= mad@madpilot.net COMMENT= Train controller simulation -WRKSRC= ${WRKDIR}/traindir-${PORTVERSION} +NO_WRKSUBDIR= yes USE_GMAKE= yes -USE_GNOME= gtk12 -USE_BZIP2= yes +USE_GNOME= gtk20 +USE_ZIP= yes -post-extract: -.for file in Makefile field.c loadsave.c run.c setup_trdir.sh tgraph.c track.c track1.c trsim.c - @${TR} -d '\015' < ${WRKSRC}/${file} > ${WRKDIR}/xxxx - @${MV} ${WRKDIR}/xxxx ${WRKSRC}/${file} -.endfor +USE_WX= 2.8 +WX_COMPS= wx +WX_UNICODE= yes -post-patch: - ${REINPLACE_CMD} -e 's#PREFIX#${PREFIX}#' ${WRKSRC}/setup_trdir.sh +DESKTOP_ENTRIES="Train Director" "${COMMENT}" "" "traindir3" \ + "Game;Simulation;StrategyGame;" false + +PLIST_FILES= bin/traindir + +MAKEFILE= Makefile.fc9 + +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/traindir3 ${PREFIX}/bin .include diff -ruN traindirector.bak/distinfo traindirector/distinfo --- traindirector.bak/distinfo 2006-01-22 13:18:44.000000000 +0200 +++ traindirector/distinfo 2008-09-07 00:52:03.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (traindir-1.19c-src.tar.bz2) = e6b0ee6fa10c155894db695f757a4b21 -SHA256 (traindir-1.19c-src.tar.bz2) = f803061fc1870773cd615f519aec4849bc4e84101a8334ad589149fc17fb470b -SIZE (traindir-1.19c-src.tar.bz2) = 112924 +MD5 (tdir35src.zip) = d51bfcc8dafae019cfa45e27863221e3 +SHA256 (tdir35src.zip) = 5819c6855cfa97b4ce6142a82bc7af9d0377b0071a73e4130c052763e07b43e3 +SIZE (tdir35src.zip) = 236651 diff -ruN traindirector.bak/files/patch-Makefile traindirector/files/patch-Makefile --- traindirector.bak/files/patch-Makefile 2003-12-13 15:25:42.000000000 +0200 +++ traindirector/files/patch-Makefile 1970-01-01 03:00:00.000000000 +0300 @@ -1,24 +0,0 @@ ---- 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 - - INSTALL = install - --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) #-static - diff -ruN traindirector.bak/files/patch-Makefile.fc9 traindirector/files/patch-Makefile.fc9 --- traindirector.bak/files/patch-Makefile.fc9 1970-01-01 03:00:00.000000000 +0300 +++ traindirector/files/patch-Makefile.fc9 2008-09-07 04:09:52.000000000 +0300 @@ -0,0 +1,32 @@ +--- Makefile.fc9.orig 2008-08-31 18:53:10.000000000 +0300 ++++ Makefile.fc9 2008-09-07 04:07:22.000000000 +0300 +@@ -20,16 +20,16 @@ + LDFLAGS_GUI = + CXX = g++ + #CXXFLAGS = -g -O0 -pthread -Wall -Wundef -Wno-ctor-dtor-privacy -finput-charset=ISO-8859-1 +-CXXFLAGS = -O2 -pthread -Wall -Wundef -Wno-ctor-dtor-privacy -finput-charset=ISO-8859-1 ++CXXFLAGS += -pthread -Wall -Wundef -Wno-ctor-dtor-privacy + #CPPFLAGS = -D__WXDEBUG__ -DGTK_NO_CHECK_CASTS -pthread -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DwxUSE_UNICODE=1 -I. +-CPPFLAGS = -DGTK_NO_CHECK_CASTS -pthread -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DwxUSE_UNICODE=1 -I. -I/usr/include/wx-2.8 -I/usr/lib/wx/include/gtk2-unicode-release-2.8 ++CPPFLAGS += -DGTK_NO_CHECK_CASTS -pthread -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DwxUSE_UNICODE=1 -I. -I/usr/local/include/wx-2.8 -I/usr/local/lib/wx/include/gtk2-unicode-release-2.8 + LDFLAGS = -pthread -L/usr/X11R6/lib + WX_LIB_FLAVOUR = + TOOLKIT = GTK + TOOLKIT_LOWERCASE = gtk + TOOLKIT_VERSION = 2 +-EXTRALIBS = -pthread -L/usr/X11R6/lib -lz -ldl -lm +-EXTRALIBS_GUI = -Wl,--export-dynamic -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0 -lXinerama -lXxf86vm -lpng -lz -ljpeg -ltiff ++EXTRALIBS = -pthread -L/usr/X11R6/lib -lz -lm ++EXTRALIBS_GUI = -Wl,--export-dynamic -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lXinerama -lXxf86vm -lpng -lz -ljpeg -ltiff + EXTRALIBS_SDL = + HOST_SUFFIX = + SAMPLES_RPATH_FLAG = -Wl,-rpath,$(top_builddir)lib +@@ -38,7 +38,7 @@ + ### Variables: ### + + DESTDIR = +-OBJDIR = objs/ ++OBJDIR = + WX_RELEASE = 2.8 + WX_VERSION = $(WX_RELEASE).4 + LIBDIRNAME = $(top_builddir)lib diff -ruN traindirector.bak/files/patch-setup_trdir.sh traindirector/files/patch-setup_trdir.sh --- traindirector.bak/files/patch-setup_trdir.sh 2005-01-26 06:22:06.000000000 +0200 +++ traindirector/files/patch-setup_trdir.sh 1970-01-01 03:00:00.000000000 +0300 @@ -1,65 +0,0 @@ ---- setup_trdir.sh.orig Tue Jan 25 13:44:55 2005 -+++ setup_trdir.sh Tue Jan 25 13:45:30 2005 -@@ -6,9 +6,9 @@ - # edit the folowing line - # - # This is the place where traindirector is installed --TRAINDIR="/usr/local/bin" -+TRAINDIR="PREFIX/bin" - # This is the place where samples file is installed --SAMPLE="/usr/local/share" -+SAMPLE="PREFIX/share" - ##################################################################" - echo "*********************************" - echo "* Traindirector Installation *" -@@ -16,7 +16,7 @@ - echo - echo "Making traindir samples directory....." - echo --TDHOMEDIR="$HOME/traindir" -+TDHOMEDIR="$HOME/.traindir" - ICONDIR="$TDHOMEDIR/tdicons" - LOCALEDIR="$TDHOMEDIR/locales" - if ! test -d $TDHOMEDIR ; then -@@ -38,7 +38,7 @@ - - case $CHOIX in - "2") FLNAME=".traindir.it" -- echo " Avette schelto Italiano" -+ echo "Avete scelto l'italiano" - STRING='locale .it';; - - "3") FLNAME=".traindir.fr" -@@ -56,12 +56,10 @@ - if ! test -d $HOME/.traindir ; then - mkdir $HOME/.traindir - fi -- echo $STRING > $HOME/.traindir/.traindir.ini -- cp -f $SAMPLE/traindir/locales/$FLNAME $HOME/.traindir/ -- --cp -f $SAMPLE/traindir/* $TDHOMEDIR --cp -f $SAMPLE/traindir/tdicons/*.* $ICONDIR -+echo $STRING > $HOME/.traindir/.traindir.ini -+cp -f -R $SAMPLE/traindir/locales/$FLNAME $HOME/.traindir/ - -+cp -f -R $SAMPLE/traindir/* $TDHOMEDIR - - echo - echo "Creating startup script......" -@@ -69,12 +67,13 @@ - echo "#!/bin/sh" > $HOME/traindir.sh - echo "# Startup file for traindirector" >> $HOME/traindir.sh - echo "#" >> $HOME/traindir.sh --echo "TDHOME=\"$HOME/traindir\"" >> $HOME/traindir.sh -+echo "TDHOME=\"$HOME/.traindir\"" >> $HOME/traindir.sh - echo "export TDHOME" >> $HOME/traindir.sh - echo "echo starting Traindirector" >> $HOME/traindir.sh - echo "$TRAINDIR/traindir" >> $HOME/traindir.sh - - chmod 0775 $HOME/traindir.sh - echo "Installation complete" --echo "You can run ~/traindir.sh from a X console" -- -+echo "a script file 'traindir.sh' 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.bak/pkg-plist traindirector/pkg-plist --- traindirector.bak/pkg-plist 2004-02-21 11:08:04.000000000 +0200 +++ traindirector/pkg-plist 1970-01-01 03:00:00.000000000 +0300 @@ -1,19 +0,0 @@ -bin/traindir -bin/gentt -bin/setup_trdir.sh -share/traindir/default.sch -share/traindir/default.trk -share/traindir/demoitin.trk -share/traindir/southst.trk -share/traindir/tdirico1.ico -share/traindir/tdirico2.ico -share/traindir/train.ico -share/traindir/tdicons/bridgeup.xpm -share/traindir/tdicons/bridgedn.xpm -share/traindir/tdicons/triangl.xpm -share/traindir/locales/.traindir.it -share/traindir/locales/.traindir.fr -share/traindir/locales/README -@dirrm share/traindir/tdicons -@dirrm share/traindir/locales -@dirrm share/traindir >Release-Note: >Audit-Trail: >Unformatted: