From b76973089cc4091e375d5bf0e4f73a6d0c5bf4c9 Mon Sep 17 00:00:00 2001 From: edwin Date: Wed, 5 Oct 2005 02:19:42 +0000 Subject: Upgrade to version 1.1.7 No version bumps neither for other ports since nobody else is using this one. --- devel/kxl/Makefile | 2 +- devel/kxl/distinfo | 4 ++-- devel/kxl/files/patch-aa | 24 +++++++++---------- devel/kxl/files/patch-src__KXL.h | 10 ++++++++ devel/kxl/files/patch-src__KXLjoystick.c | 40 ++++++++++++++++++++++++++++++++ devel/kxl/pkg-plist | 2 +- games/kxl/Makefile | 2 +- games/kxl/distinfo | 4 ++-- games/kxl/files/patch-aa | 24 +++++++++---------- games/kxl/files/patch-src__KXL.h | 10 ++++++++ games/kxl/files/patch-src__KXLjoystick.c | 40 ++++++++++++++++++++++++++++++++ games/kxl/pkg-plist | 2 +- 12 files changed, 130 insertions(+), 34 deletions(-) create mode 100644 devel/kxl/files/patch-src__KXL.h create mode 100644 devel/kxl/files/patch-src__KXLjoystick.c create mode 100644 games/kxl/files/patch-src__KXL.h create mode 100644 games/kxl/files/patch-src__KXLjoystick.c diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile index ccee6a894740..c33f98846cf9 100644 --- a/devel/kxl/Makefile +++ b/devel/kxl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kxl -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.7 CATEGORIES= games MASTER_SITES= http://kxl.hn.org/download/ DISTNAME= KXL-${PORTVERSION} diff --git a/devel/kxl/distinfo b/devel/kxl/distinfo index 757aaa04a2b9..1ffc79fa6c7b 100644 --- a/devel/kxl/distinfo +++ b/devel/kxl/distinfo @@ -1,2 +1,2 @@ -MD5 (KXL-1.1.5.tar.gz) = cc353e6e3db4f6ff72019766250ff04d -SIZE (KXL-1.1.5.tar.gz) = 152643 +MD5 (KXL-1.1.7.tar.gz) = 321bfad9dee29840656225b54bb6feb0 +SIZE (KXL-1.1.7.tar.gz) = 192070 diff --git a/devel/kxl/files/patch-aa b/devel/kxl/files/patch-aa index e960d7637e1f..046035d8c6b9 100644 --- a/devel/kxl/files/patch-aa +++ b/devel/kxl/files/patch-aa @@ -1,16 +1,14 @@ ---- src/KXLsound.c.orig Wed Feb 20 21:42:17 2002 -+++ src/KXLsound.c Wed Feb 20 21:44:49 2002 -@@ -3,7 +3,9 @@ +--- src/KXLsound.c.orig Fri Jan 17 01:29:09 2003 ++++ src/KXLsound.c Wed Oct 5 12:13:08 2005 +@@ -3,7 +3,6 @@ #include - #include #include -+#ifndef __FreeBSD__ - #include -+#endif + #include +-#include #include "KXL.h" #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -@@ -45,6 +47,7 @@ +@@ -45,6 +44,7 @@ //============================================================== void KXL_SoundServer(void) { @@ -18,7 +16,7 @@ Uint16 i; KXL_SoundControl Command; fd_set sound_fdset; -@@ -163,6 +166,7 @@ +@@ -163,6 +163,7 @@ } } } @@ -26,7 +24,7 @@ } //============================================================== -@@ -238,6 +242,7 @@ +@@ -239,6 +240,7 @@ //============================================================== void KXL_InitSound(Uint8 *path, Uint8 **fname) { @@ -34,7 +32,7 @@ KXL_SoundOk = False; KXL_LoadSoundData(path, fname); -@@ -265,6 +270,7 @@ +@@ -266,6 +268,7 @@ close(KXL_SoundData.Pipe[0]); KXL_SoundOk = True; } @@ -42,7 +40,7 @@ } //============================================================== -@@ -272,6 +278,7 @@ +@@ -273,6 +276,7 @@ //============================================================== void KXL_EndSound(void) { @@ -50,7 +48,7 @@ while (KXL_SoundData.ListCnt) KXL_Free(KXL_wavelist[-- KXL_SoundData.ListCnt].Data); KXL_Free(KXL_wavelist); -@@ -281,5 +288,6 @@ +@@ -282,5 +286,6 @@ KXL_PlaySound(0, KXL_SOUND_STOP_ALL); kill(KXL_SoundData.ID, SIGTERM); } diff --git a/devel/kxl/files/patch-src__KXL.h b/devel/kxl/files/patch-src__KXL.h new file mode 100644 index 000000000000..f355b4da9628 --- /dev/null +++ b/devel/kxl/files/patch-src__KXL.h @@ -0,0 +1,10 @@ +--- src/KXL.h.orig Wed Oct 5 12:14:12 2005 ++++ src/KXL.h Wed Oct 5 12:14:18 2005 +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include + + + //================================================================ diff --git a/devel/kxl/files/patch-src__KXLjoystick.c b/devel/kxl/files/patch-src__KXLjoystick.c new file mode 100644 index 000000000000..6937bcd9ecc2 --- /dev/null +++ b/devel/kxl/files/patch-src__KXLjoystick.c @@ -0,0 +1,40 @@ +--- src/KXLjoystick.c.orig Wed Oct 5 12:14:36 2005 ++++ src/KXLjoystick.c Wed Oct 5 12:15:19 2005 +@@ -11,24 +11,7 @@ + // return value : True - ok, False - NG + //============================================================== + Bool KXL_OpenJoystick(Uint8 *devname) { +- Uint8 name[128] = "Unknown"; +- Sint32 version = 0x000800; +- Uint8 axis = 2; +- Uint8 buttons = 2; +- +- KXL_joydev = open(devname, O_RDONLY); +- if (KXL_joydev < 0) { +- fprintf(stderr, "KXL error message\nCannot open \"%s\".\n", devname); +- return False; +- } +- ioctl(KXL_joydev, JSIOCGVERSION, &version); +- ioctl(KXL_joydev, JSIOCGAXES, &axis); +- ioctl(KXL_joydev, JSIOCGBUTTONS, &buttons); +- ioctl(KXL_joydev, JSIOCGNAME(128), name); +- //fcntl(KXL_joydev, F_SETFL, O_NONBLOCK); +- fprintf(stderr, "KXL message\nJoystick (%s) has %d axes and %d buttons.\nDriver version is %d.%d.%d.\n", +- name, axis, buttons, version >> 16, (version >> 8) & 0xff, version & 0xff); +- return True; ++ return False; + } + + //============================================================== +@@ -46,11 +29,4 @@ + // return value : True - ok, False - NG + //============================================================== + Bool KXL_ReadJoystick(KXL_Joystick *my) { +- if (KXL_joydev >= 0) { +- if (read(KXL_joydev, my, JS_RETURN) == JS_RETURN) { +- return True; +- } +- } +- fprintf(stderr, "KXL error message\njoystick reading error\n"); +- return False; + } diff --git a/devel/kxl/pkg-plist b/devel/kxl/pkg-plist index 722476106b1f..cc35666f5419 100644 --- a/devel/kxl/pkg-plist +++ b/devel/kxl/pkg-plist @@ -1,5 +1,5 @@ include/KXL.h -lib/libKXL-1.1.5.so +lib/libKXL-1.1.7.so lib/libKXL.so lib/libKXL.a lib/libKXL.la diff --git a/games/kxl/Makefile b/games/kxl/Makefile index ccee6a894740..c33f98846cf9 100644 --- a/games/kxl/Makefile +++ b/games/kxl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kxl -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.7 CATEGORIES= games MASTER_SITES= http://kxl.hn.org/download/ DISTNAME= KXL-${PORTVERSION} diff --git a/games/kxl/distinfo b/games/kxl/distinfo index 757aaa04a2b9..1ffc79fa6c7b 100644 --- a/games/kxl/distinfo +++ b/games/kxl/distinfo @@ -1,2 +1,2 @@ -MD5 (KXL-1.1.5.tar.gz) = cc353e6e3db4f6ff72019766250ff04d -SIZE (KXL-1.1.5.tar.gz) = 152643 +MD5 (KXL-1.1.7.tar.gz) = 321bfad9dee29840656225b54bb6feb0 +SIZE (KXL-1.1.7.tar.gz) = 192070 diff --git a/games/kxl/files/patch-aa b/games/kxl/files/patch-aa index e960d7637e1f..046035d8c6b9 100644 --- a/games/kxl/files/patch-aa +++ b/games/kxl/files/patch-aa @@ -1,16 +1,14 @@ ---- src/KXLsound.c.orig Wed Feb 20 21:42:17 2002 -+++ src/KXLsound.c Wed Feb 20 21:44:49 2002 -@@ -3,7 +3,9 @@ +--- src/KXLsound.c.orig Fri Jan 17 01:29:09 2003 ++++ src/KXLsound.c Wed Oct 5 12:13:08 2005 +@@ -3,7 +3,6 @@ #include - #include #include -+#ifndef __FreeBSD__ - #include -+#endif + #include +-#include #include "KXL.h" #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -@@ -45,6 +47,7 @@ +@@ -45,6 +44,7 @@ //============================================================== void KXL_SoundServer(void) { @@ -18,7 +16,7 @@ Uint16 i; KXL_SoundControl Command; fd_set sound_fdset; -@@ -163,6 +166,7 @@ +@@ -163,6 +163,7 @@ } } } @@ -26,7 +24,7 @@ } //============================================================== -@@ -238,6 +242,7 @@ +@@ -239,6 +240,7 @@ //============================================================== void KXL_InitSound(Uint8 *path, Uint8 **fname) { @@ -34,7 +32,7 @@ KXL_SoundOk = False; KXL_LoadSoundData(path, fname); -@@ -265,6 +270,7 @@ +@@ -266,6 +268,7 @@ close(KXL_SoundData.Pipe[0]); KXL_SoundOk = True; } @@ -42,7 +40,7 @@ } //============================================================== -@@ -272,6 +278,7 @@ +@@ -273,6 +276,7 @@ //============================================================== void KXL_EndSound(void) { @@ -50,7 +48,7 @@ while (KXL_SoundData.ListCnt) KXL_Free(KXL_wavelist[-- KXL_SoundData.ListCnt].Data); KXL_Free(KXL_wavelist); -@@ -281,5 +288,6 @@ +@@ -282,5 +286,6 @@ KXL_PlaySound(0, KXL_SOUND_STOP_ALL); kill(KXL_SoundData.ID, SIGTERM); } diff --git a/games/kxl/files/patch-src__KXL.h b/games/kxl/files/patch-src__KXL.h new file mode 100644 index 000000000000..f355b4da9628 --- /dev/null +++ b/games/kxl/files/patch-src__KXL.h @@ -0,0 +1,10 @@ +--- src/KXL.h.orig Wed Oct 5 12:14:12 2005 ++++ src/KXL.h Wed Oct 5 12:14:18 2005 +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include + + + //================================================================ diff --git a/games/kxl/files/patch-src__KXLjoystick.c b/games/kxl/files/patch-src__KXLjoystick.c new file mode 100644 index 000000000000..6937bcd9ecc2 --- /dev/null +++ b/games/kxl/files/patch-src__KXLjoystick.c @@ -0,0 +1,40 @@ +--- src/KXLjoystick.c.orig Wed Oct 5 12:14:36 2005 ++++ src/KXLjoystick.c Wed Oct 5 12:15:19 2005 +@@ -11,24 +11,7 @@ + // return value : True - ok, False - NG + //============================================================== + Bool KXL_OpenJoystick(Uint8 *devname) { +- Uint8 name[128] = "Unknown"; +- Sint32 version = 0x000800; +- Uint8 axis = 2; +- Uint8 buttons = 2; +- +- KXL_joydev = open(devname, O_RDONLY); +- if (KXL_joydev < 0) { +- fprintf(stderr, "KXL error message\nCannot open \"%s\".\n", devname); +- return False; +- } +- ioctl(KXL_joydev, JSIOCGVERSION, &version); +- ioctl(KXL_joydev, JSIOCGAXES, &axis); +- ioctl(KXL_joydev, JSIOCGBUTTONS, &buttons); +- ioctl(KXL_joydev, JSIOCGNAME(128), name); +- //fcntl(KXL_joydev, F_SETFL, O_NONBLOCK); +- fprintf(stderr, "KXL message\nJoystick (%s) has %d axes and %d buttons.\nDriver version is %d.%d.%d.\n", +- name, axis, buttons, version >> 16, (version >> 8) & 0xff, version & 0xff); +- return True; ++ return False; + } + + //============================================================== +@@ -46,11 +29,4 @@ + // return value : True - ok, False - NG + //============================================================== + Bool KXL_ReadJoystick(KXL_Joystick *my) { +- if (KXL_joydev >= 0) { +- if (read(KXL_joydev, my, JS_RETURN) == JS_RETURN) { +- return True; +- } +- } +- fprintf(stderr, "KXL error message\njoystick reading error\n"); +- return False; + } diff --git a/games/kxl/pkg-plist b/games/kxl/pkg-plist index 722476106b1f..cc35666f5419 100644 --- a/games/kxl/pkg-plist +++ b/games/kxl/pkg-plist @@ -1,5 +1,5 @@ include/KXL.h -lib/libKXL-1.1.5.so +lib/libKXL-1.1.7.so lib/libKXL.so lib/libKXL.a lib/libKXL.la -- cgit