diff options
author | dillo <dillo@pkgsrc.org> | 2005-05-07 23:04:17 +0000 |
---|---|---|
committer | dillo <dillo@pkgsrc.org> | 2005-05-07 23:04:17 +0000 |
commit | 484aaf03f8a5e4046af3956f8ca79622c0322dd6 (patch) | |
tree | bde20ff75341390379f4eadec159de6c7431d2b4 | |
parent | 31599c94a52a56251f4adb49f5ea4dc8cd1622e1 (diff) | |
download | pkgsrc-484aaf03f8a5e4046af3956f8ca79622c0322dd6.tar.gz |
Update to 3.1.02 (various bug fixes, old distfile no longer available)
-rw-r--r-- | games/hugo/Makefile | 6 | ||||
-rw-r--r-- | games/hugo/distinfo | 26 | ||||
-rw-r--r-- | games/hugo/patches/patch-aa | 12 | ||||
-rw-r--r-- | games/hugo/patches/patch-ab | 4 | ||||
-rw-r--r-- | games/hugo/patches/patch-ac | 4 | ||||
-rw-r--r-- | games/hugo/patches/patch-ad | 4 | ||||
-rw-r--r-- | games/hugo/patches/patch-ae | 4 | ||||
-rw-r--r-- | games/hugo/patches/patch-af | 4 | ||||
-rw-r--r-- | games/wxhugo/Makefile | 8 | ||||
-rw-r--r-- | games/wxhugo/distinfo | 16 | ||||
-rw-r--r-- | games/wxhugo/patches/patch-aa | 120 |
11 files changed, 106 insertions, 102 deletions
diff --git a/games/hugo/Makefile b/games/hugo/Makefile index 6523e0fd5a6..4854c23e33e 100644 --- a/games/hugo/Makefile +++ b/games/hugo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:51 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/05/07 23:04:17 dillo Exp $ # DISTNAME= hugov31_unix_source -PKGNAME= hugo-3.1.01 +PKGNAME= hugo-3.1.02 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_IFARCHIVE:=programming/hugo/source/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} hugolib.zip @@ -18,7 +18,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.1.0 +WRKSRC= ${WRKDIR}/hugov3.1.02 LIBDIR= ${PREFIX}/share/hugo diff --git a/games/hugo/distinfo b/games/hugo/distinfo index 0968bb1ad5d..bcd471e32df 100644 --- a/games/hugo/distinfo +++ b/games/hugo/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 23:11:59 agc Exp $ +$NetBSD: distinfo,v 1.7 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/hugolib.zip) = a27ee9591cee8932a92b087b3b22ff5047a48749 -RMD160 (hugo-3.1.01/hugolib.zip) = b72f8a017341d43bc1708c3ef6f77a953147918b -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) = fcbfdbc54507eacdb1486fa1de6a0729764edce0 -SHA1 (patch-af) = d97e6efb61472637f8680bf9cd94a1541ab2eb14 +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/hugolib.zip) = 7c16ed0cea3edc73fd0f704b4cb8284bb794c4ea +RMD160 (hugo-3.1.02/hugolib.zip) = d1d51bb2f0d56ca27e558b1a9ac15e8837a0d72e +Size (hugo-3.1.02/hugolib.zip) = 69728 bytes +SHA1 (patch-aa) = e13b502092b5e762fb853f800ec82ff2a220683b +SHA1 (patch-ab) = 7b87e47c11bda2b1e57eff97cdae45991150238b +SHA1 (patch-ac) = 7d0b631f7599e4f3761fccf7ac0b12a2d28703b7 +SHA1 (patch-ad) = 50d1ab40bdffb44f531786d5d3ed41aea2602348 +SHA1 (patch-ae) = b4ba87f4b1e3c4aec3f8ee0af45981c3a975ae5c +SHA1 (patch-af) = 3668c54b6725db7f411a94f721d38c4e4d99baff SHA1 (patch-ag) = 5ad2dad3afa263160d5d70431dc7a7e1bd542969 diff --git a/games/hugo/patches/patch-aa b/games/hugo/patches/patch-aa index a22c8d6c074..64f9c5ab650 100644 --- a/games/hugo/patches/patch-aa +++ b/games/hugo/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2004/08/27 06:29:07 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2005/05/07 23:04:17 dillo Exp $ ---- Makefile.orig 2001-11-26 19:54:04.000000000 +1100 +--- Makefile.orig 2005-01-18 08:28:22.000000000 +0100 +++ Makefile @@ -50,9 +50,9 @@ CFG_OPTIONS=-DDO_COLOR # Standard optimizations @@ -32,8 +32,8 @@ $NetBSD: patch-aa,v 1.3 2004/08/27 06:29:07 jlam Exp $ +HE_LIBS=-L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}$(PREFIX)/lib -lncurses # Shouldn't need to change anything below here. - HC_H=source/hcheader.h source/htokens.h -@@ -97,17 +98,17 @@ clean: + HC_H=$(SOURCE)/hcheader.h $(SOURCE)/htokens.h +@@ -100,17 +101,17 @@ clean: hc: $(HC_OBJS) # gcc -g -o hc $(HC_OBJS) @@ -52,5 +52,5 @@ $NetBSD: patch-aa,v 1.3 2004/08/27 06:29:07 jlam Exp $ - gcc -o hd $(HE_OBJS) $(HD_OBJS) $(HE_LIBS) + $(CC) -o hd $(HE_OBJS) $(HD_OBJS) $(HE_LIBS) - iotest: source/iotest.c gcc/hegcc.c $(HE_H) - $(CC) -o iotest source/iotest.c hegcc.o stringfn.o $(HE_LIBS) + iotest: $(SOURCE)/iotest.c gcc/hegcc.c $(HE_H) + $(CC) -o iotest $(SOURCE)/iotest.c hegcc.o stringfn.o $(HE_LIBS) diff --git a/games/hugo/patches/patch-ab b/games/hugo/patches/patch-ab index d9bcb76c26e..0f5bc0600f2 100644 --- a/games/hugo/patches/patch-ab +++ b/games/hugo/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2004/06/15 13:21:21 grant Exp $ +$NetBSD: patch-ab,v 1.3 2005/05/07 23:04:17 dillo Exp $ ---- source/hcfile.c.orig 2004-01-06 06:21:44.000000000 +1100 +--- source/hcfile.c.orig 2005-01-17 21:10:00.000000000 +0100 +++ source/hcfile.c @@ -380,6 +380,15 @@ FILE *TrytoOpen(char *f, char *p, char * return tempfile;
diff --git a/games/hugo/patches/patch-ac b/games/hugo/patches/patch-ac index 9ffc2aa0ee2..0fae0cfef45 100644 --- a/games/hugo/patches/patch-ac +++ b/games/hugo/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1 2004/05/28 14:24:04 dillo Exp $ +$NetBSD: patch-ac,v 1.2 2005/05/07 23:04:17 dillo Exp $ ---- source/hdinter.h.orig 2004-01-05 20:22:00.000000000 +0100 +--- source/hdinter.h.orig 2005-01-17 21:10:00.000000000 +0100 +++ source/hdinter.h @@ -63,7 +63,7 @@ enum D_ACTION_TYPE
/* ...and (some) object types */
diff --git a/games/hugo/patches/patch-ad b/games/hugo/patches/patch-ad index ac4b693cbab..dcab3734d0a 100644 --- a/games/hugo/patches/patch-ad +++ b/games/hugo/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2004/05/28 14:24:04 dillo Exp $ +$NetBSD: patch-ad,v 1.2 2005/05/07 23:04:17 dillo Exp $ ---- source/hdtools.c.orig 2004-01-05 20:21:48.000000000 +0100 +--- source/hdtools.c.orig 2005-01-17 21:10:00.000000000 +0100 +++ source/hdtools.c @@ -147,7 +147,7 @@ void DrawBranch(int obj)
/* Scroll the window up a line if necessary */
diff --git a/games/hugo/patches/patch-ae b/games/hugo/patches/patch-ae index dd2380eeec1..5e90dc640fd 100644 --- a/games/hugo/patches/patch-ae +++ b/games/hugo/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.2 2004/12/02 22:00:52 dillo Exp $ +$NetBSD: patch-ae,v 1.3 2005/05/07 23:04:17 dillo Exp $ ---- source/hdupdate.c.orig 2004-07-06 21:21:24.000000000 +0200 +--- source/hdupdate.c.orig 2005-01-17 21:10:00.000000000 +0100 +++ source/hdupdate.c @@ -235,10 +235,10 @@ void Navigate(void)
{
diff --git a/games/hugo/patches/patch-af b/games/hugo/patches/patch-af index 68c1d707dc2..21663f13873 100644 --- a/games/hugo/patches/patch-af +++ b/games/hugo/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1 2004/05/28 14:24:04 dillo Exp $ +$NetBSD: patch-af,v 1.2 2005/05/07 23:04:17 dillo Exp $ ---- source/hdwindow.c.orig 2004-01-05 20:22:00.000000000 +0100 +--- source/hdwindow.c.orig 2005-01-17 21:17:00.000000000 +0100 +++ source/hdwindow.c @@ -349,7 +349,7 @@ SelectThisItem:
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
+
|