Attachment #37853 for bug #60090

View | Details | Raw Unified | Return to bug 60090
Collapse All | Expand All




#

PORTNAME=	tdir
PORTVERSION=	1.18i
CATEGORIES=	games
MASTER_SITES=	http://xtsl.free.fr/118i/
DISTNAME=	traindir-${PORTVERSION}-src
WRKSRC=		${WRKDIR}/traindir-${PORTVERSION}


.endfor

post-patch:
	${REINPLACE_CMD} -e 's#PREFIX#${PREFIX}#' ${WRKSRC}/setup_trdir.sh

post-configure:
	${REINPLACE_CMD} -e 's,\#include \<malloc.h\>,/* include malloc.h */,' \

Line 1 Link Here

(-)traindirector/distinfo (-1 / +1 lines)
1	MD5 (traindir-1.18e-src.tar.gz) = df82dee6e32ea9951916d900984e0cc6	1	MD5 (traindir-1.18i-src.tar.gz) = c3f65b2a72a1e94d738f390685c18236




--- Makefile.orig	Tue Dec  9 21:59:18 2003
+++ Makefile	Tue Dec  9 22:00:42 2003
@@ -4,21 +4,21 @@
 #
 VERSION=1.18i
 
-BINDIR=/usr/local/bin
-SAMPLEDIR=/usr/local/share

 
 SHELL = /bin/sh
 INSTALL = install
@@ -16,9 +16,9 @@
 GLIBINC=`glib-config --cflags`
 GLIBLIB=`glib-config --libs`
 
 
-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)
 




--- 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 @@
 
@@ -56,7 +60,11 @@
 {
 	if(i >= v->size) {
 	    printf("Bad index %d: only %d elements in vector!\n", i, v->size);

 	}
 	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);

Return to bug 60090

Lines 6-14 Link Here

(-)traindirector/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= tdir	8	PORTNAME= tdir
9	PORTVERSION= 1.18e	9	PORTVERSION= 1.18i
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://xtsl.free.fr/118e/	11	MASTER_SITES= http://xtsl.free.fr/118i/
12	DISTNAME= traindir-${PORTVERSION}-src	12	DISTNAME= traindir-${PORTVERSION}-src
13	WRKSRC= ${WRKDIR}/traindir-${PORTVERSION}	13	WRKSRC= ${WRKDIR}/traindir-${PORTVERSION}
14		14
Lines 28-34 Link Here
28	.endfor	28	.endfor
29		29
30	post-patch:	30	post-patch:
31	${REINPLACE_CMD} -e 's#PREFIX#$(PREFIX)#' $(WRKSRC)/setup_trdir.sh	31	${REINPLACE_CMD} -e 's#PREFIX#${PREFIX}#' ${WRKSRC}/setup_trdir.sh
32		32
33	post-configure:	33	post-configure:
34	${REINPLACE_CMD} -e 's,\#include \<malloc.h\>,/* include malloc.h */,' \	34	${REINPLACE_CMD} -e 's,\#include \<malloc.h\>,/* include malloc.h */,' \

Lines 1-8 Link Here

(-)traindirector/files/patch-Makefile (-10 / +17 lines)
1	--- Makefile.orig Tue Mar 25 20:50:38 2003	1	--- Makefile.orig Tue Dec 9 21:59:18 2003
2	+++ Makefile Mon Sep 8 12:31:58 2003	2	+++ Makefile Tue Dec 9 22:00:42 2003
3	@@ -4,8 +4,8 @@	3	@@ -4,21 +4,21 @@
4	#	4	#
5	VERSION=1.18e	5	VERSION=1.18i
6		6
7	-BINDIR=/usr/local/bin	7	-BINDIR=/usr/local/bin
8	-SAMPLEDIR=/usr/local/share	8	-SAMPLEDIR=/usr/local/share
Lines 11-25 Link Here
11		11
12	SHELL = /bin/sh	12	SHELL = /bin/sh
13	INSTALL = install	13	INSTALL = install
14	@@ -16,9 +16,9 @@
15	GLIBINC=`glib-config --cflags`
16	GLIBLIB=`glib-config --libs`
17		14
18	-CFLAGS = -g ${GLIBINC} ${GTKINC} -Dunix	15
19	+CFLAGS += -g ${GLIBINC} ${GTKINC} -Dunix	16	-GTKINC=`gtk-config --cflags`
		17	-GTKLIB=`gtk-config --libs`
		18	-GLIBINC=`glib-config --cflags`
		19	-GLIBLIB=`glib-config --libs`
		20	+GTKINC=`gtk12-config --cflags`
		21	+GTKLIB=`gtk12-config --libs`
		22	+GLIBINC=`glib12-config --cflags`
		23	+GLIBLIB=`glib12-config --libs`
		24
		25	-CFLAGS = -g $(GLIBINC) $(GTKINC) -Dunix #-static
		26	+CFLAGS += -g $(GLIBINC) $(GTKINC) -Dunix #-static
20		27
21	-CC = cc	28	-CC = cc
22	+CC ?= cc	29	+CC ?= cc
23		30
24	LIBS = ${GLIBLIB} ${GTKLIB}	31	LIBS = $(GLIBLIB) $(GTKLIB)
25		32

Lines 1-21 Link Here

(-)traindirector/files/patch-run.c (-8 / +10 lines)
1	--- run.c.orig Fri Jul 18 15:53:36 2003	1	--- run.c.orig Tue Dec 9 22:02:20 2003
2	+++ run.c Fri Jul 18 15:56:59 2003	2	+++ run.c Tue Dec 9 22:04:51 2003
3	@@ -20,9 +20,13 @@	3	@@ -20,11 +20,15 @@
4		4
5	#include <stdio.h>	5	#include <stdio.h>
6	#include <string.h>	6	#include <string.h>
7	-#include <malloc.h>	7	-#include <malloc.h>
8	+#include <stdlib.h>	8	+#include <stdlib.h>
		9	#include <math.h>
9	#include "ask.h"	10	#include "ask.h"
10	#include "trsim.h"	11	#include "trsim.h"
11	+	12
12	+#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)	13	+#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
13	+#include <sys/param.h>	14	+#include <sys/param.h>
14	+#endif	15	+#endif
		16	+
		17	#define HOMAN_030330
		18	#define MERGE_TRAINS 1
15		19
16	int assign_ok = 1;	20	@@ -60,7 +64,11 @@
17
18	@@ -56,7 +60,11 @@
19	{	21	{
20	if(i >= v->size) {	22	if(i >= v->size) {
21	printf("Bad index %d: only %d elements in vector!\n", i, v->size);	23	printf("Bad index %d: only %d elements in vector!\n", i, v->size);
Lines 27-33 Link Here
27	}	29	}
28	return v->ptr[i];	30	return v->ptr[i];
29	}	31	}
30	@@ -65,7 +73,11 @@	32	@@ -69,7 +77,11 @@
31	{	33	{
32	if(i >= v->size) {	34	if(i >= v->size) {
33	printf("Bad index %d: only %d elements in vector!\n", i, v->size);	35	printf("Bad index %d: only %d elements in vector!\n", i, v->size);