Attachment #132606 for bug #176935




post-patch:
# Prefer GX Revision R ROM by default
	@${REINPLACE_CMD} -e 's+rom\.dump+${DATADIR}/gxrom-r+' \
		${WRKSRC}/src/X48.ad.h

do-install:
.for p in x48 dump2rom checkrom mkcard
	${INSTALL_PROGRAM} ${WRKSRC}/src/${p} ${PREFIX}/bin
.endfor
	${INSTALL_DATA} ${WRKSRC}/src/X48.ad ${PREFIX}/lib/X11/app-defaults/X48
	@${MKDIR} ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/??rom-? ${DATADIR}
.if !defined(NOPORTDOCS)




--- src/X48.ad.h.orig	2013-03-14 11:16:59.000000000 -0500
+++ src/X48.ad.h	2013-03-14 11:17:33.000000000 -0500
@@ -14,8 +14,8 @@
 "*printCopyright:	False",
 "*printWarranty:		False",
 "*useTerminal:		True",
-"*useSerial:		False",
-"*serialLine:		/dev/ttyS0",
+"*useSerial:		True",
+"*serialLine:		/dev/cuaa0",
 "*completeInitialize:	False",
 "*resetOnStartup:	False",
 "*romFileName:		rom.dump",




--- src/debugger.c	2011/08/10 05:36:10	57
+++ src/debugger.c	2011/08/10 05:38:58	58
@@ -1933,8 +1933,8 @@
 	      free (old_line);
               old_line = (char *) 0;
 	    }
-	  cl = strcpy ((char *) malloc (strlen (rl)), rl);
-	  old_line = strcpy ((char *) malloc (strlen (rl)), rl);
+	  cl = strdup (rl);
+	  old_line = strdup (rl); 
 #ifdef HAVE_READLINE
 	  add_history (rl);
 #endif

Line 0 Link Here

(-)x48/files/patch-src+timer.c (+11 lines)
	1	--- src/timer.c 2011/08/10 02:29:47 51
	2	+++ src/timer.c 2011/08/10 02:32:11 52
	3	@@ -509,7 +509,7 @@
	4	{
	5	set_0_time += adj_time;
	6	time_offset += adj_time;
	7	- access_time - adj_time;
	8	+ access_time -= adj_time;
	9
	10	#ifdef DEBUG_TIMER_ADJUST
	11	fprintf(stderr, "Time adjusted by ");

Lines 2-8 Link Here

(-)x48/pkg-plist (-1 lines)
2	bin/dump2rom	2	bin/dump2rom
3	bin/mkcard	3	bin/mkcard
4	bin/x48	4	bin/x48
5	lib/X11/app-defaults/X48
6	%%DATADIR%%/gxrom-r	5	%%DATADIR%%/gxrom-r
7	%%DATADIR%%/sxrom-e	6	%%DATADIR%%/sxrom-e
8	@dirrm %%DATADIR%%	7	@dirrm %%DATADIR%%

Return to bug 176935

Lines 37-49 Link Here

(-)x48/Makefile (-2 / +1 lines)
37	post-patch:	37	post-patch:
38	# Prefer GX Revision R ROM by default	38	# Prefer GX Revision R ROM by default
39	@${REINPLACE_CMD} -e 's+rom\.dump+${DATADIR}/gxrom-r+' \	39	@${REINPLACE_CMD} -e 's+rom\.dump+${DATADIR}/gxrom-r+' \
40	${WRKSRC}/src/X48.ad	40	${WRKSRC}/src/X48.ad.h
41		41
42	do-install:	42	do-install:
43	.for p in x48 dump2rom checkrom mkcard	43	.for p in x48 dump2rom checkrom mkcard
44	${INSTALL_PROGRAM} ${WRKSRC}/src/${p} ${PREFIX}/bin	44	${INSTALL_PROGRAM} ${WRKSRC}/src/${p} ${PREFIX}/bin
45	.endfor	45	.endfor
46	${INSTALL_DATA} ${WRKSRC}/src/X48.ad ${PREFIX}/lib/X11/app-defaults/X48
47	@${MKDIR} ${DATADIR}	46	@${MKDIR} ${DATADIR}
48	${INSTALL_DATA} ${WRKSRC}/??rom-? ${DATADIR}	47	${INSTALL_DATA} ${WRKSRC}/??rom-? ${DATADIR}
49	.if !defined(NOPORTDOCS)	48	.if !defined(NOPORTDOCS)

Line 0 Link Here

(-)x48/files/patch-src+X48.ad.h (+13 lines)
	1	--- src/X48.ad.h.orig 2013-03-14 11:16:59.000000000 -0500
	2	+++ src/X48.ad.h 2013-03-14 11:17:33.000000000 -0500
	3	@@ -14,8 +14,8 @@
	4	"*printCopyright: False",
	5	"*printWarranty: False",
	6	"*useTerminal: True",
	7	-"*useSerial: False",
	8	-"*serialLine: /dev/ttyS0",
	9	+"*useSerial: True",
	10	+"*serialLine: /dev/cuaa0",
	11	"*completeInitialize: False",
	12	"*resetOnStartup: False",
	13	"*romFileName: rom.dump",

Line 0 Link Here

(-)x48/files/patch-src+debugger.c (+13 lines)
	1	--- src/debugger.c 2011/08/10 05:36:10 57
	2	+++ src/debugger.c 2011/08/10 05:38:58 58
	3	@@ -1933,8 +1933,8 @@
	4	free (old_line);
	5	old_line = (char *) 0;
	6	}
	7	- cl = strcpy ((char *) malloc (strlen (rl)), rl);
	8	- old_line = strcpy ((char *) malloc (strlen (rl)), rl);
	9	+ cl = strdup (rl);
	10	+ old_line = strdup (rl);
	11	#ifdef HAVE_READLINE
	12	add_history (rl);
	13	#endif