update to a ways more recent version.
Use the same technique as nethack, so that several slash-em versions can be installed concurrently.
This commit is contained in:
espie
parent
ac63a7ed2f
commit
396439d7ee
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2004/11/28 22:41:21 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2005/09/11 12:26:02 espie Exp $
|
||||
|
||||
COMMENT= "dungeon explorin', hackin', game. Hard"
|
||||
DISTNAME= se006e4f8
|
||||
DISTNAME= se007e7f1
|
||||
CATEGORIES= games
|
||||
|
||||
HOMEPAGE= http://slashem.sourceforge.net
|
||||
@ -16,15 +16,17 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c termlib
|
||||
|
||||
PKGNAME=slash-em-3.3.1.6e4f8
|
||||
WRKDIST=${WRKDIR}/slashem-0.0.6E4F8
|
||||
PKGNAME=slash-em-3.4.3.7e7f1
|
||||
V= 3.4.3.7e7f1
|
||||
|
||||
WRKDIST=${WRKDIR}/slashem-0.0.7E7F1
|
||||
|
||||
FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
|
||||
|
||||
GAMEDIR=lib/slashemdir
|
||||
GAMEDIR=lib/slashemdir-$V
|
||||
NHDIR= ${PREFIX}/${GAMEDIR}
|
||||
MAKE_ENV+= NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
|
||||
SUBST_VARS=GAMEDIR
|
||||
SUBST_VARS=GAMEDIR V
|
||||
|
||||
# qt flavor is apparently not working yet
|
||||
FLAVORS=no_x11 #qt
|
||||
@ -57,13 +59,14 @@ post-build:
|
||||
@cd ${WRKSRC}/doc && perl -p ${FILESDIR}/substitute <recover.6 >strecover.6
|
||||
|
||||
post-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/util/strecover ${PREFIX}/bin
|
||||
@cd ${WRKSRC}/doc && \
|
||||
${INSTALL_MAN} slashem.6 strecover.6 ${PREFIX}/man/man6
|
||||
${INSTALL_PROGRAM} ${PREFIX}/bin/slashem ${PREFIX}/bin/slashem-$V
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/util/strecover ${PREFIX}/bin/strecover-$V
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/slashem.6 ${PREFIX}/man/man6/slashem-$V.6
|
||||
${INSTALL_MAN} ${WRKSRC}/doc/strecover.6 ${PREFIX}/man/man6/strecover-$V.6
|
||||
.if ${FLAVOR:L} == ""
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults
|
||||
@cd ${WRKSRC}/win/X11 && \
|
||||
${INSTALL_DATA} SlashEM.ad ${PREFIX}/lib/X11/app-defaults/SlashEM
|
||||
${INSTALL_DATA} SlashEM.ad ${PREFIX}/lib/X11/app-defaults/SlashEM-$V
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (se006e4f8.tar.gz) = 2abd847d4f5fc426d6c7ed5a97b0de99
|
||||
RMD160 (se006e4f8.tar.gz) = c1554ddba4e81fe206564409f6abc6dbb1591b2c
|
||||
SHA1 (se006e4f8.tar.gz) = f297915fb33448d3e5cfa0caa25651e338ed666f
|
||||
SIZE (se006e4f8.tar.gz) = 4331015
|
||||
MD5 (se007e7f1.tar.gz) = ab8325357de7ceaad54ea17156051ca5
|
||||
RMD160 (se007e7f1.tar.gz) = 64075f9308f10d54c80441d7e6e5983e5588129b
|
||||
SHA1 (se007e7f1.tar.gz) = f811f58241838f8c1718c90f8efda297db051ccf
|
||||
SIZE (se007e7f1.tar.gz) = 5219740
|
||||
|
||||
@ -10,3 +10,4 @@ WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
|
||||
WINLIB = $(WINTTYLIB) -lqt -lSM
|
||||
QTDIR = $(LOCALBASE)
|
||||
LD = g++
|
||||
MOC= moc2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-include_config_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- include/config.h.orig Wed May 2 01:07:54 2001
|
||||
+++ include/config.h Tue Jul 3 18:57:56 2001
|
||||
@@ -139,7 +139,7 @@
|
||||
$OpenBSD: patch-include_config_h,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- include/config.h.orig Sat Jul 2 09:24:44 2005
|
||||
+++ include/config.h Sun Sep 11 13:32:57 2005
|
||||
@@ -183,7 +183,7 @@
|
||||
* xpmtoppm <x11tiles.xpm | pnmscale 1.25 | pnmdepth 255 |
|
||||
* ppmquant 90 | ppmtoxpm >x11tiles_big.xpm
|
||||
*/
|
||||
@ -10,15 +10,15 @@ $OpenBSD: patch-include_config_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
# ifdef USE_XPM
|
||||
# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
|
||||
# endif
|
||||
@@ -152,6 +152,7 @@
|
||||
* LOGFILE and NEWS refer to files in the playground.
|
||||
@@ -197,6 +197,7 @@
|
||||
* playground.
|
||||
*/
|
||||
|
||||
+#define WIZARD "games"
|
||||
#ifndef WIZARD /* allow for compile-time or Makefile changes */
|
||||
# ifndef KR1ED
|
||||
# define WIZARD "wizard" /* the person allowed to use the -D option */
|
||||
@@ -181,12 +182,12 @@
|
||||
@@ -227,12 +228,12 @@
|
||||
|
||||
#ifdef UNIX
|
||||
/* path and file name extension for compression program */
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-include_config_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
|
||||
/* # define COMPRESS "/usr/bin/bzip2" *//* bzip2 compression */
|
||||
/* # define COMPRESS_EXTENSION ".bz2" *//* bzip2 extension */
|
||||
@@ -315,7 +316,7 @@ typedef unsigned char uchar;
|
||||
@@ -367,7 +368,7 @@ typedef unsigned char uchar;
|
||||
* functions that have been macroized.
|
||||
*/
|
||||
/* WAC Can be defined under DJGPP, even though it's DOS*/
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
$OpenBSD: patch-include_system_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- include/system.h.orig Wed May 2 01:07:19 2001
|
||||
+++ include/system.h Tue Jul 3 18:58:55 2001
|
||||
@@ -517,6 +517,9 @@ E struct tm *FDECL(localtime, (const tim
|
||||
# endif
|
||||
$OpenBSD: patch-include_system_h,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- include/system.h.orig Sat Jul 2 09:24:44 2005
|
||||
+++ include/system.h Sun Sep 11 13:34:07 2005
|
||||
@@ -525,6 +525,9 @@ E struct tm *FDECL(localtime, (const tim
|
||||
# endif
|
||||
# endif
|
||||
|
||||
+#if defined(BSD)
|
||||
+/* no declaration needed; it's in time.h */
|
||||
+#else
|
||||
# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
|
||||
# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
|
||||
# ifndef __WATCOMC__
|
||||
E time_t FDECL(time, (time_t *));
|
||||
@@ -524,6 +527,7 @@ E time_t FDECL(time, (time_t *));
|
||||
@@ -532,6 +535,7 @@ E time_t FDECL(time, (time_t *));
|
||||
# else
|
||||
E long FDECL(time, (time_t *));
|
||||
# endif /* ULTRIX */
|
||||
|
||||
@ -1,21 +1,18 @@
|
||||
$OpenBSD: patch-include_unixconf_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- include/unixconf.h.orig Wed May 2 01:07:56 2001
|
||||
+++ include/unixconf.h Tue Jul 3 18:59:43 2001
|
||||
@@ -20,7 +20,12 @@
|
||||
$OpenBSD: patch-include_unixconf_h,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- include/unixconf.h.orig Sat Jul 2 09:24:44 2005
|
||||
+++ include/unixconf.h Sun Sep 11 13:34:45 2005
|
||||
@@ -20,6 +20,10 @@
|
||||
*/
|
||||
|
||||
/* define exactly one of the following four choices */
|
||||
-/* #define BSD 1 */ /* define for 4.n BSD */
|
||||
+/* procure the real define BSD */
|
||||
+#ifdef HAVE_SYS_PARAM_H
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+/* #define BSD 1 /* define for 4.n BSD */
|
||||
+
|
||||
/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
|
||||
/* also for relatives like SunOS 4.x, DG/UX, and */
|
||||
/* older versions of Linux */
|
||||
/* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
|
||||
@@ -33,7 +38,7 @@
|
||||
@@ -33,7 +37,7 @@
|
||||
|
||||
|
||||
/* define any of the following that are appropriate */
|
||||
@ -24,7 +21,7 @@ $OpenBSD: patch-include_unixconf_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
/* including Solaris 2+ */
|
||||
#define NETWORK /* if running on a networked system */
|
||||
/* e.g. Suns sharing a playground through NFS */
|
||||
@@ -48,6 +53,7 @@
|
||||
@@ -48,6 +52,7 @@
|
||||
* job control (note that AIX is SYSV otherwise)
|
||||
* Also define this for AIX 3.2 */
|
||||
|
||||
@ -32,7 +29,7 @@ $OpenBSD: patch-include_unixconf_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
#define TERMINFO /* uses terminfo rather than termcap */
|
||||
/* Should be defined for most SYSV, SVR4 (including
|
||||
* Solaris 2+), HPUX, and Linux systems. In
|
||||
@@ -195,7 +201,7 @@
|
||||
@@ -195,7 +200,7 @@
|
||||
* "extra output" method is used, but not all systems provide access to
|
||||
* a fine-grained timer.
|
||||
*/
|
||||
@ -41,7 +38,7 @@ $OpenBSD: patch-include_unixconf_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -206,7 +212,7 @@
|
||||
@@ -206,7 +211,7 @@
|
||||
* A stat system call is done on the mailbox every MAILCKFREQ moves.
|
||||
*/
|
||||
|
||||
@ -50,7 +47,7 @@ $OpenBSD: patch-include_unixconf_h,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
|
||||
/* The Andrew Message System does mail a little differently from normal
|
||||
* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
|
||||
@@ -368,7 +374,7 @@
|
||||
@@ -380,7 +385,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef TIMED_DELAY
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- sys/unix/Makefile.src.orig Wed May 2 01:08:03 2001
|
||||
+++ sys/unix/Makefile.src Tue Jul 3 19:03:00 2001
|
||||
$OpenBSD: patch-sys_unix_Makefile_src,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- sys/unix/Makefile.src.orig Sat Jul 2 09:24:44 2005
|
||||
+++ sys/unix/Makefile.src Sun Sep 11 13:53:12 2005
|
||||
@@ -1,6 +1,7 @@
|
||||
# NetHack Makefile.
|
||||
# SCCS Id: @(#)Makefile.src 3.3 97/04/17
|
||||
# SCCS Id: @(#)Makefile.src 3.4 2002/03/02
|
||||
|
||||
+include ${NETHACKCONFIG}
|
||||
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
|
||||
# recursive make calls if $(MAKE) is used
|
||||
# these makes allow $(MAKE) to be overridden by the environment if someone
|
||||
@@ -144,8 +145,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
|
||||
@@ -144,8 +145,7 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un
|
||||
# flags for debugging:
|
||||
# CFLAGS = -g -I../include
|
||||
|
||||
@ -17,10 +17,10 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
-LFLAGS =
|
||||
+CFLAGS += -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -I../include
|
||||
|
||||
# QT windowing system
|
||||
# SuSE 6.1
|
||||
@@ -239,8 +239,6 @@ WINBEOBJ =
|
||||
#WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o nhwin.a
|
||||
# Only used for the Gnome interface.
|
||||
# When including the Gnome interface, you need to include gnome specific
|
||||
@@ -291,8 +291,6 @@ WINGLOBJ = gl_conf.o gl_emul.o gl_font.o
|
||||
SDLGL_CFLAGS = `sdl-config --cflags`
|
||||
|
||||
# Use these declarations if you only want to support the TTY windowing system
|
||||
-WINSRC = $(WINTTYSRC)
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
# Use these declarations if you want to support the X11 windowing system
|
||||
# WINSRC = $(WINTTYSRC) $(WINX11SRC)
|
||||
# WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
|
||||
@@ -271,7 +269,7 @@ WINTTYLIB = -ltermlib
|
||||
@@ -341,7 +339,7 @@ WINTTYLIB = -ltermlib
|
||||
#
|
||||
# libraries for X11
|
||||
# If USE_XPM is defined in config.h, you will also need -lXpm here.
|
||||
@ -37,24 +37,28 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
# WINX11LIB = -lXaw -lXmu -lXt -lX11
|
||||
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
|
||||
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
|
||||
@@ -295,7 +293,6 @@ WINGEMLIB = -le_gem -lgem
|
||||
WINBELIB = -lbe
|
||||
@@ -372,7 +370,6 @@ WINGLLIB = -lGL
|
||||
WINPROXYLIB = -lpthread
|
||||
|
||||
# Use this declaration if you only want to support the TTY windowing system
|
||||
-WINLIB = $(WINTTYLIB)
|
||||
# Use this declaration if you want to support the X11 windowing system
|
||||
# WINLIB = $(WINTTYLIB) $(WINX11LIB)
|
||||
# Use this declaration if you want to support the Qt windowing system
|
||||
@@ -508,10 +505,10 @@ objects.o:
|
||||
@@ -601,13 +598,13 @@ objects.o:
|
||||
|
||||
# Qt windowport meta-object-compiler output
|
||||
qt_kde0.moc: ../include/qt_kde0.h
|
||||
- $(QTBINDIR)/moc ../include/qt_kde0.h > qt_kde0.moc
|
||||
+ moc2 ../include/qt_kde0.h > qt_kde0.moc
|
||||
- $(QTBINDIR)/moc -o qt_kde0.moc ../include/qt_kde0.h
|
||||
+ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
|
||||
|
||||
qt_win.moc: ../include/qt_win.h
|
||||
- $(QTBINDIR)/moc ../include/qt_win.h > qt_win.moc
|
||||
+ moc2 ../include/qt_win.h > qt_win.moc
|
||||
- $(QTBINDIR)/moc -o qt_win.moc ../include/qt_win.h
|
||||
+ ${MOC} -o qt_win.moc ../include/qt_win.h
|
||||
|
||||
qttableview.moc: ../include/qttableview.h
|
||||
- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
|
||||
+ ${MOC} -o qttableview.moc ../include/qttableview.h
|
||||
|
||||
# NetHack windows library for modules needed by more than one windows
|
||||
# interface.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_top,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- sys/unix/Makefile.top.orig Wed May 2 01:07:44 2001
|
||||
+++ sys/unix/Makefile.top Tue Jul 3 19:06:32 2001
|
||||
$OpenBSD: patch-sys_unix_Makefile_top,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- sys/unix/Makefile.top.orig Sat Jul 2 09:24:44 2005
|
||||
+++ sys/unix/Makefile.top Sun Sep 11 14:07:56 2005
|
||||
@@ -13,19 +13,19 @@
|
||||
# execute things like 'data' and 'rumors')
|
||||
# MAKE = make
|
||||
@ -25,20 +25,20 @@ $OpenBSD: patch-sys_unix_Makefile_top,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
EXEPERM = 0755
|
||||
-DIRPERM = 0755
|
||||
+DIRPERM = 0775
|
||||
VARFILEPERM = 0644
|
||||
VARDIRPERM = 0755
|
||||
|
||||
# GAMEDIR also appears in config.h as "HACKDIR".
|
||||
# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
|
||||
@@ -38,7 +38,8 @@ DIRPERM = 0755
|
||||
@@ -40,7 +40,8 @@ VARDIRPERM = 0755
|
||||
# These must agree with the definitions in unixconf.h
|
||||
|
||||
# Defs. for non file areas support.
|
||||
-GAMEDIR = $(PREFIX)/local/slashemdir
|
||||
+REALGAMEDIR = $(PREFIX)/lib/$(GAME)dir
|
||||
+REALGAMEDIR = $(NHDIR)
|
||||
+GAMEDIR = $(DESTDIR)${REALGAMEDIR}
|
||||
VARDIR = $(GAMEDIR)
|
||||
FILE_AREA_VAR = $(VARDIR)
|
||||
FILE_AREA_SAVE = $(VARDIR)/save
|
||||
@@ -47,7 +48,7 @@ FILE_AREA_UNSHARE = $(GAMEDIR)
|
||||
@@ -49,7 +50,7 @@ FILE_AREA_UNSHARE = $(GAMEDIR)
|
||||
FILE_AREA_DOC = $(GAMEDIR)
|
||||
FILE_AREA_BONES = $(FILE_AREA_VAR)
|
||||
FILE_AREA_LEVL = $(FILE_AREA_VAR)
|
||||
@ -47,8 +47,8 @@ $OpenBSD: patch-sys_unix_Makefile_top,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
|
||||
# Defs. compatible with Linux's FSSTND 1.2
|
||||
# FILE_AREA_VAR = /var/lib/games/slashem
|
||||
@@ -242,7 +243,7 @@ dofiles:
|
||||
cp license doc/Guidebook.txt $(FILE_AREA_DOC)
|
||||
@@ -293,7 +294,7 @@ dofiles:
|
||||
cp dat/license doc/Guidebook.txt $(FILE_AREA_DOC)
|
||||
# cp win/Qt/KDE/kslashem.kdelnk $(KDEDIR)/share/applnk/Games
|
||||
-rm -f $(SHELLDIR)/$(GAME)
|
||||
- sed -e 's;/usr/games/lib/nethackdir;$(FILE_AREA_UNSHARE);' \
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-sys_unix_Makefile_utl,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- sys/unix/Makefile.utl.orig Mon Apr 17 15:36:44 2000
|
||||
+++ sys/unix/Makefile.utl Fri Mar 23 03:09:23 2001
|
||||
$OpenBSD: patch-sys_unix_Makefile_utl,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- sys/unix/Makefile.utl.orig Sat Jul 2 09:24:44 2005
|
||||
+++ sys/unix/Makefile.utl Sun Sep 11 13:32:57 2005
|
||||
@@ -1,6 +1,7 @@
|
||||
# Makefile for NetHack's utility programs.
|
||||
# SCCS Id: @(#)Makefile.utl 3.3 97/04/19
|
||||
# SCCS Id: @(#)Makefile.utl 3.4 1997/04/19
|
||||
|
||||
+include ${NETHACKCONFIG}
|
||||
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-sys_unix_unixunix_c,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- sys/unix/unixunix.c.orig Wed May 2 01:07:44 2001
|
||||
+++ sys/unix/unixunix.c Tue Jul 3 18:56:13 2001
|
||||
@@ -50,7 +50,9 @@ gethdate(name)
|
||||
* does not exist on all systems, and moreover, that it sometimes includes
|
||||
* <sys/types.h> again, so that the compiler sees these typedefs twice.
|
||||
*/
|
||||
+#ifndef HAVE_SYS_PARAM_H
|
||||
#define MAXPATHLEN 1024
|
||||
+#endif
|
||||
|
||||
register const char *np, *path;
|
||||
char filename[MAXPATHLEN+1];
|
||||
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-win_Qt_qt_win_cpp,v 1.1.1.1 2001/07/04 11:14:54 espie Exp $
|
||||
--- win/Qt/qt_win.cpp.orig Sat Dec 11 06:21:09 1999
|
||||
+++ win/Qt/qt_win.cpp Fri Apr 14 14:13:20 2000
|
||||
@@ -91,7 +91,8 @@ extern "C" {
|
||||
#include "qt_clust.h"
|
||||
#include "qt_xpms.h"
|
||||
|
||||
-#include <malloc.h>
|
||||
+//#include <malloc.h>
|
||||
$OpenBSD: patch-win_Qt_qt_win_cpp,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
--- win/Qt/qt_win.cpp.orig Sat Jul 2 09:24:44 2005
|
||||
+++ win/Qt/qt_win.cpp Sun Sep 11 13:37:55 2005
|
||||
@@ -106,7 +106,8 @@ extern "C" {
|
||||
#ifdef Q_WS_MACX
|
||||
# include <sys/malloc.h>
|
||||
#else
|
||||
-# include <malloc.h>
|
||||
+//# include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WS_X11_
|
||||
// For userid control
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.no-qt-no-no_x11,v 1.1 2004/09/15 19:57:25 espie Exp $
|
||||
lib/X11/app-defaults/SlashEM
|
||||
@comment $OpenBSD: PFRAG.no-qt-no-no_x11,v 1.2 2005/09/11 12:26:02 espie Exp $
|
||||
lib/X11/app-defaults/SlashEM-${V}
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2004/09/15 00:46:10 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2005/09/11 12:26:02 espie Exp $
|
||||
@option no-default-conflict
|
||||
@conflict slashem-${V}
|
||||
@comment bin/slashem
|
||||
bin/slashem-${V}
|
||||
@group games
|
||||
bin/slashem
|
||||
bin/strecover
|
||||
bin/strecover-${V}
|
||||
@mode 0775
|
||||
${GAMEDIR}/
|
||||
@mode
|
||||
@ -109,7 +112,6 @@ ${GAMEDIR}/bigrm-5.lev
|
||||
${GAMEDIR}/blkmar.lev
|
||||
${GAMEDIR}/castle.lev
|
||||
${GAMEDIR}/cav2fill.lev
|
||||
${GAMEDIR}/cavefill.lev
|
||||
${GAMEDIR}/cmdhelp
|
||||
${GAMEDIR}/data
|
||||
${GAMEDIR}/demogorg.lev
|
||||
@ -122,6 +124,9 @@ ${GAMEDIR}/fakewiz2.lev
|
||||
${GAMEDIR}/fire.lev
|
||||
${GAMEDIR}/frnknstn.lev
|
||||
${GAMEDIR}/geryon.lev
|
||||
${GAMEDIR}/grund-1.lev
|
||||
${GAMEDIR}/grund-2.lev
|
||||
${GAMEDIR}/grund-3.lev
|
||||
${GAMEDIR}/guild.lev
|
||||
${GAMEDIR}/gypsy.txt
|
||||
${GAMEDIR}/help
|
||||
@ -142,12 +147,20 @@ ${GAMEDIR}/mall-2.lev
|
||||
${GAMEDIR}/mall.lev
|
||||
${GAMEDIR}/medusa-1.lev
|
||||
${GAMEDIR}/medusa-2.lev
|
||||
${GAMEDIR}/medusa-3.lev
|
||||
${GAMEDIR}/medusa-4.lev
|
||||
${GAMEDIR}/minefill.lev
|
||||
${GAMEDIR}/mineking.lev
|
||||
${GAMEDIR}/minend-1.lev
|
||||
${GAMEDIR}/minend-2.lev
|
||||
${GAMEDIR}/minend-3.lev
|
||||
${GAMEDIR}/minetn-1.lev
|
||||
${GAMEDIR}/minetn-2.lev
|
||||
${GAMEDIR}/minetn-3.lev
|
||||
${GAMEDIR}/minetn-4.lev
|
||||
${GAMEDIR}/minetn-5.lev
|
||||
${GAMEDIR}/minetn-6.lev
|
||||
${GAMEDIR}/minetn-7.lev
|
||||
${GAMEDIR}/mtemple.lev
|
||||
${GAMEDIR}/nightmar.lev
|
||||
${GAMEDIR}/nymph.lev
|
||||
@ -166,6 +179,7 @@ ${GAMEDIR}/rats.lev
|
||||
@comment no checksum
|
||||
${GAMEDIR}/record
|
||||
@mode
|
||||
${GAMEDIR}/recover
|
||||
${GAMEDIR}/rumors
|
||||
${GAMEDIR}/sanctum.lev
|
||||
@mode 0575
|
||||
@ -177,12 +191,27 @@ ${GAMEDIR}/slashem
|
||||
@mode
|
||||
${GAMEDIR}/soko1-1.lev
|
||||
${GAMEDIR}/soko1-2.lev
|
||||
${GAMEDIR}/soko1-3.lev
|
||||
${GAMEDIR}/soko1-4.lev
|
||||
${GAMEDIR}/soko2-1.lev
|
||||
${GAMEDIR}/soko2-2.lev
|
||||
${GAMEDIR}/soko2-3.lev
|
||||
${GAMEDIR}/soko2-4.lev
|
||||
${GAMEDIR}/soko2-5.lev
|
||||
${GAMEDIR}/soko2-6.lev
|
||||
${GAMEDIR}/soko2-7.lev
|
||||
${GAMEDIR}/soko3-1.lev
|
||||
${GAMEDIR}/soko3-2.lev
|
||||
${GAMEDIR}/soko3-3.lev
|
||||
${GAMEDIR}/soko3-4.lev
|
||||
${GAMEDIR}/soko3-5.lev
|
||||
${GAMEDIR}/soko3-6.lev
|
||||
${GAMEDIR}/soko3-7.lev
|
||||
${GAMEDIR}/soko4-1.lev
|
||||
${GAMEDIR}/soko4-2.lev
|
||||
${GAMEDIR}/soko4-3.lev
|
||||
${GAMEDIR}/soko4-4.lev
|
||||
${GAMEDIR}/soko4-5.lev
|
||||
${GAMEDIR}/spiders.lev
|
||||
${GAMEDIR}/stor-1.lev
|
||||
${GAMEDIR}/stor-2.lev
|
||||
@ -198,7 +227,7 @@ ${GAMEDIR}/wizard2.lev
|
||||
${GAMEDIR}/wizard3.lev
|
||||
${GAMEDIR}/wizhelp
|
||||
${GAMEDIR}/yeenoghu.lev
|
||||
@man man/man6/slashem.6
|
||||
@man man/man6/strecover.6
|
||||
@unexec rm -rf %B/save/
|
||||
@man man/man6/slashem-${V}.6
|
||||
@man man/man6/strecover-${V}.6
|
||||
@unexec rm -rf ${GAMEDIR}/save/*
|
||||
!%%no_x11%%
|
||||
|
||||
Loading…
Reference in New Issue
Block a user