update to 3.1.01 (various bug fixes)

3 files changed, 29 insertions, 30 deletions

diff --git a/games/hugo/Makefile b/games/hugo/Makefile
index d259a199b40..34622c2ace2 100644
--- a/games/hugo/Makefile
+++ b/games/hugo/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:14:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/02 22:00:52 dillo Exp $
 #
 
-DISTNAME=	hugov30_unix_source
-PKGNAME=	hugo-3.0.07
-PKGREVISION=	1
+DISTNAME=	hugov31_unix_source
+PKGNAME=	hugo-3.1.01
 CATEGORIES=	games
-MASTER_SITES=	http://www.ifarchive.org/if-archive/programming/hugo/source/
+MASTER_SITES=	${MASTER_SITE_IFARCHIVE:=programming/hugo/source/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} hugolib.zip
 
 MAINTAINER=	dillo@NetBSD.org
-HOMEPAGE=	http://161.184.245.22/tessman/gcc/hugo.html
+HOMEPAGE=	http://www.generalcoffee.com/hugo.html
 COMMENT=	Interactive fiction design system and interpreter
 
-SITES_hugolib.zip=http://www.ifarchive.org/if-archive/programming/hugo/library/
+SITES_hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_BUILDLINK3=	yes
@@ -20,7 +19,7 @@ USE_GNU_TOOLS+=	make
 # uses halfkey (present since 1.6M)
 INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6 NetBSD-1.6.*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-L]*
-WRKSRC=		${WRKDIR}/hugov3.0.07
+WRKSRC=		${WRKDIR}/hugov3.1.0
 
 LIBDIR=		${PREFIX}/share/hugo
 
diff --git a/games/hugo/distinfo b/games/hugo/distinfo
index c6f472dce95..55c2bf0aa15 100644
--- a/games/hugo/distinfo
+++ b/games/hugo/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2004/08/27 06:29:07 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/12/02 22:00:52 dillo Exp $
 
-SHA1 (hugo-3.0.07/hugov30_unix_source.tar.gz) = 4b3afc3b4f03ff23643460321d76127980184ec0
-Size (hugo-3.0.07/hugov30_unix_source.tar.gz) = 213002 bytes
-SHA1 (hugo-3.0.07/hugolib.zip) = 76b5580461a6c6f15780f554d2e23574ef78e24d
-Size (hugo-3.0.07/hugolib.zip) = 67669 bytes
+SHA1 (hugo-3.1.01/hugov31_unix_source.tar.gz) = bd14b180e26cd0d39e164839da27313e79939a9b
+Size (hugo-3.1.01/hugov31_unix_source.tar.gz) = 214461 bytes
+SHA1 (hugo-3.1.01/hugolib.zip) = a27ee9591cee8932a92b087b3b22ff5047a48749
+Size (hugo-3.1.01/hugolib.zip) = 70455 bytes
 SHA1 (patch-aa) = cc0d06b3abec10feb882f6a87af8bd5def10a8b7
 SHA1 (patch-ab) = 4d2753b45b1e16c7213e1ee99860519bf889e11d
 SHA1 (patch-ac) = 43df8bc8b35cb5525f582a6d11eba89d063fbe76
 SHA1 (patch-ad) = 454c364a4fe45d1fc94b768db85443fcc8ef8204
-SHA1 (patch-ae) = ce4dc59544819330f1f8eeb45100e871c3aa0b3d
+SHA1 (patch-ae) = fcbfdbc54507eacdb1486fa1de6a0729764edce0
 SHA1 (patch-af) = d97e6efb61472637f8680bf9cd94a1541ab2eb14
 SHA1 (patch-ag) = 5ad2dad3afa263160d5d70431dc7a7e1bd542969
diff --git a/games/hugo/patches/patch-ae b/games/hugo/patches/patch-ae
index 7d1b536fd87..dd2380eeec1 100644
--- a/games/hugo/patches/patch-ae
+++ b/games/hugo/patches/patch-ae
@@ -1,29 +1,29 @@
-$NetBSD: patch-ae,v 1.1 2004/05/28 14:24:04 dillo Exp $
+$NetBSD: patch-ae,v 1.2 2004/12/02 22:00:52 dillo Exp $
 
---- source/hdupdate.c.orig	2004-01-05 20:22:00.000000000 +0100
+--- source/hdupdate.c.orig	2004-07-06 21:21:24.000000000 +0200
 +++ source/hdupdate.c
 @@ -235,10 +235,10 @@ void Navigate(void)

  	{

- 	  switch (event.object)

- 	  {

--		case UP:

-+		case EV_UP:

- 		case DOWN:

+ 		switch (event.object)

  		{

--			if (event.object==UP && win->selected > 0)

-+			if (event.object==EV_UP && win->selected > 0)

+-			case UP:

++			case EV_UP:

+ 			case DOWN:

  			{

- 				if (--new_selected < win->first)

+-				if (event.object==UP && win->selected > 0)

++				if (event.object==EV_UP && win->selected > 0)

  				{

+ 					if (--new_selected < win->first)

+ 					{

 @@ -252,7 +252,7 @@ void Navigate(void)

- 			{

- 				if (++new_selected > win->first+win->height-1)

  				{

--					debug_windowscroll(2, win->top, D_SCREENWIDTH-1, win->top+win->height-1, UP, 1);

-+					debug_windowscroll(2, win->top, D_SCREENWIDTH-1, win->top+win->height-1, EV_UP, 1);

- 					win->first++;

+ 					if (++new_selected > win->first+win->height-1)

+ 					{

+-						debug_windowscroll(2, win->top, D_SCREENWIDTH-1, win->top+win->height-1, UP, 1);

++						debug_windowscroll(2, win->top, D_SCREENWIDTH-1, win->top+win->height-1, EV_UP, 1);

+ 						win->first++;

+ 					}

  				}

- 			}

 @@ -828,7 +828,7 @@ void UpdateCodeWindow(void)

  			amount_to_scroll = buffered_code_lines;