Upgrade and bugfixes.
This commit is contained in:
parent
2758a1671d
commit
4ec695228e
8 changed files with 553 additions and 658 deletions
|
@ -1,11 +1,11 @@
|
|||
# $NetBSD: Makefile,v 1.18 2008/03/07 19:35:14 tnn2 Exp $
|
||||
# $NetBSD: Makefile,v 1.19 2008/03/09 01:16:51 hoka_adam Exp $
|
||||
|
||||
DISTNAME= abuse_sdl-0.7.0
|
||||
PKGREVISION= 1
|
||||
PKGNAME= abuse_sdl-0.7.1
|
||||
DISTNAME= ${PKGNAME:S/_sdl//}
|
||||
CATEGORIES= games
|
||||
MASTER_SITES= http://www.labyrinth.net.au/~trandor/abuse/files/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
DISTFILES= ${DEFAULT_DISTFILES} frabs210_unix.src.tar.bz2
|
||||
MASTER_SITES= http://abuse.zoy.org/raw/Downloads/
|
||||
DISTFILES= ${DEFAULT_DISTFILES} \
|
||||
abuse-frabs-2.11.tar.gz
|
||||
|
||||
MAINTAINER= snj@pobox.com
|
||||
HOMEPAGE= http://www.labyrinth.net.au/~trandor/abuse/
|
||||
|
@ -16,18 +16,26 @@ USE_TOOLS+= gmake
|
|||
USE_LIBTOOL= YES
|
||||
GNU_CONFIGURE= YES
|
||||
|
||||
SITES.frabs210_unix.src.tar.bz2= http://www.cs.uidaho.edu/~cass0664/fRaBs/
|
||||
|
||||
CPPFLAGS+= -DPREFIX=\"${PREFIX:Q}\"
|
||||
|
||||
SUBST_CLASSES+= path
|
||||
SUBST_STAGE.path= pre-configure
|
||||
SUBST_FILES.path= src/sdlport/setup.cpp
|
||||
SUBST_SED.path= -e 's,/var/games,${PREFIX}/share/abuse,g'
|
||||
SUBST_MESSAGE.path= Fixing hardcoded paths.
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX:Q}/share/abuse_sdl
|
||||
cd ${PREFIX:Q}/share/abuse_sdl && \
|
||||
(${CP} -R ${WRKDIR:Q}/frabs210_unix.src/* . && \
|
||||
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/abuse
|
||||
cd ${DESTDIR}${PREFIX:Q}/share/abuse && \
|
||||
(${CP} -R ${WRKDIR:Q}/abuse-frabs-2.11/* . && \
|
||||
${CHOWN} -R ${SHAREOWN} . && ${CHGRP} -R ${SHAREGRP} . && \
|
||||
${FIND} . -type f -exec ${CHMOD} ${SHAREMODE} '{}' ';' && \
|
||||
${FIND} . -name '*.exe' -exec rm -f '{}' ';' && \
|
||||
${FIND} . -type d -exec ${CHMOD} ${BINMODE} '{}' ';')
|
||||
|
||||
.include "../../graphics/glu/buildlink3.mk"
|
||||
.include "../../devel/SDL/buildlink3.mk"
|
||||
.include "../../x11/libXxf86vm/buildlink3.mk"
|
||||
.include "../../x11/libXdamage/buildlink3.mk"
|
||||
.include "../../x11/libdrm/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
1084
abuse_sdl/PLIST
1084
abuse_sdl/PLIST
File diff suppressed because it is too large
Load diff
|
@ -2,3 +2,5 @@ Test and import into pkgsrc. Everything is fine as far as I can tell.
|
|||
|
||||
Ignore the laggy sound. This has nothing to do with abuse-sdl itself,
|
||||
and can be seen in other SDL applications as well.
|
||||
|
||||
Fix default config file generation.
|
||||
|
|
|
@ -1,12 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.4 2005/09/28 06:41:08 rillig Exp $
|
||||
$NetBSD: distinfo,v 1.5 2008/03/09 01:16:51 hoka_adam Exp $
|
||||
|
||||
SHA1 (abuse_sdl-0.7.0.tar.bz2) = c6283d263fabeef143f7af81946519cdea704a94
|
||||
RMD160 (abuse_sdl-0.7.0.tar.bz2) = 7129ebbab11502902d435341cb3833ca99aff3e8
|
||||
Size (abuse_sdl-0.7.0.tar.bz2) = 525618 bytes
|
||||
SHA1 (frabs210_unix.src.tar.bz2) = 12ba7e44fa624d63bc449f1ec6a760edae53fad4
|
||||
RMD160 (frabs210_unix.src.tar.bz2) = cd4d3c4e372e9e111f0ff4e9da53310a89e512c7
|
||||
Size (frabs210_unix.src.tar.bz2) = 3666744 bytes
|
||||
SHA1 (patch-aa) = 389ba743eb0751fcc32d4dece4cf16f78b49412c
|
||||
SHA1 (patch-ab) = 097b99233dc13264172f7cb7b945427156abea64
|
||||
SHA1 (patch-ac) = 1631afe6de8490128a6946e015f6104594d1d936
|
||||
SHA1 (patch-ad) = d6c3286aede6abfe1c002d8fdf71d2c0560cfbb3
|
||||
SHA1 (abuse-0.7.1.tar.gz) = 07c22b306954eab1e0bf4a8a7441ae00fc107729
|
||||
RMD160 (abuse-0.7.1.tar.gz) = 6602d77157064e0a728e55caa63b045f713be790
|
||||
Size (abuse-0.7.1.tar.gz) = 719285 bytes
|
||||
SHA1 (abuse-frabs-2.11.tar.gz) = 2699f2f4cefc5e529eec808e8208aad796de36de
|
||||
RMD160 (abuse-frabs-2.11.tar.gz) = 96ea6ef031d10ba02e070eb7d2acdbc85025024f
|
||||
Size (abuse-frabs-2.11.tar.gz) = 4819133 bytes
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2003/05/19 19:47:19 blef Exp $
|
||||
|
||||
--- Makefile.in.orig Mon May 12 07:57:47 2003
|
||||
+++ Makefile.in Mon May 12 07:58:12 2003
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
man_MANS = abuse-sdl.6
|
||||
|
||||
-datafiledir = $(datadir)/games/abuse
|
||||
+datafiledir = $(datadir)/abuse_sdl
|
||||
datafile_DATA = abuse.bmp abuse.lsp abuse.png
|
||||
|
||||
EXTRA_DIST = abuse-sdl.6 abuse.bmp abuse.lsp abuse.png
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 2003/05/19 19:47:19 blef Exp $
|
||||
|
||||
--- configure.orig Mon May 12 12:09:18 2003
|
||||
+++ configure Mon May 12 12:10:01 2003
|
||||
@@ -7568,7 +7568,7 @@
|
||||
|
||||
X_LIBS=-L$x_libraries
|
||||
|
||||
-EXPDATADIR="-DEXPDATADIR=\\\"$datadir/games/abuse\\\""
|
||||
+EXPDATADIR="-DEXPDATADIR=\\\"$datadir/abuse_sdl\\\""
|
||||
|
||||
echo "$as_me:7573: checking for XShmAttach in -lXext" >&5
|
||||
echo $ECHO_N "checking for XShmAttach in -lXext... $ECHO_C" >&6
|
|
@ -1,19 +1,21 @@
|
|||
$NetBSD: patch-ac,v 1.1.1.1 2003/05/19 19:47:19 blef Exp $
|
||||
$NetBSD: patch-ac,v 1.2 2008/03/09 01:16:51 hoka_adam Exp $
|
||||
|
||||
--- src/sdlport/setup.cpp.orig Sat Dec 14 21:00:32 2002
|
||||
+++ src/sdlport/setup.cpp Mon May 12 15:12:22 2003
|
||||
@@ -363,8 +363,12 @@
|
||||
// Check if we already have a savegame directory
|
||||
if( (fd = fopen( savedir, "r" )) == NULL )
|
||||
{
|
||||
- // FIXME: Add some error checking here
|
||||
- mkdir( savedir, S_IRUSR | S_IWUSR | S_IXUSR );
|
||||
+ savedir[strlen(savedir) - 1] = '\0';
|
||||
+ if (mkdir( savedir, S_IRUSR | S_IWUSR | S_IXUSR )) {
|
||||
+ perror("mkdir");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ savedir[strlen(savedir)] = '/';
|
||||
}
|
||||
else
|
||||
{
|
||||
--- src/sdlport/setup.cpp.orig 2008-03-02 19:42:24.000000000 +0000
|
||||
+++ src/sdlport/setup.cpp
|
||||
@@ -380,8 +380,14 @@ void setup( int argc, char **argv )
|
||||
// Check if we already have a savegame directory
|
||||
if( (fd = fopen( savedir, "r" )) == NULL )
|
||||
{
|
||||
- // FIXME: Add some error checking here
|
||||
- mkdir( savedir, S_IRUSR | S_IWUSR | S_IXUSR );
|
||||
+
|
||||
+ savedir[strlen(savedir) - 1] = '\0';
|
||||
+ if (mkdir( savedir, S_IRUSR | S_IWUSR | S_IXUSR )) {
|
||||
+ perror("Can't create savedir");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ savedir[strlen(savedir)] = '/';
|
||||
+
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.1 2003/08/30 16:51:00 blef Exp $
|
||||
|
||||
--- src/sdlport/setup.cpp.orig 2003-08-30 02:34:40.000000000 -0700
|
||||
+++ src/sdlport/setup.cpp 2003-08-30 02:35:46.000000000 -0700
|
||||
@@ -72,7 +72,7 @@
|
||||
if( (fd = fopen( rcfile, "w" )) != NULL )
|
||||
{
|
||||
fputs( "; Abuse-SDL Configuration file\n\n", fd );
|
||||
- fputs( "; Location of the datafiles\ndatadir=/usr/local/share/games/abuse\n\n", fd );
|
||||
+ fputs( "; Location of the datafiles\ndatadir=" PREFIX "/share/games/abuse\n\n", fd );
|
||||
fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd );
|
||||
fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd );
|
||||
fputs( "; Use mono audio only\nmono=0\n\n", fd );
|
Loading…
Reference in a new issue