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

- update to zoom-1.1.2

Browse Source 
- remove NO_REGRESS
- fix HOMEPAGE
This commit is contained in:
ajacoutot 2007-12-06 17:03:56 +00:00
parent 84a0073de6
commit 7389f336ed
11 changed files with 25 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
games/zoom/Makefile
View File

@ -1,26 +1,35 @@
# $OpenBSD: Makefile,v 1.9 2007/09/15 18:01:04 simon Exp $
# $OpenBSD: Makefile,v 1.10 2007/12/06 17:03:56 ajacoutot Exp $
COMMENT= Z-code interpreter for X11
DISTNAME= zoom-1.0.1
DISTNAME= zoom-1.1.2
CATEGORIES= games
HOMEPAGE= http://www.logicalshift.demon.co.uk/unix/zoom/
HOMEPAGE= http://www.logicalshift.co.uk/unix/zoom/
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xft Xrender c m
WANTLIB= ICE SM X11 Xau Xdmcp Xext Xft Xrender c expat \
fontconfig freetype m z
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= png.>=6::graphics/png \
t1.>=6::devel/t1lib
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
VMEM_WARNING= Yes
NO_REGRESS= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng"
VMEM_WARNING= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zoom

10
games/zoom/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zoom-1.0.1.tar.gz) = lMGkpIXSc5HwShpgjbrO7g==
RMD160 (zoom-1.0.1.tar.gz) = lMwAP1frgc0Ap86+oR+4ptdc7zs=
SHA1 (zoom-1.0.1.tar.gz) = jP7WJtAlFQrknizn0LWv0FFt0XY=
SHA256 (zoom-1.0.1.tar.gz) = l93d89Fji5pWCCV3NuRpJL45re1IyTaNt4cgbHHCGOM=
SIZE (zoom-1.0.1.tar.gz) = 719460
MD5 (zoom-1.1.2.tar.gz) = d5FYhceV44knzVGD5xBljQ==
RMD160 (zoom-1.1.2.tar.gz) = pSXMbFFxekT/H8sRzbz5Df7ZlxU=
SHA1 (zoom-1.1.2.tar.gz) = C2R15TZ993pPvV+z3Ad0oz4jLGo=
SHA256 (zoom-1.1.2.tar.gz) = M3du2XDEReQTfJyA9pbmNKVRbZd/H11a18Wq8svLHfQ=
SIZE (zoom-1.1.2.tar.gz) = 2152557

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

@ -1,11 +0,0 @@
$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>

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

@ -1,96 +0,0 @@
$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
View File

@ -1,84 +0,0 @@
$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
View File

@ -1,12 +0,0 @@
$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
View File

@ -1,12 +0,0 @@
$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

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

@ -1,23 +0,0 @@
$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);
- crc32_table[i] = c;
+ crc32_table[i] = c & 0xffffffff;
}
}
@@ -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)
- crc = (crc << 8) ^ crc32_table[(crc >> 24) ^ *p];
- return ~crc; /* transmit complement, per CRC-32 spec */
+ crc = ((crc << 8) ^ crc32_table[(crc >> 24) ^ *p]) & 0xffffffff;
+ return ~crc & 0xffffffff; /* transmit complement, per CRC-32 spec */
}
static struct bucket *hash_lookup(hash hash,

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

@ -1,14 +0,0 @@
$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)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_stream_c,v 1.3 2004/09/18 23:58:30 pvalchev Exp $
--- src/stream.c.orig Fri Aug 30 08:46:50 2002
+++ src/stream.c Sat Sep 18 17:52:21 2004
@@ -284,7 +284,7 @@ int stream_readline(int* buf, int len, l
$OpenBSD: patch-src_stream_c,v 1.4 2007/12/06 17:03:56 ajacoutot Exp $
--- src/stream.c.orig Thu Dec 6 17:31:21 2007
+++ src/stream.c Thu Dec 6 17:31:33 2007
@@ -289,7 +289,7 @@ int stream_readline(int* buf, int len, long int timeou
if (machine.script_on)
{
int pos = 0;

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

@ -1,12 +0,0 @@
$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