Date: Thu, 5 Nov 2009 02:38:06 GMT From: Chris Petrik <chris@officialunix.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/140283: [PATCH] update games/abuse_sdl to 0.7.1 Message-ID: <200911050238.nA52c6jh035673@www.freebsd.org> Resent-Message-ID: <200911050240.nA52e2Wg008317@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140283
>Category: ports
>Synopsis: [PATCH] update games/abuse_sdl to 0.7.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 05 02:40:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Chris Petrik
>Release: FreeBSD 8.0 RC2
>Organization:
Officialunix
>Environment:
FreeBSD8
>Description:
Update abuse_sdl to 0.7.1
Add patch to fix build
change pkg_plist to remove renamed files abuse.sdl to abuse
modified abuse.sh to use new name instead of old.
modified makefile to now search for correct name.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: abuse/Makefile
===================================================================
RCS file: /usr/ncvs/ports/games/abuse/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- abuse/Makefile 19 Sep 2009 11:39:34 -0000 1.9
+++ abuse/Makefile 5 Nov 2009 02:26:27 -0000
@@ -19,7 +19,7 @@
MAINTAINER= chris@officialunix.com
COMMENT= The classic 2D action game Abuse
-RUN_DEPENDS= abuse.sdl:${PORTSDIR}/games/abuse_sdl
+RUN_DEPENDS= abuse:${PORTSDIR}/games/abuse_sdl
NO_BUILD= YES
Index: abuse/files/abuse.sh
===================================================================
RCS file: /usr/ncvs/ports/games/abuse/files/abuse.sh,v
retrieving revision 1.2
diff -u -r1.2 abuse.sh
--- abuse/files/abuse.sh 12 May 2002 00:23:49 -0000 1.2
+++ abuse/files/abuse.sh 5 Nov 2009 02:25:50 -0000
@@ -1,4 +1,4 @@
#!/bin/sh
# $FreeBSD: ports/games/abuse/files/abuse.sh,v 1.2 2002/05/12 00:23:49 des Exp $
rm -f ~/.abuse/sd_cache.tmp
-exec abuse.sdl -datadir "%%DATADIR%%" "$@"
+exec abuse -datadir "%%DATADIR%%" "$@"
Index: abuse_sdl/Makefile
===================================================================
RCS file: /usr/ncvs/ports/games/abuse_sdl/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- abuse_sdl/Makefile 19 Sep 2009 11:39:34 -0000 1.20
+++ abuse_sdl/Makefile 5 Nov 2009 02:24:23 -0000
@@ -6,14 +6,13 @@
#
PORTNAME= abuse_sdl
-PORTVERSION= 0.7.0
-PORTREVISION= 5
+PORTVERSION= 0.7.1
CATEGORIES= games
-MASTER_SITES= http://abuse.zoy.org/raw-attachment/wiki/Downloads/ \
+MASTER_SITES= http://abuse.zoy.org/raw/Downloads/ \
http://epix.linux.tucows.com/files/ \
http://blueyonder.linux.tucows.com/files/ \
http://casemanl.linux.tucows.com/files/
-DISTNAME= abuse-sdl-${PORTVERSION}
+DISTNAME= abuse-${PORTVERSION}
MAINTAINER= chris@officialunix.com
COMMENT= An SDL port of the Abuse game engine
@@ -24,8 +23,9 @@
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+WRKSRC= ${WRKDIR}/${DISTNAME}
-MAN6= abuse-sdl.6
+MAN6= abuse.6
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
Index: abuse_sdl/distinfo
===================================================================
RCS file: /usr/ncvs/ports/games/abuse_sdl/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- abuse_sdl/distinfo 31 Jan 2009 21:16:37 -0000 1.5
+++ abuse_sdl/distinfo 5 Nov 2009 02:24:23 -0000
@@ -1,3 +1,3 @@
-MD5 (abuse-sdl-0.7.0.tar.gz) = 417f07dd34d92564f6a10260e4a41baa
-SHA256 (abuse-sdl-0.7.0.tar.gz) = 2efadf8a9f85ae4509a410d600172625c674f49c4e8eb56eed7bd697ea03e3bc
-SIZE (abuse-sdl-0.7.0.tar.gz) = 676076
+MD5 (abuse-0.7.1.tar.gz) = 439b607f291560a8f9698a2f09cffa63
+SHA256 (abuse-0.7.1.tar.gz) = 1516a19efc1b89715a8549109a0d87b71502d94fd8b782942e335b6782a1dd57
+SIZE (abuse-0.7.1.tar.gz) = 719285
Index: abuse_sdl/pkg-plist
===================================================================
RCS file: /usr/ncvs/ports/games/abuse_sdl/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- abuse_sdl/pkg-plist 14 Sep 2002 22:10:47 -0000 1.2
+++ abuse_sdl/pkg-plist 5 Nov 2009 02:24:23 -0000
@@ -1,4 +1,4 @@
-bin/abuse.sdl
+bin/abuse
share/abuse_sdl/abuse.bmp
share/abuse_sdl/abuse.lsp
share/abuse_sdl/abuse.png
Index: abuse_sdl/files/patch-Makefile.in
===================================================================
RCS file: /usr/ncvs/ports/games/abuse_sdl/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- abuse_sdl/files/patch-Makefile.in 11 May 2002 21:57:40 -0000 1.1
+++ abuse_sdl/files/patch-Makefile.in 5 Nov 2009 02:24:23 -0000
@@ -1,11 +1,11 @@
---- Makefile.in.orig Sat May 11 22:58:44 2002
-+++ Makefile.in Sat May 11 23:00:15 2002
-@@ -84,7 +84,7 @@
-
- man_MANS = abuse-sdl.6
-
+--- Makefile.in.old 2009-11-04 19:47:10.000000000 -0600
++++ Makefile.in 2009-11-04 19:48:20.000000000 -0600
+@@ -201,7 +201,7 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src
+ man_MANS = abuse.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
+ EXTRA_DIST = bootstrap abuse.6 abuse.bmp abuse.lsp abuse.png
+ all: config.h
Index: abuse_sdl/files/patch-imlib-jmalloc.hpp
===================================================================
RCS file: abuse_sdl/files/patch-imlib-jmalloc.hpp
diff -N abuse_sdl/files/patch-imlib-jmalloc.hpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ abuse_sdl/files/patch-imlib-jmalloc.hpp 5 Nov 2009 02:24:23 -0000
@@ -0,0 +1,10 @@
+--- src/imlib/jmalloc.hpp.old 2009-11-04 20:07:54.000000000 -0600
++++ src/imlib/jmalloc.hpp 2009-11-04 20:08:16.000000000 -0600
+@@ -12,6 +12,7 @@
+
+
+ #include <stdlib.h>
++#include <stdint.h>
+
+ #ifdef MANAGE_MEM
+ enum {ALLOC_SPACE_STATIC,ALLOC_SPACE_CACHE};
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911050238.nA52c6jh035673>