Attachment 37853 Details for Bug 60090 – file.diff

[patch] file.diff

file.diff (text/plain), 3.23 KB, created by Guido Falsi on 2003-12-09 21:30:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2003-12-09 21:30:21 UTC

Size: 3.23 KB

patch

obsolete

>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 \<malloc.h\>,/* 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 <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
>  
>- 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);

Actions: View | Diff

Attachments on bug 60090: 37853