Update to 1.1.5

5 files changed, 68 insertions, 62 deletions

diff --git a/games/kxl/Makefile b/games/kxl/Makefile
index b25578f..ef6ecf7 100644
--- a/games/kxl/Makefile
+++ b/games/kxl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kxl
-PORTVERSION=	0.5.6
+PORTVERSION=	1.1.5
 CATEGORIES=	games
 MASTER_SITES=	http://www2.mwnet.or.jp/~fc3srx7/download/
 DISTNAME=	KXL-${PORTVERSION}
diff --git a/games/kxl/distinfo b/games/kxl/distinfo
index 131ee98..7a14260 100644
--- a/games/kxl/distinfo
+++ b/games/kxl/distinfo
@@ -1 +1 @@
-MD5 (KXL-0.5.6.tar.gz) = 7868cf8e6c342da9cac03a0f5d933598
+MD5 (KXL-1.1.5.tar.gz) = cc353e6e3db4f6ff72019766250ff04d
diff --git a/games/kxl/files/patch-aa b/games/kxl/files/patch-aa
index 7ebdd5d..e960d76 100644
--- a/games/kxl/files/patch-aa
+++ b/games/kxl/files/patch-aa
@@ -1,64 +1,59 @@
---- src/KXLsound.c.orig	Thu May 17 18:08:13 2001
-+++ src/KXLsound.c	Sat Jun 16 19:31:43 2001
-@@ -3,7 +3,6 @@
- #include <fcntl.h>

- #include <sys/time.h>

- #include <sys/ioctl.h>

--#include <linux/soundcard.h>

- #include "KXL.h"

- 

- #define MIN(a, b)  ((a<b) ? a : b)

-@@ -45,12 +44,14 @@
- ******************************************/

- void KXL_SoundServer(void)

- {

+--- 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 @@
+ #include <fcntl.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
 +#ifndef __FreeBSD__
-   Uint16 i;

-   KXL_SoundControl Command;

-   fd_set sound_fdset;

- 

-   if (KXL_SoundOk == False)

-     return;

-+
- 

-   close(KXL_SoundData.Pipe[1]);

-   for (i = 0; i < MAX_SOUNDS_PLAYING; i ++)

-@@ -166,6 +167,7 @@
-       }

-     }

-   }

+ #include <linux/soundcard.h>
 +#endif
- }

- 

- /******************************************

-@@ -245,6 +247,7 @@
- ******************************************/

- void KXL_InitSound(Uint8 *path, Uint8 **fname)

- {

+ #include "KXL.h"
+ 
+ #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+@@ -45,6 +47,7 @@
+ //==============================================================
+ void KXL_SoundServer(void)
+ {
 +#ifndef __FreeBSD__
-   KXL_SoundOk = False;

-   KXL_LoadSoundData(path, fname);

-   if (pipe(KXL_SoundData.Pipe) < 0) {

-@@ -264,6 +267,7 @@
-   }

-   if (KXL_SoundOk == False)

-     fprintf(stderr, "KXL_InitSoundServer : no sounds\n");

+   Uint16 i;
+   KXL_SoundControl Command;
+   fd_set sound_fdset;
+@@ -163,6 +166,7 @@
+       }
+     }
+   }
 +#endif
- }

- 

- /******************************************

-@@ -271,6 +275,7 @@
- ******************************************/

- void KXL_EndSound(void)

- {

+ }
+ 
+ //==============================================================
+@@ -238,6 +242,7 @@
+ //==============================================================
+ void KXL_InitSound(Uint8 *path, Uint8 **fname)
+ {
 +#ifndef __FreeBSD__
-   if (KXL_SoundOk == False)

-     return;

-   KXL_PlaySound(0, KXL_SOUND_STOP_ALL);

-@@ -278,5 +283,6 @@
-     KXL_Free(KXL_wavelist[-- KXL_SoundData.ListCnt]);

-   KXL_Free(KXL_wavelist);

-   kill(KXL_SoundData.ID, SIGTERM);

+   KXL_SoundOk = False;
+ 
+   KXL_LoadSoundData(path, fname);
+@@ -265,6 +270,7 @@
+     close(KXL_SoundData.Pipe[0]);
+     KXL_SoundOk = True;
+   }
 +#endif
- }

- 

+ }
+ 
+ //==============================================================
+@@ -272,6 +278,7 @@
+ //==============================================================
+ void KXL_EndSound(void)
+ {
++#ifndef __FreeBSD__
+   while (KXL_SoundData.ListCnt)
+     KXL_Free(KXL_wavelist[-- KXL_SoundData.ListCnt].Data);
+   KXL_Free(KXL_wavelist);
+@@ -281,5 +288,6 @@
+     KXL_PlaySound(0, KXL_SOUND_STOP_ALL);
+     kill(KXL_SoundData.ID, SIGTERM);
+   }
++#endif
+ }
+ 
diff --git a/games/kxl/files/patch-ab b/games/kxl/files/patch-ab
new file mode 100644
index 0000000..bf4d646
--- /dev/null
+++ b/games/kxl/files/patch-ab
@@ -0,0 +1,11 @@
+--- src/KXLmisc.c.orig	Wed Feb 20 21:52:35 2002
++++ src/KXLmisc.c	Wed Feb 20 21:53:17 2002
+@@ -1,6 +1,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#if __FreeBSD__ >= 5
+ #include <malloc.h>
++#endif
+ #include <signal.h>
+ #include <sys/time.h>
+ #include "KXL.h"
diff --git a/games/kxl/pkg-plist b/games/kxl/pkg-plist
index 108efdd..7224761 100644
--- a/games/kxl/pkg-plist
+++ b/games/kxl/pkg-plist
@@ -1,6 +1,6 @@
 include/KXL.h
-lib/libKXL-0.5.6.so
-lib/libKXL.a
+lib/libKXL-1.1.5.so
 lib/libKXL.so
+lib/libKXL.a
 lib/libKXL.la
 share/aclocal/KXL.m4