Attachment #166943 for bug #207162

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




MAINTAINER=	ports@FreeBSD.org
COMMENT=	Version of the Mr Do video arcade game for X11

BROKEN=		fails to run

USES=		imake tar:tgz
USE_XORG=	x11 xext xaw xmu xt sm ice
ALL_TARGET=	xmris xmred Xmris.ad
ALL_TARGET=	xmris xmred

DESKTOP_ENTRIES="XMRis" "" "" "${PORTNAME}" "" ""

post-build:
	@${LN} -sf Xmris.ad ${WRKSRC}/Xmris

do-install:
.for i in xmred xmris

	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
	(cd ${WRKSRC} && ${INSTALL_DATA} Xmris \
		${STAGEDIR}${PREFIX}/lib/X11/app-defaults)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/xmris
	(cd ${WRKSRC} && ${INSTALL_DATA} *.gdn \
		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/xmris)
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xmris
	(cd ${WRKSRC} && ${INSTALL_DATA} *.gdn \
		${STAGEDIR}${PREFIX}/lib/X11/xmris)
	@${MKDIR} ${STAGEDIR}/var/games/xmris

.include <bsd.port.mk>




--- Imakefile.orig	1995-12-22 12:05:52 UTC
+++ Imakefile
@@ -59,7 +59,7 @@ EXTRA_LOAD_FLAGS = -lV3
 XCOMM system environment
 XCOMM
 XCOMM don't you have gettimeofday?
-TIME =
+TIME = -DPOSIX
 XCOMM TIME = -DUSETIME
 XCOMM don't you have lockf or flock?
 LOCK =
@@ -71,9 +71,9 @@ XCOMM
 /* #define thefont "-*-courier-*-r-*-*-18-*-*-*-m-*-*-*" */
 XCOMM where is the high score file?
 XCOMM SCORE = $(LOCAL)/lib/$(APP)
-SCORE = $(LIBDIR)/$(APP)
+SCORE = /var/games/$(APP)
 /* to install default gardens not in app_defaults/$(APP)
-/* #define InstallDefaultGardens $(SCORE)/gardens */
+#define InstallDefaultGardens $(LIBDIR)/$(APP)
 
 XCOMM The following defines are needed for some implementations and/or sites.
 XCOMM It is xmkmf's job to get these right in the first place.

Line 0 Link Here

(-)games/xmris/files/patch-Xmris-ad.src (+11 lines)
	1	--- Xmris-ad.src.orig 1995-12-22 12:05:55 UTC
	2	+++ Xmris-ad.src
	3	@@ -18,7 +18,7 @@
	4	*Monochrome: no
	5	*Gender: he
	6	*Random: no
	7	-*Busywait: no
	8	+*Busywait: yes
	9	*UserName: no
	10	*Font: FONT
	11	*Static: no




--- all.c.orig	Fri Dec 22 13:05:56 1995
+++ all.c	Sat Oct 19 22:49:11 2002
@@ -637,8 +637,10 @@
  * returns the error string, or NULL
  */
 {
+#ifndef __FreeBSD__
   extern int sys_nerr;
   extern char *sys_errlist[];
+#endif
   
   int   error;
   




*** Xmris-ad.src.orig	Fri Dec 22 04:05:55 1995
--- Xmris-ad.src	Thu Dec  5 16:18:55 1996
***************
*** 18,24 ****
  *Monochrome:		no
  *Gender:		he
  *Random:		no
! *Busywait:		no
  *UserName:		no
  *Font:			FONT
  *Static:		no
--- 18,24 ----
  *Monochrome:		no
  *Gender:		he
  *Random:		no
! *Busywait:		yes
  *UserName:		no
  *Font:			FONT
  *Static:		no




--- all.c.orig	1995-12-22 12:05:56 UTC
+++ all.c
@@ -637,8 +637,10 @@ FUNCARG((stream),
  * returns the error string, or NULL
  */
 {
+#ifndef __FreeBSD__
   extern int sys_nerr;
   extern char *sys_errlist[];
+#endif
   
   int   error;
   




--- draw.c.orig	1995-12-22 12:07:19 UTC
+++ draw.c
@@ -1030,14 +1030,14 @@ ARGSEP  char CONST *parent
 	      stream = fopen(filename, "r");
 	    }
 	  if(!stream)
-	    /*{{{  try in app-defaults/xmris/<file>*/
+	    /*{{{  try in xmris/<file>*/
 	    {
 	      char CONST *lib;
 	      
 	      lib = XtResolvePathname(display.display,
-		  "app-defaults/xmris", name, NULL, NULL, NULL, 0, NULL);
+		  "xmris", name, NULL, NULL, NULL, 0, NULL);
 	      if(!lib)
-		lib = XtResolvePathname(display.display, "app-defaults/xmris",
+		lib = XtResolvePathname(display.display, "xmris",
 		    name, FILE_SUFFIX, NULL, NULL, 0, NULL);
 	      if(!lib && data.dir)
 		lib = XtResolvePathname(display.display, data.dir, name,




--- scoring.c.orig	1995-12-22 12:08:10 UTC
+++ scoring.c
@@ -208,7 +208,7 @@ ARGSEP  uid_t     uid
 	{
 	  if(current_uid != effective_uid)
 	    set_euid((current_uid = effective_uid));
-	  filed = open(locking_file, O_CREAT | O_EXCL, 0666);
+	  filed = open(locking_file, O_CREAT | O_EXCL, 0660);
 	  if(filed >= 0)
 	    break;
 	  if(errno == EINTR)
@@ -259,7 +259,7 @@ ARGSEP  uid_t     uid
 #endif /* USELOCKFILE */
 #ifndef TRANSPUTER
   if(stream && flag & 4 && effective_uid == real_uid)
-    chmod(name, 0666); /* not everyone has fchmod */
+    chmod(name, 0660); /* not everyone has fchmod */
   if(current_uid != real_uid)
     set_euid((current_uid = real_uid));
 #endif /* TRANSPUTER */

Line 0 Link Here

(-)games/xmris/files/patch-timer.c (+11 lines)
	1	--- timer.c.orig 1995-12-22 12:08:21 UTC
	2	+++ timer.c
	3	@@ -85,7 +85,7 @@
	4	sigprocmask(SIG_BLOCK, &temp, (maskp)); \
	5	}
	6	# define signal_release(maskp) sigprocmask(SIG_SETMASK, maskp, (MASK *)NULL)
	7	-# define signal_pause(maskp) sigpause(*(maskp))
	8	+# define signal_pause(maskp) sigsuspend(maskp)
	9	#else
	10	# ifdef __hpux /* hpux is a weird mixture of BSD & SYSV */
	11	/* don't know if this is right */




--- xmred.man.orig	1995-12-22 12:08:24 UTC
+++ xmred.man
@@ -1,13 +1,13 @@
-. Copyright (C) 1993 Nathan Sidwell
-. RCS $Id: xmred.man,v 4.6 1995/12/14 13:53:27 nathan Exp $
+.\" Copyright (C) 1993 Nathan Sidwell
+.\" RCS $Id: xmred.man,v 4.6 1995/12/14 13:53:27 nathan Exp $
 .TH XMRED 6 "20 December 1993" "X Version 11"
-.IX xmred#(n) "" "\fLxmred\fP(n)"
+.\" .IX xmred#(n) "" "\fLxmred\fP(n)"
 .SH NAME
 xmred - garden editor for xmris
 .SH SYNOPSIS
 .B xmred
 [-option ...] [-toolkitoption ...]
-.IX xmred#(n) "" "\fLxmred\fP(n) \(em video game editor"
+.\" .IX xmred#(n) "" "\fLxmred\fP(n) \(em video game editor"
 .SH DESCRIPTION
 .PP
 Mr Ed is a tool for creating and editing alternate gardens for Mr Is.
@@ -70,7 +70,7 @@ This controls where the initial path is.
 of a centre and four edges. Depending on the exact location of the pointer,
 you will select either the centre, or an edge. Filling a path will place a
 random apple in the filled location. The four locations immediately below the
-'EXTRA' letters must be clear.
+\fIEXTRA\fR letters must be clear.
 .TP
 .B Player
 This controls where the player starts from. There must be exactly one




--- xmris.man.orig	1995-12-22 12:08:29 UTC
+++ xmris.man
@@ -1,7 +1,7 @@
-. Copyright (C) 1995, 1994, 1993, 1992 Nathan Sidwell
-. RCS $Id: xmris.man,v 4.17 1995/12/14 13:53:27 nathan Exp $
+.\" Copyright (C) 1995, 1994, 1993, 1992 Nathan Sidwell
+.\" RCS $Id: xmris.man,v 4.17 1995/12/14 13:53:27 nathan Exp $
 .TH XMRIS 6 "12 December 1995" "X Version 11"
-.IX xmris#(n) "" "\fLxmris\fP(n)"
+.\" .IX xmris#(n) "" "\fLxmris\fP(n)"
 .SH NAME
 xmris - video game for X
 .SH SYNOPSIS
@@ -10,7 +10,7 @@ xmris - video game for X
 .LP
 .B xmsit
 [-option ...] [-toolkitoption ...]
-.IX xmris#(n) "" "\fLxmris\fP(n) \(em video game"
+.\" .IX xmris#(n) "" "\fLxmris\fP(n) \(em video game"
 .SH DESCRIPTION
 .PP
 Mr Is is a version of the Mr Do video arcade game for the X Window
@@ -986,7 +986,7 @@ requested time. This has to be detected,
 .PP
 The visual class name conversion is performed by a standard toolkit
 routine. It accepts only American spelling, the English spelling of
-'grey' and 'colour' are not allowed.
+\fIgrey\fR and \fIcolour\fR are not allowed.
 .SH COPYRIGHT
 Copyright (C) 1995, 1994, 1993, 1992 Nathan Sidwell.
 .SH AUTHOR




@(,games,2555) bin/xmris
@(,games,2555) bin/xmsit
@(,games,2555) bin/xmred
bin/xmsit
bin/xmred
@mode
@group
man/man6/xmred.6.gz
man/man6/xmris.6.gz
man/man6/xmsit.6.gz
lib/X11/app-defaults/Xmris
lib/X11/xmris/alphabet.gdn
lib/X11/xmris/digits.gdn
lib/X11/xmris/puzzle.gdn
lib/X11/xmris/xmred.gdn
@dir(,games,755) /var/games/xmris

Return to bug 207162

Lines 11-27 Link Here

(-)games/xmris/Makefile (-8 / +5 lines)
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Version of the Mr Do video arcade game for X11	12	COMMENT= Version of the Mr Do video arcade game for X11
13		13
14	BROKEN= fails to run
15
16	USES= imake tar:tgz	14	USES= imake tar:tgz
17	USE_XORG= x11 xext xaw xmu xt sm ice	15	USE_XORG= x11 xext xaw xmu xt sm ice
18	MAKE_ARGS= XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults	16	ALL_TARGET= xmris xmred Xmris.ad
19	ALL_TARGET= xmris xmred
20		17
21	DESKTOP_ENTRIES="XMRis" "" "" "${PORTNAME}" "" ""	18	DESKTOP_ENTRIES="XMRis" "" "" "${PORTNAME}" "" ""
22		19
23	post-build:	20	post-build:
24	@${LN} -sf Xmris-ad.src ${WRKSRC}/Xmris	21	@${LN} -sf Xmris.ad ${WRKSRC}/Xmris
25		22
26	do-install:	23	do-install:
27	.for i in xmred xmris	24	.for i in xmred xmris
Lines 37-45 Link Here
37	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults	34	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
38	(cd ${WRKSRC} && ${INSTALL_DATA} Xmris \	35	(cd ${WRKSRC} && ${INSTALL_DATA} Xmris \
39	${STAGEDIR}${PREFIX}/lib/X11/app-defaults)	36	${STAGEDIR}${PREFIX}/lib/X11/app-defaults)
40	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/xmris
41	(cd ${WRKSRC} && ${INSTALL_DATA} *.gdn \
42	${STAGEDIR}${PREFIX}/lib/X11/app-defaults/xmris)
43	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xmris	37	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xmris
		38	(cd ${WRKSRC} && ${INSTALL_DATA} *.gdn \
		39	${STAGEDIR}${PREFIX}/lib/X11/xmris)
		40	@${MKDIR} ${STAGEDIR}/var/games/xmris
44		41
45	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Line 0 Link Here

(-)games/xmris/files/patch-Imakefile (+23 lines)
	1	--- Imakefile.orig 1995-12-22 12:05:52 UTC
	2	+++ Imakefile
	3	@@ -59,7 +59,7 @@ EXTRA_LOAD_FLAGS = -lV3
	4	XCOMM system environment
	5	XCOMM
	6	XCOMM don't you have gettimeofday?
	7	-TIME =
	8	+TIME = -DPOSIX
	9	XCOMM TIME = -DUSETIME
	10	XCOMM don't you have lockf or flock?
	11	LOCK =
	12	@@ -71,9 +71,9 @@ XCOMM
	13	/* #define thefont "--courier--r---18----m---" */
	14	XCOMM where is the high score file?
	15	XCOMM SCORE = $(LOCAL)/lib/$(APP)
	16	-SCORE = $(LIBDIR)/$(APP)
	17	+SCORE = /var/games/$(APP)
	18	/* to install default gardens not in app_defaults/$(APP)
	19	-/* #define InstallDefaultGardens $(SCORE)/gardens */
	20	+#define InstallDefaultGardens $(LIBDIR)/$(APP)
	21
	22	XCOMM The following defines are needed for some implementations and/or sites.
	23	XCOMM It is xmkmf's job to get these right in the first place.

Lines 1-13 Link Here

(-)games/xmris/files/patch-aa (-13 lines)
1	--- all.c.orig Fri Dec 22 13:05:56 1995
2	+++ all.c Sat Oct 19 22:49:11 2002
3	@@ -637,8 +637,10 @@
4	* returns the error string, or NULL
5	*/
6	{
7	+#ifndef __FreeBSD__
8	extern int sys_nerr;
9	extern char *sys_errlist[];
10	+#endif
11
12	int error;
13

Lines 1-19 Link Here

(-)games/xmris/files/patch-ab (-19 lines)
1	*** Xmris-ad.src.orig Fri Dec 22 04:05:55 1995
2	--- Xmris-ad.src Thu Dec 5 16:18:55 1996
3	***************
4	* 18,24 **
5	*Monochrome: no
6	*Gender: he
7	*Random: no
8	! *Busywait: no
9	*UserName: no
10	*Font: FONT
11	*Static: no
12	--- 18,24 ----
13	*Monochrome: no
14	*Gender: he
15	*Random: no
16	! *Busywait: yes
17	*UserName: no
18	*Font: FONT
19	*Static: no

Line 0 Link Here

(-)games/xmris/files/patch-all.c (+13 lines)
	1	--- all.c.orig 1995-12-22 12:05:56 UTC
	2	+++ all.c
	3	@@ -637,8 +637,10 @@ FUNCARG((stream),
	4	* returns the error string, or NULL
	5	*/
	6	{
	7	+#ifndef __FreeBSD__
	8	extern int sys_nerr;
	9	extern char *sys_errlist[];
	10	+#endif
	11
	12	int error;
	13

Line 0 Link Here

(-)games/xmris/files/patch-draw.c (+20 lines)
	1	--- draw.c.orig 1995-12-22 12:07:19 UTC
	2	+++ draw.c
	3	@@ -1030,14 +1030,14 @@ ARGSEP char CONST *parent
	4	stream = fopen(filename, "r");
	5	}
	6	if(!stream)
	7	- /{{{ try in app-defaults/xmris/<file>/
	8	+ /{{{ try in xmris/<file>/
	9	{
	10	char CONST *lib;
	11
	12	lib = XtResolvePathname(display.display,
	13	- "app-defaults/xmris", name, NULL, NULL, NULL, 0, NULL);
	14	+ "xmris", name, NULL, NULL, NULL, 0, NULL);
	15	if(!lib)
	16	- lib = XtResolvePathname(display.display, "app-defaults/xmris",
	17	+ lib = XtResolvePathname(display.display, "xmris",
	18	name, FILE_SUFFIX, NULL, NULL, 0, NULL);
	19	if(!lib && data.dir)
	20	lib = XtResolvePathname(display.display, data.dir, name,

Line 0 Link Here

(-)games/xmris/files/patch-scoring.c (+20 lines)
	1	--- scoring.c.orig 1995-12-22 12:08:10 UTC
	2	+++ scoring.c
	3	@@ -208,7 +208,7 @@ ARGSEP uid_t uid
	4	{
	5	if(current_uid != effective_uid)
	6	set_euid((current_uid = effective_uid));
	7	- filed = open(locking_file, O_CREAT \| O_EXCL, 0666);
	8	+ filed = open(locking_file, O_CREAT \| O_EXCL, 0660);
	9	if(filed >= 0)
	10	break;
	11	if(errno == EINTR)
	12	@@ -259,7 +259,7 @@ ARGSEP uid_t uid
	13	#endif /* USELOCKFILE */
	14	#ifndef TRANSPUTER
	15	if(stream && flag & 4 && effective_uid == real_uid)
	16	- chmod(name, 0666); /* not everyone has fchmod */
	17	+ chmod(name, 0660); /* not everyone has fchmod */
	18	if(current_uid != real_uid)
	19	set_euid((current_uid = real_uid));
	20	#endif /* TRANSPUTER */

Line 0 Link Here

(-)games/xmris/files/patch-xmred.man (+29 lines)
	1	--- xmred.man.orig 1995-12-22 12:08:24 UTC
	2	+++ xmred.man
	3	@@ -1,13 +1,13 @@
	4	-. Copyright (C) 1993 Nathan Sidwell
	5	-. RCS $Id: xmred.man,v 4.6 1995/12/14 13:53:27 nathan Exp $
	6	+.\" Copyright (C) 1993 Nathan Sidwell
	7	+.\" RCS $Id: xmred.man,v 4.6 1995/12/14 13:53:27 nathan Exp $
	8	.TH XMRED 6 "20 December 1993" "X Version 11"
	9	-.IX xmred#(n) "" "\fLxmred\fP(n)"
	10	+.\" .IX xmred#(n) "" "\fLxmred\fP(n)"
	11	.SH NAME
	12	xmred - garden editor for xmris
	13	.SH SYNOPSIS
	14	.B xmred
	15	[-option ...] [-toolkitoption ...]
	16	-.IX xmred#(n) "" "\fLxmred\fP(n) \(em video game editor"
	17	+.\" .IX xmred#(n) "" "\fLxmred\fP(n) \(em video game editor"
	18	.SH DESCRIPTION
	19	.PP
	20	Mr Ed is a tool for creating and editing alternate gardens for Mr Is.
	21	@@ -70,7 +70,7 @@ This controls where the initial path is.
	22	of a centre and four edges. Depending on the exact location of the pointer,
	23	you will select either the centre, or an edge. Filling a path will place a
	24	random apple in the filled location. The four locations immediately below the
	25	-'EXTRA' letters must be clear.
	26	+\fIEXTRA\fR letters must be clear.
	27	.TP
	28	.B Player
	29	This controls where the player starts from. There must be exactly one

Line 0 Link Here

(-)games/xmris/files/patch-xmris.man (+31 lines)
	1	--- xmris.man.orig 1995-12-22 12:08:29 UTC
	2	+++ xmris.man
	3	@@ -1,7 +1,7 @@
	4	-. Copyright (C) 1995, 1994, 1993, 1992 Nathan Sidwell
	5	-. RCS $Id: xmris.man,v 4.17 1995/12/14 13:53:27 nathan Exp $
	6	+.\" Copyright (C) 1995, 1994, 1993, 1992 Nathan Sidwell
	7	+.\" RCS $Id: xmris.man,v 4.17 1995/12/14 13:53:27 nathan Exp $
	8	.TH XMRIS 6 "12 December 1995" "X Version 11"
	9	-.IX xmris#(n) "" "\fLxmris\fP(n)"
	10	+.\" .IX xmris#(n) "" "\fLxmris\fP(n)"
	11	.SH NAME
	12	xmris - video game for X
	13	.SH SYNOPSIS
	14	@@ -10,7 +10,7 @@ xmris - video game for X
	15	.LP
	16	.B xmsit
	17	[-option ...] [-toolkitoption ...]
	18	-.IX xmris#(n) "" "\fLxmris\fP(n) \(em video game"
	19	+.\" .IX xmris#(n) "" "\fLxmris\fP(n) \(em video game"
	20	.SH DESCRIPTION
	21	.PP
	22	Mr Is is a version of the Mr Do video arcade game for the X Window
	23	@@ -986,7 +986,7 @@ requested time. This has to be detected,
	24	.PP
	25	The visual class name conversion is performed by a standard toolkit
	26	routine. It accepts only American spelling, the English spelling of
	27	-'grey' and 'colour' are not allowed.
	28	+\fIgrey\fR and \fIcolour\fR are not allowed.
	29	.SH COPYRIGHT
	30	Copyright (C) 1995, 1994, 1993, 1992 Nathan Sidwell.
	31	.SH AUTHOR

Lines 1-16 Link Here

(-)games/xmris/pkg-plist (-12 / +8 lines)
1	@group games	1	@(,games,2555) bin/xmris
2	@mode 2555	2	@(,games,2555) bin/xmsit
3	bin/xmris	3	@(,games,2555) bin/xmred
4	bin/xmsit
5	bin/xmred
6	@mode
7	@group
8	man/man6/xmred.6.gz	4	man/man6/xmred.6.gz
9	man/man6/xmris.6.gz	5	man/man6/xmris.6.gz
10	man/man6/xmsit.6.gz	6	man/man6/xmsit.6.gz
11	lib/X11/app-defaults/Xmris	7	lib/X11/app-defaults/Xmris
12	lib/X11/app-defaults/xmris/alphabet.gdn	8	lib/X11/xmris/alphabet.gdn
13	lib/X11/app-defaults/xmris/digits.gdn	9	lib/X11/xmris/digits.gdn
14	lib/X11/app-defaults/xmris/puzzle.gdn	10	lib/X11/xmris/puzzle.gdn
15	lib/X11/app-defaults/xmris/xmred.gdn	11	lib/X11/xmris/xmred.gdn
16	@dir(,games,775) lib/X11/xmris	12	@dir(,games,755) /var/games/xmris