cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.0.1; from Jose Nazario <jose@monkey.org>

Browse Source
This commit is contained in:
naddy 2004-04-09 21:15:12 +00:00
parent 5cf465ffa6
commit 98702418f3
14 changed files with 254 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
games/zoom/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2004/03/10 17:32:46 naddy Exp $
# $OpenBSD: Makefile,v 1.6 2004/04/09 21:15:12 naddy Exp $
COMMENT= "Z-code interpreter for X11"
DISTNAME= zoom-0.9.99beta3
DISTNAME= zoom-1.0.1
CATEGORIES= games
HOMEPAGE= http://www.logicalshift.demon.co.uk/unix/zoom/
@ -17,7 +17,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
VMEM_WARNING= Yes
NO_REGRESS= Yes
@ -25,7 +27,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zoom
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/zoom/README
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/zoom
${INSTALL_DATA} ${WRKSRC}/zoomrc \
${INSTALL_DATA} ${WRKSRC}/src/zoomrc \
${PREFIX}/share/examples/zoom/dot.zoomrc
.include <bsd.port.mk>

6
games/zoom/distinfo
View File

@ -1,3 +1,3 @@
MD5 (zoom-0.9.99beta3.tar.gz) = 27af70fd75d1f36a0d3ae82c05f89e0d
RMD160 (zoom-0.9.99beta3.tar.gz) = 24b5736d9a19f79804fefae793812dfa363cccc1
SHA1 (zoom-0.9.99beta3.tar.gz) = 8aa94b80e5d59e3c605f4b3c724d6f831379e7e0
MD5 (zoom-1.0.1.tar.gz) = 94c1a4a485d27391f04a1a608dbaceee
RMD160 (zoom-1.0.1.tar.gz) = 94cc003f57eb81cd00a7cebea11fb8a6d75cef3b
SHA1 (zoom-1.0.1.tar.gz) = 8cfed626d025150ae49e2ce7d0b5afd0516dd176

11
games/zoom/patches/patch-THANKS Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-THANKS,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- THANKS.orig 2002-10-19 13:39:47.000000000 -0400
+++ THANKS 2004-04-06 22:48:41.000000000 -0400
@@ -2,6 +2,7 @@ These people have contributed to this ve
variously contributed patches, bug reports or feature requests. Zoom
would not be what it is without them!
+Christoffer Heggem <chheggem@tiscali.se>
Gregg V. Carroll <gregg@midcoast.com>
Volker Lanz <volker.lanz@gmx.net>
Roger Kenyon <edutec@idirect.com>

12
games/zoom/patches/patch-builder_main_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-builder_main_c,v 1.1 2004/01/08 16:23:05 naddy Exp $
--- builder/main.c.orig 2004-01-08 17:17:30.000000000 +0100
+++ builder/main.c 2004-01-08 17:17:41.000000000 +0100
@@ -686,7 +686,7 @@ void output_interpreter(FILE* dest,
if (op->type == extop && op->versions&vmask)
{
fprintf(dest, " case 0x%x: /* %s */\n", op->value, op->name);
- fprintf(dest, "#ifdef DEBUG\nprintf(\"ExtOp: %s\n\");\n#endif\n", op->name);
+ fprintf(dest, "#ifdef DEBUG\nprintf(\"ExtOp: %s\\n\");\n#endif\n", op->name);
pcadd = 3;
if (op->flags.islong)
{

96
games/zoom/patches/patch-configure Normal file
View File

@ -0,0 +1,96 @@
$OpenBSD: patch-configure,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- configure.orig 2002-10-19 17:18:01.000000000 -0400
+++ configure 2004-04-06 22:48:41.000000000 -0400
@@ -980,7 +980,7 @@ fi
PATH_SEPARATOR="$ac_path_separator"
rm -f conftest.sh
-VERSION=1.0.1
+VERSION=1.0.1a
PACKAGE=zoom
# Extract the first word of "tput", so it can be a program name with args.
@@ -6704,7 +6704,7 @@ fi
echo "$as_me:6704: result: $ac_cv_lib_z_inflate" >&5
echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6
if test $ac_cv_lib_z_inflate = yes; then
- LDFLAGS="$LDFLAGS -lz"
+ LIBS="$LIBS -lz"
fi
echo "$as_me:6710: checking for png_get_IHDR in -lpng" >&5
@@ -6762,7 +6762,7 @@ if test $ac_cv_lib_png_png_get_IHDR = ye
#define HAVE_LIBPNG 1
EOF
- LDFLAGS="$LDFLAGS -lpng"
+ LIBS="$LIBS -lpng"
else
@@ -7244,9 +7244,9 @@ fi
HAVE_T1LIB=0
if test "$WINDOW_SYSTEM" = "1"; then
- LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
+ LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_PRE_LIBS -lX11"
+ LIBS="$LIBS -lX11"
echo "$as_me:7251: checking for sin in -lm" >&5
echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6
@@ -7357,7 +7357,7 @@ echo "$as_me:7356: result: $ac_cv_lib_t1
echo "${ECHO_T}$ac_cv_lib_t1_T1_InitLib" >&6
if test $ac_cv_lib_t1_T1_InitLib = yes; then
- LDFLAGS="$LDFLAGS -lt1"
+ LIBS="$LIBS -lt1"
echo "$as_me:7361: checking for T1_SetCharX in -lt1x" >&5
echo $ECHO_N "checking for T1_SetCharX in -lt1x... $ECHO_C" >&6
if test "${ac_cv_lib_t1x_T1_SetCharX+set}" = set; then
@@ -7408,7 +7408,7 @@ fi
echo "$as_me:7408: result: $ac_cv_lib_t1x_T1_SetCharX" >&5
echo "${ECHO_T}$ac_cv_lib_t1x_T1_SetCharX" >&6
if test $ac_cv_lib_t1x_T1_SetCharX = yes; then
- LDFLAGS="$LDFLAGS -lt1x"; HAVE_T1LIB=1
+ LIBS="$LIBS -lt1x"; HAVE_T1LIB=1
fi
fi
@@ -7508,7 +7508,7 @@ fi
echo "$as_me:7508: result: $ac_cv_lib_Xext_XdbeQueryExtension" >&5
echo "${ECHO_T}$ac_cv_lib_Xext_XdbeQueryExtension" >&6
if test $ac_cv_lib_Xext_XdbeQueryExtension = yes; then
- LDFLAGS="$LDFLAGS -lXext"
+ LIBS="$LIBS -lXext"
fi
echo "$as_me:7514: checking for the DBE X extension library" >&5
@@ -7609,7 +7609,7 @@ echo "$as_me:7608: result: $ac_cv_lib_Xf
echo "${ECHO_T}$ac_cv_lib_Xft_XftInit" >&6
if test $ac_cv_lib_Xft_XftInit = yes; then
- LDFLAGS="$LDFLAGS -lXft"
+ LIBS="$LIBS -lXft"
HAVE_XFT=1
fi
@@ -7710,7 +7710,7 @@ echo "$as_me:7709: result: $ac_cv_lib_Xr
echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryExtension" >&6
if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then
- LDFLAGS="$LDFLAGS -lXft"
+ LIBS="$LIBS -lXrender"
HAVE_XRENDER=1
fi
@@ -7815,7 +7815,7 @@ if test $ac_cv_lib_png_png_get_IHDR = ye
#define HAVE_LIBPNG 1
EOF
- LDFLAGS="$LDFLAGS -lpng"
+ LIBS="$LIBS -lpng"
else

84
games/zoom/patches/patch-configure_in Normal file
View File

@ -0,0 +1,84 @@
$OpenBSD: patch-configure_in,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- configure.in.orig 2002-10-19 17:17:11.000000000 -0400
+++ configure.in 2004-04-06 22:48:41.000000000 -0400
@@ -2,7 +2,7 @@
AC_PREREQ(2.13)
AC_INIT()
-VERSION=1.0.1
+VERSION=1.0.1a
PACKAGE=zoom
UTIL_DISPLAY_INIT()
@@ -237,12 +237,12 @@ if test "$MINGW32" != "yes"; then
AC_MSG_ERROR([QuickTime not found (?)])
fi
- AC_CHECK_LIB(z, inflate, [ LDFLAGS="$LDFLAGS -lz" ])
+ AC_CHECK_LIB(z, inflate, [ LIBS="$LIBS -lz" ])
AC_CHECK_LIB(png, png_get_IHDR,
[
AC_DEFINE(HAVE_LIBPNG)
- LDFLAGS="$LDFLAGS -lpng"
+ LIBS="$LIBS -lpng"
],
[
AC_MSG_WARN([libpng not detected: blecherous QuickTime alpha blending will be used (Ew)])
@@ -322,16 +322,16 @@ AC_SUBST(BUILDERCC)
HAVE_T1LIB=0
if test "$WINDOW_SYSTEM" = "1"; then
- LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
+ LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_PRE_LIBS -lX11"
+ LIBS="$LIBS -lX11"
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(t1, T1_InitLib,
[
- LDFLAGS="$LDFLAGS -lt1"
+ LIBS="$LIBS -lt1"
AC_CHECK_LIB(t1x, T1_SetCharX,
- [ LDFLAGS="$LDFLAGS -lt1x"; HAVE_T1LIB=1 ])
+ [ LIBS="$LIBS -lt1x"; HAVE_T1LIB=1 ])
])
if test "$HAVE_T1LIB" = "1"; then
@@ -348,7 +348,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
])
fi
- AC_CHECK_LIB(Xext, XdbeQueryExtension, [ LDFLAGS="$LDFLAGS -lXext" ])
+ AC_CHECK_LIB(Xext, XdbeQueryExtension, [ LIBS="$LIBS -lXext" ])
AC_MSG_CHECKING([for the DBE X extension library])
AC_TRY_LINK(
[ #include <X11/Xlib.h>
@@ -367,7 +367,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
AC_CHECK_LIB(Xft, XftInit,
[
- LDFLAGS="$LDFLAGS -lXft"
+ LIBS="$LIBS -lXft"
HAVE_XFT=1
])
if test "$HAVE_XFT" = "1"; then
@@ -386,7 +386,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
AC_CHECK_LIB(Xrender, XRenderQueryExtension,
[
- LDFLAGS="$LDFLAGS -lXft"
+ LIBS="$LIBS -lXrender"
HAVE_XRENDER=1
])
if test "$HAVE_XRENDER" = "1"; then
@@ -406,7 +406,7 @@ if test "$WINDOW_SYSTEM" = "1"; then
AC_CHECK_LIB(png, png_get_IHDR,
[
AC_DEFINE(HAVE_LIBPNG)
- LDFLAGS="$LDFLAGS -lpng"
+ LIBS="$LIBS -lpng"
],
[
AC_MSG_WARN([libpng not detected: image support will be disabled])

12
games/zoom/patches/patch-src_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- src/Makefile.am.orig 2002-08-06 15:42:17.000000000 -0400
+++ src/Makefile.am 2004-04-06 22:48:41.000000000 -0400
@@ -74,7 +74,7 @@ endif
CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\""
OBJCFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\""
-LIBS = @LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+LIBS = @LIBS@
YFLAGS = -d
debug.c: eval.h

12
games/zoom/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- src/Makefile.in.orig 2002-10-19 17:18:32.000000000 -0400
+++ src/Makefile.in 2004-04-06 22:48:41.000000000 -0400
@@ -118,7 +118,7 @@ zoom_SOURCES = \
CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\""
OBJCFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\""
-LIBS = @LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+LIBS = @LIBS@
YFLAGS = -d
subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

18
games/zoom/patches/patch-src_hash_c
View File

@ -1,15 +1,7 @@
$OpenBSD: patch-src_hash_c,v 1.1 2004/03/10 17:32:46 naddy Exp $
--- src/hash.c.orig 2000-11-01 00:01:57.000000000 +0100
+++ src/hash.c 2004-03-10 15:36:23.000000000 +0100
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "hash.h"
@@ -80,7 +81,7 @@ static void init_crc32()
$OpenBSD: patch-src_hash_c,v 1.2 2004/04/09 21:15:12 naddy Exp $
--- src/hash.c.orig 2002-07-25 20:10:02.000000000 +0200
+++ src/hash.c 2004-04-09 22:12:31.000000000 +0200
@@ -81,7 +81,7 @@ static void init_crc32()
for (i = 0; i < 256; ++i) {
for (c = i << 24, j = 8; j > 0; --j)
c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY : (c << 1);
@ -18,7 +10,7 @@ $OpenBSD: patch-src_hash_c,v 1.1 2004/03/10 17:32:46 naddy Exp $
}
}
@@ -94,8 +95,8 @@ unsigned long hash_hash(unsigned char *b
@@ -95,8 +95,8 @@ unsigned long hash_hash(unsigned char *b
init_crc32(); /* build table */
crc = 0xffffffff; /* preload shift register, per CRC-32 spec */
for (p = buf; len > 0; ++p, --len)

14
games/zoom/patches/patch-src_rc_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_rc_c,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- src/rc.c.orig 2002-10-20 12:10:55.000000000 -0400
+++ src/rc.c 2004-04-06 22:48:41.000000000 -0400
@@ -50,8 +50,8 @@ rc_game* rc_defgame = NULL;
void rc_error(char* erm)
{
- zmachine_warning("Error while parsing .zoomrc (line %i): %s",
- _rc_line, erm);
+ zmachine_info("Error while parsing .zoomrc (line %i): %s",
+ _rc_line, erm);
}
void rc_load(void)

12
games/zoom/patches/patch-src_stream_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_stream_c,v 1.1.1.1 2001/10/28 02:24:23 naddy Exp $
--- src/stream.c.orig Wed Oct 24 23:10:44 2001
+++ src/stream.c Wed Oct 24 23:11:00 2001
@@ -134,7 +134,7 @@ void stream_buffering(int buf)
void stream_printf(const char* const f, ...)
{
- va_list* ap;
+ va_list ap;
char string[512];
va_start(ap, f);

12
games/zoom/patches/patch-src_xdisplay_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_xdisplay_c,v 1.1.1.1 2001/10/28 02:24:23 naddy Exp $
--- src/xdisplay.c.orig Wed Oct 24 23:10:19 2001
+++ src/xdisplay.c Wed Oct 24 23:10:32 2001
@@ -657,7 +657,7 @@ static void outputs(const char* string,
*/
void display_printf(const char* format, ...)
{
- va_list* ap;
+ va_list ap;
char string[512];
va_start(ap, format);

21
games/zoom/patches/patch-src_zmachine_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_zmachine_c,v 1.1.1.1 2001/10/28 02:24:23 naddy Exp $
--- src/zmachine.c.orig Wed Oct 24 23:09:20 2001
+++ src/zmachine.c Wed Oct 24 23:09:42 2001
@@ -116,7 +116,7 @@ void zmachine_load_story(char* filename,
void zmachine_fatal(char* format, ...)
{
- va_list* ap;
+ va_list ap;
char string[256];
va_start(ap, format);
@@ -154,7 +154,7 @@ void zmachine_fatal(char* format, ...)
void zmachine_warning(char* format, ...)
{
- va_list* ap;
+ va_list ap;
char string[256];
if (machine.warning_level == 0)

12
games/zoom/patches/patch-src_zoomrc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_zoomrc,v 1.1 2004/04/09 21:15:12 naddy Exp $
--- src/zoomrc.orig 2002-10-01 16:47:45.000000000 -0400
+++ src/zoomrc 2004-04-06 22:48:41.000000000 -0400
@@ -8,7 +8,7 @@
# !! IMPORTANT !! (Well, sort of)
# The default zoomrc file now sets anti-aliasing to off by default,
# because many people have reported problems with Xft's selection
-# of fonts. Blech. Reset to 'on' to get anti-aliasing back.
+# of fonts. Blech. Reset to 'yes' to get anti-aliasing back.
default "%s (%i.%.6s.%04x)"
{
interpreter 3