Update to 3.1.02 (various bug fixes, old distfile no longer available)

3 files changed, 74 insertions, 70 deletions

diff --git a/games/wxhugo/Makefile b/games/wxhugo/Makefile
index 31c2f2b8168..d0a261de15d 100644
--- a/games/wxhugo/Makefile
+++ b/games/wxhugo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/07 23:04:17 dillo Exp $
 #
 
 DISTNAME=	hugov31_unix_source
-PKGNAME=	wxhugo-3.1.01
+PKGNAME=	wxhugo-3.1.02
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_IFARCHIVE:=programming/hugo/source/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_WX}
@@ -14,9 +14,9 @@ COMMENT=	Interactive fiction interpreter with sound and graphics support
 DISTFILE_WX=	hugov31_wxwin_source${EXTRACT_SUFX}
 #EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-DIST_SUBDIR=	hugo-3.1.01
+DIST_SUBDIR=	hugo-3.1.02
 USE_GNU_TOOLS+=	make
-WRKSRC=		${WRKDIR}/hugov3.1.0/hewx
+WRKSRC=		${WRKDIR}/hugov3.1.02/hewx
 
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
diff --git a/games/wxhugo/distinfo b/games/wxhugo/distinfo
index 51780bdab71..1341e03d355 100644
--- a/games/wxhugo/distinfo
+++ b/games/wxhugo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/05/07 23:04:17 dillo Exp $
 
-SHA1 (hugo-3.1.01/hugov31_unix_source.tar.gz) = bd14b180e26cd0d39e164839da27313e79939a9b
-RMD160 (hugo-3.1.01/hugov31_unix_source.tar.gz) = 3f130b7c0ffe1f7d27551c8fe716400390450d70
-Size (hugo-3.1.01/hugov31_unix_source.tar.gz) = 214461 bytes
-SHA1 (hugo-3.1.01/hugov31_wxwin_source.tar.gz) = 9fa7f0894a6283397ade1468e3aae20b21b62bda
-RMD160 (hugo-3.1.01/hugov31_wxwin_source.tar.gz) = e2d26e0d696a2929a8ec4fc994851db8c90a9777
-Size (hugo-3.1.01/hugov31_wxwin_source.tar.gz) = 281787 bytes
-SHA1 (patch-aa) = 0d32dc98569f9b3b12e9684fc03d2bdb90f65460
+SHA1 (hugo-3.1.02/hugov31_unix_source.tar.gz) = 7c3785da668e1deb9fe222b6014c402b00fc4256
+RMD160 (hugo-3.1.02/hugov31_unix_source.tar.gz) = 205c3a26456eabe6e72116be6a2120a00e118385
+Size (hugo-3.1.02/hugov31_unix_source.tar.gz) = 214617 bytes
+SHA1 (hugo-3.1.02/hugov31_wxwin_source.tar.gz) = 477ee2d4294b4203b317a3db77015cb23b76a066
+RMD160 (hugo-3.1.02/hugov31_wxwin_source.tar.gz) = 46703c623d82afe9194167572f81a1c20baa4a7f
+Size (hugo-3.1.02/hugov31_wxwin_source.tar.gz) = 284234 bytes
+SHA1 (patch-aa) = 7dfcfa9a642e86551b9c4cf5cc084734f8106866
diff --git a/games/wxhugo/patches/patch-aa b/games/wxhugo/patches/patch-aa
index f91653b1abc..031e0febb01 100644
--- a/games/wxhugo/patches/patch-aa
+++ b/games/wxhugo/patches/patch-aa
@@ -1,60 +1,64 @@
-$NetBSD: patch-aa,v 1.3 2005/01/10 19:43:54 dillo Exp $
+$NetBSD: patch-aa,v 1.4 2005/05/07 23:04:17 dillo Exp $
 
---- Makefile.orig	2004-08-07 21:32:02.000000000 +0200
+--- Makefile.orig	2005-01-16 20:25:50.000000000 +0100
 +++ Makefile
-@@ -15,12 +15,12 @@
- # (The wxWindows file locations should really be taken from wx-config.)
- HUGOSOURCEDIR = ../source
- MIKMODINCLUDEDIR = /usr/local/include
--CXXINCLUDEDIR = /usr/include/g++-3
-+#CXXINCLUDEDIR = /usr/include/g++-3
- 
- # Libraries to be linked:
- # If a working libmikmod.so has been compiled on the runtime system
- # and the wxGTK library is installed:
--LDFLAGS = `wx-config --libs` -lgtk -lgdk -lmikmod
-+LDFLAGS += `wx-config --libs` -lmikmod
- STATICLIBS =
- # Otherwise, use these LDFLAGS and STATICLIBS:
- #LDFLAGS = -lwx_gtk -lgtk -lgdk -lpthread -lmikmod
-@@ -34,7 +34,7 @@ MYCODEDIR := .
- 
- # Directories to search for header files
- 
--SEARCHDIRS := -I- -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR} -I${CXXINCLUDEDIR}
-+SEARCHDIRS := -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR}
- 
- # makemake variables
- 
-@@ -44,17 +44,18 @@ TOUCHHEADERS := ${MYCODEDIR}/*.h
- 
- # C
- 
--CC     := gcc
-+#CC     := gcc
- # Debugging:
- #CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -fwritable-strings -g3 -Wall `wx-config --cflags`
- # Release build:
--CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -fwritable-strings -O2 -Wall `wx-config --cflags`
-+CPPFLAGS  += ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET
-+CFLAGS  += -fwritable-strings `wx-config --cflags`
- 
- # C++
- 
--CXX      := g++
-+#CXX      := g++
- #CXXFLAGS  = ${DEPENDFLAGS}
--CXXFLAGS = ${CFLAGS} -fno-rtti
-+CXXFLAGS += ${CFLAGS} -fno-rtti
- 
- %.o : %.cpp
- 	${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}
-@@ -64,7 +65,7 @@ CXXFLAGS = ${CFLAGS} -fno-rtti
- 
- # C preprocessor
- 
--CPPFLAGS = 
-+#CPPFLAGS = 
- 
- # linker
- 
+@@ -12,7 +12,7 @@
+ # (The wxWindows file locations should really be taken from wx-config.)

+ HUGOSOURCEDIR = ../source

+ MIKMODINCLUDEDIR = /usr/local/include

+-CXXINCLUDEDIR = /usr/include/g++-3

++#CXXINCLUDEDIR = /usr/include/g++-3

+ 

+ # Libraries to be linked:

+ # If a working libmikmod.so has been compiled on the runtime system

+@@ -23,7 +23,7 @@ STATICLIBS =

+ # Uncomment the following if compiling with GTK 1.2 support:

+ #LDFLAGS = `wx-config --libs` -lgtk -lgdk -lmikmod

+ # Uncomment the following if compiling with GTK 2 support:

+-LDFLAGS = `wx-config --libs` -lgtk-x11-2.0 -lgdk-x11-2.0 -lmikmod

++LDFLAGS = `wx-config --libs` -lmikmod

+ 

+ # Use these LDFLAGS and STATICLIBS for static building:

+ #STATICLIBS = /usr/local/lib/libmikmod.a /usr/local/lib/libwx_gtk2-2.4.a

+@@ -39,7 +39,7 @@ MYCODEDIR := .

+ # Uncomment the following if compiling with GTK 1.2 support:

+ #SEARCHDIRS := -I- -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR} -I${CXXINCLUDEDIR}

+ # Uncomment the following if compiling with GTK 2 support:

+-SEARCHDIRS := -I- -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR} -I${CXXINCLUDEDIR} -I/usr/include/gtk-2.0

++SEARCHDIRS := -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR}

+ 

+ 

+ # Hopefully nothing below here will need to be changed:

+@@ -52,17 +52,19 @@ TOUCHHEADERS := ${MYCODEDIR}/*.h

+ 

+ # C

+ 

+-CC     := gcc

++#CC     := gcc

+ # Debugging:

+ #CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -g3 -Wall `wx-config --cflags`

+ # Release build:

+-CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -O2 -Wall `wx-config --cflags`

++CPPFLAGS+=${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET

++HUGO_CFLAGS=-O2 -Wall `wx-config --cflags`

++CFLAGS  += ${HUGO_CFLAGS}
+ 

+ # C++

+ 

+-CXX      := g++

++#CXX      := g++

+ #CXXFLAGS  = ${DEPENDFLAGS}

+-CXXFLAGS = ${CFLAGS} -fno-rtti

++CXXFLAGS += ${HUGO_CFLAGS} -fno-rtti

+ 

+ %.o : %.cpp

+ 	${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}

+@@ -72,7 +74,7 @@ CXXFLAGS = ${CFLAGS} -fno-rtti

+ 

+ # C preprocessor

+ 

+-CPPFLAGS = 

++#CPPFLAGS = 

+ 

+ # linker

+