Re: UPDATE: games/abuse

2012-03-20 Thread Brad Smith 

On 09/03/12 4:18 PM, Antti Harri wrote:

Update to 0.8:

Frabs was reorganized and put into main distribution in
upstream so remove here.

Bundle abuse-free-sounds-20120309 that has free sounds
we can package. Most of the sounds that matter are available.


Working fine on amd64.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: UPDATE: games/abuse

2012-03-20 Thread Antti Harri 
On Wednesday 21 March 2012 02:43:04 Brad Smith wrote:
 On 09/03/12 4:18 PM, Antti Harri wrote:
  Update to 0.8:
 
  Frabs was reorganized and put into main distribution in
  upstream so remove here.
 
  Bundle abuse-free-sounds-20120309 that has free sounds
  we can package. Most of the sounds that matter are available.

 Working fine on amd64.

Thanks.

Data was restructured upstream and I noticed there is a potential problem when
upgrading from a previous version because the game writes default user config
on initial startup having datapath enabled. I commented this out in the config
template so it won't happen in future versions, but people upgrading from 0.7.x
might need to tweak their ~/.abuse/abuserc file and comment out the entry.

Fixed diff attached. Could someone commit this please?

-- 
Antti Harri

diff --git games/abuse/Makefile games/abuse/Makefile
index f22cf3d..37be9a6 100644
--- games/abuse/Makefile
+++ games/abuse/Makefile
@@ -2,61 +2,73 @@
 
 COMMENT =  SDL port of the legendary 2D platform shooter
 
-DISTNAME = abuse-0.7.1
-REVISION = 1
+DISTNAME = abuse-free-0.8
+PKGNAME =  abuse-0.8
 EPOCH =0
-ABUSE_FRABS =  abuse-frabs-2.11
+ABUSE_SFX =abuse-free-sounds-20120309
 CATEGORIES =   games x11
 
 HOMEPAGE = http://abuse.zoy.org/
 
 MAINTAINER =   Antti Harri i...@openbsd.fi
 
-# GPLv2 and public domain
+# Abuse: GPLv2 and public domain
+# Abuse-free-sounds: various free licenses
 PERMIT_PACKAGE_CDROM = Yes
 PERMIT_PACKAGE_FTP =   Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB =  c m pthread GL stdc++ usbhid SDL sndio X11 Xau Xdamage \
-   Xdmcp Xext Xfixes Xxf86vm drm pthread-stubs xcb
+WANTLIB += FLAC GL SDL SDL_mixer X11 Xdamage Xext Xfixes Xrandr
+WANTLIB += Xrender Xxf86vm c drm iconv m mikmod ogg pthread smpeg
+WANTLIB += sndio stdc++ usbhid vorbis vorbisfile xcb
 
-MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/Downloads/
+MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/download/
+MASTER_SITES0 =http://openbsd.fi/dist/
 
 MODULES =  converters/libiconv
 # Needs AC_PROG_LIBTOOL
 BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS =  devel/sdl
-
-DISTFILES =${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
-EXTRACT_ONLY = ${DISTNAME}.tar.gz
-
+RUN_DEPENDS =  audio/timidity
+LIB_DEPENDS =  devel/sdl-mixer \
+   devel/smpeg \
+   audio/flac \
+   audio/libogg \
+   audio/libmikmod \
+   audio/libvorbis
+
+DISTFILES =${DISTNAME}.tar.gz \
+   ${ABUSE_SFX}.tar.gz:0
+
+SEPARATE_BUILD =Yes
 USE_LIBTOOL =  Yes
 
-AUTOCONF_VERSION = 2.61
-AUTOMAKE_VERSION = 1.10
 CONFIGURE_STYLE =  gnu
-
-CONFIGURE_ENV =CPPFLAGS=-I${X11BASE}/include \
-   LDFLAGS=-L${X11BASE}/lib
+CONFIGURE_ARGS =   --enable-release \
+   --disable-nonfree \
+   --with-assetdir=${PREFIX}/share/abuse \
+   --datadir=${PREFIX}/share/abuse
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
 
 NO_REGRESS =   Yes
-DATADIR =  ${PREFIX}/share/abuse/frabs
-SUBST_VARS =   DATADIR
+
+post-patch:
+   cd ${WRKSRC}  \
+   find ${WRKDIR}/${ABUSE_SFX}/patches/ -name 'patch-*' \
+   -exec patch -z .afs-orig -i {} \;
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/src/sdlport/setup.cpp
-   cd ${WRKSRC}; \
+   cd ${WRKSRC}  \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
autoreconf -fi
 
 post-install:
-   cd ${PREFIX}/share/abuse  \
-   gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
-   tar xf -  \
-   mv ${ABUSE_FRABS} frabs
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/abuse/sfx
+   cd ${WRKDIR}/${ABUSE_SFX}/sfx  find . -type f -exec \
+   ${INSTALL_DATA} {} ${PREFIX}/share/abuse/sfx/ \;
 
 .include bsd.port.mk
diff --git games/abuse/distinfo games/abuse/distinfo
index 8e287f9..46e44922 100644
--- games/abuse/distinfo
+++ games/abuse/distinfo
@@ -1,10 +1,10 @@
-MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
-MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
-RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
-RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
-SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
-SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
-SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
-SHA256 (abuse-frabs-2.11.tar.gz) = bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
-SIZE (abuse-0.7.1.tar.gz) = 719285
-SIZE (abuse-frabs-2.11.tar.gz) = 4819133
+MD5 (abuse-free-0.8.tar.gz) = BZ3n6JHxo041yc5bBUAz0g==
+MD5 (abuse-free-sounds-20120309.tar.gz) = Qkaum3uwnyLc1g/7QCvJ0g==
+RMD160 (abuse-free-0.8.tar.gz) =

Re: UPDATE: games/abuse

2012-03-10 Thread Ryan Freeman 
On Fri, Mar 09, 2012 at 11:18:35PM +0200, Antti Harri wrote:
 Update to 0.8:
 
 Frabs was reorganized and put into main distribution in
 upstream so remove here.
 
 Bundle abuse-free-sounds-20120309 that has free sounds
 we can package. Most of the sounds that matter are available.

works good here on i386-current, both software and gl
modes seem to work flawlessly, windows or fullscreen

 
 -- 
 Antti Harri
 
 diff --git games/abuse/Makefile games/abuse/Makefile
 index f22cf3d..815593d 100644
 --- games/abuse/Makefile
 +++ games/abuse/Makefile
 @@ -2,61 +2,73 @@
  
  COMMENT =SDL port of the legendary 2D platform shooter
  
 -DISTNAME =   abuse-0.7.1
 -REVISION =   1
 +DISTNAME =   abuse-free-0.8
 +PKGNAME =abuse-0.8
  EPOCH =  0
 -ABUSE_FRABS =abuse-frabs-2.11
 +ABUSE_SFX =  abuse-free-sounds-20120309
  CATEGORIES = games x11
  
  HOMEPAGE =   http://abuse.zoy.org/
  
  MAINTAINER = Antti Harri i...@openbsd.fi
  
 -# GPLv2 and public domain
 +# Abuse: GPLv2 and public domain
 +# Abuse-free-sounds: various free licenses
  PERMIT_PACKAGE_CDROM =   Yes
  PERMIT_PACKAGE_FTP = Yes
  PERMIT_DISTFILES_CDROM =Yes
  PERMIT_DISTFILES_FTP =   Yes
  
 -WANTLIB =c m pthread GL stdc++ usbhid SDL sndio X11 Xau Xdamage \
 - Xdmcp Xext Xfixes Xxf86vm drm pthread-stubs xcb
 +WANTLIB += FLAC GL SDL SDL_mixer X11 Xext Xrandr Xrender c iconv
 +WANTLIB += m mikmod ogg pthread smpeg sndio stdc++ usbhid vorbis
 +WANTLIB += vorbisfile xcb
  
 -MASTER_SITES =   ${HOMEPAGE}raw-attachment/wiki/Downloads/
 +MASTER_SITES =   ${HOMEPAGE}raw-attachment/wiki/download/
 +MASTER_SITES0 =  http://openbsd.fi/dist/
  
  MODULES =converters/libiconv
  # Needs AC_PROG_LIBTOOL
  BUILD_DEPENDS =  devel/libtool \
   ${MODGNU_AUTOCONF_DEPENDS} \
   ${MODGNU_AUTOMAKE_DEPENDS}
 -LIB_DEPENDS =devel/sdl
 -
 -DISTFILES =  ${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
 -EXTRACT_ONLY =   ${DISTNAME}.tar.gz
 +RUN_DEPENDS =audio/timidity
 +LIB_DEPENDS =devel/sdl \
 + devel/sdl-mixer \
 + devel/smpeg \
 + audio/flac \
 + audio/libogg \
 + audio/libmikmod \
 + audio/libvorbis
 +
 +DISTFILES =  ${DISTNAME}.tar.gz \
 + ${ABUSE_SFX}.tar.gz:0
  
  USE_LIBTOOL =Yes
  
 -AUTOCONF_VERSION =   2.61
 -AUTOMAKE_VERSION =   1.10
  CONFIGURE_STYLE =gnu
 -
 -CONFIGURE_ENV =  CPPFLAGS=-I${X11BASE}/include \
 - LDFLAGS=-L${X11BASE}/lib
 +CONFIGURE_ARGS = --enable-release \
 + --disable-nonfree \
 + --with-assetdir=${PREFIX}/share/abuse \
 + --datadir=${PREFIX}/share/abuse
 +AUTOMAKE_VERSION =   1.11
 +AUTOCONF_VERSION =   2.68
  
  NO_REGRESS = Yes
 -DATADIR =${PREFIX}/share/abuse/frabs
 -SUBST_VARS = DATADIR
 +
 +post-patch:
 + cd ${WRKSRC}  \
 + find ${WRKDIR}/${ABUSE_SFX}/patches/ -name 'patch-*' \
 + -exec patch -z .afs-orig -i {} \;
  
  pre-configure:
 - ${SUBST_CMD} ${WRKSRC}/src/sdlport/setup.cpp
 - cd ${WRKSRC}; \
 + cd ${WRKSRC}  \
   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
   autoreconf -fi
  
  post-install:
 - cd ${PREFIX}/share/abuse  \
 - gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
 - tar xf -  \
 - mv ${ABUSE_FRABS} frabs
 + ${INSTALL_DATA_DIR} ${PREFIX}/share/abuse/sfx
 + cd ${WRKDIR}/${ABUSE_SFX}/sfx  find . -type f -exec \
 + ${INSTALL_DATA} {} ${PREFIX}/share/abuse/sfx/ \;
  
  .include bsd.port.mk
 diff --git games/abuse/distinfo games/abuse/distinfo
 index 8e287f9..46e44922 100644
 --- games/abuse/distinfo
 +++ games/abuse/distinfo
 @@ -1,10 +1,10 @@
 -MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
 -MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
 -RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
 -RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
 -SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
 -SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
 -SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
 -SHA256 (abuse-frabs-2.11.tar.gz) = 
 bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
 -SIZE (abuse-0.7.1.tar.gz) = 719285
 -SIZE (abuse-frabs-2.11.tar.gz) = 4819133
 +MD5 (abuse-free-0.8.tar.gz) = BZ3n6JHxo041yc5bBUAz0g==
 +MD5 (abuse-free-sounds-20120309.tar.gz) = Qkaum3uwnyLc1g/7QCvJ0g==
 +RMD160 (abuse-free-0.8.tar.gz) = ZhwF/H/nkMmwn8b9cNS9nGKjZKo=
 +RMD160 (abuse-free-sounds-20120309.tar.gz) = xK314/twqQxu5zTJYs1gboj9GFg=
 +SHA1 (abuse-free-0.8.tar.gz) = TWGDEgY5r97XxhZvbi6vNuQb0oU=
 +SHA1 (abuse-free-sounds-20120309.tar.gz) = 4Lsa9x6pTiiUs/fMZFiTSO1QTNw=
 +SHA256 (abuse-free-0.8.tar.gz) = dOG/00l9WhfYvp9QhmY8k5vO7lGxHFhhA1D5pwwv1cc=
 +SHA256 (abuse-free-sounds-20120309.tar.gz) =

UPDATE: games/abuse

2012-03-09 Thread Antti Harri 
Update to 0.8:

Frabs was reorganized and put into main distribution in
upstream so remove here.

Bundle abuse-free-sounds-20120309 that has free sounds
we can package. Most of the sounds that matter are available.

-- 
Antti Harri

diff --git games/abuse/Makefile games/abuse/Makefile
index f22cf3d..815593d 100644
--- games/abuse/Makefile
+++ games/abuse/Makefile
@@ -2,61 +2,73 @@
 
 COMMENT =  SDL port of the legendary 2D platform shooter
 
-DISTNAME = abuse-0.7.1
-REVISION = 1
+DISTNAME = abuse-free-0.8
+PKGNAME =  abuse-0.8
 EPOCH =0
-ABUSE_FRABS =  abuse-frabs-2.11
+ABUSE_SFX =abuse-free-sounds-20120309
 CATEGORIES =   games x11
 
 HOMEPAGE = http://abuse.zoy.org/
 
 MAINTAINER =   Antti Harri i...@openbsd.fi
 
-# GPLv2 and public domain
+# Abuse: GPLv2 and public domain
+# Abuse-free-sounds: various free licenses
 PERMIT_PACKAGE_CDROM = Yes
 PERMIT_PACKAGE_FTP =   Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB =  c m pthread GL stdc++ usbhid SDL sndio X11 Xau Xdamage \
-   Xdmcp Xext Xfixes Xxf86vm drm pthread-stubs xcb
+WANTLIB += FLAC GL SDL SDL_mixer X11 Xext Xrandr Xrender c iconv
+WANTLIB += m mikmod ogg pthread smpeg sndio stdc++ usbhid vorbis
+WANTLIB += vorbisfile xcb
 
-MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/Downloads/
+MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/download/
+MASTER_SITES0 =http://openbsd.fi/dist/
 
 MODULES =  converters/libiconv
 # Needs AC_PROG_LIBTOOL
 BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS =  devel/sdl
-
-DISTFILES =${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
-EXTRACT_ONLY = ${DISTNAME}.tar.gz
+RUN_DEPENDS =  audio/timidity
+LIB_DEPENDS =  devel/sdl \
+   devel/sdl-mixer \
+   devel/smpeg \
+   audio/flac \
+   audio/libogg \
+   audio/libmikmod \
+   audio/libvorbis
+
+DISTFILES =${DISTNAME}.tar.gz \
+   ${ABUSE_SFX}.tar.gz:0
 
 USE_LIBTOOL =  Yes
 
-AUTOCONF_VERSION = 2.61
-AUTOMAKE_VERSION = 1.10
 CONFIGURE_STYLE =  gnu
-
-CONFIGURE_ENV =CPPFLAGS=-I${X11BASE}/include \
-   LDFLAGS=-L${X11BASE}/lib
+CONFIGURE_ARGS =   --enable-release \
+   --disable-nonfree \
+   --with-assetdir=${PREFIX}/share/abuse \
+   --datadir=${PREFIX}/share/abuse
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
 
 NO_REGRESS =   Yes
-DATADIR =  ${PREFIX}/share/abuse/frabs
-SUBST_VARS =   DATADIR
+
+post-patch:
+   cd ${WRKSRC}  \
+   find ${WRKDIR}/${ABUSE_SFX}/patches/ -name 'patch-*' \
+   -exec patch -z .afs-orig -i {} \;
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/src/sdlport/setup.cpp
-   cd ${WRKSRC}; \
+   cd ${WRKSRC}  \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
autoreconf -fi
 
 post-install:
-   cd ${PREFIX}/share/abuse  \
-   gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
-   tar xf -  \
-   mv ${ABUSE_FRABS} frabs
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/abuse/sfx
+   cd ${WRKDIR}/${ABUSE_SFX}/sfx  find . -type f -exec \
+   ${INSTALL_DATA} {} ${PREFIX}/share/abuse/sfx/ \;
 
 .include bsd.port.mk
diff --git games/abuse/distinfo games/abuse/distinfo
index 8e287f9..46e44922 100644
--- games/abuse/distinfo
+++ games/abuse/distinfo
@@ -1,10 +1,10 @@
-MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
-MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
-RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
-RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
-SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
-SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
-SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
-SHA256 (abuse-frabs-2.11.tar.gz) = bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
-SIZE (abuse-0.7.1.tar.gz) = 719285
-SIZE (abuse-frabs-2.11.tar.gz) = 4819133
+MD5 (abuse-free-0.8.tar.gz) = BZ3n6JHxo041yc5bBUAz0g==
+MD5 (abuse-free-sounds-20120309.tar.gz) = Qkaum3uwnyLc1g/7QCvJ0g==
+RMD160 (abuse-free-0.8.tar.gz) = ZhwF/H/nkMmwn8b9cNS9nGKjZKo=
+RMD160 (abuse-free-sounds-20120309.tar.gz) = xK314/twqQxu5zTJYs1gboj9GFg=
+SHA1 (abuse-free-0.8.tar.gz) = TWGDEgY5r97XxhZvbi6vNuQb0oU=
+SHA1 (abuse-free-sounds-20120309.tar.gz) = 4Lsa9x6pTiiUs/fMZFiTSO1QTNw=
+SHA256 (abuse-free-0.8.tar.gz) = dOG/00l9WhfYvp9QhmY8k5vO7lGxHFhhA1D5pwwv1cc=
+SHA256 (abuse-free-sounds-20120309.tar.gz) = 
rpXLao8feB0gUXghLRutdrPWRrJ8akGYUPYeY2Z9Dl0=
+SIZE (abuse-free-0.8.tar.gz) = 4347621
+SIZE (abuse-free-sounds-20120309.tar.gz) = 3256805
diff --git games/abuse/patches/patch-Makefile_am 
games/abuse/patches/patch-Makefile_am
deleted file mode 100644
index

Re: Resending: update games/abuse

2011-04-14 Thread Brad 

On 13/04/11 2:51 PM, Antti Harri wrote:

Hi.

Several improvements over the last diff:

- @comment out some bins from abuse-frabs
- remove version from abuse-frabs dir
- use SUBST_CMD

Tested to work on amd64 and i386. Builds also on sparc64.
Can this finally be commited, please?


I was looking at this last night and was going to comment
on this today. Anyway, the data files should be moved to
share/abuse/frabs not share/abuse-frabs. Also why are the
sound files now missing? You also don't need SUBST_CMD
on the configure.ac file; just change the path with the
patch.


diff --git games/abuse/Makefile games/abuse/Makefile
index 4c87a28..c338f50 100644
--- games/abuse/Makefile
+++ games/abuse/Makefile
@@ -1,29 +1,58 @@
  # $OpenBSD: ports/games/abuse/Makefile,v 1.33 2010/11/16 11:23:25 espie Exp $

-BROKEN-sparc=  Does not work on SPARC
-BROKEN-vax=gmake loops forever
-
-COMMENT=   full color 320x200 arcade quality platform shooter
-
-DISTNAME=  abuse-2.0
-REVISION = 3
-CATEGORIES=games x11
-MASTER_SITES=  ${MASTER_SITE_GNU:=non-gnu/abuse/}
-MASTER_SITES0= ftp://ftp.NetBSD.ORG/pub/NetBSD/packages/distfiles/
-DISTFILES= ${DISTNAME}.tar.gz abuse_data.tar.gz:0
-
-PERMIT_PACKAGE_CDROM=  unclear
-PERMIT_PACKAGE_FTP=unclear
-PERMIT_DISTFILES_CDROM=unclear
-PERMIT_DISTFILES_FTP=  unclear
-WANTLIB=   X11 Xext c m pthread-stubs stdc++ xcb
-
-USE_GMAKE= Yes
-SEPARATE_BUILD=concurrent
-CONFIGURE_STYLE=gnu dest
-
-post-extract:
-   @mv ${WRKDIR}/addon ${WRKDIR}/art ${WRKDIR}/levels ${WRKDIR}/lisp \
-   ${WRKDIR}/music ${WRKDIR}/sfx ${WRKSRC}/abuse
+COMMENT =  SDL port of the legendary 2D platform shooter
+
+DISTNAME = abuse-0.7.1
+EPOCH =0
+ABUSE_FRABS =  abuse-frabs-2.11
+CATEGORIES =   games x11
+
+HOMEPAGE = http://abuse.zoy.org/
+
+MAINTAINER =   Antti Harrii...@openbsd.fi
+
+# GPLv2 and public domain
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB =  c m pthread GL iconv stdc++ usbhid SDL sndio
+
+MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/Downloads/
+
+BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
+   ${MODGNU_AUTOMAKE_DEPENDS}
+LIB_DEPENDS =  devel/sdl
+
+DISTFILES =${DISTNAME}.tar.gz ${ABUSE_FRABS}.tar.gz
+EXTRACT_ONLY = ${DISTNAME}.tar.gz
+
+USE_LIBTOOL =  gnu
+
+AUTOCONF_VERSION = 2.61
+AUTOMAKE_VERSION = 1.10
+CONFIGURE_STYLE =  gnu
+
+CONFIGURE_ENV =CPPFLAGS=-I${X11BASE}/include \
+   LDFLAGS=-L${X11BASE}/lib
+
+NO_REGRESS =   Yes
+DATADIR =  ${PREFIX}/share/abuse-frabs
+SUBST_VARS =   DATADIR
+
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/configure.ac \
+   ${WRKSRC}/src/sdlport/setup.cpp
+   cd ${WRKSRC}; \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   autoreconf -fi
+
+post-install:
+   cd ${PREFIX}/share/  \
+   gzip -dc ${FULLDISTDIR}/${ABUSE_FRABS}.tar.gz | \
+   tar xf -
+   mv ${PREFIX}/share/${ABUSE_FRABS} ${PREFIX}/share/abuse-frabs

  .includebsd.port.mk
diff --git games/abuse/distinfo games/abuse/distinfo
index 7f13902..8e287f9 100644
--- games/abuse/distinfo
+++ games/abuse/distinfo
@@ -1,10 +1,10 @@
-MD5 (abuse-2.0.tar.gz) = nH0FYp+zJzwTBMVZ2kz8yg==
-MD5 (abuse_data.tar.gz) = qdrtu1+/vyQNIWYecG/iiw==
-RMD160 (abuse-2.0.tar.gz) = ZgX+NJK+CMRXcLLUDYasEK8O7Vk=
-RMD160 (abuse_data.tar.gz) = rzPQQjtZauS7B7WoRP41KuwJtKA=
-SHA1 (abuse-2.0.tar.gz) = hsvKJ8ZlGtijnRX5JCJMOvx3rvg=
-SHA1 (abuse_data.tar.gz) = Ln+ta4Zvu8jzTjrGjPJonJFZbkg=
-SHA256 (abuse-2.0.tar.gz) = bl3MSd+531k+EEGmwThEyuWN1Ls6h22DIH0O2DphS/w=
-SHA256 (abuse_data.tar.gz) = jxzapLPZcSX8FR17psiQm0xmqeetFu0uPqDpc+RbFzM=
-SIZE (abuse-2.0.tar.gz) = 2478364
-SIZE (abuse_data.tar.gz) = 1593160
+MD5 (abuse-0.7.1.tar.gz) = Q5tgfykVYKj5aYovCc/6Yw==
+MD5 (abuse-frabs-2.11.tar.gz) = Bob5USif5RSEaQO6s2ogeQ==
+RMD160 (abuse-0.7.1.tar.gz) = ZgLXcVcGTgpyjlXKpjsEX3E755A=
+RMD160 (abuse-frabs-2.11.tar.gz) = lupu8DHRC6AuBw630qzbyFAlAk8=
+SHA1 (abuse-0.7.1.tar.gz) = B8IrMGlU6rHgv0qKdEGuAPwQdyk=
+SHA1 (abuse-frabs-2.11.tar.gz) = Jpny9M78XlKe7ICOggiq15beNt4=
+SHA256 (abuse-0.7.1.tar.gz) = FRahnvwbiXFahUkQmg2HtxUC2U/Yt4KULjNbZ4Kh3Vc=
+SHA256 (abuse-frabs-2.11.tar.gz) = bMvfSnVLus18B7CfTwyAW+8506U3qtuwzU0GrVCs/bg=
+SIZE (abuse-0.7.1.tar.gz) = 719285
+SIZE (abuse-frabs-2.11.tar.gz) = 4819133
diff --git games/abuse/patches/patch-Makefile_am 
games/abuse/patches/patch-Makefile_am
new file mode 100644
index 000..c81934b
--- /dev/null
+++ games/abuse/patches/patch-Makefile_am
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.am.orig   Mon Apr  4 23:56:57 2011
 Makefile.amMon Apr  4 23:57:05 2011
+@@ -4,7 +4,7 @@ SUBDIRS = src
+
+ man_MANS = abuse.6
+
+-datafiledir = $(datadir)/games/abuse
++datafiledir = $(datadir)/abuse
+ datafile_DATA = abuse.bmp abuse.lsp abuse.png
+
+ EXTRA_DIST = bootstrap