diff --git a/games/xblast/Makefile b/games/xblast/Makefile index e7b22bcb86b..96ab188305f 100644 --- a/games/xblast/Makefile +++ b/games/xblast/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.21 2007/08/08 14:59:47 aanriot Exp $ +# $OpenBSD: Makefile,v 1.22 2007/12/20 22:03:05 ajacoutot Exp $ COMMENT= graphical multi-player real-time strategy game for X11 -DISTNAME= xblast-2.10.2 +DISTNAME= xblast-2.10.4 DIST_SUBDIR= xblast DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ images-2005-01-06${EXTRACT_SUFX} \ @@ -19,17 +19,22 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c ICE m ossaudio X11 + +WANTLIB= c ICE m ossaudio X11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xblast/} USE_X11= Yes -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.59 -CONFIGURE_ENV= LDFLAGS="-lossaudio" -CONFIGURE_ARGS= --enable-sound \ - --with-otherdatadir=$(PREFIX)/share/xblast +MODULES= devel/gettext + +CONFIGURE_STYLE=autoconf +AUTOCONF_VERSION=2.59 +CONFIGURE_ENV= LDFLAGS="-lossaudio \ + -L${LOCALBASE}/lib -liconv -lintl" +CONFIGURE_ARGS= --enable-sound \ + --with-otherdatadir=${PREFIX}/share/xblast \ + --disable-sdl post-extract: @cp -r ${WRKDIR}/images-2005-01-06 ${WRKSRC}/image @cp -r ${WRKDIR}/levels-2005-01-06 ${WRKSRC}/level @@ -37,6 +42,4 @@ post-extract: @cp -r ${WRKDIR}/sounds ${WRKSRC}/sounds @cp -r ${WRKDIR}/musics-2005-01-06/* ${WRKSRC}/sounds -NO_REGRESS= Yes - .include diff --git a/games/xblast/distinfo b/games/xblast/distinfo index 6a69fc2fbfc..cb0edb09077 100644 --- a/games/xblast/distinfo +++ b/games/xblast/distinfo @@ -3,28 +3,28 @@ MD5 (xblast/levels-2005-01-06.tar.gz) = 6mJ3rw6XrX6uoJNw9P5Vug== MD5 (xblast/models-2005-01-06.tar.gz) = iH6EyeeESCPjyLWeY+iFmw== MD5 (xblast/musics-2005-01-06.tar.gz) = 5yGi5Ej4HKg9mgp3IlH2EQ== MD5 (xblast/sounds.tar.gz) = gJwn8QAq1Neqg24IP1KhmQ== -MD5 (xblast/xblast-2.10.2.tar.gz) = FAUH8SbIV2E3+ly/vqfLqQ== +MD5 (xblast/xblast-2.10.4.tar.gz) = 7KdiDDSrSbti+o7wH3Oy8w== RMD160 (xblast/images-2005-01-06.tar.gz) = PCbJ1XAALWM0OJBVxGUakIQfDsg= RMD160 (xblast/levels-2005-01-06.tar.gz) = U3sRhmqEIyjHjiB897SE1wgjxEM= RMD160 (xblast/models-2005-01-06.tar.gz) = 9YaXHoe/lkhXlxDh6LGmEnWOVz8= RMD160 (xblast/musics-2005-01-06.tar.gz) = Yz7+oVwuuapX1Y9BYO7rGly0Xjk= RMD160 (xblast/sounds.tar.gz) = mo4LSI+AqeVKFJI2imj/19JWKsw= -RMD160 (xblast/xblast-2.10.2.tar.gz) = uVj+nRMOHLsT/nERlBH2rVBCD3Q= +RMD160 (xblast/xblast-2.10.4.tar.gz) = x4w66V3zZvkn+V8FHvg1syQ97oU= SHA1 (xblast/images-2005-01-06.tar.gz) = P9WXpo6WwyVlSjdy4HUopbDtyAI= SHA1 (xblast/levels-2005-01-06.tar.gz) = 0LAZIYR5qPlhf4WNd1j34bS9hms= SHA1 (xblast/models-2005-01-06.tar.gz) = j0IRMwCaSA+b4FrBd2LKtmkcH0I= SHA1 (xblast/musics-2005-01-06.tar.gz) = UZ5LQBSHcrcrsSN1xdGgXzyyb+o= SHA1 (xblast/sounds.tar.gz) = iHVijeDdpNT3n/4yT36OVgxOBHE= -SHA1 (xblast/xblast-2.10.2.tar.gz) = H/CyasADqmjflkrWqORFBdgt5f0= +SHA1 (xblast/xblast-2.10.4.tar.gz) = J+qWrCWgD3fclimBlw6SqQ146OQ= SHA256 (xblast/images-2005-01-06.tar.gz) = JLYnrx1IhPo5y/tK0tlTZhqlKD+W7meBN7pVS2dCNUI= SHA256 (xblast/levels-2005-01-06.tar.gz) = rxRdy0DJTgeVPzoSrfKrZ0EUKLMaBEbfPffJHV8mB1o= SHA256 (xblast/models-2005-01-06.tar.gz) = 2u0NUMA3Gv4YcVnHaS19JtEk6A6cMggEPYOltsphD3c= SHA256 (xblast/musics-2005-01-06.tar.gz) = QqRbB0kldV19Kg7/uaWenjh0+Sp6qeELuQ+Y7rEcvGE= SHA256 (xblast/sounds.tar.gz) = MQyJWSE532F+bpgatb87/KhKd3jVGRM0vajrBpySS2E= -SHA256 (xblast/xblast-2.10.2.tar.gz) = ZLbAsaj9CZIEyj4nhp8I85YKocOYfT5qwqmO0ciwlxE= +SHA256 (xblast/xblast-2.10.4.tar.gz) = k818R/+D4AZVYF/L7GoDH3XRcNfrRnuFvL5sFzO8whM= SIZE (xblast/images-2005-01-06.tar.gz) = 860830 SIZE (xblast/levels-2005-01-06.tar.gz) = 283353 SIZE (xblast/models-2005-01-06.tar.gz) = 1738564 SIZE (xblast/musics-2005-01-06.tar.gz) = 5317575 SIZE (xblast/sounds.tar.gz) = 1612625 -SIZE (xblast/xblast-2.10.2.tar.gz) = 590442 +SIZE (xblast/xblast-2.10.4.tar.gz) = 684965 diff --git a/games/xblast/patches/patch-Makefile_in b/games/xblast/patches/patch-Makefile_in index 22675afcd7c..ffccb5649a6 100644 --- a/games/xblast/patches/patch-Makefile_in +++ b/games/xblast/patches/patch-Makefile_in @@ -1,32 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2007/08/08 14:59:47 aanriot Exp $ ---- Makefile.in.orig Mon Aug 6 14:24:56 2007 -+++ Makefile.in Mon Aug 6 14:26:11 2007 -@@ -782,19 +782,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am - install-data-local: - @$(NORMAL_INSTALL) - if test -d $(srcdir)/image; then \ -- $(mkinstalldirs) $(game_datadir); \ -- $(mkinstalldirs) $(game_datadir)/image; \ -- cp -r $(srcdir)/image/* $(game_datadir)/image;\ -+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir); \ -+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/image; \ -+ cp -r $(srcdir)/image/* $(DESTDIR)/$(game_datadir)/image;\ - fi; \ - if test -d $(srcdir)/level; then \ -- $(mkinstalldirs) $(game_datadir)/ ; \ -- $(mkinstalldirs) $(game_datadir)//level; \ -- cp -r $(srcdir)/level/* $(game_datadir)//level;\ -+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/ ; \ -+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/level; \ -+ cp -r $(srcdir)/level/* $(DESTDIR)/$(game_datadir)/level;\ - fi; \ - if test -d $(srcdir)/sounds; then \ -- $(mkinstalldirs) $(game_datadir)/ ; \ -- $(mkinstalldirs) $(game_datadir)//sounds; \ -- cp -r $(srcdir)/sounds/* $(game_datadir)//sounds;\ -+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/ ; \ -+ $(mkinstalldirs) $(DESTDIR)/$(game_datadir)/sounds; \ -+ cp -r $(srcdir)/sounds/* $(DESTDIR)/$(game_datadir)/sounds;\ - fi; - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. +$OpenBSD: patch-Makefile_in,v 1.2 2007/12/20 22:03:05 ajacoutot Exp $ +--- Makefile.in.orig Sun Dec 16 13:46:08 2007 ++++ Makefile.in Sun Dec 16 13:46:18 2007 +@@ -290,7 +290,7 @@ infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ +-localedir = $(game_datadir)/locale ++localedir = $(prefix)/share/locale + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ diff --git a/games/xblast/patches/patch-po_Makefile_in_in b/games/xblast/patches/patch-po_Makefile_in_in new file mode 100644 index 00000000000..0baf262e8cb --- /dev/null +++ b/games/xblast/patches/patch-po_Makefile_in_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-po_Makefile_in_in,v 1.1 2007/12/20 22:03:05 ajacoutot Exp $ +--- po/Makefile.in.in.orig Sun Dec 16 14:11:08 2007 ++++ po/Makefile.in.in Sun Dec 16 14:11:22 2007 +@@ -24,7 +24,7 @@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ diff --git a/games/xblast/patches/patch-xbsndsrv_c b/games/xblast/patches/patch-xbsndsrv_c index b51cdc34620..64be3b56be2 100644 --- a/games/xblast/patches/patch-xbsndsrv_c +++ b/games/xblast/patches/patch-xbsndsrv_c @@ -1,16 +1,17 @@ -$OpenBSD: patch-xbsndsrv_c,v 1.2 2007/08/08 14:59:47 aanriot Exp $ ---- xbsndsrv.c.orig Tue Mar 8 18:27:15 2005 -+++ xbsndsrv.c Mon Aug 6 21:21:39 2007 -@@ -63,6 +63,8 @@ - /* non-sun audio includes */ - #ifdef __FreeBSD__ - #include -+#elif __OpenBSD__ -+#include - #else +$OpenBSD: patch-xbsndsrv_c,v 1.3 2007/12/20 22:03:05 ajacoutot Exp $ +--- xbsndsrv.c.orig Mon Jun 12 13:06:36 2006 ++++ xbsndsrv.c Sun Dec 16 15:37:02 2007 +@@ -75,6 +75,9 @@ + #ifdef HAVE_LINUX_SOUNDCARD_H #include #endif -@@ -195,6 +197,10 @@ static struct _sound_name { ++#ifdef __OpenBSD__ ++#include ++#endif + + #endif + +@@ -263,6 +266,10 @@ static struct _sound_name #define SAMPLE_CHANNELS 2 #define SAMPLE_SIZE 16 #define SUN_AUDIO_REF 0 diff --git a/games/xblast/pkg/DESCR b/games/xblast/pkg/DESCR index c28e16ff6fd..295b08b574b 100644 --- a/games/xblast/pkg/DESCR +++ b/games/xblast/pkg/DESCR @@ -1,7 +1,3 @@ -XBlast is a multi-player arcade game for X11R5/R6. The game can be -played with at least two players and up to six players. It was inspired -by the video/computer game Bomberman(Dynablaster), which was to my -knowledge first programmed for NEC's PC Engine/Turbo Grafx. Other (com- -mercial) versions of the original game exist for IBM-PC, Atari ST, -Amiga, NES, GameBoy and Super NES. - +XBlast is an X11 multiplayer only arcade game inspired by classic games +like Bomberman (Dynablaster) which was to myknowledge first programmed +for NEC's PC Engine/Turbo Grafx. diff --git a/games/xblast/pkg/PLIST b/games/xblast/pkg/PLIST index 49977356197..05b54b2fa42 100644 --- a/games/xblast/pkg/PLIST +++ b/games/xblast/pkg/PLIST @@ -1,6 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.6 2005/07/17 08:53:54 aanriot Exp $ +@comment $OpenBSD: PLIST,v 1.7 2007/12/20 22:03:05 ajacoutot Exp $ bin/xblast bin/xbsndsrv +share/locale/de/LC_MESSAGES/xblast.mo +share/locale/fr/LC_MESSAGES/xblast.mo share/xblast/ share/xblast/image/ share/xblast/image/Imakefile