Re: FreeBSD-games/Larn is broken in FreeBSD7.0 Release

2008-03-08 Thread Martin Tournoij
On Sat, Mar 08, 2008 at 06:53:52AM +0100, Martin Tournoij wrote:
 
 Good idea,
 
 I tested the games from DragonflyBSD and they seem to work OK on
 FreeBSD 7/GCC4.2
 
 Everything compiles with some minor changes, the two issues with larn
 and hack are solved, I didn't test any of the other games yet.
 
 I need to do some more cleanup/testing, I will send a PR tomorrow
 since it's very late now ...
 
 Regards,
 Martin Tournoij

A patch for games/freebsd-games is attached in this patch, please test
it, I'm not familiar with all the games.

Note that the old freebsd-games ports just removes all score files without
asking/mentioning, so if you have a score to be proud of then you may
want to backup /var/games

Regards,
Martin Tournoij
diff -urN --exclude CVS --exclude '*.old' /ports/games/freebsd-games/Makefile games/freebsd-games/Makefile
--- /ports/games/freebsd-games/Makefile	2007-05-28 10:28:45.0 +0200
+++ games/freebsd-games/Makefile	2008-03-08 19:46:26.0 +0100
@@ -6,74 +6,26 @@
 #
 
 PORTNAME=	freebsd-games
-PORTVERSION=	5.1.1
-PORTREVISION=	7
+PORTVERSION=	5.2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=markm
+MASTER_SITES=	http://www.carpetsmoker.net/distfiles/ \
+		http://www.xs4all.nl/~tournoij/
 
-MAINTAINER=	[EMAIL PROTECTED]
+MAINTAINER=	[EMAIL PROTECTED]
 COMMENT=	FreeBSD-modified Standard BSD games
 
-USE_BZIP2=	yes
-
-MAN6=	\
-	adventure.6 \
-	arithmetic.6 \
-	atc.6 \
-	backgammon.6 \
-	battlestar.6 \
-	bs.6 \
-	canfield.6 \
-	cfscores.6 \
-	cribbage.6 \
-	fish.6 \
-	hack.6 \
-	hangman.6 \
-	larn.6 \
-	mille.6 \
-	phantasia.6 \
-	piano.6 \
-	pig.6 \
-	quiz.6 \
-	robots.6 \
-	rogue.6 \
-	sail.6 \
-	snake.6 \
-	snscore.6 \
-	trek.6 \
-	worm.6 \
-	wump.6
-
-MANCOMPRESSED=	maybe
-
-PATHNAME_FILES=	atc/atc.6 \
-		atc/pathnames.h \
-		cribbage/pathnames.h \
-		fish/pathnames.h \
-		larn/pathnames.h \
-		quiz/datfiles/index \
-		quiz/pathnames.h \
-		quiz/quiz.6 \
-		wump/pathnames.h
+MAN5=		dm.conf.5
+MAN6=		adventure.6 arithmetic.6 atc.6 backgammon.6 battlestar.6 \
+		bs.6 canfield.6 cfscores.6 cribbage.6 fish.6 hack.6 hangman.6 \
+		larn.6 mille.6 phantasia.6 piano.6 pig.6 quiz.6 robots.6 rain.6 \
+		rogue.6 sail.6 snake.6 snscore.6 trek.6 wargames.6 worm.6 worms.6 wump.6 \
+MAN8=		dm.8
+MANCOMPRESSED=	yes
 
 .include bsd.port.pre.mk
 
-post-extract:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} extract)
-
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' -or -name '*.6' -or \
-		-name 'index' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|share/games|local/share/games|g'
-	@${FIND} ${WRKSRC} -name 'Makefile' | \
-		${XARGS} ${REINPLACE_CMD}  's|$${LIBCOMPAT}||g;;s|-lcompat||g'
-	@for f in ${PATHNAME_FILES}; do \
-		${REINPLACE_CMD} -e 's|/usr/local/local/local|${PREFIX}|g' \
-			${WRKSRC}/$${f}; \
-	done
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
-		${WRKSRC}/hack/hack.unix.c
+	@${FIND} ${WRKSRC} -type f | ${XARGS} \
+		${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g'
 
 .include bsd.port.post.mk
diff -urN --exclude CVS --exclude '*.old' /ports/games/freebsd-games/distinfo games/freebsd-games/distinfo
--- /ports/games/freebsd-games/distinfo	2005-11-24 20:27:31.0 +0100
+++ games/freebsd-games/distinfo	2008-03-08 19:41:48.0 +0100
@@ -1,3 +1,3 @@
-MD5 (freebsd-games-5.1.1.tar.bz2) = 31c098a1ef0d198a6456e26b6d65be72
-SHA256 (freebsd-games-5.1.1.tar.bz2) = 2ef700e090c975c7d6807a556ca29acc11215ba43f3ad26ad555a63cb3f72f71
-SIZE (freebsd-games-5.1.1.tar.bz2) = 2434501
+MD5 (freebsd-games-5.2.tar.gz) = d2094da7f9d26c2ec841a2489f9fb2f4
+SHA256 (freebsd-games-5.2.tar.gz) = 97fe168c3a7885e500f5bb3c51137de512de2c2e497eb8b23cc0f23a6b38c8f4
+SIZE (freebsd-games-5.2.tar.gz) = 875833
diff -urN --exclude CVS --exclude '*.old' /ports/games/freebsd-games/files/patch-adventure_crc.c games/freebsd-games/files/patch-adventure_crc.c
--- /ports/games/freebsd-games/files/patch-adventure_crc.c	2007-03-24 00:02:33.0 +0100
+++ games/freebsd-games/files/patch-adventure_crc.c	1970-01-01 01:00:00.0 +0100
@@ -1,11 +0,0 @@
 adventure/crc.c.bak	Sat Feb 23 01:59:45 2002
-+++ adventure/crc.c	Wed Sep 29 03:29:37 2004
-@@ -120,7 +120,7 @@
- 
- /* Process nr bytes at a time; ptr points to them */
- u_long
--crc(const char *ptr, size_t nr)
-+crc(const char *ptr, ssize_t nr)
- {
- 	int 	i;
- 	const char 	*p;
diff -urN --exclude CVS --exclude '*.old' /ports/games/freebsd-games/files/patch-adventure_hdr.h games/freebsd-games/files/patch-adventure_hdr.h
--- /ports/games/freebsd-games/files/patch-adventure_hdr.h	2007-03-24 00:02:33.0 +0100
+++ games/freebsd-games/files/patch-adventure_hdr.h	1970-01-01 01:00:00.0 +0100
@@ -1,11 +0,0 @@
 adventure/hdr.h.bak	Mon Nov 10 15:46:52 2003
-+++ adventure/hdr.h	Wed Sep 29 03:30:55 2004
-@@ -167,7 +167,7 @@
- void checkhints (void);
- void ciao (void);
- extern gid_t	egid;
--u_long crc (const char *ptr, size_t nr);
-+u_long crc (const char 

Re: FreeBSD-games/Larn is broken in FreeBSD7.0 Release

2008-03-07 Thread Martin Tournoij
On Thu, Mar 06, 2008 at 09:00:53AM +0100, Edward Tomasz Napierala wrote:
 In article [EMAIL PROTECTED] you wrote:
   When you run Larn, and chose to read/eat/drink anything the games exits
   with a signal 11 ,segfaults and does a coredump.
 
   You have found a magic potion
   Do you (d) drink it, (t) take it, or (i) ignore it?
   Segmentation fault (core dumped) [SIGSEGV]drink
 
   I would like to use Larn on 7.0, what do I suggest I do to fix this ?
 
  This is caused by the same problem as freebsd-games/hack.
  Please refer to the thread beginning with
  http://lists.freebsd.org/pipermail/freebsd-ports/2008-January/046245.html
 
  For the temporary solution,
  edit freebsd-games/files/patch-larn_Makefile to add -fwritable-strings
  to CFLAGS and do not forget to use gcc34 or earlier instead of gcc in  
  7.0.
 
  Hope this helps.
  
  I believe that someone in DragonFly BSD did a lot of clean up in the  
  src/games/*. But I don't know if these cleans up will helping with this  
  issue. It might be worth for someone to dig in there and bring in FreeBSD  
  if someone care about these games.
 
 Diff between freebsd-games and DragonFly, after removing irrelevant stuff,
 is over a megabyte long.  Maybe we should just use their code verbatim?
 
 (Untested diff at http://freebsd.org/~trasz/patch-zzz_fixes_from_dfly)
 

Good idea,

I tested the games from DragonflyBSD and they seem to work OK on
FreeBSD 7/GCC4.2

Everything compiles with some minor changes, the two issues with larn
and hack are solved, I didn't test any of the other games yet.

I need to do some more cleanup/testing, I will send a PR tomorrow
since it's very late now ...

Regards,
Martin Tournoij
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: FreeBSD-games/Larn is broken in FreeBSD7.0 Release

2008-03-06 Thread Edward Tomasz Napierala
In article [EMAIL PROTECTED] you wrote:
  When you run Larn, and chose to read/eat/drink anything the games exits
  with a signal 11 ,segfaults and does a coredump.

  You have found a magic potion
  Do you (d) drink it, (t) take it, or (i) ignore it?
  Segmentation fault (core dumped) [SIGSEGV]drink

  I would like to use Larn on 7.0, what do I suggest I do to fix this ?

 This is caused by the same problem as freebsd-games/hack.
 Please refer to the thread beginning with
 http://lists.freebsd.org/pipermail/freebsd-ports/2008-January/046245.html

 For the temporary solution,
 edit freebsd-games/files/patch-larn_Makefile to add -fwritable-strings
 to CFLAGS and do not forget to use gcc34 or earlier instead of gcc in  
 7.0.

 Hope this helps.
 
 I believe that someone in DragonFly BSD did a lot of clean up in the  
 src/games/*. But I don't know if these cleans up will helping with this  
 issue. It might be worth for someone to dig in there and bring in FreeBSD  
 if someone care about these games.

Diff between freebsd-games and DragonFly, after removing irrelevant stuff,
is over a megabyte long.  Maybe we should just use their code verbatim?

(Untested diff at http://freebsd.org/~trasz/patch-zzz_fixes_from_dfly)

-- 
If you cut off my head, what would I say?  Me and my head, or me and my body?

___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]


FreeBSD-games/Larn is broken in FreeBSD7.0 Release

2008-03-04 Thread tigner
Dear [EMAIL PROTECTED],

I am sorry to bother you but I did not know where else to go for help.

I am running FreeBSD 7.0 i386 Release. I have installed FreeBSD-games
from both the package and the port and I have the same problem in both.

When you run Larn, and chose to read/eat/drink anything the games exits
with a signal 11 ,segfaults and does a coredump.

You have found a magic potion
Do you (d) drink it, (t) take it, or (i) ignore it?
Segmentation fault (core dumped) [SIGSEGV]drink

I would like to use Larn on 7.0, what do I suggest I do to fix this ?

Many thanks for any help you can give me on this.

Barry Tigner
[EMAIL PROTECTED]

___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: FreeBSD-games/Larn is broken in FreeBSD7.0 Release

2008-03-04 Thread Hiroto Kagotani
Hi,

2008/3/5, tigner [EMAIL PROTECTED]:
  When you run Larn, and chose to read/eat/drink anything the games exits
  with a signal 11 ,segfaults and does a coredump.

  You have found a magic potion
  Do you (d) drink it, (t) take it, or (i) ignore it?
  Segmentation fault (core dumped) [SIGSEGV]drink

  I would like to use Larn on 7.0, what do I suggest I do to fix this ?

This is caused by the same problem as freebsd-games/hack.
Please refer to the thread beginning with
http://lists.freebsd.org/pipermail/freebsd-ports/2008-January/046245.html

For the temporary solution,
edit freebsd-games/files/patch-larn_Makefile to add -fwritable-strings
to CFLAGS and do not forget to use gcc34 or earlier instead of gcc in 7.0.

Hope this helps.

-- 
Hiroto Kagotani
[EMAIL PROTECTED]
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]


Re: FreeBSD-games/Larn is broken in FreeBSD7.0 Release

2008-03-04 Thread Jeremy Messenger
On Tue, 04 Mar 2008 20:14:18 -0600, Hiroto Kagotani  
[EMAIL PROTECTED] wrote:



Hi,

2008/3/5, tigner [EMAIL PROTECTED]:

 When you run Larn, and chose to read/eat/drink anything the games exits
 with a signal 11 ,segfaults and does a coredump.

 You have found a magic potion
 Do you (d) drink it, (t) take it, or (i) ignore it?
 Segmentation fault (core dumped) [SIGSEGV]drink

 I would like to use Larn on 7.0, what do I suggest I do to fix this ?


This is caused by the same problem as freebsd-games/hack.
Please refer to the thread beginning with
http://lists.freebsd.org/pipermail/freebsd-ports/2008-January/046245.html

For the temporary solution,
edit freebsd-games/files/patch-larn_Makefile to add -fwritable-strings
to CFLAGS and do not forget to use gcc34 or earlier instead of gcc in  
7.0.


Hope this helps.


I believe that someone in DragonFly BSD did a lot of clean up in the  
src/games/*. But I don't know if these cleans up will helping with this  
issue. It might be worth for someone to dig in there and bring in FreeBSD  
if someone care about these games.


Cheers,
Mezz


--
[EMAIL PROTECTED]  -  [EMAIL PROTECTED]
FreeBSD GNOME Team
http://www.FreeBSD.org/gnome/  -  [EMAIL PROTECTED]
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to [EMAIL PROTECTED]