pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/wxhugo update to 3.1.01 (various bugfixes)
details: https://anonhg.NetBSD.org/pkgsrc/rev/0b927e2a7484
branches: trunk
changeset: 487160:0b927e2a7484
user: dillo <dillo%pkgsrc.org@localhost>
date: Mon Jan 10 16:26:34 2005 +0000
description:
update to 3.1.01 (various bugfixes)
diffstat:
games/wxhugo/Makefile | 38 ++++++----------------
games/wxhugo/distinfo | 13 +++----
games/wxhugo/patches/patch-aa | 71 +++++++++---------------------------------
games/wxhugo/patches/patch-ab | 13 -------
4 files changed, 33 insertions(+), 102 deletions(-)
diffs (207 lines):
diff -r 698037e14fb0 -r 0b927e2a7484 games/wxhugo/Makefile
--- a/games/wxhugo/Makefile Mon Jan 10 16:25:27 2005 +0000
+++ b/games/wxhugo/Makefile Mon Jan 10 16:26:34 2005 +0000
@@ -1,44 +1,28 @@
-# $NetBSD: Makefile,v 1.4 2004/12/28 23:18:19 reed Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/10 16:26:34 dillo Exp $
#
-DISTNAME= hugov30_unix_source
-PKGNAME= wxhugo-3.0.07
-PKGREVISION= 2
+DISTNAME= hugov31_unix_source
+PKGNAME= wxhugo-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} ${DISTFILE_WX}
MAINTAINER= dillo%NetBSD.org@localhost
-HOMEPAGE= http://161.184.245.22/tessman/gcc/hugo.html
+HOMEPAGE= http://www.generalcoffee.com/hugo.html
COMMENT= Interactive fiction interpreter with sound and graphics support
-DISTFILE_WX= hugov30_wxwin_source${EXTRACT_SUFX}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILE_WX= hugov31_wxwin_source${EXTRACT_SUFX}
+#EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR= hugo-3.0.07
+DIST_SUBDIR= hugo-3.1.01
USE_BUILDLINK3= yes
USE_GNU_TOOLS+= make
-WRKSRC= ${WRKDIR}/hugov3.0.07/hewx
-
-LIBDIR= ${PREFIX}/share/hugo
+WRKSRC= ${WRKDIR}/hugov3.1.0/hewx
-post-extract:
- extract_file="${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_WX}"; export extract_file; \
- cd ${WRKSRC}/.. && ${EXTRACT_CMD.tar.gz}
- for f in hejpeg.cpp hesound.cpp hesound_SDL.cpp hewxwin.cpp; \
- do \
- { cd ${WRKSRC} && ${MV} $$f $$f.dos \
- && ${TR} -d '\015' < $$f.dos > $$f; }; \
- done
- for f in hevideo.cpp; \
- do \
- { cd ${WRKSRC} && ${MV} $$f $$f.mac \
- && ${TR} '\015' '\012' < $$f.mac > $$f; }; \
- done
+.include "../../audio/libmikmod/buildlink3.mk"
+.include "../../x11/wxGTK/buildlink3.mk"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hewx ${PREFIX}/bin
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 698037e14fb0 -r 0b927e2a7484 games/wxhugo/distinfo
--- a/games/wxhugo/distinfo Mon Jan 10 16:25:27 2005 +0000
+++ b/games/wxhugo/distinfo Mon Jan 10 16:26:34 2005 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/05/22 23:35:39 dillo Exp $
+$NetBSD: distinfo,v 1.2 2005/01/10 16:26:34 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/hugov30_wxwin_source.tar.gz) = a0871b4dd5d9b0d7bc638ea2728cd285d4457304
-Size (hugo-3.0.07/hugov30_wxwin_source.tar.gz) = 69444 bytes
-SHA1 (patch-aa) = 2a7df05b854e82938f9e26fd698eaed4fce91ca4
-SHA1 (patch-ab) = d8eb602e631143595071eb2d449c15a0bb8860e6
+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/hugov31_wxwin_source.tar.gz) = 9fa7f0894a6283397ade1468e3aae20b21b62bda
+Size (hugo-3.1.01/hugov31_wxwin_source.tar.gz) = 281787 bytes
+SHA1 (patch-aa) = 316fcabf3501b3fbb0cb7ccc6be289c5dbc1b36a
diff -r 698037e14fb0 -r 0b927e2a7484 games/wxhugo/patches/patch-aa
--- a/games/wxhugo/patches/patch-aa Mon Jan 10 16:25:27 2005 +0000
+++ b/games/wxhugo/patches/patch-aa Mon Jan 10 16:26:34 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/05/22 23:35:39 dillo Exp $
+$NetBSD: patch-aa,v 1.2 2005/01/10 16:26:34 dillo Exp $
---- Makefile.orig Thu Jan 15 19:23:19 2004
+--- Makefile.orig 2004-08-07 21:32:02.000000000 +0200
+++ Makefile
@@ -15,12 +15,12 @@
# (The wxWindows file locations should really be taken from wx-config.)
@@ -13,11 +13,11 @@
# 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
++LDFLAGS += `wx-config --libs` -lmikmod
STATICLIBS =
# Otherwise, use these LDFLAGS and STATICLIBS:
#LDFLAGS = -lwx_gtk -lgtk -lgdk -lpthread -lmikmod
-@@ -34,27 +34,28 @@ MYCODEDIR := .
+@@ -34,7 +34,7 @@ MYCODEDIR := .
# Directories to search for header files
@@ -26,74 +26,35 @@
# makemake variables
--LINKER := gcc
-+LINKER := ${CC}
- DEPENDFLAGS := ${SEARCHDIRS}
- TOUCHHEADERS := ${MYCODEDIR}/*.h
+@@ -44,17 +44,18 @@ TOUCHHEADERS := ${MYCODEDIR}/*.h
# C
-CC := gcc
+#CC := gcc
# Debugging:
- #CFLAGS = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -fwritable-strings -fno-rtti -g3 -Wall `wx-config --cflags`
+ #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 -fno-rtti -O2 -Wall `wx-config --cflags`
-+MY_CFLAGS = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -fwritable-strings -fno-rtti -O2 -Wall `wx-config --cflags`
-+CFLAGS+=${MY_CFLAGS}
+-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}
-+CXXFLAGS+=${MY_CFLAGS}
+-CXXFLAGS = ${CFLAGS} -fno-rtti
++CXXFLAGS += ${CFLAGS} -fno-rtti
%.o : %.cpp
${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}
-@@ -133,31 +134,28 @@ jdepend:
-
- # DO NOT DELETE THIS LINE -- makemake depends on it.
-
--../source/he.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/he.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
-
--../source/hebuffer.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/hebuffer.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
+@@ -64,7 +65,7 @@ CXXFLAGS = ${CFLAGS} -fno-rtti
--../source/heexpr.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/heexpr.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
-
--./hejpeg.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h /usr/include/assert.h /usr/include/ctype.h /usr/include/dirent.h /usr/include/g++-3/iostream
/usr/include/g++-3/iostream.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/strings.h /usr/include/sys/types.h
/usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h /usr/include/wctype.h
-+./hejpeg.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h
-
--../source/hemisc.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/hemisc.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
-
--../source/heobject.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/heobject.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
+ # C preprocessor
--../source/heparse.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/heparse.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
-
--../source/heres.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/heres.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
-
--../source/herun.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/herun.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
-
--../source/heset.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h /usr/include/ctype.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/time.h
/usr/include/unistd.h
-+../source/heset.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h
+-CPPFLAGS =
++#CPPFLAGS =
--./hesound.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h /usr/include/assert.h /usr/include/ctype.h /usr/include/dirent.h /usr/include/g++-3/iostream
/usr/include/g++-3/iostream.h /usr/include/limits.h /usr/include/mikmod.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/strings.h /usr/include/sys/types.h
/usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h /usr/include/wctype.h
-+./hesound.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h
+ # linker
--./hewx.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h /usr/include/assert.h /usr/include/ctype.h /usr/include/dirent.h /usr/include/g++-3/iostream
/usr/include/g++-3/iostream.h /usr/include/limits.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/strings.h /usr/include/sys/types.h /usr/include/time.h
/usr/include/unistd.h /usr/include/wchar.h /usr/include/wctype.h
--
--./hewxwin.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h /usr/include/assert.h /usr/include/ctype.h /usr/include/dirent.h /usr/include/g++-3/iostream
/usr/include/g++-3/iostream.h /usr/include/limits.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/strings.h /usr/include/sys/types.h /usr/include/time.h
/usr/include/unistd.h /usr/include/wchar.h /usr/include/wctype.h
--
--../source/stringfn.o: /usr/include/ctype.h /usr/include/stdio.h /usr/include/string.h
-+./hewx.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h
-
-+./hewxwin.o: ../source/hdinter.h ../source/heheader.h ../source/htokens.h ./hewx.h
diff -r 698037e14fb0 -r 0b927e2a7484 games/wxhugo/patches/patch-ab
--- a/games/wxhugo/patches/patch-ab Mon Jan 10 16:25:27 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/05/22 23:35:39 dillo Exp $
-
---- hewx.h.orig Fri Jan 24 21:04:46 2003
-+++ hewx.h
-@@ -133,7 +133,7 @@ inline double MyMilliseconds(void)
- #else
- inline double MyMilliseconds(void)
- {
-- return (double)(clock()/(CLOCKS_PER_SEC/1000));
-+ return (double)(clock()/(CLOCKS_PER_SEC/1000.));
- }
- #endif
-
Home |
Main Index |
Thread Index |
Old Index